Commit graph

7051 commits

Author SHA1 Message Date
Livar Cunha
eb7b759fec Remove newtonsoft.json dependency from TestAssets/DesktopTestProjects/AutoAddDesktopReferencesDuringMigrate/project.json 2017-05-08 16:22:03 -07:00
Eric Erhardt
6df51ceb3b Fix CLI's reference to core-setup's installer files to use $(RID) instead of a moniker. 2017-05-08 17:39:14 -05:00
Livar
444d75c0cd Merge pull request #6526 from mikkelbu/fail-gracefully-when-multiple-project-exist
Fail gracefully when multiple projects exist
2017-05-08 15:33:22 -07:00
Livar Cunha
ad76052cb4 Changing the order of the help text for dotnet publish so that it matches the order from dotnet build as well. 2017-05-08 15:30:31 -07:00
Livar
760bdf8f75 Merge pull request #6530 from mikkelbu/gracefully-report-invalid-projects
Gracefully report invalid project when added via sln-add
2017-05-08 11:39:17 -07:00
Livar
97da2a03b5 Merge pull request #6539 from mlorbetske/dev/mlorbe/UpdateToSetupCrossgen86
Update to SetupCrossgen 86 - Coherence 24920
2017-05-06 21:27:41 -07:00
Mike Lorbetske
b3204bedb8 Update to SetupCrossgen 86 - Coherence 24920 2017-05-06 19:21:17 -07:00
Christopher Costa
cc2cbd4d7f Undo back dependencymodel / platformabstractions change 2017-05-06 13:16:56 -07:00
Christopher Costa
f9cebfda09 update versions to 25306-06 2017-05-06 12:18:35 -07:00
Christopher Costa
49636ea608 Merge branch 'master' of https://github.com/dotnet/cli into version-25305-19 2017-05-06 12:17:03 -07:00
Livar
6ecc1fc6c3 Merge pull request #6531 from nguerrera/merge-release-2.0
Merge release/2.0.0 to master
2017-05-05 21:54:33 -07:00
Livar
4c5978dad9 Merge pull request #6532 from mlorbetske/dev/mlorbe/UpdateTemplatesTo222
Update templates to 222
2017-05-05 21:43:36 -07:00
Livar
1337bb8f83 Merge pull request #6529 from mlorbetske/dev/mlorbe/UpdateToSetupCrossgen77
Update SetupCrossgen to build 77
2017-05-05 21:22:53 -07:00
Mike Lorbetske
546c29361c Fix date on package version 2017-05-05 20:28:03 -07:00
Mike Lorbetske
a44e52abb3 Update templates to 222 2017-05-05 20:09:27 -07:00
Mike Lorbetske
f0e8a4f21b Update SetupCrossgen to build 82 2017-05-05 18:34:47 -07:00
Mike Lorbetske
f403c6a836 Update SetupCrossgen to build 80 2017-05-05 17:43:18 -07:00
Mike Lorbetske
835fe1dba0 Update SetupCrossgen to build 77 2017-05-05 17:29:29 -07:00
Nick Guerrera
fe14c72226 Update dotnet/sdk version 2017-05-05 17:08:57 -07:00
Mikkel Nylander Bundgaard
7a824fe737 Gracefully report invalid project in sln-add
Fixes #5900
2017-05-06 02:08:00 +02:00
Christopher Costa
9e9f17a3e2 Reset platformabstraction and dependencymodel versions while issue is
being investigated
2017-05-05 17:05:35 -07:00
Nick Guerrera
ee16de3f7b Fix bad merges 2017-05-05 16:38:10 -07:00
Nick Guerrera
071789b33f Merge branch 'release/2.0.0' into merge-release-2.0 2017-05-05 16:21:15 -07:00
Livar
75af8b479e Merge pull request #6525 from dsplaisted/tool-tfm-fallback
Fall back to tools restored for .NET Core 1.x if they haven't been restored for .NET Core 2.0
2017-05-05 15:08:12 -07:00
Eric Erhardt
01c5f59bdb Fix test to use case-insensitive search on DependencyContext library name. 2017-05-05 16:41:46 -05:00
Daniel Plaisted
10dd67baa8 Clean up tool restore framework fallback logic so there aren't multiple call sites to GetToolLockFile 2017-05-05 14:23:33 -07:00
Mikkel Nylander Bundgaard
de10e0dd54 Fail gracefully when multiple projects exist
Fixes #6267
2017-05-05 23:07:46 +02:00
Christopher Costa
acc3d012ac Testing version 25305-19 2017-05-05 13:29:38 -07:00
Daniel Plaisted
8b13b3e579 Fall back to tools restored for .NET Core 1.x if they haven't been restored for .NET Core 2.0 2017-05-05 13:15:02 -07:00
Livar
6e50ad9630 Merge pull request #6521 from mlorbetske/dev/mlorbe/SwitchToNoTimestampPackagesOnSetupCrossgen65
Update to no-timestamp packages and adjust feeds and cache accordingly
2017-05-05 08:18:44 -07:00
Mike Lorbetske
209d05992f Disable telemetry for new 2017-05-05 01:44:24 -07:00
Mike Lorbetske
17f522e66c Update to no-timestamp packages and adjust feeds and cache accordingly 2017-05-05 01:44:24 -07:00
Livar
85b6b74bd5 Merge pull request #6506 from mikkelbu/no-or-wrong-arguments-also-shows-help
Show help info when no or wrong arguments are given
2017-05-04 21:09:04 -07:00
Livar
056ac0e9cd Merge pull request #6522 from dotnet-bot/release/2.0.0-UpdateDependencies
Update CoreSetup to preview1-002111 (release/2.0.0)
2017-05-04 21:08:35 -07:00
dotnet-bot
d075a8ec6e Update CoreSetup to preview1-002111 2017-05-05 02:49:39 +00:00
Livar
20a66270e4 Merge pull request #6520 from dsplaisted/livarcocc-update_sdk
Updating the SDK to include the implicit package downgrade warnings fix.
2017-05-04 19:13:30 -07:00
Daniel Plaisted
755a91a05e Update to SDK with fix for design time evaluation 2017-05-04 18:12:14 -07:00
Livar
af1e6684fd Merge pull request #6518 from dotnet/livarcocc-patch-1
Dummy commit.
2017-05-04 13:25:41 -07:00
Livar
4a134bbdf4 Dummy commit. 2017-05-04 13:25:26 -07:00
Livar
356e309f17 Merge pull request #6512 from mlorbetske/dev/mlorbe/UpdateToCache65
Update to ASP.NET 24840 packages/Archive 65
2017-05-04 11:26:39 -07:00
William Lee
dafdc69d62 Merge pull request #6509 from dotnet/dev/wul/pkg-deb-include-aspnet-runtime
Add asp.net runtime to SDK pkg and deb package
2017-05-04 09:21:54 -07:00
Mike Lorbetske
6b864cfead Update to ASP.NET 24840 packages/Archive 65, switch to timestamped cache packages, make clearly configurable 2017-05-03 21:44:39 -07:00
Livar Cunha
4a3c499b98 Updating the SDK to include the implicit package downgrade warnings fix. 2017-05-03 21:02:21 -07:00
William Lee
8b4eb985ca Merge branch 'release/2.0.0' into dev/wul/pkg-deb-include-aspnet-runtime 2017-05-03 19:09:52 -07:00
Livar Cunha
9c796bbe6b Refactoring shared item groups between deb and pkg to the same location. 2017-05-03 17:55:34 -07:00
Livar Cunha
1736c388b0 Adding the Asp.Net runtime package store to the SDK pkg for now, since we don't have a separate PKG for it being produced. 2017-05-03 17:38:06 -07:00
Livar
7f414b0666 Merge pull request #6504 from livarcocc/fallback_folder_as_feed
Switches the fallback folder under Nuget.Config to a package source
2017-05-03 17:30:09 -07:00
William Li
3e42e8233b Add asp.net runtime to SDK deb package
Copy the runtime file to the deb layout folder, the deb tool picks it up
from there
2017-05-03 23:42:06 +00:00
Mikkel Nylander Bundgaard
18d71a8471 Show help info when no or wrong arguments are given
Fixes #5383, fixes #5384
2017-05-04 01:01:35 +02:00
Livar Cunha
0dc1b53482 Switches the fallback folder under Nuget.Config to a package source, since we have issues for 1.0 apps using fallback folders. 2017-05-03 14:12:50 -07:00