Commit graph

1358 commits

Author SHA1 Message Date
John Beisner
e6b8ef5bb7 The transport feed DLL method: 'PushToBlobFeed' parameters have changed with the newer DLL. 2017-10-30 16:40:49 -07:00
Livar
3d8ce7574b
Merge pull request #7900 from dotnet/merges/release/15.5-to-master-20171025-065942
Merge release/15.5 to master
2017-10-30 10:56:28 -07:00
Livar Cunha
dfd20eaf30 Updating the version of the command line parser. 2017-10-27 11:17:18 -07:00
Livar
954b9a3ee1 Merge branch 'master' into merges/release/15.5-to-master-20171025-065942 2017-10-26 15:13:01 -07:00
dotnet-bot
7d3ac35d84 Update CoreSetup to preview1-25825-07 2017-10-25 22:19:32 +00:00
Livar
103a56803f Merge branch 'master' into merges/release/15.5-to-master-20171025-065942 2017-10-25 10:46:31 -07:00
Livar
835d38b27f Merge branch 'release/15.5' into merges/release/2.0.0-to-release/15.5-20171024-070026 2017-10-24 10:09:16 -07:00
Andy Gerlicher
f81c0fc1d7 MSBuild 15.5.165 2017-10-23 14:59:24 -07:00
dotnet-bot
fa2bd27688 Update CoreSetup to preview1-25823-01 2017-10-23 17:28:38 +00:00
John Beisner
f26e651c6a Defining the published Nupkgs in one place. 2017-10-20 14:02:41 -07:00
John Beisner
9bd54acabe Adding the second CLI NuPkg 2017-10-20 11:55:14 -07:00
Livar
b50595c419 Merge branch 'master' into merges/release/15.5-to-master-20171019-070029 2017-10-19 11:26:33 -07:00
Livar
0d51d3d0f7 Merge branch 'master' into master-UpdateDependencies 2017-10-18 20:16:33 -07:00
dotnet-bot
5537be658f Update CoreSetup to preview1-25818-02 2017-10-18 21:35:19 +00:00
Livar
aad235fd1c Merge branch 'master' into merges/release/15.5-to-master-20171018-070036 2017-10-18 12:20:03 -07:00
Livar
8d7863e103 Merge pull request #7865 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25818-01 (master)
2017-10-18 11:38:33 -07:00
Livar
569ae654ae Merge pull request #7860 from dotnet/livarcocc-patch-3
Updating the version on master to 2.2.0
2017-10-18 10:54:32 -07:00
dotnet-bot
8b69a7506a Update CoreSetup to preview1-25818-01 2017-10-18 17:45:51 +00:00
Livar
d3098e7fcd Update SDK to 15.5.0-preview-20171018-2 2017-10-18 10:40:15 -07:00
Livar
8e2b99dae1 Removing a bundled template that should not be here.
Microsoft.DotNet.Web.Client.ItemTemplates should not be here yet.
2017-10-17 17:53:18 -07:00
Livar
a450165732 Updating the branding to 2.2.0 2017-10-17 16:54:22 -07:00
Livar
13ba5efc12 Updating the version on master to 2.2.0 2017-10-17 16:53:50 -07:00
Livar
9bd976f5ec Updating ASP.NET templates to 1.0.0-beta2-20170810-304 2017-10-17 16:52:20 -07:00
Livar
730affa440 Merge branch 'master' into master-UpdateDependencies 2017-10-17 16:26:04 -07:00
Livar
a34ecdeff6 Merge branch 'master' into merges/release/15.5-to-master-20171016-070031 2017-10-17 14:42:15 -07:00
dotnet-bot
3484dd26df Update CoreSetup to preview1-25817-05 2017-10-17 21:40:36 +00:00
Livar
5d44ab70cd Merge pull request #7856 from livarcocc/update_branding_to_2_1
Updating the brand to 2.1.1.
2017-10-17 13:20:30 -07:00
Livar
966e133565 Merge branch 'master' into merges/release/15.5-to-master-20171016-070031 2017-10-17 11:36:43 -07:00
Livar Cunha
bfb045e311 Updating the brand to 2.1.1. 2017-10-17 11:22:24 -07:00
dotnet-bot
a6b40da4ae Update CoreSetup to preview1-25817-01 2017-10-17 17:50:35 +00:00
Livar
95dafad76b Merge branch 'release/15.5' into update_roslyn 2017-10-17 10:09:24 -07:00
Livar
c4faa28ffa Merge pull request #7847 from AndyGerlicher/MSBuild.15.5.160
MSBuild 15.5.160
2017-10-17 09:50:22 -07:00
Livar Cunha
ea158bb686 Update the roslyn version to 2.6.0-beta2-62210-01. 2017-10-17 09:48:16 -07:00
John Beisner
f33310fefc Make the uploads to blob storage more exacting. 2017-10-17 09:08:35 -07:00
Daniel Plaisted
2a3a5be07d Insert SDK 15.5.0-preview-20171017-1 2017-10-16 17:23:12 -07:00
Livar
9de48be817 Merge pull request #7834 from harshjain2/TPv2LatestRelease
Updated version of TestPlatform to 15.5.0-preview-20171012-09
2017-10-16 15:52:49 -07:00
Livar Cunha
e1916cc4dc Merge remote-tracking branch 'dotnet/release/15.5' into merges/release/15.5-to-master-20171016-070031
* dotnet/release/15.5: (21 commits)
  Manually merging some changes that git merged wrong and deleted from the 15.5 branch.
  Separating the 'legacy' URL construction from the 'current' URL construction methods and logic.
  Use temporary path for fake deps.json in test
  Use same build number for roslyn and F# satellites
  Updating Roslyn satellites and SDK versions
  Insert NuGet Build 4.5.0-preview2-4529 into cli
  Update NuGet to 4529 (signed)
  MSBuild 15.5.154
  MSBuild 15.5.153
  removed commented out config I'd meant to remove
  added a way to specify the asp.net template versions
  Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0
  'NuGet.master.config' does not appear to be used.
  Fixed tests
  Update branch info to release/15.5
  Updating the websdk version to 2.0.0-rel-20171010-665
  Insert NuGet Build 4.5.0-preview1-4526 into cli
  Update DependencyVersions.props
  Updated version of TestPlatform to 15.5.0-preview-20170923-02
  MSBuild 15.4.8
  ...
2017-10-16 15:42:40 -07:00
Andy Gerlicher
88bcf0ffb3 MSBuild 15.5.160 2017-10-16 14:40:46 -07:00
dotnet-bot
1efa3f57ad Update CoreSetup to preview1-25816-02 2017-10-16 21:38:06 +00:00
John Beisner
0c4bcdcc55 Enabling the publish of CLI NuPkg to the unified Transport feed. 2017-10-16 14:33:50 -07:00
Livar
80d76f93a4 Merge branch 'release/15.5' into merges/release/2.0.0-to-release/15.5-20171013-070028 2017-10-13 10:19:11 -07:00
Livar Cunha
27aa698710 Manually merging some changes that git merged wrong and deleted from the 15.5 branch. 2017-10-13 09:56:08 -07:00
Livar Cunha
1943ddc57f Merge remote-tracking branch 'dotnet/release/2.0.0' into merges/release/2.0.0-to-release/15.5-20171013-070028
* dotnet/release/2.0.0:
  Use temporary path for fake deps.json in test
  Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0
  'NuGet.master.config' does not appear to be used.
  Reverting previous change to: 'NuGet.master.config'
  Moving the runtime version to 2.0.0 for the SDK.
  Revert release/2.0.0 back to 1bcee43995
  Adding the unified transport NuGet feed.
  Keeping the branding for release/2.0.0 at 2.0.3.
  MSBuild 15.4.8
  Insert SDK 2.0.2-vspre-20170927-1
2017-10-13 09:04:58 -07:00
Harsh Jain
41d1f6ad6d Updated version of TPv2 2017-10-13 14:09:32 +05:30
Nick Guerrera
c0c4be7946 Merge branch 'release/2.0-vs' into merge-2.0-vs 2017-10-12 18:22:04 -07:00
Nick Guerrera
7b558111ae Use same build number for roslyn and F# satellites 2017-10-12 16:22:06 -07:00
Livar
428b2caa6b Merge pull request #7814 from AndyGerlicher/MSBuild.15.5.154
MSBuild 15.5.154
2017-10-12 13:51:38 -07:00
Livar
278cbf6c44 Merge pull request #7819 from dotnet/livarcocc-patch-2
Updating Roslyn satellites and SDK versions
2017-10-11 23:54:09 -07:00
Livar
821a413dd6 Updating Roslyn satellites and SDK versions 2017-10-11 22:29:40 -07:00
NuGet Team Bot
15ee853d49 Insert NuGet Build 4.5.0-preview2-4529 into cli 2017-10-11 18:44:34 -07:00