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

7456 commits

This branch
This branch
All branches
Author SHA1 Message Date
Livar
82d9bbc2f2 Merge pull request #7868 from dotnet/merges/release/15.5-to-master-20171019-070029 
Merge release/15.5 to master
 2017-10-19 16:25:55 -07:00
Livar
b50595c419 Merge branch 'master' into merges/release/15.5-to-master-20171019-070029 2017-10-19 11:26:33 -07:00
Kevin Ransom (msft)
1860d2f513 Merge pull request #7866 from dotnet-bot/master-UpdateDependencies 
Update CoreSetup to preview1-25818-02 (master)
 2017-10-19 11:07:30 -07:00
Livar
0d51d3d0f7 Merge branch 'master' into master-UpdateDependencies 2017-10-18 20:16:33 -07:00
Livar
ffbb8b14b5 Merge pull request #7862 from dotnet/merges/release/15.5-to-master-20171018-070036 
Merge release/15.5 to master
 2017-10-18 16:42:22 -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
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
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
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
2cd143d949 Merge pull request #7858 from dotnet-bot/master-UpdateDependencies 
Update CoreSetup to preview1-25817-05 (master)
 2017-10-17 20:52:50 -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
2258ab811c Merge pull request #7845 from dotnet/merges/release/15.5-to-master-20171016-070031 
Merge release/15.5 to master
 2017-10-17 16:24:48 -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
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
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
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
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