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

7801 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kevin Ransom (msft)
182e0ca569 Merge pull request #7855 from dotnet-bot/master-UpdateDependencies 
Update CoreSetup to preview1-25817-01 (master)
 2017-10-17 14:13:33 -07:00
Livar Cunha
4577a7839a Fixing the windows build. 2017-10-17 13:43:19 -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
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
a1ecb3bb3f Merge pull request #7850 from dotnet/livarcocc-patch-2 
Adding a note about needing additional feeds
 2017-10-17 09:51:14 -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
Eric Erhardt
fa8006cf9e Merge pull request #7846 from dotnet-bot/master-UpdateDependencies 
Update CoreSetup to preview1-25816-02 (master)
 2017-10-17 08:57:46 -05:00
Livar
c434233ba5 Adding a note about needing additional feeds 
Additional feeds may be necessary when consuming pre-release bits. Added this additional information to the README page of the CLI.
 2017-10-16 21:16:43 -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
Livar Cunha
7af7c91eb6 Adding redist to the list of changes. I missed it in the merge commit. 2017-10-16 15:44:15 -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
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
Livar
8c589212c8 Merge pull request #7802 from dotnet-bot/master-UpdateDependencies 
Update CoreSetup to preview1-25810-02 (master)
 2017-10-12 12:59:11 -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
65caf8faab Merge pull request #7817 from dotnet/nuget-insertbuild4529 
Insert NuGet Build 4.5.0-preview2-4529 into cli
 2017-10-11 22:30:55 -07:00
Livar
821a413dd6 Updating Roslyn satellites and SDK versions 2017-10-11 22:29:40 -07:00
Eric Erhardt
484714df1b Exclude Desktop framework assemblies in the "Extensions" folder from crossgen. 
Work around MSBuild globbing bug in a Target by just excluding the one assembly.

See https://github.com/Microsoft/msbuild/issues/2631
 2017-10-11 22:31:27 -05:00
NuGet Team Bot
15ee853d49 Insert NuGet Build 4.5.0-preview2-4529 into cli 2017-10-11 18:44:34 -07:00
Livar
95a56ffcfe Merge pull request #7811 from seancpeters/15.5_separate_aspnet_templates 
Added a property to DependencyVersions.props for asp.net template version
 2017-10-11 18:40:24 -07:00
Livar
58bbbe8c1a Merge branch 'release/15.5' into MSBuild.15.5.154 2017-10-11 18:37:03 -07:00
Livar
9d0d22a0e0 Merge pull request #7813 from AndyGerlicher/MSBuild.15.5.153 
MSBuild 15.5.153 (No Double Evaluation Fix)
 2017-10-11 18:36:34 -07:00
Andy Gerlicher
d15d448332 Update NuGet to 4529 (signed) 2017-10-11 18:30:57 -07:00
Andy Gerlicher
97f4a01869 MSBuild 15.5.154 2017-10-11 17:27:36 -07:00