From bfe5fef17fb0880be78d68d53e20c2189836974a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amaury=20Lev=C3=A9?= Date: Mon, 18 Jul 2022 16:55:23 +0200 Subject: [PATCH] Cleanups post move to net462 (#3856) --- Directory.Build.props | 6 ++ .../TestPlatform.Playground.csproj | 2 +- .../Microsoft.TestPlatform.E2ETest.csproj | 4 +- ...stPlatform.TranslationLayer.E2ETest.csproj | 4 +- .../UnitTestProject/UnitTestProject.csproj | 6 +- scripts/build.sh | 12 ++-- .../DumpMinitool.arm64.csproj | 2 +- .../DumpMinitool.x86/DumpMinitool.x86.csproj | 2 +- .../DumpMinitool/DumpMinitool.csproj | 2 +- ...atform.Extensions.EventLogCollector.csproj | 2 +- ...osoft.TestPlatform.AdapterUtilities.csproj | 4 +- .../Microsoft.TestPlatform.Client.csproj | 4 +- .../Microsoft.TestPlatform.Common.csproj | 4 +- ...TestPlatform.CommunicationUtilities.csproj | 4 +- ...icrosoft.TestPlatform.CoreUtilities.csproj | 6 +- ...rosoft.TestPlatform.CrossPlatEngine.csproj | 4 +- ....TestPlatform.Extensions.HtmlLogger.csproj | 4 +- ...t.TestPlatform.Extensions.TrxLogger.csproj | 4 +- .../Microsoft.TestPlatform.ObjectModel.csproj | 4 +- .../TraitCollection.cs | 2 +- ...t.TestPlatform.PlatformAbstractions.csproj | 4 +- ...osoft.TestPlatform.TestHostProvider.csproj | 4 +- .../Microsoft.TestPlatform.Utilities.csproj | 4 +- ...form.VsTestConsole.TranslationLayer.csproj | 4 +- src/SettingsMigrator/SettingsMigrator.csproj | 6 +- src/datacollector/datacollector.csproj | 2 +- src/package/VSIXProject/TestPlatform.csproj | 2 +- src/package/package/package.csproj | 6 +- src/package/sign/sign.csproj | 4 +- src/package/sign/sign.proj | 68 ++++++++----------- src/testhost.arm64/testhost.arm64.csproj | 4 +- src/testhost.x86/testhost.x86.csproj | 4 +- src/testhost/testhost.csproj | 4 +- src/vstest.console/vstest.console.csproj | 8 +-- .../AppDomainGetAssembliesTestProject.csproj | 2 +- .../BlameUnitTestProject.csproj | 2 +- .../CUITTestProject/CUITTestProject.csproj | 2 +- .../CodeCoverageTest/CodeCoverageTest.csproj | 4 +- .../ConsoleManagedApp.csproj | 2 +- .../ConsoleRunners/ConsoleRunners.csproj | 2 +- .../DisableAppdomainTest1.csproj | 4 +- .../DisableAppdomainTest2.csproj | 4 +- .../DiscoveryTestProject.csproj | 4 +- .../EnvironmentVariablesTestProject.csproj | 2 +- .../EventLogUnitTestProject.csproj | 4 +- .../LegacySettingsUnitTestProject.csproj | 2 +- .../MSTestProject1/MSTestProject1.csproj | 4 +- .../MSTestProject2/MSTestProject2.csproj | 4 +- .../MstestV1UnitTestProject.csproj | 2 +- .../MultitargetedNetFrameworkProject.csproj | 4 +- .../NUTestProject/NUTestProject.csproj | 2 +- .../NewtonSoftDependency.csproj | 4 +- .../OutOfProcDataCollector.csproj | 2 +- .../ParametrizedTestProject.csproj | 4 +- .../PerfTestProject/PerfTestProject.csproj | 4 +- .../ProjectFileRunSettingsTestProject.csproj | 4 +- .../SimpleClassLibrary.csproj | 6 +- .../SimpleDataCollector.csproj | 2 +- .../SimpleTestProject.csproj | 4 +- .../SimpleTestProject2.csproj | 4 +- .../SimpleTestProject3.csproj | 6 +- .../SimpleTestProjectARM.csproj | 2 +- .../SimpleTestProjectx86.csproj | 2 +- .../XUTestProject/XUTestProject.csproj | 2 +- test/TestAssets/child-hang/child-hang.csproj | 2 +- test/TestAssets/crash/crash.csproj | 2 +- test/TestAssets/timeout/timeout.csproj | 2 +- 67 files changed, 151 insertions(+), 157 deletions(-) create mode 100644 Directory.Build.props diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000000..eb44a6ae38 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,6 @@ + + + + net462 + + diff --git a/playground/TestPlatform.Playground/TestPlatform.Playground.csproj b/playground/TestPlatform.Playground/TestPlatform.Playground.csproj index 3d620e060c..c815ff0e6c 100644 --- a/playground/TestPlatform.Playground/TestPlatform.Playground.csproj +++ b/playground/TestPlatform.Playground/TestPlatform.Playground.csproj @@ -36,7 +36,7 @@ - + diff --git a/samples/Microsoft.TestPlatform.E2ETest/Microsoft.TestPlatform.E2ETest.csproj b/samples/Microsoft.TestPlatform.E2ETest/Microsoft.TestPlatform.E2ETest.csproj index ecc29fbadf..718a7183c1 100644 --- a/samples/Microsoft.TestPlatform.E2ETest/Microsoft.TestPlatform.E2ETest.csproj +++ b/samples/Microsoft.TestPlatform.E2ETest/Microsoft.TestPlatform.E2ETest.csproj @@ -6,7 +6,7 @@ 15.0.0 - net462 + $(TargetNetFxVersion) Microsoft.TestPlatform.E2ETest Exe win7-x64 @@ -19,7 +19,7 @@ PreserveNewest - + diff --git a/samples/Microsoft.TestPlatform.TranslationLayer.E2ETest/Microsoft.TestPlatform.TranslationLayer.E2ETest.csproj b/samples/Microsoft.TestPlatform.TranslationLayer.E2ETest/Microsoft.TestPlatform.TranslationLayer.E2ETest.csproj index 3e4941ffc2..f781d22e7d 100644 --- a/samples/Microsoft.TestPlatform.TranslationLayer.E2ETest/Microsoft.TestPlatform.TranslationLayer.E2ETest.csproj +++ b/samples/Microsoft.TestPlatform.TranslationLayer.E2ETest/Microsoft.TestPlatform.TranslationLayer.E2ETest.csproj @@ -1,7 +1,7 @@ - net462 + $(TargetNetFxVersion) Microsoft.TestPlatform.TranslationLayer.E2ETest Exe win7-x64 @@ -14,7 +14,7 @@ PreserveNewest - + diff --git a/samples/UnitTestProject/UnitTestProject.csproj b/samples/UnitTestProject/UnitTestProject.csproj index b4c0478330..3799eb3c80 100644 --- a/samples/UnitTestProject/UnitTestProject.csproj +++ b/samples/UnitTestProject/UnitTestProject.csproj @@ -2,9 +2,9 @@ - netcoreapp1.0;net462 + netcoreapp1.0;$(TargetNetFxVersion) netcoreapp3.1 - Exe + Exe UnitTestProject false false @@ -20,7 +20,7 @@ - + diff --git a/scripts/build.sh b/scripts/build.sh index d105eecb6f..dc4347a2a0 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -216,10 +216,10 @@ function install_cli() fi chmod u+x $install_script # Get netcoreapp1.1 shared components - $install_script --runtime dotnet --install-dir "$TP_DOTNET_DIR" --no-path --architecture x64 --channel "2.1" --version "2.1.30" - $install_script --runtime dotnet --install-dir "$TP_DOTNET_DIR" --no-path --architecture x64 --channel "3.1" --version "3.1.24" - $install_script --runtime dotnet --install-dir "$TP_DOTNET_DIR" --no-path --architecture x64 --channel "5.0" --version "5.0.16" - $install_script --runtime dotnet --install-dir "$TP_DOTNET_DIR" --no-path --architecture x64 --channel "6.0" --version "6.0.4" + $install_script --runtime dotnet --install-dir "$TP_DOTNET_DIR" --no-path --architecture x64 --channel "2.1" --version "2.1.30" + $install_script --runtime dotnet --install-dir "$TP_DOTNET_DIR" --no-path --architecture x64 --channel "3.1" --version "3.1.24" + $install_script --runtime dotnet --install-dir "$TP_DOTNET_DIR" --no-path --architecture x64 --channel "5.0" --version "5.0.16" + $install_script --runtime dotnet --install-dir "$TP_DOTNET_DIR" --no-path --architecture x64 --channel "6.0" --version "6.0.4" log "install_cli: Get the latest dotnet cli toolset..." $install_script --install-dir "$TP_DOTNET_DIR" --channel "7.0" --no-path --version $DOTNET_CLI_VERSION @@ -340,8 +340,8 @@ function publish_package() mkdir -p $testhost if [[ $TP_USE_REPO_API = 0 ]]; then - cp -r src/testhost/bin/$TPB_Configuration/net462/win7-x64/* $testhost - cp -r src/testhost.x86/bin/$TPB_Configuration/net462/win7-x86/* $testhost + cp -r src/testhost/bin/$TPB_Configuration/$TPB_TargetFramework/win7-x64/* $testhost + cp -r src/testhost.x86/bin/$TPB_Configuration/$TPB_TargetFramework/win7-x86/* $testhost else cp -r src/testhost/bin/$TPB_Configuration/net6.0/* $testhost cp -r src/testhost.x86/bin/$TPB_Configuration/net6.0/* $testhost diff --git a/src/DataCollectors/DumpMinitool.arm64/DumpMinitool.arm64.csproj b/src/DataCollectors/DumpMinitool.arm64/DumpMinitool.arm64.csproj index 22f83286a3..f571dc4af9 100644 --- a/src/DataCollectors/DumpMinitool.arm64/DumpMinitool.arm64.csproj +++ b/src/DataCollectors/DumpMinitool.arm64/DumpMinitool.arm64.csproj @@ -6,7 +6,7 @@ - net462 + $(TargetNetFxVersion) net6.0 AnyCPU false diff --git a/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj b/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj index 0b9af2c937..d640b294fc 100644 --- a/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj +++ b/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj @@ -6,7 +6,7 @@ - net462 + $(TargetNetFxVersion) net6.0 AnyCPU true diff --git a/src/DataCollectors/DumpMinitool/DumpMinitool.csproj b/src/DataCollectors/DumpMinitool/DumpMinitool.csproj index 193cdc7331..ae03c84fcf 100644 --- a/src/DataCollectors/DumpMinitool/DumpMinitool.csproj +++ b/src/DataCollectors/DumpMinitool/DumpMinitool.csproj @@ -6,7 +6,7 @@ - net462 + $(TargetNetFxVersion) net6.0 AnyCPU false diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Microsoft.TestPlatform.Extensions.EventLogCollector.csproj b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Microsoft.TestPlatform.Extensions.EventLogCollector.csproj index d70c335c9c..e63a69b94a 100644 --- a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Microsoft.TestPlatform.Extensions.EventLogCollector.csproj +++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Microsoft.TestPlatform.Extensions.EventLogCollector.csproj @@ -6,7 +6,7 @@ Microsoft.TestPlatform.Extensions.EventLogCollector - net462 + $(TargetNetFxVersion) net6.0 false true diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj index db394bd085..6c665c18e2 100644 --- a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj +++ b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj @@ -5,7 +5,7 @@ - netstandard1.0;netstandard2.0;net462 + netstandard1.0;netstandard2.0;$(TargetNetFxVersion) $(TargetFrameworks);uap10.0 net6.0 Microsoft.TestPlatform.AdapterUtilities @@ -28,7 +28,7 @@ false - + any false diff --git a/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj b/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj index 691cfe18d0..b37d45bed0 100644 --- a/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj +++ b/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj @@ -6,7 +6,7 @@ Microsoft.VisualStudio.TestPlatform.Client - netstandard2.0;net462 + netstandard2.0;$(TargetNetFxVersion) net6.0 false @@ -24,7 +24,7 @@ true - + diff --git a/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj b/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj index e7c93252e9..1657dcba1c 100644 --- a/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj +++ b/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj @@ -6,7 +6,7 @@ Microsoft.VisualStudio.TestPlatform.Common - net6.0;netstandard2.0;netstandard1.3;net462 + net6.0;netstandard2.0;netstandard1.3;$(TargetNetFxVersion) net6.0 false true @@ -17,7 +17,7 @@ - + diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj b/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj index 6bf95f4807..422c75a4cf 100644 --- a/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj +++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj @@ -5,7 +5,7 @@ Microsoft.TestPlatform.CommunicationUtilities - net6.0;netstandard2.0;netstandard1.3;net462 + net6.0;netstandard2.0;netstandard1.3;$(TargetNetFxVersion) net6.0 false @@ -20,7 +20,7 @@ $(JsonNetVersion) - + diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj index 4a252abfd1..5b50b6e69c 100644 --- a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj +++ b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj @@ -6,7 +6,7 @@ Microsoft.TestPlatform.CoreUtilities - net6.0;netstandard2.0;netstandard1.3;net462 + net6.0;netstandard2.0;netstandard1.3;$(TargetNetFxVersion) false $(TargetFrameworks);uap10.0;netstandard1.0 net6.0 @@ -30,7 +30,7 @@ - + @@ -39,7 +39,7 @@ - + diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj b/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj index d470a416cc..1f746ac353 100644 --- a/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj +++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj @@ -6,7 +6,7 @@ Microsoft.TestPlatform.CrossPlatEngine - net6.0;netstandard2.0;netstandard1.3;net462 + net6.0;netstandard2.0;netstandard1.3;$(TargetNetFxVersion) net6.0 false @@ -28,7 +28,7 @@ - + diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj index 25be4eb501..31b103cb77 100644 --- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj +++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj @@ -6,7 +6,7 @@ Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger - netstandard2.0;net462 + netstandard2.0;$(TargetNetFxVersion) net6.0 false true @@ -15,7 +15,7 @@ - + diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj index 54c0ae2e93..16e5eda699 100644 --- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj +++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj @@ -6,14 +6,14 @@ Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger - net6.0;netstandard2.0;net462 + net6.0;netstandard2.0;$(TargetNetFxVersion) net6.0 false - + diff --git a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj index 456beb6244..51304bd236 100644 --- a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj +++ b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj @@ -6,7 +6,7 @@ Microsoft.VisualStudio.TestPlatform.ObjectModel - net462;netcoreapp2.1;netcoreapp1.0;netstandard2.0;netstandard1.3 + $(TargetNetFxVersion);netcoreapp2.1;netcoreapp1.0;netstandard2.0;netstandard1.3 $(TargetFrameworks);uap10.0;netstandard1.0 net6.0 Microsoft.TestPlatform.ObjectModel @@ -26,7 +26,7 @@ - + diff --git a/src/Microsoft.TestPlatform.ObjectModel/TraitCollection.cs b/src/Microsoft.TestPlatform.ObjectModel/TraitCollection.cs index 8ea7d31d22..b4cb4e641e 100644 --- a/src/Microsoft.TestPlatform.ObjectModel/TraitCollection.cs +++ b/src/Microsoft.TestPlatform.ObjectModel/TraitCollection.cs @@ -19,7 +19,7 @@ public class TraitCollection : IEnumerable internal const string TraitPropertyId = "TestObject.Traits"; private static readonly TestProperty TraitsProperty = TestProperty.Register( TraitPropertyId, -#if !NET462 +#if WINDOWS_UWP // TODO: Fix this with proper resourcing for UWP and Win 8.1 Apps // Trying to access resources will throw "MissingManifestResourceException" percolated as "TypeInitialization" exception "Traits", diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj index edc0aedc74..7de06f6ae0 100644 --- a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj +++ b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj @@ -7,7 +7,7 @@ Microsoft.TestPlatform.PlatformAbstractions Microsoft.TestPlatform.PlatformAbstractions - net462;netcoreapp1.0;netcoreapp2.1;netstandard1.3;netstandard2.0;net6.0 + $(TargetNetFxVersion);netcoreapp1.0;netcoreapp2.1;netstandard1.3;netstandard2.0;net6.0 $(TargetFrameworks);uap10.0;netstandard1.0 net6.0 false @@ -36,7 +36,7 @@ - + diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj b/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj index 792d131a56..b1a10b8ac4 100644 --- a/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj +++ b/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj @@ -6,13 +6,13 @@ Microsoft.TestPlatform.TestHostRuntimeProvider - net6.0;netstandard2.0;net462 + net6.0;netstandard2.0;$(TargetNetFxVersion) net6.0 $(DefineConstants);DOTNET_BUILD_FROM_SOURCE false true - + diff --git a/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj b/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj index d71de7ce57..f481890916 100644 --- a/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj +++ b/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj @@ -6,11 +6,11 @@ Microsoft.TestPlatform.Utilities - netstandard2.0;netstandard1.3;net462 + netstandard2.0;netstandard1.3;$(TargetNetFxVersion) net6.0 false - + diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj index d4d0ed500b..604fd9e646 100644 --- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj +++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj @@ -6,7 +6,7 @@ Microsoft.TestPlatform.VsTestConsole.TranslationLayer - net6.0;netstandard2.0;net462 + net6.0;netstandard2.0;$(TargetNetFxVersion) net6.0 false @@ -19,7 +19,7 @@ - + diff --git a/src/SettingsMigrator/SettingsMigrator.csproj b/src/SettingsMigrator/SettingsMigrator.csproj index 5d7a8c3869..82f634edfc 100644 --- a/src/SettingsMigrator/SettingsMigrator.csproj +++ b/src/SettingsMigrator/SettingsMigrator.csproj @@ -6,20 +6,20 @@ SettingsMigrator - net462 + $(TargetNetFxVersion) net6.0 Exe AnyCPU false true - + win7-x64 - + diff --git a/src/datacollector/datacollector.csproj b/src/datacollector/datacollector.csproj index c0e86f9928..7905489dc3 100644 --- a/src/datacollector/datacollector.csproj +++ b/src/datacollector/datacollector.csproj @@ -13,7 +13,7 @@ datacollector.arm64 netcoreapp2.1 $(TargetFrameworks);net472 - $(TargetFrameworks);net462 + $(TargetFrameworks);$(TargetNetFxVersion) net6.0 AnyCPU Exe diff --git a/src/package/VSIXProject/TestPlatform.csproj b/src/package/VSIXProject/TestPlatform.csproj index b9ea2074ec..66c2411daa 100644 --- a/src/package/VSIXProject/TestPlatform.csproj +++ b/src/package/VSIXProject/TestPlatform.csproj @@ -27,7 +27,7 @@ false False true - $(TestPlatformRoot)artifacts\$(Configuration)\net462\win7-x64 + $(TestPlatformRoot)artifacts\$(Configuration)\$(TargetNetFxVersion)\win7-x64 $(TestPlatformRoot)artifacts\$(Configuration)\VSIX TestPlatform [installDir]\Common7\IDE\Extensions\TestPlatform diff --git a/src/package/package/package.csproj b/src/package/package/package.csproj index 091c9800e4..2d4d044286 100644 --- a/src/package/package/package.csproj +++ b/src/package/package/package.csproj @@ -5,7 +5,7 @@ - net462;netcoreapp2.1 + $(TargetNetFxVersion);netcoreapp2.1 net6.0 package false @@ -28,10 +28,10 @@ false - + win7-x64 - + diff --git a/src/package/sign/sign.csproj b/src/package/sign/sign.csproj index 5bd7e31bcb..76bab86510 100644 --- a/src/package/sign/sign.csproj +++ b/src/package/sign/sign.csproj @@ -1,6 +1,6 @@  - net462 + $(TargetNetFxVersion) sign win7-x64 @@ -11,7 +11,7 @@ - + diff --git a/src/package/sign/sign.proj b/src/package/sign/sign.proj index e31ef32bdd..0f0d8fcfea 100644 --- a/src/package/sign/sign.proj +++ b/src/package/sign/sign.proj @@ -16,7 +16,7 @@ $(RootDirectory)artifacts\$(BuildConfiguration)\ - $(ArtifactsBaseDirectory)net462\ + $(ArtifactsBaseDirectory)$(TargetFramework)\ $(ArtifactsBaseDirectory)$(TargetFramework)\$(TargetRuntime)\ @@ -302,55 +302,43 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + - + diff --git a/src/testhost.arm64/testhost.arm64.csproj b/src/testhost.arm64/testhost.arm64.csproj index d7820dbb0b..65aa9de61f 100644 --- a/src/testhost.arm64/testhost.arm64.csproj +++ b/src/testhost.arm64/testhost.arm64.csproj @@ -11,7 +11,7 @@ testhost.arm64 - netcoreapp2.1;netcoreapp1.0;net462;net47;net471;net472;net48 + netcoreapp2.1;netcoreapp1.0;$(TargetNetFxVersion);net47;net471;net472;net48 net6.0 Exe false @@ -20,7 +20,7 @@ win10-arm64 false - $(AssemblyName.Replace('.arm64', '')).$(TargetFramework).arm64 + $(AssemblyName.Replace('.arm64', '')).$(TargetFramework).arm64 diff --git a/src/testhost.x86/testhost.x86.csproj b/src/testhost.x86/testhost.x86.csproj index 2fb16047c9..ef34d2b62c 100644 --- a/src/testhost.x86/testhost.x86.csproj +++ b/src/testhost.x86/testhost.x86.csproj @@ -11,7 +11,7 @@ testhost.x86 - netcoreapp2.1;netcoreapp1.0;net462;net47;net471;net472;net48 + netcoreapp2.1;netcoreapp1.0;$(TargetNetFxVersion);net47;net471;net472;net48 net6.0 AnyCPU true @@ -22,7 +22,7 @@ win7-x86 false - $(AssemblyName.Replace('.x86', '')).$(TargetFramework).x86 + $(AssemblyName.Replace('.x86', '')).$(TargetFramework).x86 diff --git a/src/testhost/testhost.csproj b/src/testhost/testhost.csproj index 4d52d6cee9..9dcf7be417 100644 --- a/src/testhost/testhost.csproj +++ b/src/testhost/testhost.csproj @@ -11,7 +11,7 @@ testhost - netcoreapp2.1;netcoreapp1.0;net462;net47;net471;net472;net48 + netcoreapp2.1;netcoreapp1.0;$(TargetNetFxVersion);net47;net471;net472;net48 net6.0 Exe false @@ -20,7 +20,7 @@ win7-x64 false - $(AssemblyName).$(TargetFramework) + $(AssemblyName).$(TargetFramework) diff --git a/src/vstest.console/vstest.console.csproj b/src/vstest.console/vstest.console.csproj index 5ff29872dc..820f823bae 100644 --- a/src/vstest.console/vstest.console.csproj +++ b/src/vstest.console/vstest.console.csproj @@ -8,12 +8,12 @@ vstest.console vstest.console.arm64 - netcoreapp2.1;net462 + netcoreapp2.1;$(TargetNetFxVersion) net6.0 Exe Major false - AnyCPU + AnyCPU app.manifest Microsoft.VisualStudio.TestPlatform.CommandLine true @@ -23,13 +23,13 @@ --> false - + win7-x64;win10-arm64 - + diff --git a/test/TestAssets/AppDomainGetAssembliesTestProject/AppDomainGetAssembliesTestProject.csproj b/test/TestAssets/AppDomainGetAssembliesTestProject/AppDomainGetAssembliesTestProject.csproj index 4ce8cbec45..58801b621a 100644 --- a/test/TestAssets/AppDomainGetAssembliesTestProject/AppDomainGetAssembliesTestProject.csproj +++ b/test/TestAssets/AppDomainGetAssembliesTestProject/AppDomainGetAssembliesTestProject.csproj @@ -1,7 +1,7 @@ - netcoreapp2.1;net462 + netcoreapp2.1;$(TargetNetFxVersion) netcoreapp3.1 false diff --git a/test/TestAssets/BlameUnitTestProject/BlameUnitTestProject.csproj b/test/TestAssets/BlameUnitTestProject/BlameUnitTestProject.csproj index a444e24919..370e14865b 100644 --- a/test/TestAssets/BlameUnitTestProject/BlameUnitTestProject.csproj +++ b/test/TestAssets/BlameUnitTestProject/BlameUnitTestProject.csproj @@ -11,7 +11,7 @@ BlameUnitTestProject - netcoreapp2.1;net462 + netcoreapp2.1;$(TargetNetFxVersion) Exe diff --git a/test/TestAssets/CUITTestProject/CUITTestProject.csproj b/test/TestAssets/CUITTestProject/CUITTestProject.csproj index e67659f21a..f66d004f92 100644 --- a/test/TestAssets/CUITTestProject/CUITTestProject.csproj +++ b/test/TestAssets/CUITTestProject/CUITTestProject.csproj @@ -12,7 +12,7 @@ CUITTestProject - net462 + $(TargetNetFxVersion) Exe diff --git a/test/TestAssets/CodeCoverageTest/CodeCoverageTest.csproj b/test/TestAssets/CodeCoverageTest/CodeCoverageTest.csproj index 525a6ffbd0..48516eb884 100644 --- a/test/TestAssets/CodeCoverageTest/CodeCoverageTest.csproj +++ b/test/TestAssets/CodeCoverageTest/CodeCoverageTest.csproj @@ -5,7 +5,7 @@ CodeCoverageTest - netcoreapp2.1;net462 + netcoreapp2.1;$(TargetNetFxVersion) netcoreapp3.1 false @@ -21,7 +21,7 @@ $(NETTestSdkVersion) - + diff --git a/test/TestAssets/ConsoleManagedApp/ConsoleManagedApp.csproj b/test/TestAssets/ConsoleManagedApp/ConsoleManagedApp.csproj index 97fa077e53..946e9ff58c 100644 --- a/test/TestAssets/ConsoleManagedApp/ConsoleManagedApp.csproj +++ b/test/TestAssets/ConsoleManagedApp/ConsoleManagedApp.csproj @@ -4,7 +4,7 @@ ConsoleManagedApp - netcoreapp2.1;net462 + netcoreapp2.1;$(TargetNetFxVersion) Exe netcoreapp3.1 false diff --git a/test/TestAssets/ConsoleRunners/ConsoleRunners.csproj b/test/TestAssets/ConsoleRunners/ConsoleRunners.csproj index 0b0cc7004e..3b9c7b8702 100644 --- a/test/TestAssets/ConsoleRunners/ConsoleRunners.csproj +++ b/test/TestAssets/ConsoleRunners/ConsoleRunners.csproj @@ -3,7 +3,7 @@ - netcoreapp2.1;net462 + netcoreapp2.1;$(TargetNetFxVersion) netcoreapp3.1 false diff --git a/test/TestAssets/DisableAppdomainTest1/DisableAppdomainTest1.csproj b/test/TestAssets/DisableAppdomainTest1/DisableAppdomainTest1.csproj index a8fcbcb9f7..dc736baf7b 100644 --- a/test/TestAssets/DisableAppdomainTest1/DisableAppdomainTest1.csproj +++ b/test/TestAssets/DisableAppdomainTest1/DisableAppdomainTest1.csproj @@ -12,12 +12,12 @@ DisableAppdomainTest1 - net462 + $(TargetNetFxVersion) Exe - + diff --git a/test/TestAssets/DisableAppdomainTest2/DisableAppdomainTest2.csproj b/test/TestAssets/DisableAppdomainTest2/DisableAppdomainTest2.csproj index 5c99d8c237..cc11497dca 100644 --- a/test/TestAssets/DisableAppdomainTest2/DisableAppdomainTest2.csproj +++ b/test/TestAssets/DisableAppdomainTest2/DisableAppdomainTest2.csproj @@ -12,12 +12,12 @@ DisableAppDomainTest2 - net462 + $(TargetNetFxVersion) Exe - + diff --git a/test/TestAssets/DiscoveryTestProject/DiscoveryTestProject.csproj b/test/TestAssets/DiscoveryTestProject/DiscoveryTestProject.csproj index 4a06e6c07b..39844ed9c7 100644 --- a/test/TestAssets/DiscoveryTestProject/DiscoveryTestProject.csproj +++ b/test/TestAssets/DiscoveryTestProject/DiscoveryTestProject.csproj @@ -5,7 +5,7 @@ DiscoveryTestProject - netcoreapp1.0;netcoreapp1.1;netcoreapp2.0;net462 + netcoreapp1.0;netcoreapp1.1;netcoreapp2.0;$(TargetNetFxVersion) netcoreapp3.1 x64 @@ -15,7 +15,7 @@ - + diff --git a/test/TestAssets/EnvironmentVariablesTestProject/EnvironmentVariablesTestProject.csproj b/test/TestAssets/EnvironmentVariablesTestProject/EnvironmentVariablesTestProject.csproj index 6e3afb30dd..969cd0d890 100644 --- a/test/TestAssets/EnvironmentVariablesTestProject/EnvironmentVariablesTestProject.csproj +++ b/test/TestAssets/EnvironmentVariablesTestProject/EnvironmentVariablesTestProject.csproj @@ -1,7 +1,7 @@ - net462;netcoreapp2.1 + $(TargetNetFxVersion);netcoreapp2.1 netcoreapp3.1 false diff --git a/test/TestAssets/EventLogUnitTestProject/EventLogUnitTestProject.csproj b/test/TestAssets/EventLogUnitTestProject/EventLogUnitTestProject.csproj index 968982f918..3513c70f4b 100644 --- a/test/TestAssets/EventLogUnitTestProject/EventLogUnitTestProject.csproj +++ b/test/TestAssets/EventLogUnitTestProject/EventLogUnitTestProject.csproj @@ -12,11 +12,11 @@ EventLogUnitTestProject - net462 + $(TargetNetFxVersion) Exe - + diff --git a/test/TestAssets/LegacySettingsUnitTestProject/LegacySettingsUnitTestProject.csproj b/test/TestAssets/LegacySettingsUnitTestProject/LegacySettingsUnitTestProject.csproj index 23ad79fbd4..fd6123da6e 100644 --- a/test/TestAssets/LegacySettingsUnitTestProject/LegacySettingsUnitTestProject.csproj +++ b/test/TestAssets/LegacySettingsUnitTestProject/LegacySettingsUnitTestProject.csproj @@ -8,7 +8,7 @@ library - net462 + $(TargetNetFxVersion) LegacySettingsUnitTestProject diff --git a/test/TestAssets/MSTestProject1/MSTestProject1.csproj b/test/TestAssets/MSTestProject1/MSTestProject1.csproj index 4097865146..1181d1b10f 100644 --- a/test/TestAssets/MSTestProject1/MSTestProject1.csproj +++ b/test/TestAssets/MSTestProject1/MSTestProject1.csproj @@ -3,7 +3,7 @@ - netcoreapp2.1;net462 + netcoreapp2.1;$(TargetNetFxVersion) netcoreapp3.1 false Preview @@ -20,7 +20,7 @@ $(NETTestSdkVersion) - + diff --git a/test/TestAssets/MSTestProject2/MSTestProject2.csproj b/test/TestAssets/MSTestProject2/MSTestProject2.csproj index 4097865146..1181d1b10f 100644 --- a/test/TestAssets/MSTestProject2/MSTestProject2.csproj +++ b/test/TestAssets/MSTestProject2/MSTestProject2.csproj @@ -3,7 +3,7 @@ - netcoreapp2.1;net462 + netcoreapp2.1;$(TargetNetFxVersion) netcoreapp3.1 false Preview @@ -20,7 +20,7 @@ $(NETTestSdkVersion) - + diff --git a/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj b/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj index 57fd203b1c..6c2a077d11 100644 --- a/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj +++ b/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj @@ -9,7 +9,7 @@ library - net462 + $(TargetNetFxVersion) MstestV1UnitTestProject diff --git a/test/TestAssets/MultitargetedNetFrameworkProject/MultitargetedNetFrameworkProject.csproj b/test/TestAssets/MultitargetedNetFrameworkProject/MultitargetedNetFrameworkProject.csproj index 5bab2d74ab..533e02812b 100644 --- a/test/TestAssets/MultitargetedNetFrameworkProject/MultitargetedNetFrameworkProject.csproj +++ b/test/TestAssets/MultitargetedNetFrameworkProject/MultitargetedNetFrameworkProject.csproj @@ -4,11 +4,11 @@ - net462;net47;net471;net472;net48 + $(TargetNetFxVersion);net47;net471;net472;net48 true true - + TRACE diff --git a/test/TestAssets/NUTestProject/NUTestProject.csproj b/test/TestAssets/NUTestProject/NUTestProject.csproj index a3d65eca98..0c8fce7d49 100644 --- a/test/TestAssets/NUTestProject/NUTestProject.csproj +++ b/test/TestAssets/NUTestProject/NUTestProject.csproj @@ -4,7 +4,7 @@ - net462;netcoreapp2.1 + $(TargetNetFxVersion);netcoreapp2.1 netcoreapp3.1 false NUTestProject diff --git a/test/TestAssets/NewtonSoftDependency/NewtonSoftDependency.csproj b/test/TestAssets/NewtonSoftDependency/NewtonSoftDependency.csproj index 90e3c62cfe..d0689f553f 100644 --- a/test/TestAssets/NewtonSoftDependency/NewtonSoftDependency.csproj +++ b/test/TestAssets/NewtonSoftDependency/NewtonSoftDependency.csproj @@ -11,12 +11,12 @@ NewtonSoftDependency - net462 + $(TargetNetFxVersion) Exe - + diff --git a/test/TestAssets/OutOfProcDataCollector/OutOfProcDataCollector.csproj b/test/TestAssets/OutOfProcDataCollector/OutOfProcDataCollector.csproj index 57df8960cf..838cbaf576 100644 --- a/test/TestAssets/OutOfProcDataCollector/OutOfProcDataCollector.csproj +++ b/test/TestAssets/OutOfProcDataCollector/OutOfProcDataCollector.csproj @@ -1,6 +1,6 @@ - netcoreapp2.1;net462 + netcoreapp2.1;$(TargetNetFxVersion) netcoreapp3.1 false 15.0.0.0 diff --git a/test/TestAssets/ParametrizedTestProject/ParametrizedTestProject.csproj b/test/TestAssets/ParametrizedTestProject/ParametrizedTestProject.csproj index 8882eb6de5..8ee167749a 100644 --- a/test/TestAssets/ParametrizedTestProject/ParametrizedTestProject.csproj +++ b/test/TestAssets/ParametrizedTestProject/ParametrizedTestProject.csproj @@ -5,7 +5,7 @@ ParametrizedTestProject - netcoreapp2.1;net462 + netcoreapp2.1;$(TargetNetFxVersion) netcoreapp3.1 false @@ -21,7 +21,7 @@ $(NETTestSdkVersion) - + diff --git a/test/TestAssets/PerfTestProject/PerfTestProject.csproj b/test/TestAssets/PerfTestProject/PerfTestProject.csproj index 771dee18e6..2e4d3dbe9e 100644 --- a/test/TestAssets/PerfTestProject/PerfTestProject.csproj +++ b/test/TestAssets/PerfTestProject/PerfTestProject.csproj @@ -7,7 +7,7 @@ - netcoreapp2.1;net462 + netcoreapp2.1;$(TargetNetFxVersion) netcoreapp3.1 Exe false @@ -16,7 +16,7 @@ portable - + full diff --git a/test/TestAssets/ProjectFileRunSettingsTestProject/ProjectFileRunSettingsTestProject.csproj b/test/TestAssets/ProjectFileRunSettingsTestProject/ProjectFileRunSettingsTestProject.csproj index 2afd99462e..ca5c112b8d 100644 --- a/test/TestAssets/ProjectFileRunSettingsTestProject/ProjectFileRunSettingsTestProject.csproj +++ b/test/TestAssets/ProjectFileRunSettingsTestProject/ProjectFileRunSettingsTestProject.csproj @@ -4,7 +4,7 @@ - netcoreapp2.1;net462 + netcoreapp2.1;$(TargetNetFxVersion) netcoreapp3.1 false x64 @@ -15,7 +15,7 @@ - + diff --git a/test/TestAssets/SimpleClassLibrary/SimpleClassLibrary.csproj b/test/TestAssets/SimpleClassLibrary/SimpleClassLibrary.csproj index e244a42139..76638c35d0 100644 --- a/test/TestAssets/SimpleClassLibrary/SimpleClassLibrary.csproj +++ b/test/TestAssets/SimpleClassLibrary/SimpleClassLibrary.csproj @@ -3,7 +3,7 @@ - netcoreapp1.0;netcoreapp1.1;netcoreapp2.1;net462 + netcoreapp1.0;netcoreapp1.1;netcoreapp2.1;$(TargetNetFxVersion) netcoreapp3.1 false @@ -18,10 +18,10 @@ portable - + full - + portable diff --git a/test/TestAssets/SimpleDataCollector/SimpleDataCollector.csproj b/test/TestAssets/SimpleDataCollector/SimpleDataCollector.csproj index 6813334fcc..0864efcc09 100644 --- a/test/TestAssets/SimpleDataCollector/SimpleDataCollector.csproj +++ b/test/TestAssets/SimpleDataCollector/SimpleDataCollector.csproj @@ -10,7 +10,7 @@ 15.0.0.0 15.0.0.0 15.0.0.0 - netcoreapp2.1;net462 + netcoreapp2.1;$(TargetNetFxVersion) netcoreapp3.1 false true diff --git a/test/TestAssets/SimpleTestProject/SimpleTestProject.csproj b/test/TestAssets/SimpleTestProject/SimpleTestProject.csproj index d5879513e1..1eabc63320 100644 --- a/test/TestAssets/SimpleTestProject/SimpleTestProject.csproj +++ b/test/TestAssets/SimpleTestProject/SimpleTestProject.csproj @@ -5,7 +5,7 @@ SimpleTestProject - netcoreapp2.1;net462 + netcoreapp2.1;$(TargetNetFxVersion) netcoreapp3.1 false @@ -21,7 +21,7 @@ $(NETTestSdkVersion) - + diff --git a/test/TestAssets/SimpleTestProject2/SimpleTestProject2.csproj b/test/TestAssets/SimpleTestProject2/SimpleTestProject2.csproj index c614311e87..2581ffed06 100644 --- a/test/TestAssets/SimpleTestProject2/SimpleTestProject2.csproj +++ b/test/TestAssets/SimpleTestProject2/SimpleTestProject2.csproj @@ -12,7 +12,7 @@ SimpleTestProject2 - netcoreapp2.1;net462 + netcoreapp2.1;$(TargetNetFxVersion) netcoreapp3.1 false Exe @@ -24,7 +24,7 @@ portable - + full diff --git a/test/TestAssets/SimpleTestProject3/SimpleTestProject3.csproj b/test/TestAssets/SimpleTestProject3/SimpleTestProject3.csproj index e8c6a2f138..142a070261 100644 --- a/test/TestAssets/SimpleTestProject3/SimpleTestProject3.csproj +++ b/test/TestAssets/SimpleTestProject3/SimpleTestProject3.csproj @@ -4,7 +4,7 @@ - netcoreapp2.1;net462 + netcoreapp2.1;$(TargetNetFxVersion) netcoreapp3.1 false Exe @@ -16,11 +16,11 @@ - + - + diff --git a/test/TestAssets/SimpleTestProjectARM/SimpleTestProjectARM.csproj b/test/TestAssets/SimpleTestProjectARM/SimpleTestProjectARM.csproj index 0c86aaf484..b0ebf4b9be 100644 --- a/test/TestAssets/SimpleTestProjectARM/SimpleTestProjectARM.csproj +++ b/test/TestAssets/SimpleTestProjectARM/SimpleTestProjectARM.csproj @@ -13,7 +13,7 @@ SimpleTestProjectARM - netcoreapp2.1;net462 + netcoreapp2.1;$(TargetNetFxVersion) netcoreapp3.1 false Exe diff --git a/test/TestAssets/SimpleTestProjectx86/SimpleTestProjectx86.csproj b/test/TestAssets/SimpleTestProjectx86/SimpleTestProjectx86.csproj index da88e74f94..2a9893e677 100644 --- a/test/TestAssets/SimpleTestProjectx86/SimpleTestProjectx86.csproj +++ b/test/TestAssets/SimpleTestProjectx86/SimpleTestProjectx86.csproj @@ -13,7 +13,7 @@ SimpleTestProjectx86 - netcoreapp2.1;net462 + netcoreapp2.1;$(TargetNetFxVersion) netcoreapp3.1 false Exe diff --git a/test/TestAssets/XUTestProject/XUTestProject.csproj b/test/TestAssets/XUTestProject/XUTestProject.csproj index b6e2dba047..bb0f0f800e 100644 --- a/test/TestAssets/XUTestProject/XUTestProject.csproj +++ b/test/TestAssets/XUTestProject/XUTestProject.csproj @@ -4,7 +4,7 @@ XUTestProject - netcoreapp2.1;net462 + netcoreapp2.1;$(TargetNetFxVersion) netcoreapp3.1 false diff --git a/test/TestAssets/child-hang/child-hang.csproj b/test/TestAssets/child-hang/child-hang.csproj index ace2f96a56..98fbfc175d 100644 --- a/test/TestAssets/child-hang/child-hang.csproj +++ b/test/TestAssets/child-hang/child-hang.csproj @@ -8,7 +8,7 @@ - net462;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0 + $(TargetNetFxVersion);net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0 netcoreapp3.1 child_hang false diff --git a/test/TestAssets/crash/crash.csproj b/test/TestAssets/crash/crash.csproj index def2e2b035..663716024f 100644 --- a/test/TestAssets/crash/crash.csproj +++ b/test/TestAssets/crash/crash.csproj @@ -8,7 +8,7 @@ - net462;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0 + $(TargetNetFxVersion);net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0 netcoreapp3.1 false diff --git a/test/TestAssets/timeout/timeout.csproj b/test/TestAssets/timeout/timeout.csproj index d835f77aee..06e9ad2a2b 100644 --- a/test/TestAssets/timeout/timeout.csproj +++ b/test/TestAssets/timeout/timeout.csproj @@ -9,7 +9,7 @@ - net462;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0 + $(TargetNetFxVersion);net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0 netcoreapp3.1 false