diff --git a/samples/Microsoft.TestPlatform.Protocol/Microsoft.TestPlatform.Protocol.csproj b/samples/Microsoft.TestPlatform.Protocol/Microsoft.TestPlatform.Protocol.csproj index c3ecb6ac02..98f259f429 100644 --- a/samples/Microsoft.TestPlatform.Protocol/Microsoft.TestPlatform.Protocol.csproj +++ b/samples/Microsoft.TestPlatform.Protocol/Microsoft.TestPlatform.Protocol.csproj @@ -2,6 +2,7 @@ netcoreapp1.0 + netcoreapp3.1 Exe diff --git a/samples/UnitTestProject/UnitTestProject.csproj b/samples/UnitTestProject/UnitTestProject.csproj index 9a53f820a8..fc06eb77ff 100644 --- a/samples/UnitTestProject/UnitTestProject.csproj +++ b/samples/UnitTestProject/UnitTestProject.csproj @@ -3,7 +3,8 @@ netcoreapp1.0;net451 - Exe + netcoreapp3.1 + Exe UnitTestProject false false diff --git a/scripts/build.sh b/scripts/build.sh index 7ba14d50d6..2cc0cf4c09 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -507,9 +507,17 @@ function create_package() cp -r "$TP_PACKAGE_NUSPEC_DIR/../licenses" $stagingDir for i in ${projectFiles[@]}; do - log "$dotnet pack --no-build $stagingDir/${i} -o $packageOutputDir -p:Version=$TPB_Version" \ - && $dotnet restore $stagingDir/${i} \ - && $dotnet pack --no-build $stagingDir/${i} -o $packageOutputDir -p:Version=$TPB_Version /bl:pack_$i.binlog + if [[ $TP_USE_REPO_API = 0 ]]; then + log "$dotnet pack --no-build $stagingDir/${i} -o $packageOutputDir -p:Version=$TPB_Version" + + $dotnet restore $stagingDir/${i} \ + && $dotnet pack --no-build $stagingDir/${i} -o $packageOutputDir -p:Version=$TPB_Version /bl:pack_$i.binlog + else + log "$dotnet pack --no-build $stagingDir/${i} -o $packageOutputDir -p:Version=$TPB_Version (Source Build)" + + $dotnet restore $stagingDir/${i} \ + && $dotnet pack --no-build $stagingDir/${i} -o $packageOutputDir -p:Version=$TPB_Version /bl:pack_$i.binlog -p:DotNetBuildFromSource=true + fi done log "Create-NugetPackages: Elapsed $(( SECONDS - start ))s." diff --git a/scripts/build/TestPlatform.Dependencies.props b/scripts/build/TestPlatform.Dependencies.props index d9e7c09d23..fd507c6ffe 100644 --- a/scripts/build/TestPlatform.Dependencies.props +++ b/scripts/build/TestPlatform.Dependencies.props @@ -1,4 +1,4 @@ - + 15.8.3247 diff --git a/src/package/nuspec/Microsoft.TestPlatform.Build.csproj b/src/package/nuspec/Microsoft.TestPlatform.Build.csproj index e982426e44..038fbf8920 100644 --- a/src/package/nuspec/Microsoft.TestPlatform.Build.csproj +++ b/src/package/nuspec/Microsoft.TestPlatform.Build.csproj @@ -1,8 +1,8 @@ Exe - netcoreapp1.0 - net6.0 + netcoreapp1.0 + false TestPlatform.Build.nuspec version=$(Version) diff --git a/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj b/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj index e68582679c..29198ba2f3 100644 --- a/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj +++ b/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj @@ -1,8 +1,8 @@ Exe - netcoreapp1.0 - net6.0 + netcoreapp1.0 + false TestPlatform.CLI.nuspec version=$(Version) diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.csproj b/test/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.csproj index 2f1aa13370..bbc5b66688 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.csproj +++ b/test/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.csproj @@ -7,8 +7,9 @@ - Exe + Exe netcoreapp2.1;net451 + netcoreapp3.1 Microsoft.TestPlatform.AcceptanceTests diff --git a/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/Microsoft.TestPlatform.AdapterUtilities.UnitTests.csproj b/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/Microsoft.TestPlatform.AdapterUtilities.UnitTests.csproj index 7c0d0612d7..0e9bc56646 100644 --- a/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/Microsoft.TestPlatform.AdapterUtilities.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/Microsoft.TestPlatform.AdapterUtilities.UnitTests.csproj @@ -7,7 +7,8 @@ netcoreapp2.1 - Exe + netcoreapp3.1 + Exe Microsoft.TestPlatform.AdapterUtilities.UnitTests true 3.8.0-3.20427.2 diff --git a/test/Microsoft.TestPlatform.Build.UnitTests/Microsoft.TestPlatform.Build.UnitTests.csproj b/test/Microsoft.TestPlatform.Build.UnitTests/Microsoft.TestPlatform.Build.UnitTests.csproj index e1d3b67bfb..b8922d576d 100644 --- a/test/Microsoft.TestPlatform.Build.UnitTests/Microsoft.TestPlatform.Build.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.Build.UnitTests/Microsoft.TestPlatform.Build.UnitTests.csproj @@ -7,8 +7,9 @@ - Exe netcoreapp2.1 + netcoreapp3.1 + Exe Microsoft.TestPlatform.Build.UnitTests true true diff --git a/test/Microsoft.TestPlatform.Client.UnitTests/Microsoft.TestPlatform.Client.UnitTests.csproj b/test/Microsoft.TestPlatform.Client.UnitTests/Microsoft.TestPlatform.Client.UnitTests.csproj index 2a9ca74a04..29dcd973cd 100644 --- a/test/Microsoft.TestPlatform.Client.UnitTests/Microsoft.TestPlatform.Client.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.Client.UnitTests/Microsoft.TestPlatform.Client.UnitTests.csproj @@ -7,8 +7,9 @@ - Exe netcoreapp2.1;net451 + netcoreapp3.1 + Exe Microsoft.TestPlatform.Client.UnitTests diff --git a/test/Microsoft.TestPlatform.Common.PlatformTests/Microsoft.TestPlatform.Common.PlatformTests.csproj b/test/Microsoft.TestPlatform.Common.PlatformTests/Microsoft.TestPlatform.Common.PlatformTests.csproj index 69354e500b..63e3b0c9f6 100644 --- a/test/Microsoft.TestPlatform.Common.PlatformTests/Microsoft.TestPlatform.Common.PlatformTests.csproj +++ b/test/Microsoft.TestPlatform.Common.PlatformTests/Microsoft.TestPlatform.Common.PlatformTests.csproj @@ -7,8 +7,9 @@ - Exe netcoreapp2.1;net451 + netcoreapp3.1 + Exe Microsoft.TestPlatform.Common.PlatformTests true diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/Microsoft.TestPlatform.Common.UnitTests.csproj b/test/Microsoft.TestPlatform.Common.UnitTests/Microsoft.TestPlatform.Common.UnitTests.csproj index 8a796cfdc5..463037ec3e 100644 --- a/test/Microsoft.TestPlatform.Common.UnitTests/Microsoft.TestPlatform.Common.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.Common.UnitTests/Microsoft.TestPlatform.Common.UnitTests.csproj @@ -7,8 +7,9 @@ - Exe netcoreapp2.1;net451 + netcoreapp3.1 + Exe Microsoft.TestPlatform.Common.UnitTests diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests.csproj b/test/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests.csproj index 8943f5e5b7..b2ddb8c50a 100644 --- a/test/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests.csproj +++ b/test/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests.csproj @@ -7,8 +7,9 @@ - Exe netcoreapp2.1;net451 + netcoreapp3.1 + Exe Microsoft.TestPlatform.CommunicationUtilities.PlatformTests true diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Microsoft.TestPlatform.CommunicationUtilities.UnitTests.csproj b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Microsoft.TestPlatform.CommunicationUtilities.UnitTests.csproj index 43edb6f320..77cbe1b6c6 100644 --- a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Microsoft.TestPlatform.CommunicationUtilities.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Microsoft.TestPlatform.CommunicationUtilities.UnitTests.csproj @@ -7,8 +7,9 @@ - Exe netcoreapp2.1;net451 + netcoreapp3.1 + Exe Microsoft.TestPlatform.CommunicationUtilities.UnitTests true diff --git a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Microsoft.TestPlatform.CoreUtilities.UnitTests.csproj b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Microsoft.TestPlatform.CoreUtilities.UnitTests.csproj index 49ccfde044..adc8ecc706 100644 --- a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Microsoft.TestPlatform.CoreUtilities.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Microsoft.TestPlatform.CoreUtilities.UnitTests.csproj @@ -7,8 +7,9 @@ - Exe netcoreapp2.1;net451 + netcoreapp3.1 + Exe Microsoft.TestPlatform.CoreUtilities.UnitTests diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Microsoft.TestPlatform.CrossPlatEngine.UnitTests.csproj b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Microsoft.TestPlatform.CrossPlatEngine.UnitTests.csproj index 7f159a7f5c..34239e46b1 100644 --- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Microsoft.TestPlatform.CrossPlatEngine.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Microsoft.TestPlatform.CrossPlatEngine.UnitTests.csproj @@ -7,9 +7,10 @@ - Exe Microsoft.TestPlatform.CrossPlatEngine.UnitTests netcoreapp2.1;net451 + netcoreapp3.1 + Exe diff --git a/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests.csproj b/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests.csproj index 3ea0be736f..09bce9beb6 100644 --- a/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests.csproj @@ -11,8 +11,9 @@ netcoreapp2.1;net472 + netcoreapp3.1 + Exe Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests - Exe true true diff --git a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests.csproj b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests.csproj index e759df800e..c4f3325d64 100644 --- a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests.csproj @@ -9,8 +9,9 @@ - Exe netcoreapp2.1;net451 + netcoreapp3.1 + Exe diff --git a/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests.csproj b/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests.csproj index ea6f73b955..2984bca87b 100644 --- a/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests.csproj @@ -9,8 +9,9 @@ - Exe netcoreapp2.1;net451 + netcoreapp3.1 + Exe Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests diff --git a/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.csproj b/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.csproj index 08e4f9a03a..129135fbe7 100644 --- a/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.csproj +++ b/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.csproj @@ -6,8 +6,9 @@ - Exe netcoreapp2.1;net451 + netcoreapp3.1 + Exe Microsoft.TestPlatform.ObjectModel.PlatformTests diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Microsoft.TestPlatform.ObjectModel.UnitTests.csproj b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Microsoft.TestPlatform.ObjectModel.UnitTests.csproj index 66f705d6e3..0081392c81 100644 --- a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Microsoft.TestPlatform.ObjectModel.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Microsoft.TestPlatform.ObjectModel.UnitTests.csproj @@ -7,8 +7,9 @@ - Exe netcoreapp2.1;net451 + netcoreapp3.1 + Exe Microsoft.TestPlatform.ObjectModel.UnitTests diff --git a/test/Microsoft.TestPlatform.SmokeTests/Microsoft.TestPlatform.SmokeTests.csproj b/test/Microsoft.TestPlatform.SmokeTests/Microsoft.TestPlatform.SmokeTests.csproj index 4018e607a6..f54a5ce17a 100644 --- a/test/Microsoft.TestPlatform.SmokeTests/Microsoft.TestPlatform.SmokeTests.csproj +++ b/test/Microsoft.TestPlatform.SmokeTests/Microsoft.TestPlatform.SmokeTests.csproj @@ -7,9 +7,10 @@ - Exe Microsoft.TestPlatform.SmokeTests netcoreapp2.1;net451 + netcoreapp3.1 + Exe diff --git a/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Microsoft.TestPlatform.TestHostProvider.UnitTests.csproj b/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Microsoft.TestPlatform.TestHostProvider.UnitTests.csproj index 5a2219e9c1..f0ae08cbd3 100644 --- a/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Microsoft.TestPlatform.TestHostProvider.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Microsoft.TestPlatform.TestHostProvider.UnitTests.csproj @@ -7,9 +7,10 @@ - Exe Microsoft.TestPlatform.TestHostProvider.UnitTests netcoreapp2.1;net472 + netcoreapp3.1 + Exe true diff --git a/test/Microsoft.TestPlatform.TestUtilities/Microsoft.TestPlatform.TestUtilities.csproj b/test/Microsoft.TestPlatform.TestUtilities/Microsoft.TestPlatform.TestUtilities.csproj index 98ddadf533..9af656a0fb 100644 --- a/test/Microsoft.TestPlatform.TestUtilities/Microsoft.TestPlatform.TestUtilities.csproj +++ b/test/Microsoft.TestPlatform.TestUtilities/Microsoft.TestPlatform.TestUtilities.csproj @@ -7,6 +7,7 @@ Microsoft.TestPlatform.TestUtilities netcoreapp2.1;net451 + netcoreapp3.1 true false diff --git a/test/Microsoft.TestPlatform.Utilities.UnitTests/Microsoft.TestPlatform.Utilities.UnitTests.csproj b/test/Microsoft.TestPlatform.Utilities.UnitTests/Microsoft.TestPlatform.Utilities.UnitTests.csproj index f40e178de1..f87f3be25f 100644 --- a/test/Microsoft.TestPlatform.Utilities.UnitTests/Microsoft.TestPlatform.Utilities.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.Utilities.UnitTests/Microsoft.TestPlatform.Utilities.UnitTests.csproj @@ -8,8 +8,9 @@ - Exe netcoreapp2.1;net451 + netcoreapp3.1 + Exe Microsoft.TestPlatform.Utilities.UnitTests diff --git a/test/TestAssets/AppDomainGetAssembliesTestProject/AppDomainGetAssembliesTestProject.csproj b/test/TestAssets/AppDomainGetAssembliesTestProject/AppDomainGetAssembliesTestProject.csproj index 94bacc0351..f156940b22 100644 --- a/test/TestAssets/AppDomainGetAssembliesTestProject/AppDomainGetAssembliesTestProject.csproj +++ b/test/TestAssets/AppDomainGetAssembliesTestProject/AppDomainGetAssembliesTestProject.csproj @@ -2,6 +2,7 @@ netcoreapp2.1;net451 + netcoreapp3.1 false false diff --git a/test/TestAssets/CodeCoverageTest/CodeCoverageTest.csproj b/test/TestAssets/CodeCoverageTest/CodeCoverageTest.csproj index da9c346968..74f4f0e14d 100644 --- a/test/TestAssets/CodeCoverageTest/CodeCoverageTest.csproj +++ b/test/TestAssets/CodeCoverageTest/CodeCoverageTest.csproj @@ -8,6 +8,7 @@ CodeCoverageTest netcoreapp2.1;net451 + netcoreapp3.1 false diff --git a/test/TestAssets/ConsoleManagedApp/ConsoleManagedApp.csproj b/test/TestAssets/ConsoleManagedApp/ConsoleManagedApp.csproj index ef98c4ea04..2fea82aced 100644 --- a/test/TestAssets/ConsoleManagedApp/ConsoleManagedApp.csproj +++ b/test/TestAssets/ConsoleManagedApp/ConsoleManagedApp.csproj @@ -5,8 +5,9 @@ ConsoleManagedApp - Exe netcoreapp2.1;net451 + Exe + netcoreapp3.1 false diff --git a/test/TestAssets/ConsoleRunners/ConsoleRunners.csproj b/test/TestAssets/ConsoleRunners/ConsoleRunners.csproj index bbc28dd132..7e119e0352 100644 --- a/test/TestAssets/ConsoleRunners/ConsoleRunners.csproj +++ b/test/TestAssets/ConsoleRunners/ConsoleRunners.csproj @@ -3,6 +3,7 @@ netcoreapp2.1;net452 + netcoreapp3.1 false false diff --git a/test/TestAssets/CoverletCoverageTestProject/CoverletCoverageTestProject.csproj b/test/TestAssets/CoverletCoverageTestProject/CoverletCoverageTestProject.csproj index 869ddddce7..c010ae4018 100644 --- a/test/TestAssets/CoverletCoverageTestProject/CoverletCoverageTestProject.csproj +++ b/test/TestAssets/CoverletCoverageTestProject/CoverletCoverageTestProject.csproj @@ -6,6 +6,7 @@ netcoreapp2.1 + netcoreapp3.1 false false diff --git a/test/TestAssets/CrashingOnDebugAssertTestProject/CrashingOnDebugAssertTestProject.csproj b/test/TestAssets/CrashingOnDebugAssertTestProject/CrashingOnDebugAssertTestProject.csproj index 77a56a6436..66c2cbc8a6 100644 Binary files a/test/TestAssets/CrashingOnDebugAssertTestProject/CrashingOnDebugAssertTestProject.csproj and b/test/TestAssets/CrashingOnDebugAssertTestProject/CrashingOnDebugAssertTestProject.csproj differ diff --git a/test/TestAssets/DiscoveryTestProject/DiscoveryTestProject.csproj b/test/TestAssets/DiscoveryTestProject/DiscoveryTestProject.csproj index 6e9a8c7404..064b59845e 100644 --- a/test/TestAssets/DiscoveryTestProject/DiscoveryTestProject.csproj +++ b/test/TestAssets/DiscoveryTestProject/DiscoveryTestProject.csproj @@ -8,6 +8,7 @@ DiscoveryTestProject netcoreapp1.0;netcoreapp1.1;netcoreapp2.0;net451 + netcoreapp3.1 x64 diff --git a/test/TestAssets/EnvironmentVariablesTestProject/EnvironmentVariablesTestProject.csproj b/test/TestAssets/EnvironmentVariablesTestProject/EnvironmentVariablesTestProject.csproj index c1e982ebe9..70e6228436 100644 --- a/test/TestAssets/EnvironmentVariablesTestProject/EnvironmentVariablesTestProject.csproj +++ b/test/TestAssets/EnvironmentVariablesTestProject/EnvironmentVariablesTestProject.csproj @@ -2,6 +2,7 @@ net451;netcoreapp2.1 + netcoreapp3.1 false false diff --git a/test/TestAssets/NUTestProject/NUTestProject.csproj b/test/TestAssets/NUTestProject/NUTestProject.csproj index f005d3e03b..9c6dd853cc 100644 --- a/test/TestAssets/NUTestProject/NUTestProject.csproj +++ b/test/TestAssets/NUTestProject/NUTestProject.csproj @@ -5,6 +5,7 @@ net451;netcoreapp2.1 + netcoreapp3.1 false NUTestProject diff --git a/test/TestAssets/OutOfProcDataCollector/OutOfProcDataCollector.csproj b/test/TestAssets/OutOfProcDataCollector/OutOfProcDataCollector.csproj index 3ade768eeb..f172b1ecb5 100644 --- a/test/TestAssets/OutOfProcDataCollector/OutOfProcDataCollector.csproj +++ b/test/TestAssets/OutOfProcDataCollector/OutOfProcDataCollector.csproj @@ -1,6 +1,7 @@  netcoreapp2.1;net451 + netcoreapp3.1 false 15.0.0.0 1.6.0 diff --git a/test/TestAssets/ParametrizedTestProject/ParametrizedTestProject.csproj b/test/TestAssets/ParametrizedTestProject/ParametrizedTestProject.csproj index 7150b83402..776fdb0d73 100644 Binary files a/test/TestAssets/ParametrizedTestProject/ParametrizedTestProject.csproj and b/test/TestAssets/ParametrizedTestProject/ParametrizedTestProject.csproj differ diff --git a/test/TestAssets/PerfAssets/MSTestAdapterPerfTestProject/MSTestAdapterPerfTestProject.csproj b/test/TestAssets/PerfAssets/MSTestAdapterPerfTestProject/MSTestAdapterPerfTestProject.csproj index 96185aeb90..80918b712b 100644 --- a/test/TestAssets/PerfAssets/MSTestAdapterPerfTestProject/MSTestAdapterPerfTestProject.csproj +++ b/test/TestAssets/PerfAssets/MSTestAdapterPerfTestProject/MSTestAdapterPerfTestProject.csproj @@ -3,6 +3,7 @@ netcoreapp2.1;net451 + netcoreapp3.1 false false diff --git a/test/TestAssets/PerfAssets/NUnitAdapterPerfTestProject/NUnitAdapterPerfTestProject.csproj b/test/TestAssets/PerfAssets/NUnitAdapterPerfTestProject/NUnitAdapterPerfTestProject.csproj index 36daf6e1b8..8aa01f4769 100644 --- a/test/TestAssets/PerfAssets/NUnitAdapterPerfTestProject/NUnitAdapterPerfTestProject.csproj +++ b/test/TestAssets/PerfAssets/NUnitAdapterPerfTestProject/NUnitAdapterPerfTestProject.csproj @@ -3,6 +3,7 @@ netcoreapp2.1;net451 + netcoreapp3.1 false diff --git a/test/TestAssets/PerfAssets/XUnitAdapterPerfTestProject/XUnitAdapterPerfTestProject.csproj b/test/TestAssets/PerfAssets/XUnitAdapterPerfTestProject/XUnitAdapterPerfTestProject.csproj index 9f6af112a8..c8ea76f623 100644 --- a/test/TestAssets/PerfAssets/XUnitAdapterPerfTestProject/XUnitAdapterPerfTestProject.csproj +++ b/test/TestAssets/PerfAssets/XUnitAdapterPerfTestProject/XUnitAdapterPerfTestProject.csproj @@ -3,6 +3,7 @@ netcoreapp2.1;net451 + netcoreapp3.1 false false diff --git a/test/TestAssets/PerfTestProject/PerfTestProject.csproj b/test/TestAssets/PerfTestProject/PerfTestProject.csproj index 6d62eda442..94c7a09f41 100644 Binary files a/test/TestAssets/PerfTestProject/PerfTestProject.csproj and b/test/TestAssets/PerfTestProject/PerfTestProject.csproj differ diff --git a/test/TestAssets/ProjectFileRunSettingsTestProject/ProjectFileRunSettingsTestProject.csproj b/test/TestAssets/ProjectFileRunSettingsTestProject/ProjectFileRunSettingsTestProject.csproj index 81f87a7537..74c8bdb6ec 100644 --- a/test/TestAssets/ProjectFileRunSettingsTestProject/ProjectFileRunSettingsTestProject.csproj +++ b/test/TestAssets/ProjectFileRunSettingsTestProject/ProjectFileRunSettingsTestProject.csproj @@ -7,6 +7,7 @@ netcoreapp2.1;net451 + netcoreapp3.1 false x64 fail.runsettings diff --git a/test/TestAssets/SampleProjectWithOldTestHost/SampleProjectWithOldTestHost.csproj b/test/TestAssets/SampleProjectWithOldTestHost/SampleProjectWithOldTestHost.csproj index 544c3fd838..7a875623ec 100644 --- a/test/TestAssets/SampleProjectWithOldTestHost/SampleProjectWithOldTestHost.csproj +++ b/test/TestAssets/SampleProjectWithOldTestHost/SampleProjectWithOldTestHost.csproj @@ -6,6 +6,7 @@ netcoreapp1.0;netcoreapp1.1;netcoreapp2.1 + netcoreapp3.1 true false diff --git a/test/TestAssets/SimpleClassLibrary/SimpleClassLibrary.csproj b/test/TestAssets/SimpleClassLibrary/SimpleClassLibrary.csproj index 5f9345b594..1e63c37975 100644 --- a/test/TestAssets/SimpleClassLibrary/SimpleClassLibrary.csproj +++ b/test/TestAssets/SimpleClassLibrary/SimpleClassLibrary.csproj @@ -4,10 +4,7 @@ netcoreapp1.0;netcoreapp1.1;netcoreapp2.1;net451 - false - - - + netcoreapp3.1 false diff --git a/test/TestAssets/SimpleDataCollector/SimpleDataCollector.csproj b/test/TestAssets/SimpleDataCollector/SimpleDataCollector.csproj index 38e84a9dae..b14207c1d7 100644 Binary files a/test/TestAssets/SimpleDataCollector/SimpleDataCollector.csproj and b/test/TestAssets/SimpleDataCollector/SimpleDataCollector.csproj differ diff --git a/test/TestAssets/SimpleTestProject/SimpleTestProject.csproj b/test/TestAssets/SimpleTestProject/SimpleTestProject.csproj index c18161de3b..86436292dc 100644 Binary files a/test/TestAssets/SimpleTestProject/SimpleTestProject.csproj and b/test/TestAssets/SimpleTestProject/SimpleTestProject.csproj differ diff --git a/test/TestAssets/SimpleTestProject2/SimpleTestProject2.csproj b/test/TestAssets/SimpleTestProject2/SimpleTestProject2.csproj index 6eefa783cc..e3cd2aa7b3 100644 Binary files a/test/TestAssets/SimpleTestProject2/SimpleTestProject2.csproj and b/test/TestAssets/SimpleTestProject2/SimpleTestProject2.csproj differ diff --git a/test/TestAssets/SimpleTestProject3/SimpleTestProject3.csproj b/test/TestAssets/SimpleTestProject3/SimpleTestProject3.csproj index 9218fdee45..955adce869 100644 --- a/test/TestAssets/SimpleTestProject3/SimpleTestProject3.csproj +++ b/test/TestAssets/SimpleTestProject3/SimpleTestProject3.csproj @@ -7,6 +7,7 @@ netcoreapp2.1;net451 + netcoreapp3.1 false Exe x64 diff --git a/test/TestAssets/SimpleTestProjectARM/SimpleTestProjectARM.csproj b/test/TestAssets/SimpleTestProjectARM/SimpleTestProjectARM.csproj index 8dd7423004..659d4e1984 100644 Binary files a/test/TestAssets/SimpleTestProjectARM/SimpleTestProjectARM.csproj and b/test/TestAssets/SimpleTestProjectARM/SimpleTestProjectARM.csproj differ diff --git a/test/TestAssets/SimpleTestProjectx86/SimpleTestProjectx86.csproj b/test/TestAssets/SimpleTestProjectx86/SimpleTestProjectx86.csproj index e7ccf94e2c..6606fa6add 100644 Binary files a/test/TestAssets/SimpleTestProjectx86/SimpleTestProjectx86.csproj and b/test/TestAssets/SimpleTestProjectx86/SimpleTestProjectx86.csproj differ diff --git a/test/TestAssets/XUPerfTestProject/XUPerfTestProject.csproj b/test/TestAssets/XUPerfTestProject/XUPerfTestProject.csproj index fa184a7505..b74766c104 100644 --- a/test/TestAssets/XUPerfTestProject/XUPerfTestProject.csproj +++ b/test/TestAssets/XUPerfTestProject/XUPerfTestProject.csproj @@ -12,17 +12,18 @@ - Exe netcoreapp1.0;net452 + netcoreapp3.1 + Exe XUPerfTestProject false false false - + portable - + full diff --git a/test/TestAssets/XUTestProject/XUTestProject.csproj b/test/TestAssets/XUTestProject/XUTestProject.csproj index 22eff0b35d..349071511b 100644 --- a/test/TestAssets/XUTestProject/XUTestProject.csproj +++ b/test/TestAssets/XUTestProject/XUTestProject.csproj @@ -7,6 +7,7 @@ XUTestProject netcoreapp2.1;net46 + netcoreapp3.1 false diff --git a/test/TestAssets/child-hang/child-hang.csproj b/test/TestAssets/child-hang/child-hang.csproj index 2e5771d325..f7dcd74f58 100644 --- a/test/TestAssets/child-hang/child-hang.csproj +++ b/test/TestAssets/child-hang/child-hang.csproj @@ -12,6 +12,7 @@ net452;net461;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0 + netcoreapp3.1 child_hang false @@ -27,5 +28,3 @@ - - diff --git a/test/TestAssets/crash/crash.csproj b/test/TestAssets/crash/crash.csproj index 407c359388..3738962374 100644 --- a/test/TestAssets/crash/crash.csproj +++ b/test/TestAssets/crash/crash.csproj @@ -12,6 +12,7 @@ net452;net461;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0 + netcoreapp3.1 false false diff --git a/test/TestAssets/timeout/timeout.csproj b/test/TestAssets/timeout/timeout.csproj index 4e1c9d546e..68459a0e11 100644 --- a/test/TestAssets/timeout/timeout.csproj +++ b/test/TestAssets/timeout/timeout.csproj @@ -11,6 +11,7 @@ net452;net461;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0 + netcoreapp3.1 false false diff --git a/test/TranslationLayer.UnitTests/TranslationLayer.UnitTests.csproj b/test/TranslationLayer.UnitTests/TranslationLayer.UnitTests.csproj index bdd32a6254..bebc846f8b 100644 --- a/test/TranslationLayer.UnitTests/TranslationLayer.UnitTests.csproj +++ b/test/TranslationLayer.UnitTests/TranslationLayer.UnitTests.csproj @@ -7,8 +7,9 @@ - Exe netcoreapp2.1;net451 + netcoreapp3.1 + Exe TranslationLayer.UnitTests diff --git a/test/coverlet.collector/coverlet.collector.csproj b/test/coverlet.collector/coverlet.collector.csproj index 7134907825..165bc10db5 100644 --- a/test/coverlet.collector/coverlet.collector.csproj +++ b/test/coverlet.collector/coverlet.collector.csproj @@ -2,6 +2,7 @@ netcoreapp2.1;net451 + netcoreapp3.1 false false diff --git a/test/datacollector.PlatformTests/datacollector.PlatformTests.csproj b/test/datacollector.PlatformTests/datacollector.PlatformTests.csproj index 844c320419..025c98867e 100644 --- a/test/datacollector.PlatformTests/datacollector.PlatformTests.csproj +++ b/test/datacollector.PlatformTests/datacollector.PlatformTests.csproj @@ -10,7 +10,8 @@ netcoreapp2.1;net472 - Exe + netcoreapp3.1 + Exe datacollector.PlatformTests diff --git a/test/datacollector.UnitTests/datacollector.UnitTests.csproj b/test/datacollector.UnitTests/datacollector.UnitTests.csproj index 654ba2c74c..8837003249 100644 --- a/test/datacollector.UnitTests/datacollector.UnitTests.csproj +++ b/test/datacollector.UnitTests/datacollector.UnitTests.csproj @@ -10,8 +10,9 @@ Microsoft.VisualStudio.TestPlatform.DataCollector.UnitTests - Exe + Exe netcoreapp2.1;net472 + netcoreapp3.1 datacollector.UnitTests diff --git a/test/testhost.UnitTests/testhost.UnitTests.csproj b/test/testhost.UnitTests/testhost.UnitTests.csproj index 5274cc7dea..48525ba029 100644 --- a/test/testhost.UnitTests/testhost.UnitTests.csproj +++ b/test/testhost.UnitTests/testhost.UnitTests.csproj @@ -7,8 +7,9 @@ - Exe netcoreapp2.1;net451 + netcoreapp3.1 + Exe testhost.UnitTests x64 diff --git a/test/vstest.console.PlatformTests/vstest.console.PlatformTests.csproj b/test/vstest.console.PlatformTests/vstest.console.PlatformTests.csproj index e2de007564..e2dd910ffa 100644 --- a/test/vstest.console.PlatformTests/vstest.console.PlatformTests.csproj +++ b/test/vstest.console.PlatformTests/vstest.console.PlatformTests.csproj @@ -8,7 +8,8 @@ netcoreapp2.1;net451 - Exe + netcoreapp3.1 + Exe vstest.console.PlatformTests true diff --git a/test/vstest.console.UnitTests/vstest.console.UnitTests.csproj b/test/vstest.console.UnitTests/vstest.console.UnitTests.csproj index 8fb0f65be0..307a79b2fd 100644 --- a/test/vstest.console.UnitTests/vstest.console.UnitTests.csproj +++ b/test/vstest.console.UnitTests/vstest.console.UnitTests.csproj @@ -7,8 +7,9 @@ - Exe netcoreapp2.1;net451 + netcoreapp3.1 + Exe vstest.console.UnitTests