Commit graph

5851 commits

Author SHA1 Message Date
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
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
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
Livar
eabf8e69af Merge pull request #6347 from eerhardt/RemoveOSXConclusion
Remove the conclusion.html from the OSX installer.
2017-04-17 22:42:51 -07:00
Eric Erhardt
4c9ee21b27 Remove the conclusion.html from the OSX installer.
Also, bump the min version to 10.12, since that is all .NET Core 2.0 supports.

Fix #6322
2017-04-17 20:56:48 -05:00
dotnet-bot
64b976a348 Update CoreSetup to preview1-002028 2017-04-17 21:36:31 +00:00
Livar Cunha
ead57a58e1 Removing the location option from the msi installer. 2017-04-17 13:57:41 -07:00
Rama Krishnan Raghupathy
a629dfe210 Updating Microsoft.Extensions.DependencyModel to 002022 2017-04-17 13:02:56 -07:00
Livar
78868ad33a Merge pull request #6320 from johnbeisner/CLI-backcompat-tests
Adding a CLI Test: Execute a 1.0 tool in a netcoreapp1.1 project
2017-04-17 10:05:40 -07:00
Vijay Ramakrishnan
e9f2b22492 Updating the websdk version to 1.0.0-rel-20170413-451 2017-04-17 10:00:42 -07:00
John Beisner
a8eb0d0f50 Changes per PR code review. 2017-04-17 09:27:25 -07:00
Eric Erhardt
2acaa40269 Merge pull request #6323 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-002021 (master)
2017-04-17 10:57:48 -05:00
dotnet-bot
65ebbded91 Update CoreSetup to preview1-002021 2017-04-17 15:09:44 +00:00
faahmad
b98dccb1f7 Fix tests 2017-04-17 07:31:03 -07:00
Livar
2a00911b1f Merge pull request #6324 from eerhardt/Fix6244
Rename publish --target to --manifest.
2017-04-14 20:37:04 -07:00