From 93f8157a048898d7123a3e7e9fb54798ac9d6976 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Wed, 22 Feb 2017 14:41:38 -0600 Subject: [PATCH 1/8] Update NET.Sdk to 1.1.0-alpha-20170217-4 --- build/DependencyVersions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 375c0bcd9..88969a98e 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -4,8 +4,8 @@ 2.0.0-beta-001509-00 15.2.0-preview-000002-01 2.0.0-rc4-61325-08 - 1.1.0-alpha-20170209-1 - + 1.1.0-alpha-20170217-4 + 4.0.1-beta-2321 1.0.0-alpha-20170130-3-281 15.0.0-preview-20170125-04 From c0faf492d8a41b6376ecc46f521d4c2f2b7fc5da Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 23 Feb 2017 17:57:32 -0800 Subject: [PATCH 2/8] Remove runtime specification in favor of implicit runtime --- .../GivenAProjectDependenciesCommandFactory.cs | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependenciesCommandFactory.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependenciesCommandFactory.cs index ba8194a21..84578fde6 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependenciesCommandFactory.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependenciesCommandFactory.cs @@ -28,7 +28,6 @@ namespace Microsoft.DotNet.Cli.Utils.Tests [WindowsOnlyFact] public void It_resolves_desktop_apps_defaulting_to_Debug_Configuration() { - var runtime = DotnetLegacyRuntimeIdentifiers.InferLegacyRestoreRuntimeIdentifier(); var configuration = "Debug"; var testInstance = TestAssets.Get(TestAssetKinds.DesktopTestProjects, "AppWithProjTool2Fx") @@ -38,14 +37,12 @@ namespace Microsoft.DotNet.Cli.Utils.Tests var restoreCommand = new RestoreCommand() .WithWorkingDirectory(testInstance.Root) - .WithRuntime(runtime) .ExecuteWithCapturedOutput() .Should().Pass(); var buildCommand = new BuildCommand() .WithWorkingDirectory(testInstance.Root) .WithConfiguration(configuration) - .WithRuntime(runtime) .WithCapturedOutput() .Execute() .Should().Pass(); @@ -67,7 +64,6 @@ namespace Microsoft.DotNet.Cli.Utils.Tests [WindowsOnlyFact] public void It_resolves_desktop_apps_when_configuration_is_Debug() { - var runtime = DotnetLegacyRuntimeIdentifiers.InferLegacyRestoreRuntimeIdentifier(); var configuration = "Debug"; var testInstance = TestAssets.Get(TestAssetKinds.DesktopTestProjects, "AppWithProjTool2Fx") @@ -77,14 +73,12 @@ namespace Microsoft.DotNet.Cli.Utils.Tests var restoreCommand = new RestoreCommand() .WithWorkingDirectory(testInstance.Root) - .WithRuntime(runtime) .ExecuteWithCapturedOutput() .Should().Pass(); var buildCommand = new BuildCommand() .WithWorkingDirectory(testInstance.Root) .WithConfiguration(configuration) - .WithRuntime(runtime) .Execute() .Should().Pass(); @@ -104,7 +98,6 @@ namespace Microsoft.DotNet.Cli.Utils.Tests [WindowsOnlyFact] public void It_resolves_desktop_apps_when_configuration_is_Release() { - var runtime = DotnetLegacyRuntimeIdentifiers.InferLegacyRestoreRuntimeIdentifier(); var configuration = "Debug"; var testInstance = TestAssets.Get(TestAssetKinds.DesktopTestProjects, "AppWithProjTool2Fx") @@ -114,14 +107,12 @@ namespace Microsoft.DotNet.Cli.Utils.Tests var restoreCommand = new RestoreCommand() .WithWorkingDirectory(testInstance.Root) - .WithRuntime(runtime) .ExecuteWithCapturedOutput() .Should().Pass(); var buildCommand = new BuildCommand() .WithWorkingDirectory(testInstance.Root) .WithConfiguration(configuration) - .WithRuntime(runtime) .WithCapturedOutput() .Execute() .Should().Pass(); @@ -143,7 +134,6 @@ namespace Microsoft.DotNet.Cli.Utils.Tests [WindowsOnlyFact] public void It_resolves_desktop_apps_using_configuration_passed_to_create() { - var runtime = DotnetLegacyRuntimeIdentifiers.InferLegacyRestoreRuntimeIdentifier(); var configuration = "Debug"; var testInstance = TestAssets.Get(TestAssetKinds.DesktopTestProjects, "AppWithProjTool2Fx") @@ -153,14 +143,12 @@ namespace Microsoft.DotNet.Cli.Utils.Tests var restoreCommand = new RestoreCommand() .WithWorkingDirectory(testInstance.Root) - .WithRuntime(runtime) .ExecuteWithCapturedOutput() .Should().Pass(); var buildCommand = new BuildCommand() .WithWorkingDirectory(testInstance.Root) .WithConfiguration(configuration) - .WithRuntime(runtime) .WithCapturedOutput() .Execute() .Should().Pass(); From c1da263d403dfcb9b18568453efde6a5b6b200fb Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Mon, 27 Feb 2017 17:04:27 -0600 Subject: [PATCH 3/8] Update NuGet to 4.0.1-beta-2321. Update NET.Sdk to 1.1.0-alpha-20170227-1 --- build/DependencyVersions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 88969a98e..5a0d1f05a 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -4,8 +4,8 @@ 2.0.0-beta-001509-00 15.2.0-preview-000002-01 2.0.0-rc4-61325-08 - 1.1.0-alpha-20170217-4 - + 1.1.0-alpha-20170227-4 + 4.0.1-beta-2321 1.0.0-alpha-20170130-3-281 15.0.0-preview-20170125-04 From 37c6842e00c561e99b9e279999f9d9e562774ed2 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Mon, 27 Feb 2017 21:08:11 -0600 Subject: [PATCH 4/8] Update NET.Sdk to 1.1.0-alpha-20170228-1. --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 5a0d1f05a..c84682e98 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -4,7 +4,7 @@ 2.0.0-beta-001509-00 15.2.0-preview-000002-01 2.0.0-rc4-61325-08 - 1.1.0-alpha-20170227-4 + 1.1.0-alpha-20170228-1 4.0.1-beta-2321 1.0.0-alpha-20170130-3-281 From e685a808a19c12b69af3012321718686afec0a4a Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Tue, 28 Feb 2017 00:44:24 -0800 Subject: [PATCH 5/8] Fix reference in MSBuild Test Utilities --- test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj b/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj index 9559ff788..b1e4e5329 100644 --- a/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj +++ b/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj @@ -2,7 +2,8 @@ - netcoreapp2.0 + $(CliTargetFramework) + $(CLI_SharedFrameworkVersion) Msbuild.Tests.Utilities $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -15,7 +16,6 @@ - From 5d6acc03d12556025195b91c70a327cc159be4b3 Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Tue, 28 Feb 2017 11:58:06 -0800 Subject: [PATCH 6/8] Fix long path --- .../.noautobuild | 0 .../Program.cs | 0 .../project.json | 0 test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename TestAssets/TestProjects/{TestAppMultipleFrameworksNoRuntimes => AppWith2Tfm0Rid}/.noautobuild (100%) rename TestAssets/TestProjects/{TestAppMultipleFrameworksNoRuntimes => AppWith2Tfm0Rid}/Program.cs (100%) rename TestAssets/TestProjects/{TestAppMultipleFrameworksNoRuntimes => AppWith2Tfm0Rid}/project.json (100%) diff --git a/TestAssets/TestProjects/TestAppMultipleFrameworksNoRuntimes/.noautobuild b/TestAssets/TestProjects/AppWith2Tfm0Rid/.noautobuild similarity index 100% rename from TestAssets/TestProjects/TestAppMultipleFrameworksNoRuntimes/.noautobuild rename to TestAssets/TestProjects/AppWith2Tfm0Rid/.noautobuild diff --git a/TestAssets/TestProjects/TestAppMultipleFrameworksNoRuntimes/Program.cs b/TestAssets/TestProjects/AppWith2Tfm0Rid/Program.cs similarity index 100% rename from TestAssets/TestProjects/TestAppMultipleFrameworksNoRuntimes/Program.cs rename to TestAssets/TestProjects/AppWith2Tfm0Rid/Program.cs diff --git a/TestAssets/TestProjects/TestAppMultipleFrameworksNoRuntimes/project.json b/TestAssets/TestProjects/AppWith2Tfm0Rid/project.json similarity index 100% rename from TestAssets/TestProjects/TestAppMultipleFrameworksNoRuntimes/project.json rename to TestAssets/TestProjects/AppWith2Tfm0Rid/project.json diff --git a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs index 339019b29..bd3c4a9be 100644 --- a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs +++ b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs @@ -62,7 +62,7 @@ namespace Microsoft.DotNet.Migration.Tests } [WindowsOnlyTheory] - [InlineData("TestAppMultipleFrameworksNoRuntimes", null)] + [InlineData("AppWith2Tfm0Rid", null)] [InlineData("TestAppWithMultipleFullFrameworksOnly", "net461")] public void ItMigratesAppsWithFullFramework(string projectName, string framework) { From 88ab21600d6a01cedb3f5ca79ceab344e27538d6 Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Tue, 28 Feb 2017 12:00:05 -0800 Subject: [PATCH 7/8] Remove RID from package creation --- build/test/TestPackageProjects.targets | 2 -- 1 file changed, 2 deletions(-) diff --git a/build/test/TestPackageProjects.targets b/build/test/TestPackageProjects.targets index a71fd6053..1d900b84a 100644 --- a/build/test/TestPackageProjects.targets +++ b/build/test/TestPackageProjects.targets @@ -88,7 +88,6 @@ $(CliVersionPrefix) $(VersionSuffix) True - /p:RuntimeIdentifier=$(CoreCLRRid) @@ -100,7 +99,6 @@ $(CliVersionPrefix) $(VersionSuffix) True - /p:RuntimeIdentifier=$(CoreCLRRid) dotnet-hello From 3b04278b6520b932a32777072d3c08f68a1557da Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Tue, 28 Feb 2017 13:11:34 -0800 Subject: [PATCH 8/8] Shorten another Test Asset name --- .../.noautobuild | 0 .../Program.cs | 0 .../project.json | 0 .../Rules/GivenThatIWantToMigrateTFMs.cs | 2 +- test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs | 2 +- 5 files changed, 2 insertions(+), 2 deletions(-) rename TestAssets/TestProjects/{TestAppWithMultipleFullFrameworksOnly => AppWith4netTfm0Rid}/.noautobuild (100%) rename TestAssets/TestProjects/{TestAppWithMultipleFullFrameworksOnly => AppWith4netTfm0Rid}/Program.cs (100%) rename TestAssets/TestProjects/{TestAppWithMultipleFullFrameworksOnly => AppWith4netTfm0Rid}/project.json (100%) diff --git a/TestAssets/TestProjects/TestAppWithMultipleFullFrameworksOnly/.noautobuild b/TestAssets/TestProjects/AppWith4netTfm0Rid/.noautobuild similarity index 100% rename from TestAssets/TestProjects/TestAppWithMultipleFullFrameworksOnly/.noautobuild rename to TestAssets/TestProjects/AppWith4netTfm0Rid/.noautobuild diff --git a/TestAssets/TestProjects/TestAppWithMultipleFullFrameworksOnly/Program.cs b/TestAssets/TestProjects/AppWith4netTfm0Rid/Program.cs similarity index 100% rename from TestAssets/TestProjects/TestAppWithMultipleFullFrameworksOnly/Program.cs rename to TestAssets/TestProjects/AppWith4netTfm0Rid/Program.cs diff --git a/TestAssets/TestProjects/TestAppWithMultipleFullFrameworksOnly/project.json b/TestAssets/TestProjects/AppWith4netTfm0Rid/project.json similarity index 100% rename from TestAssets/TestProjects/TestAppWithMultipleFullFrameworksOnly/project.json rename to TestAssets/TestProjects/AppWith4netTfm0Rid/project.json diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTFMs.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTFMs.cs index 438a505c5..11557ceac 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTFMs.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTFMs.cs @@ -148,7 +148,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests { var testDirectory = Temp.CreateDirectory().Path; var testPJ = new ProjectJsonBuilder(TestAssets) - .FromTestAssetBase("TestAppWithMultipleFullFrameworksOnly") + .FromTestAssetBase("AppWith4netTfm0Rid") .SaveToDisk(testDirectory); var projectContexts = ProjectContext.CreateContextForEachFramework(testDirectory); diff --git a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs index bd3c4a9be..cb2fff3a4 100644 --- a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs +++ b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs @@ -63,7 +63,7 @@ namespace Microsoft.DotNet.Migration.Tests [WindowsOnlyTheory] [InlineData("AppWith2Tfm0Rid", null)] - [InlineData("TestAppWithMultipleFullFrameworksOnly", "net461")] + [InlineData("AppWith4netTfm0Rid", "net461")] public void ItMigratesAppsWithFullFramework(string projectName, string framework) { var projectDirectory = TestAssets