Commit graph

1289 commits

Author SHA1 Message Date
Livar Cunha
a27354ba57 Merge branch 'release/2.1' into merge_release_21
* release/2.1:
  Correct the fix for devdiv bugs 526577 and 526578, the wrong property had been updated
  Updating the branding of the CLI to 2.1.4
  Updating the msbuild version for Microsoft.Build.Runtime.
  Updating the websdk version to 2.0.0-rel-20171110-671

	build/DependencyVersions.props
2017-12-12 15:24:09 -08:00
Mike Lorbetske
5fb2b271a8 Correct the fix for devdiv bugs 526577 and 526578, the wrong property had been updated 2017-12-08 12:52:48 -08:00
Livar
9c5843d071
Merge pull request #8165 from dotnet/vramak/UpdateWebSdk_12_4
Updating the websdk version to 2.0.0-rel-20171110-671
2017-12-07 14:35:01 -08:00
Livar Cunha
c768b01523 Updating the branding of the CLI to 2.1.4 2017-12-07 13:15:46 -08:00
Livar Cunha
902904cdd6 Updating the msbuild version for Microsoft.Build.Runtime. 2017-12-07 13:13:43 -08:00
Livar Cunha
60ba27d2db Adding a separate dependency version for Microsoft.Build.Runtime. 2017-12-07 12:19:43 -08:00
Livar Cunha
0c97a82d92 Updating the branding of the CLI to 2.1.4 and the runtime to 2.0.5. 2017-12-04 21:23:14 -08:00
Vijay Ramakrishnan
11d9413b49 Updating the websdk version to 2.0.0-rel-20171110-671 2017-12-04 16:02:40 -08:00
John Luo
9d391355f8 Consume 2.0.4 LZMA attempt 2 2017-12-01 10:54:49 -08:00
John Luo
6e41f29b38 Consume 2.0.4 LZMA 2017-11-30 16:43:20 -08:00
Livar Cunha
fdb3c60deb Updating the branding of the CLI to 2.1.3. 2017-11-28 12:57:34 -08:00
Livar Cunha
9e97e53446 Updating the CLI branding to 2.1.2 and ingesting the 2.0.4 runtime. 2017-11-27 11:36:12 -08:00
Nick Guerrera
68c8639f09
Merge pull request #8083 from nguerrera/update-satellites
Update F# and Roslyn translations
2017-11-27 10:20:57 -08:00
Livar
469d6fb4df
Merge pull request #8094 from dotnet/merges/release/2.0.0-to-release/15.5-20171124-080040
Merge release/2.0.0 to release/15.5
2017-11-24 19:52:41 -08:00
Nick Guerrera
129b064900 Update F# and Roslyn translations 2017-11-21 17:02:26 -08:00
Matt Mitchell
b7cc4a51b7
Update feed tasks version
Includes some fixes for upload timeouts and a version number change
2017-11-21 13:50:27 -08:00
Nick Guerrera
211255ec88 Revert "Update Roslyn and F# satellite assemblies"
This reverts commit f91a4906a7.
2017-11-21 10:43:26 -08:00
Nick Guerrera
f91a4906a7
Update Roslyn and F# satellite assemblies 2017-11-21 10:16:18 -08:00
Livar
2b55a52e33
Merge pull request #8057 from mlorbetske/dev/mlorbe/UpdateTemplateEngineVersionFor15.5
Update template engine version for 15.5
2017-11-20 11:50:43 -08:00
Mike Lorbetske
d5c799b926 Update template engine version for 15.5 2017-11-17 18:40:33 -08:00
Livar
7e92f68b41
Merge branch 'release/15.5' into merges/release/2.0.0-to-release/15.5-20171117-080027 2017-11-17 18:26:30 -08:00
NuGet Team Bot
0cd05674ac Insert NuGet Build 4.5.0-rtm-4651 into cli 2017-11-16 16:43:21 -08:00
Livar
09b2cd74c4
Merge pull request #8031 from AndyGerlicher/MSBuild.15.5.179
MSBuild 15.5.179
2017-11-16 11:55:46 -08:00
Andy Gerlicher
a75115f4f7 MSBuild 15.5.179 2017-11-15 18:05:25 -08:00
Livar
b7f81a574e
Update SDK to 15.5.0-preview-20171116-1 2017-11-15 17:14:17 -08:00
Livar Cunha
fe69088703 Updating Roslyn version. 2017-11-15 13:22:30 -08:00
Livar
46c55a322f
Merge pull request #8016 from livarcocc/merge_15_5_msrc
Merge release/15.5-MSRC into release/15.5
2017-11-15 09:49:19 -08:00
Livar
30329286d7
Merge pull request #8019 from KevinRansom/release/15.5
Update F# compiler
2017-11-14 18:54:51 -08:00
Kevin Ransom (msft)
6fef644b70 Update F# compiler 2017-11-14 14:54:03 -08:00
Livar
c0488894b1
Merge pull request #8005 from mlorbetske/dev/mlorbe/UpdateForTestTemplates
Update non-web templates to version 1.0.0-beta3-20171110-312
2017-11-14 14:49:44 -08:00
Livar Cunha
e212767253 Keeping the branding suffix as servicing. 2017-11-14 12:57:11 -08:00
Livar Cunha
dc8a8e02db Merge branch 'release/2.0.0-MSRC' into merge_2_0_0_MSRC
* release/2.0.0-MSRC:
  Updating SDK to 2.0.3-servicing-20171109-3
  Update SDK to 2.0.2-vspre-20170927-1.
  Update aspnetcore to 2.0.3 build 125
  Update aspnetcore to 2.0.3 build 124
  Update aspnetcore to 2.0.3 build 123
  Updating branding to 2.0.3, again
  Fixing closing tags in the DEB and RPM targets.
  Enabling our native installer tests to always get a 2.0.0 asp.net runtime store. We need to solve this in a more generic way in the future. But this will unblock the build for now.
  Update aspnetcore runtime store and LZMA to 2.0.3 build 120
  Adding the pre-release runtime version hack to RHEL as well. Basically, skip native installer tests when using a pre-release runtime.
  Adding the access token to the native installer URLs so that we can download those from protected locations when needed.
  Fixing the expected runtime version by the tool tests.
  Updating the runtime version.
  Updating the branding to 15.5.1
  Adding a test hack to allow the CLI to pass tests with a pre-release runtime for 2.0 TFM.
  Merged PR 82801: Allow non-anonymous storage account access for .lzma download
2017-11-14 12:51:43 -08:00
Livar Cunha
005eab5b3f Merge branch 'release/15.5-MSRC' into merge_15_5_msrc
* release/15.5-MSRC:
  Update aspnetcore to 2.0.3 build 125
  Update aspnetcore to 2.0.3 build 124
  Update aspnetcore to 2.0.3 build 123
  Updating branding to 2.0.3, again
  Fixing closing tags in the DEB and RPM targets.
  Enabling our native installer tests to always get a 2.0.0 asp.net runtime store. We need to solve this in a more generic way in the future. But this will unblock the build for now.
  Update aspnetcore runtime store and LZMA to 2.0.3 build 120
  Adding the pre-release runtime version hack to RHEL as well. Basically, skip native installer tests when using a pre-release runtime.
  Adding the access token to the native installer URLs so that we can download those from protected locations when needed.
  Fixing the expected runtime version by the tool tests.
  Updating the runtime version.
  Updating the branding to 15.5.1
  Adding a test hack to allow the CLI to pass tests with a pre-release runtime for 2.0 TFM.
  Merged PR 82801: Allow non-anonymous storage account access for .lzma download
2017-11-14 12:47:53 -08:00
Livar
e5d2a67cfe
Merge pull request #7974 from singhsarab/patch-1
Updating the version for TestPlatform
2017-11-13 12:14:25 -08:00
Mike Lorbetske
5d85c8fde6 Update non-web templates to version 1.0.0-beta3-20171110-312 2017-11-13 12:02:34 -08:00
John Beisner
f0111a36c2
Merge pull request #7984 from johnbeisner/PublishToTFMethodUpdate
Changes in the Transport feed DLL requires our response; release/2.0.0
2017-11-09 15:49:23 -08:00
John Beisner
85e79297c3 Simplified logic; part 2. 2017-11-09 13:38:33 -08:00
John Beisner
ef22bb23fc Simplified some logic. 2017-11-09 12:17:25 -08:00
John Beisner
14be2fc2a8 Fixed an incorrect conditional. 2017-11-09 12:14:56 -08:00
John Beisner
31fd2312b0 Make the "ExpectedFeedUrl" fully configurable. 2017-11-09 12:11:25 -08:00
John Beisner
95f30e3bec Moving conditional to load 'Microsoft.DotNet.Build.Tasks.Feed.targets' out of 'build.proj' 2017-11-09 09:30:11 -08:00
Livar
8b3c80958b
Merge pull request #7971 from dotnet/merges/release/2.0.0-to-release/15.5-20171107-080033
Merge release/2.0.0 to release/15.5
2017-11-09 00:04:47 -08:00
John Beisner
7b593a8ec6 Defining: "BuildTasksFeedToolVersion" 2017-11-08 19:42:41 -08:00
Livar Cunha
f85436d82d Updating SDK to 2.0.3-servicing-20171109-3 2017-11-08 19:16:27 -08:00
John Beisner
04ac042451 Changes in the Transport feed DLL requires our response; update Transport feed DLL version and base URL.
Defining "BuildTasksFeedDll" & relevent 'UsingTask' no longer needed as PublishNupkgToTransportFeed.targets uses the imported Microsoft.DotNet.Build.Tasks.Feed.targets to locate the Feed DLL
2017-11-08 19:07:29 -08:00
Livar Cunha
ef453ae64a Merge branch 'release/15.5' into merge_release_15_5
* release/15.5:
  Updating the SDK and Support package on the CLI
2017-11-08 18:04:43 -08:00
Jose Perez Rodriguez
079edcd894 Updating the SDK and Support package on the CLI 2017-11-08 15:31:51 -08:00
Livar Cunha
aa944444f6 Update SDK to 2.0.2-vspre-20170927-1. 2017-11-08 14:31:06 -08:00
Livar Cunha
cdefd5d7aa Merge branch 'release/15.5' into release/15.5-MSRC
* release/15.5:
  Update SDK to 15.5.0-preview-20171107-4
  MSBuild 15.5.178
  LOC CHECKIN | dotnet/cli - release/15.5 | 20171031
2017-11-08 13:14:44 -08:00
John Beisner
d19b3f4b2e Correcting 'PUBLISH_TO_AZURE_BLOB' and 'PUBLISH_NUPKG_TO_AZURE_BLOB' Booleans - 'false' should not be conveyed by the empty string. 2017-11-08 10:24:25 -08:00