From 5bbfbfeeed9bdb9dac16d9780108cf727fa697dc Mon Sep 17 00:00:00 2001 From: Rohit Agrawal Date: Fri, 6 Jan 2017 16:28:04 -0800 Subject: [PATCH] update nuget to 4.0.0-rc3 and sdk to 1.0.0-alpha-20170105-5 (#5214) * update nuget to 4.0.0-rc3 and sdk to 1.0.0-alpha-20170105-5 * Modifying restore project.json to use the project.json stage0 CLI instead of restore-projectjson command. * add a nuget dependency so migrated project has packageref and generates an assets file on restore --- .../project.json | 4 +++- .../dotnet-dependency-tool-invoker.csproj | 2 +- build/Microsoft.DotNet.Cli.BundledSdks.props | 2 +- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- .../dotnet-cli-build/dotnet-cli-build.csproj | 12 ++++++++---- .../Microsoft.DotNet.Cli.Utils.csproj | 8 ++++---- src/redist/redist.csproj | 2 +- src/tool_nuget/tool_nuget.csproj | 2 +- .../Microsoft.DotNet.Cli.Utils.Tests.csproj | 8 ++++---- .../Commands/RestoreProjectJsonCommand.cs | 7 +++---- .../GivenThatIWantToMigrateTestApps.cs | 6 +++--- 11 files changed, 30 insertions(+), 25 deletions(-) diff --git a/TestAssets/DesktopTestProjects/AutoAddDesktopReferencesDuringMigrate/project.json b/TestAssets/DesktopTestProjects/AutoAddDesktopReferencesDuringMigrate/project.json index 1720635d6..57931c899 100644 --- a/TestAssets/DesktopTestProjects/AutoAddDesktopReferencesDuringMigrate/project.json +++ b/TestAssets/DesktopTestProjects/AutoAddDesktopReferencesDuringMigrate/project.json @@ -4,7 +4,9 @@ "debugType": "portable", "emitEntryPoint": true }, - "dependencies": {}, + "dependencies": { + "Newtonsoft.Json": "9.0.1" + }, "frameworks": { "net451": {} }, diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj index a4c7e260e..4ca756e18 100644 --- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj +++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj @@ -24,7 +24,7 @@ 1.0.3 - 4.0.0-rc2 + 4.0.0-rc3 $(SdkNugetVersion) diff --git a/build/Microsoft.DotNet.Cli.BundledSdks.props b/build/Microsoft.DotNet.Cli.BundledSdks.props index 6b5abffdb..baab92a0b 100644 --- a/build/Microsoft.DotNet.Cli.BundledSdks.props +++ b/build/Microsoft.DotNet.Cli.BundledSdks.props @@ -2,7 +2,7 @@ - + diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 2e4f35ab1..7b73d8094 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -3,7 +3,7 @@ 15.1.0-preview-000503-01 2.0.0-rc3-61212-03 - 1.0.0-alpha-20170105-1 + 1.0.0-alpha-20170105-5 1.0.0-alpha-20170106-1-203 15.0.0-preview-20161227-02 1.0.0-beta1-20170106-79 diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj index d2a5d8ec4..8e5ec2d2f 100644 --- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj +++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj @@ -1,13 +1,12 @@ - + - Build scripts for dotnet-cli 1.0.0 netcoreapp1.0 true bin\$(Configuration) - $(PackageTargetFallback);portable-net45+win8+wp8+wpa81 + $(PackageTargetFallback);portable-net45+win8+wp8+wpa81 @@ -42,11 +41,16 @@ 7.2.1 - 4.0.0-rc2 + 4.0.0-rc3 $(CLI_MSBuild_Version) + + + $(CLI_MSBuild_Version) + 1.0.1-beta-000933 diff --git a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj index 22324b215..f6337cf28 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj +++ b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj @@ -18,16 +18,16 @@ 1.0.1-beta-000933 - 4.0.0-rc2 + 4.0.0-rc3 - 4.0.0-rc2 + 4.0.0-rc3 - 4.0.0-rc2 + 4.0.0-rc3 - 4.0.0-rc2 + 4.0.0-rc3 $(CLI_MSBuild_Version) diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index c3dfcdf3f..7711edecb 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -15,7 +15,7 @@ $(CLI_MSBuild_Version) - 4.0.0-rc2 + 4.0.0-rc3 $(CLI_TestPlatform_Version) diff --git a/src/tool_nuget/tool_nuget.csproj b/src/tool_nuget/tool_nuget.csproj index afc588439..36c74b48b 100644 --- a/src/tool_nuget/tool_nuget.csproj +++ b/src/tool_nuget/tool_nuget.csproj @@ -10,7 +10,7 @@ 1.0.3 - 4.0.0-rc2 + 4.0.0-rc3 diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj b/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj index 5c005311f..c9d901f0d 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj @@ -57,16 +57,16 @@ 4.1.1 - 4.0.0-rc2 + 4.0.0-rc3 - 4.0.0-rc2 + 4.0.0-rc3 - 4.0.0-rc2 + 4.0.0-rc3 - 4.0.0-rc2 + 4.0.0-rc3 4.4.0-beta8 diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/RestoreProjectJsonCommand.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/RestoreProjectJsonCommand.cs index 8f6703241..a54d89605 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/RestoreProjectJsonCommand.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/RestoreProjectJsonCommand.cs @@ -8,21 +8,20 @@ namespace Microsoft.DotNet.Tools.Test.Utilities public sealed class RestoreProjectJsonCommand : TestCommand { public RestoreProjectJsonCommand() - : base("dotnet") + : base(new RepoDirectoriesProvider().PjDotnet) { - } public override CommandResult Execute(string args="") { - args = $"restore-projectjson {args}"; + args = $"restore {args}"; return base.Execute(args); } public override CommandResult ExecuteWithCapturedOutput(string args = "") { - args = $"restore-projectjson {args}"; + args = $"restore {args}"; return base.ExecuteWithCapturedOutput(args); } } diff --git a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs index 772dc7639..6621200c7 100644 --- a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs +++ b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs @@ -681,9 +681,9 @@ namespace Microsoft.DotNet.Migration.Tests private void RestoreProjectJson(string projectDirectory) { - new TestCommand("dotnet") - .WithWorkingDirectory(projectDirectory) - .Execute("restore-projectjson") + var projectFile = "\"" + Path.Combine(projectDirectory, "project.json") + "\""; + new RestoreProjectJsonCommand() + .Execute(projectFile) .Should().Pass(); }