From 9a5261a26ed651d79cb879277a118a77610e424c Mon Sep 17 00:00:00 2001
From: Medeni Baykal <433724+Haplois@users.noreply.github.com>
Date: Tue, 16 Aug 2022 15:29:19 +0200
Subject: [PATCH 01/21] Added net7 support.
---
playground/MSTest1/MSTest1.csproj | 2 +-
samples/UnitTestProject/UnitTestProject.csproj | 2 +-
scripts/build.sh | 8 ++++----
src/AttachVS/AttachVS.csproj | 2 +-
.../DumpMinitool.arm64.csproj | 4 ++--
.../DumpMinitool.x86/DumpMinitool.x86.csproj | 4 ++--
.../DumpMinitool/DumpMinitool.csproj | 4 ++--
...Platform.Extensions.EventLogCollector.csproj | 6 +++---
.../PublicAPI/net7.0/PublicAPI.Shipped.txt | 1 +
.../PublicAPI/net7.0/PublicAPI.Unshipped.txt | 1 +
...crosoft.TestPlatform.AdapterUtilities.csproj | 4 ++--
.../Microsoft.TestPlatform.Build.csproj | 4 ++--
.../Microsoft.TestPlatform.Client.csproj | 4 ++--
.../PublicAPI/net7.0/PublicAPI.Shipped.txt | 1 +
.../PublicAPI/net7.0/PublicAPI.Unshipped.txt | 1 +
.../Microsoft.TestPlatform.Common.csproj | 4 ++--
.../PublicAPI/net7.0/PublicAPI.Shipped.txt | 1 +
.../PublicAPI/net7.0/PublicAPI.Unshipped.txt | 1 +
...t.TestPlatform.CommunicationUtilities.csproj | 4 ++--
.../PublicAPI/net7.0/PublicAPI.Shipped.txt | 1 +
.../PublicAPI/net7.0/PublicAPI.Unshipped.txt | 1 +
.../Microsoft.TestPlatform.CoreUtilities.csproj | 4 ++--
.../PublicAPI/net7.0/PublicAPI.Shipped.txt | 13 +++++++++++++
.../PublicAPI/net7.0/PublicAPI.Unshipped.txt | 1 +
...icrosoft.TestPlatform.CrossPlatEngine.csproj | 4 ++--
.../PublicAPI/net7.0/PublicAPI.Shipped.txt | 1 +
.../PublicAPI/net7.0/PublicAPI.Unshipped.txt | 1 +
...latform.Extensions.BlameDataCollector.csproj | 4 ++--
.../PublicAPI/net7.0/PublicAPI.Shipped.txt | 1 +
.../PublicAPI/net7.0/PublicAPI.Unshipped.txt | 1 +
...ft.TestPlatform.Extensions.HtmlLogger.csproj | 4 ++--
.../PublicAPI/net7.0/PublicAPI.Shipped.txt | 1 +
.../PublicAPI/net7.0/PublicAPI.Unshipped.txt | 1 +
...oft.TestPlatform.Extensions.TrxLogger.csproj | 4 ++--
.../PublicAPI/net7.0/PublicAPI.Shipped.txt | 1 +
.../PublicAPI/net7.0/PublicAPI.Unshipped.txt | 1 +
.../Microsoft.TestPlatform.ObjectModel.csproj | 4 ++--
.../PublicAPI/net7.0/PublicAPI.Shipped.txt | 4 ++++
.../PublicAPI/net7.0/PublicAPI.Unshipped.txt | 1 +
...oft.TestPlatform.PlatformAbstractions.csproj | 4 ++--
.../PublicAPI/net7.0/PublicAPI.Shipped.txt | 17 +++++++++++++++++
.../PublicAPI/net7.0/PublicAPI.Unshipped.txt | 1 +
...crosoft.TestPlatform.TestHostProvider.csproj | 4 ++--
.../PublicAPI/net7.0/PublicAPI.Shipped.txt | 1 +
.../PublicAPI/net7.0/PublicAPI.Unshipped.txt | 1 +
.../Microsoft.TestPlatform.Utilities.csproj | 4 ++--
.../PublicAPI/net7.0/PublicAPI.Shipped.txt | 1 +
.../PublicAPI/net7.0/PublicAPI.Unshipped.txt | 1 +
...atform.VsTestConsole.TranslationLayer.csproj | 4 ++--
.../PublicAPI/net7.0/PublicAPI.Shipped.txt | 1 +
.../PublicAPI/net7.0/PublicAPI.Unshipped.txt | 1 +
src/SettingsMigrator/SettingsMigrator.csproj | 4 ++--
.../PublicAPI/net7.0/PublicAPI.Shipped.txt | 1 +
.../PublicAPI/net7.0/PublicAPI.Unshipped.txt | 1 +
src/datacollector/datacollector.csproj | 3 ++-
.../nuspec/Microsoft.TestPlatform.Build.csproj | 2 +-
.../nuspec/Microsoft.TestPlatform.CLI.csproj | 2 +-
src/package/package/package.csproj | 2 +-
src/testhost.arm64/testhost.arm64.csproj | 6 +++---
src/testhost.x86/testhost.x86.csproj | 6 +++---
src/testhost/testhost.csproj | 6 +++---
.../PublicAPI/net7.0/PublicAPI.Shipped.txt | 1 +
.../PublicAPI/net7.0/PublicAPI.Unshipped.txt | 1 +
src/vstest.console/vstest.console.csproj | 4 ++--
.../ArchitectureSwitch.csproj | 4 ++--
test/TestAssets/Tools/Tools.csproj | 2 +-
test/TestAssets/child-crash/child-crash.csproj | 2 +-
test/TestAssets/child-hang/child-hang.csproj | 2 +-
test/TestAssets/crash/crash.csproj | 2 +-
.../hanging-child/hanging-child.csproj | 2 +-
.../Perfy.TestAdapter/Perfy.TestAdapter.csproj | 2 +-
.../problematic-child/problematic-child.csproj | 2 +-
test/TestAssets/timeout/timeout.csproj | 2 +-
73 files changed, 137 insertions(+), 73 deletions(-)
create mode 100644 src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net7.0/PublicAPI.Shipped.txt
create mode 100644 src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net7.0/PublicAPI.Unshipped.txt
create mode 100644 src/Microsoft.TestPlatform.Client/PublicAPI/net7.0/PublicAPI.Shipped.txt
create mode 100644 src/Microsoft.TestPlatform.Client/PublicAPI/net7.0/PublicAPI.Unshipped.txt
create mode 100644 src/Microsoft.TestPlatform.Common/PublicAPI/net7.0/PublicAPI.Shipped.txt
create mode 100644 src/Microsoft.TestPlatform.Common/PublicAPI/net7.0/PublicAPI.Unshipped.txt
create mode 100644 src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net7.0/PublicAPI.Shipped.txt
create mode 100644 src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net7.0/PublicAPI.Unshipped.txt
create mode 100644 src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net7.0/PublicAPI.Shipped.txt
create mode 100644 src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net7.0/PublicAPI.Unshipped.txt
create mode 100644 src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net7.0/PublicAPI.Shipped.txt
create mode 100644 src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net7.0/PublicAPI.Unshipped.txt
create mode 100644 src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net7.0/PublicAPI.Shipped.txt
create mode 100644 src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net7.0/PublicAPI.Unshipped.txt
create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net7.0/PublicAPI.Shipped.txt
create mode 100644 src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net7.0/PublicAPI.Unshipped.txt
create mode 100644 src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net7.0/PublicAPI.Shipped.txt
create mode 100644 src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net7.0/PublicAPI.Unshipped.txt
create mode 100644 src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net7.0/PublicAPI.Shipped.txt
create mode 100644 src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net7.0/PublicAPI.Unshipped.txt
create mode 100644 src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net7.0/PublicAPI.Shipped.txt
create mode 100644 src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net7.0/PublicAPI.Unshipped.txt
create mode 100644 src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net7.0/PublicAPI.Shipped.txt
create mode 100644 src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net7.0/PublicAPI.Unshipped.txt
create mode 100644 src/Microsoft.TestPlatform.Utilities/PublicAPI/net7.0/PublicAPI.Shipped.txt
create mode 100644 src/Microsoft.TestPlatform.Utilities/PublicAPI/net7.0/PublicAPI.Unshipped.txt
create mode 100644 src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net7.0/PublicAPI.Shipped.txt
create mode 100644 src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net7.0/PublicAPI.Unshipped.txt
create mode 100644 src/datacollector/PublicAPI/net7.0/PublicAPI.Shipped.txt
create mode 100644 src/datacollector/PublicAPI/net7.0/PublicAPI.Unshipped.txt
create mode 100644 src/vstest.console/PublicAPI/net7.0/PublicAPI.Shipped.txt
create mode 100644 src/vstest.console/PublicAPI/net7.0/PublicAPI.Unshipped.txt
diff --git a/playground/MSTest1/MSTest1.csproj b/playground/MSTest1/MSTest1.csproj
index 2f0ced5017..1ffb127333 100644
--- a/playground/MSTest1/MSTest1.csproj
+++ b/playground/MSTest1/MSTest1.csproj
@@ -6,7 +6,7 @@
- $(TargetFrameworks);net472;net5.0
+ $(TargetFrameworks);net472;net5.0;net6.0;net7.0
false
false
diff --git a/samples/UnitTestProject/UnitTestProject.csproj b/samples/UnitTestProject/UnitTestProject.csproj
index 06b3b010e9..30d3885a17 100644
--- a/samples/UnitTestProject/UnitTestProject.csproj
+++ b/samples/UnitTestProject/UnitTestProject.csproj
@@ -2,7 +2,7 @@
- $(TargetNetFxVersion);$(TargetNetCoreVersion)
+ $(TargetNetFxVersion);$(TargetNetCoreVersion);net7.0;net6.0;
$(TargetNetCoreVersion)
Exe
UnitTestProject
diff --git a/scripts/build.sh b/scripts/build.sh
index 066a6eef0f..01140550a1 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -156,7 +156,7 @@ TPB_BRANCH="$(git -C "." rev-parse --abbrev-ref HEAD 2>/dev/null)" || TPB_BRANCH
TPB_COMMIT="$(git -C "." rev-parse HEAD 2>/dev/null)" || TPB_COMMIT="LOCALBUILD" # detached HEAD
if [[ $TP_USE_REPO_API = 1 ]]; then
- TPB_TargetFrameworkCore="net6.0"
+ TPB_TargetFrameworkCore="net7.0"
fi
#
@@ -346,8 +346,8 @@ function publish_package()
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
+ cp -r src/testhost/bin/$TPB_Configuration/net7.0/* $testhost
+ cp -r src/testhost.x86/bin/$TPB_Configuration/net7.0/* $testhost
fi
# Copy over the logger assemblies to the Extensions folder.
@@ -355,7 +355,7 @@ function publish_package()
if [[ $TP_USE_REPO_API = 1 ]]; then
log ".. Package: mv (Source Build)"
- local current_tfn="net6.0"
+ local current_tfn="net7.0"
else
log ".. Package: mv"
local current_tfn="netstandard2.0"
diff --git a/src/AttachVS/AttachVS.csproj b/src/AttachVS/AttachVS.csproj
index 69b747e2a9..37fcc745f1 100644
--- a/src/AttachVS/AttachVS.csproj
+++ b/src/AttachVS/AttachVS.csproj
@@ -7,7 +7,7 @@
Exe
- net472
+ net7;net472
AttachVS
diff --git a/src/DataCollectors/DumpMinitool.arm64/DumpMinitool.arm64.csproj b/src/DataCollectors/DumpMinitool.arm64/DumpMinitool.arm64.csproj
index f571dc4af9..d206b4ff00 100644
--- a/src/DataCollectors/DumpMinitool.arm64/DumpMinitool.arm64.csproj
+++ b/src/DataCollectors/DumpMinitool.arm64/DumpMinitool.arm64.csproj
@@ -6,8 +6,8 @@
- $(TargetNetFxVersion)
- net6.0
+ net7.0;net6.0;$(TargetNetFxVersion)
+ 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..a7ff13ab40 100644
--- a/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj
+++ b/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj
@@ -6,8 +6,8 @@
- $(TargetNetFxVersion)
- net6.0
+ net7.0;$(TargetNetFxVersion)
+ net7.0
AnyCPU
true
Exe
diff --git a/src/DataCollectors/DumpMinitool/DumpMinitool.csproj b/src/DataCollectors/DumpMinitool/DumpMinitool.csproj
index ae03c84fcf..61b77b74af 100644
--- a/src/DataCollectors/DumpMinitool/DumpMinitool.csproj
+++ b/src/DataCollectors/DumpMinitool/DumpMinitool.csproj
@@ -6,8 +6,8 @@
- $(TargetNetFxVersion)
- net6.0
+ net7.0;net6.0;$(TargetNetFxVersion)
+ 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..6247d42b27 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,8 +6,8 @@
Microsoft.TestPlatform.Extensions.EventLogCollector
- $(TargetNetFxVersion)
- net6.0
+ net7.0;$(TargetNetFxVersion)
+ net7.0
false
true
@@ -17,7 +17,7 @@
-
+
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net7.0/PublicAPI.Shipped.txt b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net7.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net7.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net7.0/PublicAPI.Unshipped.txt b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net7.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net7.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj
index ed46d7cd29..f12bef2853 100644
--- a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj
@@ -5,9 +5,9 @@
- netstandard1.0;netstandard2.0;$(TargetNetFxVersion)
+ net6.0;net7.0;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..7abfd2e6fd 100644
--- a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj
+++ b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj
@@ -7,8 +7,8 @@
2.0.0
Microsoft.TestPlatform.Build
- netstandard2.0
- net6.0
+ net7.0;netstandard2.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..628557e922 100644
--- a/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj
+++ b/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj
@@ -6,8 +6,8 @@
Microsoft.VisualStudio.TestPlatform.Client
- netstandard2.0;$(TargetNetFxVersion)
- net6.0
+ net7.0;netstandard2.0;$(TargetNetFxVersion)
+ net7.0
false
diff --git a/src/Microsoft.TestPlatform.Client/PublicAPI/net7.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Client/PublicAPI/net7.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Client/PublicAPI/net7.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Client/PublicAPI/net7.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Client/PublicAPI/net7.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Client/PublicAPI/net7.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj b/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj
index 1657dcba1c..68fa590c11 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;net6.0;netstandard2.0;netstandard1.3;$(TargetNetFxVersion)
+ net7.0
false
true
diff --git a/src/Microsoft.TestPlatform.Common/PublicAPI/net7.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Common/PublicAPI/net7.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Common/PublicAPI/net7.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Common/PublicAPI/net7.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Common/PublicAPI/net7.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Common/PublicAPI/net7.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj b/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj
index 422c75a4cf..b3bbdaf570 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;net6.0;netstandard2.0;netstandard1.3;$(TargetNetFxVersion)
+ net7.0
false
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net7.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net7.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net7.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net7.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net7.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net7.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj
index ab410d21d1..bf8cea140e 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);$(TargetNetCoreVersion)
+ net7.0;net6.0;netstandard2.0;netstandard1.3;$(TargetNetFxVersion);$(TargetNetCoreVersion)
false
$(TargetFrameworks);uap10.0;netstandard1.0
- net6.0
+ net7.0;
false
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net7.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net7.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..dc4f1b293a
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net7.0/PublicAPI.Shipped.txt
@@ -0,0 +1,13 @@
+#nullable enable
+Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput
+Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.Write(string? message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level) -> void
+Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.WriteLine(string? message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level) -> void
+Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.set -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.Instance.get -> Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput!
+static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Error(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, bool appendPrefix, string! format, params object?[]? args) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Information(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, bool appendPrefix, string! format, params object?[]? args) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Information(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, bool appendPrefix, System.ConsoleColor foregroundColor, string! format, params object?[]? args) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Warning(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, bool appendPrefix, string! format, params object?[]? args) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Write(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, string! message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level, System.ConsoleColor foregroundColor) -> void
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net7.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net7.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..ab058de62d
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net7.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj b/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj
index 1f746ac353..bf3772f173 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;net6.0;netstandard2.0;netstandard1.3;$(TargetNetFxVersion)
+ net7.0;
false
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net7.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net7.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net7.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net7.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net7.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net7.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
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..71d6303652 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj
@@ -18,8 +18,8 @@
Microsoft.TestPlatform.Extensions.BlameDataCollector
- netstandard2.0;net472
- net6.0
+ net7.0;netstandard2.0;net472
+ net7.0;
false
true
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net7.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net7.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net7.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net7.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net7.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net7.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
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..935cd5af48 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj
@@ -6,8 +6,8 @@
Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger
- netstandard2.0;$(TargetNetFxVersion)
- net6.0
+ net7.0;netstandard2.0;$(TargetNetFxVersion)
+ net7.0;
false
true
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net7.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net7.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net7.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net7.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net7.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net7.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
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..95b58f7d57 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;net6.0;netstandard2.0;$(TargetNetFxVersion)
+ net7.0;
false
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net7.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net7.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net7.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net7.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net7.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net7.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
index 08ca15093b..d355a6a502 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
+++ b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
@@ -6,9 +6,9 @@
Microsoft.VisualStudio.TestPlatform.ObjectModel
- $(TargetNetFxVersion);$(TargetNetCoreVersion);netstandard2.0;netstandard1.3
+ net7.0;$(TargetNetFxVersion);$(TargetNetCoreVersion);netstandard2.0;netstandard1.3
$(TargetFrameworks);uap10.0;netstandard1.0
- net6.0
+ net7.0;
Microsoft.TestPlatform.ObjectModel
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net7.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net7.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..2ceb9ba877
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net7.0/PublicAPI.Shipped.txt
@@ -0,0 +1,4 @@
+#nullable enable
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.set -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework.DefaultFramework.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework!
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net7.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net7.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..ab058de62d
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net7.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj
index b87db8e4d5..5c4257aeb5 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);$(TargetNetCoreVersion);netstandard1.3;netstandard2.0;net6.0
+ net7.0;$(TargetNetFxVersion);$(TargetNetCoreVersion);netstandard1.3;netstandard2.0;net6.0
$(TargetFrameworks);uap10.0;netstandard1.0
- net6.0
+ net7.0;
false
$(NoWarn);NU1605
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net7.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net7.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..d17adb2a82
--- /dev/null
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net7.0/PublicAPI.Shipped.txt
@@ -0,0 +1,17 @@
+#nullable enable
+Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.InitializeTrace(string? customLogFile, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel platformTraceLevel) -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.MapPlatformTraceToTrace(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel traceLevel) -> System.Diagnostics.TraceLevel
+Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.WriteLine(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel level, string? message) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener
+Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.RollingFileTraceListener(string! fileName, string! name, int rollSizeKB) -> void
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyResolver.~PlatformAssemblyResolver() -> void
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformThread.Run(System.Action? action, Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformApartmentState apartmentState, bool waitForCompletion) -> void
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.LaunchProcess(string! processPath, string? arguments, string? workingDirectory, System.Collections.Generic.IDictionary? envVariables, System.Action