Commit graph

8017 commits

Author SHA1 Message Date
seancpeters
b5b7b9b16c
Merge branch 'master' into templating_2.1.0-preview1_insertion_2017_11_09 2017-11-14 14:06:05 -08:00
seancpeters
29a3673535
Merge branch 'master' into templating_2.1.0-preview1_insertion_2017_11_09 2017-11-14 14:04:55 -08:00
Livar
3b4becd7c8
Merge pull request #8011 from dotnet/merges/release/15.5-to-master-20171114-080040
Merge release/15.5 to master
2017-11-14 12:58:56 -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
5955194c11
Merge pull request #8002 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25912-02 (master)
2017-11-13 12:14:46 -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
dotnet-bot
36d201b4f0 Update CoreSetup to preview1-25912-02 2017-11-12 22:48:10 +00:00
John Beisner
929cf1d5ac Corrected usage... 2017-11-11 21:22:54 -08:00
John Beisner
9599ee5b77 Removing the MyGet 'dotnet-core' from the Nuget.config 2017-11-11 20:30:23 -08:00
Nick Guerrera
20d4d77586
Merge pull request #7998 from dotnet/release/15.5
Merge release/15.5 to master
2017-11-11 10:15:25 -08:00
Nick Guerrera
f64717fc31
Merge pull request #7994 from dotnet/nguerrera/update-sdk
Update SDK
2017-11-10 21:42:30 -08:00
seancpeters
02e82d5610
Merge branch 'master' into templating_2.1.0-preview1_insertion_2017_11_09 2017-11-10 17:28:33 -08:00
Sean Peters
b1c7c072b6 updated the websdk version 2017-11-10 17:21:37 -08:00
Sean Peters
a49a9680ff bumped the templating build number 2017-11-10 16:26:36 -08:00
Jon Sequeira
7327bae574
Update tab-completion.md 2017-11-10 15:27:27 -08:00
Nick Guerrera
5d2c5f9943
Update SDK 2017-11-10 10:56:54 -08:00
Nick Guerrera
f15495cee3
Merge pull request #7987 from dotnet/merges/release/15.5-to-master-20171109-080038
Merge release/15.5 to master
2017-11-10 10:20:37 -08:00
Nick Guerrera
71cb608e48
Merge branch 'master' into merges/release/15.5-to-master-20171109-080038 2017-11-09 18:43:28 -08:00
Livar
10238b401f
Merge pull request #7991 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25909-03 (master)
2017-11-09 17:10:45 -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
Sean Peters
82718a146c Inserting dotnet/templating rel/2.1.0-preview1 into cli master 2017-11-09 15:46:14 -08:00
dotnet-bot
dfc674fb09 Update CoreSetup to preview1-25909-03 2017-11-09 22:44:46 +00: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
Livar Cunha
12f0c7efcc Merged PR 93532: Updating SDK to 2.0.3-servicing-20171109-3
Updating SDK to 2.0.3-servicing-20171109-3
2017-11-09 19:19:16 +00: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
John Beisner
5bc9335ff8
Merge pull request #7981 from johnbeisner/FixingPublishConditionals
Correcting 'PUBLISH_TO_AZURE_BLOB' and 'PUBLISH_NUPKG_TO_AZURE_BLOB'
2017-11-08 18:16:27 -08:00
Livar Cunha
a4d1a8e0bb Merged PR 93520: Merge release/15.5 to release/15.5-MSRC 2017-11-09 02:05:53 +00: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
Livar
f33659b500
Merge pull request #7983 from joperezr/UpdateSDK
Updating the SDK and Support package on the CLI
2017-11-08 17:37:12 -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
4447dffe26 Merged PR 93462: Update SDK to 2.0.2-vspre-20170927-1.
Update SDK to 2.0.2-vspre-20170927-1.
2017-11-08 22:32:50 +00:00
Livar Cunha
aa944444f6 Update SDK to 2.0.2-vspre-20170927-1. 2017-11-08 14:31:06 -08:00
John Beisner
08e594b860
Merge pull request #7982 from johnbeisner/FixingPublishConditionals2.0.0
Correcting 'PUBLISH_TO_AZURE_BLOB' and 'PUBLISH_NUPKG_TO_AZURE_BLOB'; 2.0.0
2017-11-08 14:25:44 -08:00
John Beisner
e3b32e41ec
Merge pull request #7978 from johnbeisner/NugetConfigModification
Removing Tier 1 repos from Nuget.config
2017-11-08 14:24:20 -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
6302b34d56 per code review:
Putting back: https://dotnet.myget.org/F/dotnet-core/api/v3/index.json
2017-11-08 10:33:40 -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
John Beisner
e1d3320376 Correcting 'PUBLISH_TO_AZURE_BLOB' and 'PUBLISH_NUPKG_TO_AZURE_BLOB' Booleans - 'false' should not be conveyed by the empty string. 2017-11-08 09:26:32 -08:00
Livar
b80bfc6dfb
Merge pull request #7977 from dotnet/update_sdk
Update SDK to 15.5.0-preview-20171107-4
2017-11-07 21:32:00 -08:00
John Beisner
ef42a98a1c Removing Tier 1 repos from Nuget.config; those repos are now coming from the internal 'dotnet-core' feed. 2017-11-07 16:38:39 -08:00