Commit graph

1454 commits

Author SHA1 Message Date
Livar
01393ed3bc
Merge branch 'master' into merges/release/15.5-to-master-20171120-080035 2017-11-20 12:30:12 -08:00
dotnet-bot
125514df02 Update CoreSetup to preview1-25919-02 2017-11-19 22:30:20 +00:00
Livar
d0b2b5f678
Merge pull request #8059 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25918-03 (master)
2017-11-18 13:56:17 -08:00
Livar
90d667e9b0
Merge pull request #8056 from mlorbetske/dev/mlorbe/UpdateTemplateEngineVersion
Update template engine version for 15.6+
2017-11-18 13:55:27 -08:00
dotnet-bot
d4df0010af Update CoreSetup to preview1-25918-03 2017-11-18 19:18:46 +00:00
Mike Lorbetske
746b669a4c Update template engine version for 15.6+ 2017-11-17 18:37:56 -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
dotnet-bot
90a0249e00 Update CoreSetup to preview1-25917-06 2017-11-17 22:39:35 +00:00
Livar
d0c5510ee2
Merge pull request #7992 from seancpeters/templating_2.1.0-preview1_insertion_2017_11_09
Inserting dotnet/templating rel/2.1.0-preview1 into cli master
2017-11-16 18:27:28 -08:00
NuGet Team Bot
0cd05674ac Insert NuGet Build 4.5.0-rtm-4651 into cli 2017-11-16 16:43:21 -08:00
dotnet-bot
4498142bb5 Update CoreSetup to preview1-25916-02 2017-11-16 22:48:36 +00: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
dotnet-bot
91bdd7e3a4 Update CoreSetup to preview1-25916-01 2017-11-16 18:45:07 +00: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
dotnet-bot
23575687f6 Update CoreSetup to preview1-25915-02 2017-11-15 23:44:19 +00:00
Livar Cunha
fe69088703 Updating Roslyn version. 2017-11-15 13:22:30 -08:00
dotnet-bot
1a16f3a7c5 Update CoreSetup to preview1-25915-01 2017-11-15 19:13:43 +00: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
dotnet-bot
04c477fc21 Update CoreSetup to preview1-25914-05 2017-11-14 23:04:34 +00: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
Sean Peters
be0bebdf30 updated TemplateEnd template versions. Removed old entries from BundledTemplates.props 2017-11-14 14:13:31 -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
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
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
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
Nick Guerrera
5d2c5f9943
Update SDK 2017-11-10 10:56:54 -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
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
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