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/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/build/DependencyVersions.props b/build/DependencyVersions.props index 375c0bcd9..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-20170209-1 + 1.1.0-alpha-20170228-1 4.0.1-beta-2321 1.0.0-alpha-20170130-3-281 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 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(); 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/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 @@ - diff --git a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs index 339019b29..cb2fff3a4 100644 --- a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs +++ b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs @@ -62,8 +62,8 @@ namespace Microsoft.DotNet.Migration.Tests } [WindowsOnlyTheory] - [InlineData("TestAppMultipleFrameworksNoRuntimes", null)] - [InlineData("TestAppWithMultipleFullFrameworksOnly", "net461")] + [InlineData("AppWith2Tfm0Rid", null)] + [InlineData("AppWith4netTfm0Rid", "net461")] public void ItMigratesAppsWithFullFramework(string projectName, string framework) { var projectDirectory = TestAssets