diff --git a/src/DataCollectors/DumpMinitool.arm64/DumpMinitool.arm64.csproj b/src/DataCollectors/DumpMinitool.arm64/DumpMinitool.arm64.csproj index f571dc4af9..aaf5966521 100644 --- a/src/DataCollectors/DumpMinitool.arm64/DumpMinitool.arm64.csproj +++ b/src/DataCollectors/DumpMinitool.arm64/DumpMinitool.arm64.csproj @@ -7,7 +7,7 @@ $(TargetNetFxVersion) - net6.0 + net7.0 AnyCPU false Exe diff --git a/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj b/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj index d640b294fc..4d348be301 100644 --- a/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj +++ b/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj @@ -7,7 +7,7 @@ $(TargetNetFxVersion) - net6.0 + net7.0 AnyCPU true Exe diff --git a/src/DataCollectors/DumpMinitool/DumpMinitool.csproj b/src/DataCollectors/DumpMinitool/DumpMinitool.csproj index ae03c84fcf..9742c19649 100644 --- a/src/DataCollectors/DumpMinitool/DumpMinitool.csproj +++ b/src/DataCollectors/DumpMinitool/DumpMinitool.csproj @@ -7,7 +7,7 @@ $(TargetNetFxVersion) - net6.0 + net7.0 AnyCPU false Exe 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 e63a69b94a..76d040155d 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 @@ -7,7 +7,7 @@ Microsoft.TestPlatform.Extensions.EventLogCollector $(TargetNetFxVersion) - net6.0 + net7.0 false true @@ -17,7 +17,7 @@ - + diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj index 3d4467f0de..7f0be504ff 100644 --- a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj +++ b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj @@ -7,7 +7,7 @@ netstandard1.0;netstandard2.0;$(TargetNetFxVersion) $(TargetFrameworks);uap10.0 - net6.0 + net7.0 Microsoft.TestPlatform.AdapterUtilities Microsoft.TestPlatform.AdapterUtilities diff --git a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj index 10857dfd35..0fefef1a2d 100644 --- a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj +++ b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj @@ -8,7 +8,7 @@ 2.0.0 Microsoft.TestPlatform.Build netstandard2.0 - net6.0 + net7.0 false true diff --git a/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj b/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj index b37d45bed0..86755728fc 100644 --- a/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj +++ b/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj @@ -7,7 +7,7 @@ Microsoft.VisualStudio.TestPlatform.Client netstandard2.0;$(TargetNetFxVersion) - net6.0 + net7.0 false diff --git a/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj b/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj index 1657dcba1c..acfa2ffc63 100644 --- a/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj +++ b/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj @@ -6,8 +6,8 @@ Microsoft.VisualStudio.TestPlatform.Common - net6.0;netstandard2.0;netstandard1.3;$(TargetNetFxVersion) - net6.0 + net7.0;netstandard2.0;netstandard1.3;$(TargetNetFxVersion) + net7.0 false true diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj b/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj index 422c75a4cf..44f5eff2cd 100644 --- a/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj +++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj @@ -5,8 +5,8 @@ Microsoft.TestPlatform.CommunicationUtilities - net6.0;netstandard2.0;netstandard1.3;$(TargetNetFxVersion) - net6.0 + net7.0;netstandard2.0;netstandard1.3;$(TargetNetFxVersion) + net7.0 false diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj index 5b50b6e69c..e2ecd1402c 100644 --- a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj +++ b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj @@ -6,10 +6,10 @@ Microsoft.TestPlatform.CoreUtilities - net6.0;netstandard2.0;netstandard1.3;$(TargetNetFxVersion) + net7.0;netstandard2.0;netstandard1.3;$(TargetNetFxVersion) false $(TargetFrameworks);uap10.0;netstandard1.0 - net6.0 + net7.0 false diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj b/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj index 1f746ac353..7e04d2c3a8 100644 --- a/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj +++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj @@ -6,8 +6,8 @@ Microsoft.TestPlatform.CrossPlatEngine - net6.0;netstandard2.0;netstandard1.3;$(TargetNetFxVersion) - net6.0 + net7.0;netstandard2.0;netstandard1.3;$(TargetNetFxVersion) + net7.0 false diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj index 54847933a7..8621e89e2a 100644 --- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj +++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj @@ -19,7 +19,7 @@ Microsoft.TestPlatform.Extensions.BlameDataCollector netstandard2.0;net472 - net6.0 + net7.0 false true 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 31b103cb77..2bf36b79c7 100644 --- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj +++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj @@ -7,7 +7,7 @@ Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger netstandard2.0;$(TargetNetFxVersion) - net6.0 + net7.0 false true 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 16e5eda699..d8c9ee3437 100644 --- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj +++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj @@ -6,8 +6,8 @@ Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger - net6.0;netstandard2.0;$(TargetNetFxVersion) - net6.0 + net7.0;netstandard2.0;$(TargetNetFxVersion) + net7.0 false @@ -30,7 +30,7 @@ - + diff --git a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj index 51304bd236..23efea9089 100644 --- a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj +++ b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj @@ -8,7 +8,7 @@ Microsoft.VisualStudio.TestPlatform.ObjectModel $(TargetNetFxVersion);netcoreapp2.1;netcoreapp1.0;netstandard2.0;netstandard1.3 $(TargetFrameworks);uap10.0;netstandard1.0 - net6.0 + net7.0 Microsoft.TestPlatform.ObjectModel diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj index 7de06f6ae0..d614deab31 100644 --- a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj +++ b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj @@ -7,9 +7,9 @@ Microsoft.TestPlatform.PlatformAbstractions Microsoft.TestPlatform.PlatformAbstractions - $(TargetNetFxVersion);netcoreapp1.0;netcoreapp2.1;netstandard1.3;netstandard2.0;net6.0 + $(TargetNetFxVersion);netcoreapp1.0;netcoreapp2.1;netstandard1.3;netstandard2.0;net7.0 $(TargetFrameworks);uap10.0;netstandard1.0 - net6.0 + net7.0 false $(NoWarn);NU1605 diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net6.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net7.0/PublicAPI.Shipped.txt similarity index 100% rename from src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net6.0/PublicAPI.Shipped.txt rename to src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net7.0/PublicAPI.Shipped.txt diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net6.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net7.0/PublicAPI.Unshipped.txt similarity index 100% rename from src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net6.0/PublicAPI.Unshipped.txt rename to src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net7.0/PublicAPI.Unshipped.txt diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs b/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs index d1e3665b2b..242fae4785 100644 --- a/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs +++ b/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs @@ -296,7 +296,7 @@ public virtual TestProcessStartInfo GetTestHostProcessStartInfo( var testHostNugetRoot = new DirectoryInfo(testHostPath).Parent!.Parent!.Parent!; #if DOTNET_BUILD_FROM_SOURCE - var testHostExeNugetPath = Path.Combine(testHostNugetRoot.FullName, "build", "net6.0", folderName, exeName); + var testHostExeNugetPath = Path.Combine(testHostNugetRoot.FullName, "build", "net7.0", folderName, exeName); #else var testHostExeNugetPath = Path.Combine(testHostNugetRoot.FullName, "build", "netcoreapp2.1", folderName, exeName); #endif diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj b/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj index b1a10b8ac4..6c9412efb9 100644 --- a/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj +++ b/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj @@ -6,8 +6,8 @@ Microsoft.TestPlatform.TestHostRuntimeProvider - net6.0;netstandard2.0;$(TargetNetFxVersion) - net6.0 + net7.0;netstandard2.0;$(TargetNetFxVersion) + net7.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 f481890916..a6e1f2ad40 100644 --- a/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj +++ b/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj @@ -7,7 +7,7 @@ Microsoft.TestPlatform.Utilities netstandard2.0;netstandard1.3;$(TargetNetFxVersion) - net6.0 + net7.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 604fd9e646..2668a1330d 100644 --- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj +++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj @@ -6,8 +6,8 @@ Microsoft.TestPlatform.VsTestConsole.TranslationLayer - net6.0;netstandard2.0;$(TargetNetFxVersion) - net6.0 + net7.0;netstandard2.0;$(TargetNetFxVersion) + net7.0 false diff --git a/src/SettingsMigrator/SettingsMigrator.csproj b/src/SettingsMigrator/SettingsMigrator.csproj index 82f634edfc..0ab68ddcad 100644 --- a/src/SettingsMigrator/SettingsMigrator.csproj +++ b/src/SettingsMigrator/SettingsMigrator.csproj @@ -7,7 +7,7 @@ SettingsMigrator $(TargetNetFxVersion) - net6.0 + net7.0 Exe AnyCPU false diff --git a/src/datacollector/datacollector.csproj b/src/datacollector/datacollector.csproj index 7905489dc3..e5c138f9de 100644 --- a/src/datacollector/datacollector.csproj +++ b/src/datacollector/datacollector.csproj @@ -14,7 +14,7 @@ netcoreapp2.1 $(TargetFrameworks);net472 $(TargetFrameworks);$(TargetNetFxVersion) - net6.0 + net7.0 AnyCPU Exe Major diff --git a/src/package/nuspec/Microsoft.TestPlatform.Build.csproj b/src/package/nuspec/Microsoft.TestPlatform.Build.csproj index 6f3480e8ab..909ce2c73c 100644 --- a/src/package/nuspec/Microsoft.TestPlatform.Build.csproj +++ b/src/package/nuspec/Microsoft.TestPlatform.Build.csproj @@ -2,7 +2,7 @@ Exe netstandard2.0 - net6.0 + net7.0 false TestPlatform.Build.nuspec BranchName=$(BranchName);CommitId=$(CommitId);Version=$(Version);TargetFramework=$(TargetFramework) diff --git a/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj b/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj index b74d7ba0a6..7aa526ef63 100644 --- a/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj +++ b/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj @@ -2,7 +2,7 @@ Exe netcoreapp2.1 - net6.0 + net7.0 false TestPlatform.CLI.nuspec BranchName=$(BranchName);CommitId=$(CommitId);Version=$(Version);TargetFramework=$(TargetFramework) diff --git a/src/package/package/package.csproj b/src/package/package/package.csproj index 2d4d044286..12dcc8d2fd 100644 --- a/src/package/package/package.csproj +++ b/src/package/package/package.csproj @@ -6,7 +6,7 @@ $(TargetNetFxVersion);netcoreapp2.1 - net6.0 + net7.0 package false false diff --git a/src/testhost.arm64/testhost.arm64.csproj b/src/testhost.arm64/testhost.arm64.csproj index 65aa9de61f..06c5a3c41f 100644 --- a/src/testhost.arm64/testhost.arm64.csproj +++ b/src/testhost.arm64/testhost.arm64.csproj @@ -12,12 +12,12 @@ testhost.arm64 netcoreapp2.1;netcoreapp1.0;$(TargetNetFxVersion);net47;net471;net472;net48 - net6.0 + net7.0 Exe false app.manifest - + win10-arm64 false $(AssemblyName.Replace('.arm64', '')).$(TargetFramework).arm64 diff --git a/src/testhost.x86/testhost.x86.csproj b/src/testhost.x86/testhost.x86.csproj index ef34d2b62c..3fa4a4dfc8 100644 --- a/src/testhost.x86/testhost.x86.csproj +++ b/src/testhost.x86/testhost.x86.csproj @@ -12,14 +12,14 @@ testhost.x86 netcoreapp2.1;netcoreapp1.0;$(TargetNetFxVersion);net47;net471;net472;net48 - net6.0 + net7.0 AnyCPU true Exe false app.manifest - + win7-x86 false $(AssemblyName.Replace('.x86', '')).$(TargetFramework).x86 diff --git a/src/testhost/testhost.csproj b/src/testhost/testhost.csproj index 9dcf7be417..8502e816aa 100644 --- a/src/testhost/testhost.csproj +++ b/src/testhost/testhost.csproj @@ -12,12 +12,12 @@ testhost netcoreapp2.1;netcoreapp1.0;$(TargetNetFxVersion);net47;net471;net472;net48 - net6.0 + net7.0 Exe false app.manifest - + win7-x64 false $(AssemblyName).$(TargetFramework) diff --git a/src/vstest.console/vstest.console.csproj b/src/vstest.console/vstest.console.csproj index 2d106c009c..d8a0c66504 100644 --- a/src/vstest.console/vstest.console.csproj +++ b/src/vstest.console/vstest.console.csproj @@ -9,7 +9,7 @@ vstest.console vstest.console.arm64 netcoreapp2.1;$(TargetNetFxVersion) - net6.0 + net7.0 Exe Major false