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

6114 commits

This branch
This branch
All branches
Author SHA1 Message Date
Livar
79c308bb58 Merge branch 'release/2.0.0' into small-bug-fixes 2017-04-24 10:17:53 -07:00
Livar
dd4e8b79e0 Merge pull request #6382 from dotnet-bot/master-UpdateDependencies 
Update CoreSetup to preview2-002066 (master)
 2017-04-24 10:14:36 -07:00
Eric Erhardt
65662ea385 Merge branch 'master' into master-UpdateDependencies 2017-04-24 10:19:27 -05:00
William Li
de0c37a48c Remove accidental debug line 2017-04-23 14:13:19 -07:00
William Li
da398658dc Localization for CommonOptions 2017-04-23 14:13:11 -07:00
Livar
63832070dd Merge pull request #6388 from livarcocc/bring_over_template_changes 
Merge pull request #6362 from mlorbetske/dev/mlorbe/Update20Templates
 2017-04-22 13:18:16 -07:00
Livar
72cc5baeac Merge pull request #6387 from livarcocc/update_channel_release_200 
Merge pull request #6380 from livarcocc/update_channel
 2017-04-22 13:18:00 -07:00
Livar
0156fa5f60 Merge pull request #6386 from livarcocc/revert_channel_update 
Revert "Merge pull request #6380 from livarcocc/update_channel"
 2017-04-22 13:17:10 -07:00
Livar
6464e0152d Merge pull request #6380 from livarcocc/update_channel 
Updating the release/2.0.0 channel and the README to point to this new channel
 2017-04-22 12:03:22 -07:00
Livar Cunha
d78823c019 Revert "Merge pull request #6380 from livarcocc/update_channel" 
This reverts commit 14cede7909, reversing
changes made to 8f2fcef544.
 2017-04-22 12:01:57 -07:00
Livar
4f6fbc4a7f Merge pull request #6362 from mlorbetske/dev/mlorbe/Update20Templates 
Update templates and engine, pin ASP.NET package versions, add web item templates
 2017-04-22 12:00:08 -07:00
Livar
4992296d12 Merge pull request #6362 from mlorbetske/dev/mlorbe/Update20Templates 
Update templates and engine, pin ASP.NET package versions, add web item templates
 2017-04-22 11:52:54 -07:00
Livar
14cede7909 Merge pull request #6380 from livarcocc/update_channel 
Updating the release/2.0.0 channel and the README to point to this new channel
 2017-04-22 11:52:13 -07:00
Mike Lorbetske
8227a6edac Update templates, remove browserlink from checked packages 2017-04-21 22:10:57 -07:00
Mike Lorbetske
38e467e990 Fix build warning for web projects, add gracefull fallback for framework reference add attempts 2017-04-21 20:51:52 -07:00
Mike Lorbetske
cc64d6cd6d Re-enable tests as promised 2017-04-21 20:51:52 -07:00
Mike Lorbetske
2cbbea5b48 Put 195 engine version back 2017-04-21 20:51:52 -07:00
Mike Lorbetske
90cdb07cbc Try slightly earlier engine version 2017-04-21 20:51:52 -07:00
Mike Lorbetske
4dd1be1978 Respond to review feedback 2017-04-21 20:51:52 -07:00
Mike Lorbetske
9ea9cbc8a6 Update templates and engine, pin ASP.NET package versions, add web item templates 2017-04-21 20:51:52 -07:00
Eric Erhardt
88b99847e0 Fixing crossgen to use the correct RID for OSX and Win now that only portable packages are being produced. 2017-04-21 21:54:35 -05:00
dotnet-bot
31dbdfa197 Update CoreSetup to preview2-002066 2017-04-22 02:06:37 +00:00
Livar
8f2fcef544 Merge pull request #6379 from livarcocc/move_master_to_preview2 
Moving master branch to preview2 branding.
 2017-04-21 16:57:37 -07:00
Livar Cunha
41a2e46ca0 Updating the release/2.0.0 channel and the README to point to this new channel. 2017-04-21 16:11:14 -07:00
Livar Cunha
6df9bc3055 Moving master branch to preview2 branding. 2017-04-21 14:26:45 -07:00
Eric Erhardt
542981f307 Merge pull request #6377 from dotnet/eerhardt-patch-1 
Update Core-setup to 2.0.0-preview1-002061-00
 2017-04-21 15:10:38 -05:00
Eric Erhardt
98e77edeb7 Merge pull request #6378 from eerhardt/FixUpdateDeps 
Fix update-dependencies
 2017-04-21 13:56:34 -05:00
Eric Erhardt
7b04142ddd Fix update-dependencies 
Update all core-setup dependencies.
Fix the app to get its shared framework from stage0 instead of what is currently checked in to the repo (which my mis-match when many builds of core-setup come out at a time).
 2017-04-21 13:04:19 -05:00
Eric Erhardt
12eff39992 Update Core-setup to 2.0.0-preview1-002061-00 2017-04-21 12:47:56 -05:00
Livar
63efcc5a0f Merge pull request #6366 from dotnet-bot/master-UpdateDependencies 
Update CoreSetup to preview1-002057 (master)
 2017-04-21 09:54:18 -07:00
Livar
0ac0048240 Merge pull request #6367 from livarcocc/highentropyva 
Enable HighEntropyVA in our builds by default.
 2017-04-21 09:53:59 -07:00
Livar
78a138412f Merge pull request #6368 from mlorbetske/dev/mlorbe/TemporarilyDisableMvcAndWebApiCreationTests 
Temporarily disable mvc & web api creation tests
 2017-04-20 17:22:39 -07:00
dotnet-bot
bb60a32737 Update CoreSetup to preview1-002057 2017-04-21 00:13:14 +00:00
Mike Lorbetske
c751bc1b7c Temporarily disable mvc & web api creation tests 2017-04-20 16:32:28 -07:00
Livar Cunha
31eeaa4744 Enable HighEntropyVA in our builds by default. 2017-04-20 14:01:34 -07:00
Livar
ca8440f44d Merge pull request #6353 from livarcocc/remove_location_from_msi 
Removing the location option from the msi installer.
 2017-04-19 22:56:44 -07:00
Eric Erhardt
b4a821109d Merge pull request #6361 from livarcocc/update_sdk 
Updating SDK version to 2.0.0-alpha-20170420-1
 2017-04-19 20:03:08 -05:00
Livar Cunha
3464af99d4 The previous commit removed the location option from the bundle. This one removes it from the sdk msi. 2017-04-19 17:15:32 -07:00
Livar Cunha
61a934229e Updating SDK version to 2.0.0-alpha-20170420-1 2017-04-19 17:12:07 -07:00
Ankit Mishra
ca8d61960e Merge pull request #6358 from dotnet/dev-anmishr-addimprovement 
Improving add package performance by removing extra dg spec files
 2017-04-19 12:36:44 -07:00
Ankit Mishra
e36f518d63 Improving add package performance by removing extra dg spec files 2017-04-19 10:48:48 -07:00
Livar
12dbed613a Merge pull request #6319 from smadala/tp-insert-0414 
TestPlatform 15.1.0-preview-20170414-04 insertion
 2017-04-19 10:08:46 -07:00
Eric Erhardt
33b83ee1c7 Merge pull request #6343 from dotnet-bot/master-UpdateDependencies 
Update CoreSetup to preview1-002028 (master)
 2017-04-19 09:15:26 -05:00
Rama krishnan Raghupathy
a150055dfb Merge pull request #6342 from ramarag/updateDependency 
Updating Microsoft.Extensions.DependencyModel to 002022
 2017-04-18 22:16:14 -07:00
Livar
3f82e11a91 Merge branch 'master' into tp-insert-0414 2017-04-18 21:06:17 -07:00
Livar
3269475562 Merge pull request #6341 from dotnet/websdkversionupdate0417 
Updating the websdk version to 1.0.0-rel-20170413-451
 2017-04-18 21:05:31 -07:00
Livar
0dc8e0c3ca Merge pull request #6351 from rogersachan/patch-1 
Mac OS X is now macOS (README.md)
 2017-04-18 21:04:40 -07:00
Livar
052237c794 Merge pull request #6354 from eerhardt/READMEFix 
Move the installer and binaries table under the Installers and Binaries section in the README.
 2017-04-18 21:03:49 -07:00
Eric Erhardt
b6e3b46df9 Move the installer and binaries table under the Installers and Binaries section in the README. 2017-04-18 14:01:07 -05:00
Roger
7d6e8bf919 Mac OS X is now macOS 2017-04-18 10:54:50 -04:00