mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
7227 commits 41 branches 190 tags 95 MiB
Commit graph

7227 commits

This branch
This branch
All branches
Author SHA1 Message Date
Livar
38b935e47a Merge pull request #7893 from dotnet/merges/release/2.0.0-to-release/15.5-20171024-070026 
Merge release/2.0.0 to release/15.5
 2017-10-24 12:45:25 -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
Livar
1421c10f1d Merge pull request #7891 from AndyGerlicher/MSBuild.15.5.165 
MSBuild 15.5.165
 2017-10-24 10:05:00 -07:00
Andy Gerlicher
f81c0fc1d7 MSBuild 15.5.165 2017-10-23 14:59:24 -07:00
Kevin Ransom
6ef8af7d6d update fsharp compiler for preview release 2017-10-23 14:47:31 -07:00
John Beisner
b11cabca4a Merge pull request #7876 from johnbeisner/PublishToTransportFeed 
Enabling the publish of CLI NuPkg to the unified Transport feed; part 2
 2017-10-23 10:18:58 -07:00
Livar Cunha
687cba8ca8 Updating branding to 2.0.3, again 2017-10-20 16:35:01 -07:00
Livar Cunha
e37e9f3fe8 Fixing closing tags in the DEB and RPM targets. 2017-10-20 14:43:29 -07:00
Livar Cunha
d4f980a02e 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. 2017-10-20 14:23:34 -07: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
Nate McMaster
372739a91f Merged PR 90385: Update aspnetcore runtime store and LZMA to 2.0.3 build 120 
Update aspnetcore runtime store and LZMA to 2.0.3 build 120.

The nupkgs for the templates and runtime are in dotnetbuilddropsmsrc/msrc-2-0-aspnet-20171018
 2017-10-20 17:15:41 +00:00
John Beisner
7fe5bda018 Merge pull request #7848 from johnbeisner/PublishToTransportFeed 
Enabling the publish of CLI NuPkg to the unified Transport feed.
 2017-10-20 09:23:18 -07:00
Nate McMaster
be1b014c7c Update aspnetcore runtime store and LZMA to 2.0.3 build 120 2017-10-20 08:59:31 -07:00
Livar
f657648f07 Merge pull request #7864 from dotnet/livarcocc-patch-2 
Update SDK to 15.5.0-preview-20171018-2
 2017-10-18 11:38:13 -07:00
Livar
d3098e7fcd Update SDK to 15.5.0-preview-20171018-2 2017-10-18 10:40:15 -07:00
Livar
150757bf66 Merge pull request #7859 from dotnet/livarcocc-patch-2 
Updating ASP.NET templates to 1.0.0-beta2-20170810-304
 2017-10-18 09:56:16 -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 Cunha
c85173f757 Merged PR 90125: Merge merge_release_200 to release/2.0.0-MSRC 2017-10-18 00:39:58 +00:00
Livar Cunha
72eda50303 Merge branch 'release/2.0.0' into merge_release_200 
* release/2.0.0:
  Separating the 'legacy' URL construction from the 'current' URL construction methods and logic.
  Use temporary path for fake deps.json in test
  MSBuild 15.4.8
  Insert SDK 2.0.2-vspre-20170927-1
 2017-10-17 17:30:58 -07:00
Livar
9bd976f5ec Updating ASP.NET templates to 1.0.0-beta2-20170810-304 2017-10-17 16:52:20 -07: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
c8c55e8edd Merge pull request #7854 from livarcocc/update_roslyn 
Update the roslyn version to 2.6.0-beta2-62210-01.
 2017-10-17 11:37:19 -07:00
Livar Cunha
bfb045e311 Updating the brand to 2.1.1. 2017-10-17 11:22:24 -07: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
Livar
54b754aafb Merge pull request #7849 from dsplaisted/insert-sdk 
Insert SDK 15.5.0-preview-20171017-1
 2017-10-16 18:09:37 -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
Andy Gerlicher
88bcf0ffb3 MSBuild 15.5.160 2017-10-16 14:40:46 -07:00
John Beisner
0c4bcdcc55 Enabling the publish of CLI NuPkg to the unified Transport feed. 2017-10-16 14:33:50 -07:00
Livar
66c321c05b Merge pull request #7843 from dotnet/merges/release/2.0.0-to-release/15.5-20171016-070028 
Merge release/2.0.0 to release/15.5
 2017-10-16 14:02:10 -07:00
Livar Cunha
401d349be2 Merged PR 89422: Merge release/2.0.0 to release/2.0.0-MSRC 2017-10-13 20:24:09 +00:00
Livar
04d6278a1f Merge pull request #7831 from dotnet/merges/release/2.0.0-to-release/15.5-20171013-070028 
Merge release/2.0.0 to release/15.5
 2017-10-13 12:01:05 -07:00
John Beisner
f7899911a7 Merge pull request #7835 from johnbeisner/InstallScriptUpdate 
Separating the URL construction methods for dotnet-install.sh
 2017-10-13 10:23:36 -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
7ed2a559c1 Merge pull request #7826 from nguerrera/sync-satellite-ver 
Use same build number for roslyn and F# satellites
 2017-10-13 10:12:02 -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
John Beisner
3d52d24058 Separating the 'legacy' URL construction from the 'current' URL construction methods and logic. 2017-10-13 09:43:04 -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
Livar
cea4c38789 Merge pull request #7830 from nguerrera/merge-2.0-vs 
Merge release/2.0-vs into release/2.0.0
 2017-10-13 09:01:17 -07:00
Harsh Jain
41d1f6ad6d Updated version of TPv2 2017-10-13 14:09:32 +05:30
Nick Guerrera
fe57933b09 Merge pull request #7829 from nguerrera/port-json-flakiness-fix 
Use temporary path for fake deps.json in test
 2017-10-12 20:29:28 -07:00
Nick Guerrera
c0c4be7946 Merge branch 'release/2.0-vs' into merge-2.0-vs 2017-10-12 18:22:04 -07:00
Nick Guerrera
e59fd7af46 Use temporary path for fake deps.json in test 
(cherry picked from commit 796b4a06e7)
 2017-10-12 16:32:12 -07:00
Nick Guerrera
7b558111ae Use same build number for roslyn and F# satellites 2017-10-12 16:22:06 -07:00
Livar Cunha
f6a07bcb39 Merge branch 'release/2.0.0' into merge_release_200 
* release/2.0.0:
  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.
  Update cli-deps-satellites
  Fix up roslyn satellite assembly handling to match new insertion mechanism
 2017-10-12 14:56:23 -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