diff --git a/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj b/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj index f52962bc8..f72d85fc6 100644 --- a/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj +++ b/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj @@ -4,7 +4,7 @@ netcoreapp2.0;net451 Exe - $(PackageTargetFallback);portable-net45+win8;dnxcore50 + $(AssetTargetFallback);portable-net45+win8;dnxcore50 win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64 diff --git a/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj b/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj index e0865b59b..d57f09629 100644 --- a/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj +++ b/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj @@ -2,7 +2,7 @@ netstandard1.6;net451 Library - $(PackageTargetFallback);portable-net45+win8;dnxcore50;netcoreapp2.0 + $(AssetTargetFallback);portable-net45+win8;dnxcore50;netcoreapp2.0 diff --git a/TestAssets/NonRestoredTestProjects/PJHalfMigrated/src/ProjectA/ProjectA.csproj b/TestAssets/NonRestoredTestProjects/PJHalfMigrated/src/ProjectA/ProjectA.csproj index fec86e036..915cb3e07 100755 --- a/TestAssets/NonRestoredTestProjects/PJHalfMigrated/src/ProjectA/ProjectA.csproj +++ b/TestAssets/NonRestoredTestProjects/PJHalfMigrated/src/ProjectA/ProjectA.csproj @@ -6,7 +6,7 @@ ProjectA Exe ProjectA - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);dnxcore50 1.0.3 diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj index d3149a2f2..261918eb3 100755 --- a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj +++ b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj @@ -2,7 +2,7 @@ netcoreapp2.0 Exe - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);dnxcore50 diff --git a/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj b/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj index 5dfd70f43..9c5447b05 100755 --- a/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj +++ b/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj @@ -7,7 +7,7 @@ DependencyContextFromTool Exe false - $(PackageTargetFallback);dnxcore50;portable-net45+win8 + $(AssetTargetFallback);dnxcore50;portable-net45+win8 diff --git a/TestAssets/TestProjects/FSharpTestAppSimple/TestAppSimple.fsproj b/TestAssets/TestProjects/FSharpTestAppSimple/TestAppSimple.fsproj index e504e9b9d..1af08f3b6 100644 --- a/TestAssets/TestProjects/FSharpTestAppSimple/TestAppSimple.fsproj +++ b/TestAssets/TestProjects/FSharpTestAppSimple/TestAppSimple.fsproj @@ -5,7 +5,7 @@ netcoreapp2.0 Exe - true + true diff --git a/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj b/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj index 302abe3bc..e9f02f323 100755 --- a/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj +++ b/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj @@ -5,6 +5,6 @@ netcoreapp2.0 Exe - true + true \ No newline at end of file diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 2436c07c4..3a5f52238 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -10,7 +10,7 @@ - 2.0.0-preview2-20170610-3 + 2.0.0-preview2-20170614-1 $(CLI_NETSDK_Version) 4.3.0-preview3-4154 diff --git a/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj b/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj index f0b957bab..dd2f94e91 100644 --- a/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj +++ b/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj @@ -6,7 +6,7 @@ true true Microsoft.DotNet.Cli.Build.Framework - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);dnxcore50 diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj index abace8f08..872cae995 100644 --- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj +++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj @@ -6,7 +6,7 @@ $(CliTargetFramework) true bin\$(Configuration) - $(PackageTargetFallback);portable-net45+win8+wp8+wpa81 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81 diff --git a/build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj b/build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj index b7af21b7f..14a4c4a33 100644 --- a/build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj +++ b/build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj @@ -5,7 +5,7 @@ Build scripts for dotnet-cli netstandard1.6 shared-build-targets-utils - $(PackageTargetFallback);dnxcore50;portable-net45+win8 + $(AssetTargetFallback);dnxcore50;portable-net45+win8 diff --git a/src/dotnet/dotnet.csproj b/src/dotnet/dotnet.csproj index 67f099dd9..ee1d93fff 100644 --- a/src/dotnet/dotnet.csproj +++ b/src/dotnet/dotnet.csproj @@ -8,7 +8,7 @@ ../../tools/Key.snk true true - $(PackageTargetFallback);dotnet5.4 + $(AssetTargetFallback);dotnet5.4 Microsoft.DotNet.Cli diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 1394361be..665666da5 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -10,7 +10,7 @@ $(CLI_SharedFrameworkVersion) true false - $(PackageTargetFallback);dotnet5.4 + $(AssetTargetFallback);dotnet5.4 $(SdkOutputDirectory) $(CommitCount) diff --git a/test/ArgumentForwardingTests/ArgumentForwardingTests.csproj b/test/ArgumentForwardingTests/ArgumentForwardingTests.csproj index a3ab58d0a..c71c5cf15 100644 --- a/test/ArgumentForwardingTests/ArgumentForwardingTests.csproj +++ b/test/ArgumentForwardingTests/ArgumentForwardingTests.csproj @@ -6,7 +6,7 @@ $(CLI_SharedFrameworkVersion) ArgumentForwardingTests Exe - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/EndToEnd/EndToEnd.csproj b/test/EndToEnd/EndToEnd.csproj index d2207d758..83c4a521a 100644 --- a/test/EndToEnd/EndToEnd.csproj +++ b/test/EndToEnd/EndToEnd.csproj @@ -6,7 +6,7 @@ $(CLI_SharedFrameworkVersion) EndToEnd Exe - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj b/test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj index 562e754f8..0cc22883c 100644 --- a/test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj +++ b/test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj @@ -9,7 +9,7 @@ ../../tools/test_key.snk true true - $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 + $(AssetTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 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 3995076df..dce7b8e2e 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 @@ -9,7 +9,7 @@ ../../tools/Key.snk true true - $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 + $(AssetTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 @@ -36,7 +36,7 @@ - + diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj b/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj index 5cffd690d..69269abf5 100644 --- a/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj +++ b/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj @@ -9,7 +9,7 @@ ../../tools/Key.snk true true - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(AssetTargetFallback);dotnet5.4;portable-net451+win8 @@ -22,7 +22,7 @@ - + diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj index 8febc4df5..c13629f52 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj @@ -8,7 +8,7 @@ ../../tools/Key.snk true true - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(AssetTargetFallback);dotnet5.4;portable-net451+win8 1.6.0 diff --git a/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj b/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj index 3d762fb60..ded34abd0 100644 --- a/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj +++ b/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj @@ -5,7 +5,7 @@ $(CliTargetFramework) $(CLI_SharedFrameworkVersion) Msbuild.Tests.Utilities - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/binding-redirects.Tests/binding-redirects.Tests.csproj b/test/binding-redirects.Tests/binding-redirects.Tests.csproj index 36c2d6553..7922a876d 100644 --- a/test/binding-redirects.Tests/binding-redirects.Tests.csproj +++ b/test/binding-redirects.Tests/binding-redirects.Tests.csproj @@ -6,7 +6,7 @@ $(CLI_SharedFrameworkVersion) true binding-redirects.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/crossgen.Tests/crossgen.Tests.csproj b/test/crossgen.Tests/crossgen.Tests.csproj index 48df94f04..980cd78e7 100644 --- a/test/crossgen.Tests/crossgen.Tests.csproj +++ b/test/crossgen.Tests/crossgen.Tests.csproj @@ -6,7 +6,7 @@ $(CLI_SharedFrameworkVersion) true crossgen.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj b/test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj index a8fd8d373..5c303ff3b 100644 --- a/test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj +++ b/test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj @@ -6,7 +6,7 @@ $(CLI_SharedFrameworkVersion) true dotnet-add-package.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj b/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj index 71045dfbc..7e107c72b 100644 --- a/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj +++ b/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj @@ -6,7 +6,7 @@ $(CLI_SharedFrameworkVersion) true dotnet-add-reference.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-build.Tests/dotnet-build.Tests.csproj b/test/dotnet-build.Tests/dotnet-build.Tests.csproj index 6ebffe33b..d72a8f986 100644 --- a/test/dotnet-build.Tests/dotnet-build.Tests.csproj +++ b/test/dotnet-build.Tests/dotnet-build.Tests.csproj @@ -6,7 +6,7 @@ $(CLI_SharedFrameworkVersion) true dotnet-build.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-clean.Tests/dotnet-clean.Tests.csproj b/test/dotnet-clean.Tests/dotnet-clean.Tests.csproj index abdf7f324..831a64d3b 100644 --- a/test/dotnet-clean.Tests/dotnet-clean.Tests.csproj +++ b/test/dotnet-clean.Tests/dotnet-clean.Tests.csproj @@ -6,7 +6,7 @@ $(CLI_SharedFrameworkVersion) true dotnet-clean.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-help.Tests/dotnet-help.Tests.csproj b/test/dotnet-help.Tests/dotnet-help.Tests.csproj index 73bdcfde8..5c5062efd 100644 --- a/test/dotnet-help.Tests/dotnet-help.Tests.csproj +++ b/test/dotnet-help.Tests/dotnet-help.Tests.csproj @@ -6,7 +6,7 @@ $(CLI_SharedFrameworkVersion) true dotnet-help.Tests - $(PackageTargetFallback);dnxcore50;portable-net45+win8 + $(AssetTargetFallback);dnxcore50;portable-net45+win8 diff --git a/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj b/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj index 0902fd8a6..66c649155 100644 --- a/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj +++ b/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj @@ -6,7 +6,7 @@ $(CLI_SharedFrameworkVersion) true dotnet-list-reference.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj b/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj index d12f9ae1d..2a9fe2963 100644 --- a/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj +++ b/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj @@ -6,7 +6,7 @@ $(CLI_SharedFrameworkVersion) true dotnet-migrate.Tests - $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 + $(AssetTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 @@ -27,7 +27,7 @@ - + diff --git a/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj b/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj index 69f57b7f0..a301adcba 100644 --- a/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj +++ b/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj @@ -6,7 +6,7 @@ $(CLI_SharedFrameworkVersion) true dotnet-msbuild.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs index 31f271f50..a468bd7b8 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs @@ -67,9 +67,10 @@ namespace Microsoft.DotNet.New.Tests .Execute($"{projectType} --debug:ephemeral-hive --no-restore") .Should().Pass(); + // https://github.com/dotnet/templating/issues/946 - remove DisableImplicitAssetTargetFallback once this is fixed. new RestoreCommand() .WithWorkingDirectory(projectFolder) - .Execute($"--configfile {repoRootNuGetConfig} --packages {packagesDirectory}") + .Execute($"--configfile {repoRootNuGetConfig} --packages {packagesDirectory} /p:DisableImplicitAssetTargetFallback=true") .Should().Pass(); } diff --git a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs index 5e12f441c..34d706979 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs @@ -56,14 +56,15 @@ namespace Microsoft.DotNet.New.Tests Directory.CreateDirectory(Path.Combine(rootPath, "wwwroot", "dist")); } + // https://github.com/dotnet/templating/issues/946 - remove DisableImplicitAssetTargetFallback once this is fixed. new TestCommand("dotnet") .WithWorkingDirectory(rootPath) - .Execute($"restore") + .Execute($"restore /p:DisableImplicitAssetTargetFallback=true") .Should().Pass(); var buildResult = new TestCommand("dotnet") .WithWorkingDirectory(rootPath) - .ExecuteWithCapturedOutput("build") + .ExecuteWithCapturedOutput("build --no-restore") .Should().Pass() .And.NotHaveStdErr(); } diff --git a/test/dotnet-new.Tests/dotnet-new.Tests.csproj b/test/dotnet-new.Tests/dotnet-new.Tests.csproj index 4128a4099..7dc7368f6 100644 --- a/test/dotnet-new.Tests/dotnet-new.Tests.csproj +++ b/test/dotnet-new.Tests/dotnet-new.Tests.csproj @@ -6,7 +6,7 @@ $(CLI_SharedFrameworkVersion) true dotnet-new.Tests - $(PackageTargetFallback);dnxcore50;portable-net45+win8 + $(AssetTargetFallback);dnxcore50;portable-net45+win8 diff --git a/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj b/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj index dda2a8cd0..327ad4bec 100644 --- a/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj +++ b/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj @@ -6,7 +6,7 @@ $(CLI_SharedFrameworkVersion) true dotnet-nuget.UnitTests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(AssetTargetFallback);dotnet5.4;portable-net451+win8 @@ -19,6 +19,6 @@ - + diff --git a/test/dotnet-pack.Tests/dotnet-pack.Tests.csproj b/test/dotnet-pack.Tests/dotnet-pack.Tests.csproj index cef65d60c..755ce3f43 100644 --- a/test/dotnet-pack.Tests/dotnet-pack.Tests.csproj +++ b/test/dotnet-pack.Tests/dotnet-pack.Tests.csproj @@ -6,7 +6,7 @@ $(CLI_SharedFrameworkVersion) true dotnet-pack.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj b/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj index ea8493b24..5641910fa 100644 --- a/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj +++ b/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj @@ -6,7 +6,7 @@ $(CLI_SharedFrameworkVersion) true dotnet-publish.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-remove-package.Tests/dotnet-remove-package.Tests.csproj b/test/dotnet-remove-package.Tests/dotnet-remove-package.Tests.csproj index 4e04974e5..fa622344b 100644 --- a/test/dotnet-remove-package.Tests/dotnet-remove-package.Tests.csproj +++ b/test/dotnet-remove-package.Tests/dotnet-remove-package.Tests.csproj @@ -6,7 +6,7 @@ $(CLI_SharedFrameworkVersion) true dotnet-remove-package.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj b/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj index 946c6e332..09b86ea4d 100644 --- a/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj +++ b/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj @@ -6,7 +6,7 @@ $(CLI_SharedFrameworkVersion) true dotnet-remove-reference.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj b/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj index 2803c75e5..812246448 100644 --- a/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj +++ b/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj @@ -6,7 +6,7 @@ $(CLI_SharedFrameworkVersion) true dotnet-restore.Tests - $(PackageTargetFallback);dnxcore50;portable-net45+win8 + $(AssetTargetFallback);dnxcore50;portable-net45+win8 diff --git a/test/dotnet-run.Tests/dotnet-run.Tests.csproj b/test/dotnet-run.Tests/dotnet-run.Tests.csproj index baf437495..e552a93fc 100644 --- a/test/dotnet-run.Tests/dotnet-run.Tests.csproj +++ b/test/dotnet-run.Tests/dotnet-run.Tests.csproj @@ -6,7 +6,7 @@ $(CLI_SharedFrameworkVersion) true dotnet-run.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj b/test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj index 2a630a940..b504be8ab 100644 --- a/test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj +++ b/test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj @@ -6,7 +6,7 @@ $(CLI_SharedFrameworkVersion) true dotnet-sln-add.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj b/test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj index cf1befb50..e270d24f0 100644 --- a/test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj +++ b/test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj @@ -6,7 +6,7 @@ $(CLI_SharedFrameworkVersion) true dotnet-sln-list.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj b/test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj index 77ec8a398..abc12915f 100644 --- a/test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj +++ b/test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj @@ -6,7 +6,7 @@ $(CLI_SharedFrameworkVersion) true dotnet-sln-remove.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-store.Tests/dotnet-store.Tests.csproj b/test/dotnet-store.Tests/dotnet-store.Tests.csproj index 06ecba4cc..650b63b6a 100644 --- a/test/dotnet-store.Tests/dotnet-store.Tests.csproj +++ b/test/dotnet-store.Tests/dotnet-store.Tests.csproj @@ -6,7 +6,7 @@ $(CLI_SharedFrameworkVersion) true dotnet-cache.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-test.Tests/dotnet-test.Tests.csproj b/test/dotnet-test.Tests/dotnet-test.Tests.csproj index d0ec87860..a47ee9357 100644 --- a/test/dotnet-test.Tests/dotnet-test.Tests.csproj +++ b/test/dotnet-test.Tests/dotnet-test.Tests.csproj @@ -6,7 +6,7 @@ $(CLI_SharedFrameworkVersion) true dotnet-test.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj b/test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj index 8b3592d0f..c774406bd 100644 --- a/test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj +++ b/test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj @@ -6,7 +6,7 @@ $(CLI_SharedFrameworkVersion) true dotnet-vstest.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet.Tests/dotnet.Tests.csproj b/test/dotnet.Tests/dotnet.Tests.csproj index fae7025ce..12467295b 100644 --- a/test/dotnet.Tests/dotnet.Tests.csproj +++ b/test/dotnet.Tests/dotnet.Tests.csproj @@ -9,7 +9,7 @@ ../../tools/Key.snk true true - $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 + $(AssetTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 diff --git a/test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj b/test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj index 9e4307049..cab0ce168 100644 --- a/test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj +++ b/test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj @@ -6,7 +6,7 @@ $(CLI_SharedFrameworkVersion) true msbuild.IntegrationTests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(AssetTargetFallback);dotnet5.4;portable-net451+win8