Commit graph

6023 commits

Author SHA1 Message Date
Eric Erhardt
126c42050d Fixing crossgen to use the correct RID for OSX and Win now that only portable packages are being produced. 2017-04-25 23:00:20 -05:00
Eric Erhardt
de139a3bf8 Update core-setup channel to release/2.0.0 2017-04-25 22:29:50 -05:00
dotnet-bot
fd112f45a0 Update CoreSetup to preview1-002088 2017-04-26 03:16:03 +00:00
Zhi Li
ab0a68d32f update nuget version to 4.3.0-preview1-2500 2017-04-25 16:48:12 -07:00
Mike Lorbetske
9014b1b163 Update templates and add 'baseline' feature 2017-04-25 16:25:27 -07:00
Livar
9593adffc7 Merge pull request #6405 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview2-002081 (master)
2017-04-25 16:10:31 -07:00
Livar Cunha
7ebd363ca2 Generating the Microsoft.NETCoreSdk.BundledVersions.props file in the CLI folder, so that it can be picked up by the SDK. 2017-04-25 13:10:15 -07:00
dotnet-bot
195d11ceb5 Update CoreSetup to preview2-002081 2017-04-25 19:30:57 +00:00
William Lee
6dd6192155 Merge pull request #6383 from wli3/small-bug-fixes
Small bug fixes
2017-04-24 16:40:46 -07:00
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