From f70bb54c78e256362eb0bf0c526ccac2898e6295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Jare=C5=A1?= <me@jakubjares.com>
Date: Thu, 23 Jan 2025 13:12:19 +0100
Subject: [PATCH] Drop unsupported frameworks (#10565)

Update to net8 and net9.
---
 Directory.Build.props                         |   67 +-
 azure-pipelines-official.yml                  |    6 +-
 eng/SourceBuildPrebuiltBaseline.xml           |   24 +-
 eng/Version.Details.xml                       |    2 +-
 eng/Versions.props                            |   37 +-
 eng/verify-nupkgs.ps1                         |   10 +-
 playground/MSTest1/MSTest1.csproj             |    4 +-
 playground/MSTest2/MSTest2.csproj             |    4 +-
 .../TestPlatform.Playground.csproj            |   36 +-
 scripts/perf/perf.ps1                         |   12 +-
 scripts/test.ps1                              |   14 +-
 scripts/test.sh                               |    4 +-
 src/AttachVS/AttachVS.csproj                  |    2 +-
 .../DumpMinitool.arm64.csproj                 |    9 +-
 .../DumpMinitool.x86/DumpMinitool.x86.csproj  |   11 +-
 .../DumpMinitool/DumpMinitool.csproj          |    9 +-
 ...atform.Extensions.EventLogCollector.csproj |    2 +-
 .../{net462 => net48}/PublicAPI.Shipped.txt   |    0
 .../{net462 => net48}/PublicAPI.Unshipped.txt |    0
 .../{net6.0 => net8.0}/PublicAPI.Shipped.txt  |    0
 .../PublicAPI.Unshipped.txt                   |    0
 .../{net7.0 => net9.0}/PublicAPI.Shipped.txt  |    0
 .../PublicAPI.Unshipped.txt                   |    0
 ...osoft.TestPlatform.AdapterUtilities.csproj |   10 +-
 ...osoft.TestPlatform.AdapterUtilities.nuspec |   16 -
 .../Microsoft.TestPlatform.Build.csproj       |    7 +-
 .../Microsoft.TestPlatform.Client.csproj      |    9 +-
 .../{net462 => net48}/PublicAPI.Shipped.txt   |    0
 .../{net462 => net48}/PublicAPI.Unshipped.txt |    0
 .../{net6.0 => net8.0}/PublicAPI.Shipped.txt  |    0
 .../PublicAPI.Unshipped.txt                   |    0
 .../{net7.0 => net9.0}/PublicAPI.Shipped.txt  |    0
 .../PublicAPI.Unshipped.txt                   |    0
 .../Microsoft.TestPlatform.Common.csproj      |    4 +-
 .../{net6.0 => net8.0}/PublicAPI.Shipped.txt  |    0
 .../PublicAPI.Unshipped.txt                   |    0
 .../{net7.0 => net9.0}/PublicAPI.Shipped.txt  |    0
 .../PublicAPI.Unshipped.txt                   |    0
 .../Utilities/AssemblyProperties.cs           |    2 +-
 ...TestPlatform.CommunicationUtilities.csproj |    4 +-
 .../{net6.0 => net8.0}/PublicAPI.Shipped.txt  |    0
 .../PublicAPI.Unshipped.txt                   |    0
 .../Extensions/StringBuilderPolyfill.cs       |   12 -
 .../Friends.cs                                |    3 +
 ...icrosoft.TestPlatform.CoreUtilities.csproj |   21 +-
 .../PublicAPI/net481/PublicAPI.Shipped.txt    |   15 +
 .../PublicAPI.Unshipped.txt                   |    0
 .../PublicAPI.Shipped.txt                     |    0
 .../PublicAPI/net8.0}/PublicAPI.Unshipped.txt |    0
 .../Friends.cs                                |    3 +
 ...rosoft.TestPlatform.CrossPlatEngine.csproj |    4 +-
 .../PublicAPI/net8.0}/PublicAPI.Shipped.txt   |    0
 .../PublicAPI/net8.0}/PublicAPI.Unshipped.txt |    0
 .../HangDumperFactory.cs                      |    2 +-
 ...tform.Extensions.BlameDataCollector.csproj |   13 +-
 .../ProcDumpArgsBuilder.cs                    |   11 +-
 .../PublicAPI/net48}/PublicAPI.Shipped.txt    |    0
 .../PublicAPI/net48}/PublicAPI.Unshipped.txt  |    0
 .../PublicAPI/net8.0}/PublicAPI.Shipped.txt   |    0
 .../PublicAPI/net8.0}/PublicAPI.Unshipped.txt |    0
 .../{net472 => net9.0}/PublicAPI.Shipped.txt  |    0
 .../PublicAPI.Unshipped.txt                   |    0
 ....TestPlatform.Extensions.HtmlLogger.csproj |    8 +-
 .../PublicAPI/net48}/PublicAPI.Shipped.txt    |    0
 .../PublicAPI/net48}/PublicAPI.Unshipped.txt  |    0
 ...t.TestPlatform.Extensions.TrxLogger.csproj |   23 +-
 .../Microsoft.TestPlatform.ObjectModel.csproj |   10 +-
 .../Microsoft.TestPlatform.ObjectModel.nuspec |   22 +-
 .../PublicAPI/PublicAPI.Shipped.txt           |    1 -
 .../{net7.0 => net6.0}/PublicAPI.Shipped.txt  |    0
 .../PublicAPI.Unshipped.txt                   |    0
 .../PublicAPI.Shipped.txt                     |    0
 .../PublicAPI/net8.0}/PublicAPI.Unshipped.txt |    0
 ...t.TestPlatform.PlatformAbstractions.csproj |   24 +-
 .../PublicAPI/PublicAPI.Shipped.txt           |    1 -
 .../PublicAPI.Shipped.txt                     |    0
 .../PublicAPI/net8.0/PublicAPI.Unshipped.txt  |    1 +
 .../Hosting/DefaultTestHostManager.cs         |    2 +-
 .../Hosting/DotnetTestHostManager.cs          |    6 +-
 ...osoft.TestPlatform.TestHostProvider.csproj |    8 +-
 .../PublicAPI/net48}/PublicAPI.Shipped.txt    |    0
 .../PublicAPI/net48}/PublicAPI.Unshipped.txt  |    0
 .../PublicAPI/net8.0}/PublicAPI.Shipped.txt   |    0
 .../PublicAPI/net8.0}/PublicAPI.Unshipped.txt |    0
 .../{net462 => net9.0}/PublicAPI.Shipped.txt  |    0
 .../PublicAPI.Unshipped.txt                   |    0
 .../Microsoft.TestPlatform.Utilities.csproj   |    8 +-
 .../PublicAPI/net8.0}/PublicAPI.Shipped.txt   |    0
 .../PublicAPI/net8.0}/PublicAPI.Unshipped.txt |    0
 ...form.VsTestConsole.TranslationLayer.csproj |    4 +-
 .../PublicAPI/net8.0}/PublicAPI.Shipped.txt   |    0
 .../PublicAPI/net8.0}/PublicAPI.Unshipped.txt |    0
 src/SettingsMigrator/SettingsMigrator.csproj  |   11 +-
 .../datacollector.arm64.csproj                |   17 +-
 .../PublicAPI/net48}/PublicAPI.Shipped.txt    |    0
 .../PublicAPI/net48}/PublicAPI.Unshipped.txt  |    0
 .../PublicAPI/net6.0/PublicAPI.Shipped.txt    |    1 -
 .../PublicAPI/net6.0/PublicAPI.Unshipped.txt  |    1 -
 .../PublicAPI/net7.0/PublicAPI.Shipped.txt    |    1 -
 .../PublicAPI/net7.0/PublicAPI.Unshipped.txt  |    1 -
 .../PublicAPI/net8.0}/PublicAPI.Shipped.txt   |    0
 .../PublicAPI/net8.0}/PublicAPI.Unshipped.txt |    0
 .../PublicAPI/net9.0}/PublicAPI.Shipped.txt   |    0
 .../PublicAPI/net9.0}/PublicAPI.Unshipped.txt |    0
 .../netcoreapp3.1/PublicAPI.Shipped.txt       |    1 -
 .../netcoreapp3.1/PublicAPI.Unshipped.txt     |    1 -
 src/datacollector/app.config                  |   12 +
 src/datacollector/datacollector.csproj        |   17 +-
 .../Microsoft.CodeCoverage.csproj             |    8 +-
 .../Microsoft.CodeCoverage.nuspec             |    4 +-
 .../Microsoft.NET.Test.Sdk.nuspec             |    8 +-
 .../Microsoft.TestPlatform.CLI.csproj         |   43 +-
 .../Microsoft.TestPlatform.CLI.nuspec         |  800 +++++------
 ...rosoft.TestPlatform.CLI.sourcebuild.nuspec |    2 -
 ...estPlatform.CLI.sourcebuild.product.nuspec |    2 -
 .../Microsoft.TestPlatform.Portable.csproj    |   37 +-
 .../Microsoft.TestPlatform.Portable.nuspec    | 1201 +++++++++--------
 .../Microsoft.TestPlatform.TestHost.csproj    |    4 +-
 .../Microsoft.TestPlatform.TestHost.nuspec    |  110 +-
 .../Microsoft.TestPlatform.csproj             |   49 +-
 .../Microsoft.TestPlatform.nuspec             | 1167 ++++++++--------
 ...tudio.TestTools.TestPlatform.V2.CLI.csproj |    9 +-
 src/testhost.arm64/testhost.arm64.csproj      |    8 +-
 src/testhost.x86/app.config                   |   12 +
 src/testhost.x86/testhost.x86.csproj          |   12 +-
 src/testhost/testhost.csproj                  |    8 +-
 .../vstest.console.arm64.csproj               |    8 +-
 .../InProcessVsTestConsoleWrapper.cs          |    2 +-
 .../PublicAPI/net462/PublicAPI.Shipped.txt    |    1 -
 .../PublicAPI/net462/PublicAPI.Unshipped.txt  |    1 -
 .../PublicAPI/net48}/PublicAPI.Shipped.txt    |    0
 .../PublicAPI/net48}/PublicAPI.Unshipped.txt  |    0
 .../PublicAPI/net6.0/PublicAPI.Shipped.txt    |    1 -
 .../PublicAPI/net6.0/PublicAPI.Unshipped.txt  |    1 -
 .../PublicAPI/net7.0/PublicAPI.Shipped.txt    |    1 -
 .../PublicAPI/net7.0/PublicAPI.Unshipped.txt  |    1 -
 .../PublicAPI/net8.0}/PublicAPI.Shipped.txt   |    0
 .../PublicAPI/net8.0}/PublicAPI.Unshipped.txt |    0
 .../PublicAPI/net9.0}/PublicAPI.Shipped.txt   |    0
 .../PublicAPI/net9.0}/PublicAPI.Unshipped.txt |    0
 src/vstest.console/app.config                 |   12 +
 src/vstest.console/vstest.console.csproj      |   14 +-
 test/.editorconfig                            |    3 +
 ...ensions.EventLogCollector.UnitTests.csproj |    2 +-
 .../Intent.Primitives.csproj                  |    2 +-
 test/Intent/Intent.csproj                     |    2 +-
 .../AcceptanceTestBase.cs                     |   26 +-
 .../AssemblyMetadataProviderTests.cs          |   16 +-
 .../AssemblyPropertiesTests.cs                |    4 +-
 .../BlameDataCollectorTests.cs                |   33 +-
 .../DataCollectorTests.Coverlet.cs            |    2 +-
 .../DiaSessionTests.cs                        |    8 +-
 .../DotnetArchitectureSwitchTests.cs          |   36 +-
 .../DotnetHostArchitectureVerifierTests.cs    |    2 +-
 .../DotnetTestMSBuildOutputTests.cs           |    4 +-
 .../ExecutionTests.cs                         |   12 +-
 .../Extension/CompatibilityRowsBuilder.cs     |    4 +-
 .../Extension/NetCoreRunnerAttribute.cs       |    4 +-
 ...tCoreTargetFrameworkDataSourceAttribute.cs |    4 +-
 .../Extension/NetFrameworkRunnerAttribute.cs  |    6 +-
 .../TestPlatformCompatibilityDataSource.cs    |    2 +-
 .../FrameworkTests.cs                         |    8 +-
 ...latform.Acceptance.IntegrationTests.csproj |   14 +-
 .../TranslationLayer/TelemetryPerfTestBase.cs |    2 +-
 .../ProcessesInteractionTests.cs              |    4 +-
 .../SelfContainedAppTests.cs                  |    4 +-
 .../DifferentTestFrameworkSimpleTests.cs      |   12 +-
 ...RunTestsWithDifferentConfigurationTests.cs |    6 +-
 ...Platform.AdapterUtilities.UnitTests.csproj |    4 +-
 ...rosoft.TestPlatform.Build.UnitTests.csproj |    4 +-
 ...osoft.TestPlatform.Client.UnitTests.csproj |   10 +-
 ...osoft.TestPlatform.Common.UnitTests.csproj |   10 +-
 ...icationUtilities.Platform.UnitTests.csproj |   11 +-
 ...rm.CommunicationUtilities.UnitTests.csproj |    6 +-
 ...estPlatform.CoreUtilities.UnitTests.csproj |   24 +-
 ...ProcDataCollectionExtensionManagerTests.cs |    2 +-
 ...tPlatform.CrossPlatEngine.UnitTests.csproj |   12 +-
 ...nsions.BlameDataCollector.UnitTests.csproj |   11 +-
 .../XmlReaderWriterTests.cs                   |   20 -
 ...orm.Extensions.HtmlLogger.UnitTests.csproj |   11 +-
 ...form.Extensions.TrxLogger.UnitTests.csproj |   11 +-
 ....TestPlatform.ObjectModel.UnitTests.csproj |   11 +-
 .../Hosting/DotnetTestHostManagerTests.cs     |   32 +-
 ...Platform.TestHostProvider.UnitTests.csproj |   11 +-
 .../IntegrationTestBase.cs                    |   10 +-
 .../IntegrationTestEnvironment.cs             |    4 +-
 ...icrosoft.TestPlatform.TestUtilities.csproj |   10 +-
 ...ft.TestPlatform.Utilities.UnitTests.csproj |   11 +-
 .../MigratorTests.cs                          |    4 +-
 .../SettingsMigrator.UnitTests.csproj         |    2 +-
 .../ArchitectureSwitch.csproj                 |    4 +-
 test/TestAssets/Directory.Build.props         |    4 +-
 .../NewtonSoftDependency.csproj               |    2 +-
 .../SelfContainedAppTestProject.csproj        |    4 +-
 .../SimpleTestProjectARM64.csproj}            |    3 +-
 .../UnitTest1.cs                              |    0
 test/TestAssets/TestAssets.sln                |    2 +-
 test/TestAssets/Tools/Tools.csproj            |    2 +-
 test/TestAssets/child-crash/UnitTest1.cs      |    2 +-
 .../TestAssets/child-crash/child-crash.csproj |    2 +-
 test/TestAssets/child-hang/UnitTest1.cs       |    2 +-
 test/TestAssets/child-hang/child-hang.csproj  |    2 +-
 test/TestAssets/crash/crash.csproj            |    2 +-
 .../hanging-child/hanging-child.csproj        |    2 +-
 .../MSTest1000Passing.csproj                  |    2 +-
 .../MSTest100Passing/MSTest100Passing.csproj  |    2 +-
 .../MSTest10kPassing/MSTest10kPassing.csproj  |    2 +-
 .../MSTest1Passing/MSTest1Passing.csproj      |    2 +-
 .../NUnit1000Passing/NUnit1000Passing.csproj  |    2 +-
 .../NUnit100Passing/NUnit100Passing.csproj    |    2 +-
 .../NUnit10kPassing/NUnit10kPassing.csproj    |    2 +-
 .../NUnit1Passing/NUnit1Passing.csproj        |    2 +-
 .../Perfy.TestAdapter.csproj                  |    2 +-
 .../XUnit1000Passing/XUnit1000Passing.csproj  |    2 +-
 .../XUnit100Passing/XUnit100Passing.csproj    |    2 +-
 .../XUnit10kPassing/XUnit10kPassing.csproj    |    2 +-
 .../XUnit1Passing/XUnit1Passing.csproj        |    2 +-
 .../problematic-child.csproj                  |    2 +-
 test/TestAssets/timeout/timeout.csproj        |    2 +-
 .../TranslationLayer.UnitTests.csproj         |    8 +-
 .../coverlet.collector.csproj                 |    2 +-
 .../datacollector.PlatformTests.csproj        |   11 +-
 .../datacollector.UnitTests.csproj            |   11 +-
 .../testhost.UnitTests.csproj                 |   13 +-
 .../vstest.ProgrammerTests.csproj             |    6 +-
 .../Internal/ConsoleLoggerTests.cs            |   17 +-
 .../vstest.console.UnitTests.csproj           |   12 +-
 227 files changed, 2378 insertions(+), 2314 deletions(-)
 rename src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/{net462 => net48}/PublicAPI.Shipped.txt (100%)
 rename src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/{net462 => net48}/PublicAPI.Unshipped.txt (100%)
 rename src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/{net6.0 => net8.0}/PublicAPI.Shipped.txt (100%)
 rename src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/{net6.0 => net8.0}/PublicAPI.Unshipped.txt (100%)
 rename src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/{net7.0 => net9.0}/PublicAPI.Shipped.txt (100%)
 rename src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/{net7.0 => net9.0}/PublicAPI.Unshipped.txt (100%)
 rename src/Microsoft.TestPlatform.Client/PublicAPI/{net462 => net48}/PublicAPI.Shipped.txt (100%)
 rename src/Microsoft.TestPlatform.Client/PublicAPI/{net462 => net48}/PublicAPI.Unshipped.txt (100%)
 rename src/Microsoft.TestPlatform.Client/PublicAPI/{net6.0 => net8.0}/PublicAPI.Shipped.txt (100%)
 rename src/Microsoft.TestPlatform.Client/PublicAPI/{net6.0 => net8.0}/PublicAPI.Unshipped.txt (100%)
 rename src/Microsoft.TestPlatform.Client/PublicAPI/{net7.0 => net9.0}/PublicAPI.Shipped.txt (100%)
 rename src/Microsoft.TestPlatform.Client/PublicAPI/{net7.0 => net9.0}/PublicAPI.Unshipped.txt (100%)
 rename src/Microsoft.TestPlatform.Common/PublicAPI/{net6.0 => net8.0}/PublicAPI.Shipped.txt (100%)
 rename src/Microsoft.TestPlatform.Common/PublicAPI/{net6.0 => net8.0}/PublicAPI.Unshipped.txt (100%)
 rename src/Microsoft.TestPlatform.Common/PublicAPI/{net7.0 => net9.0}/PublicAPI.Shipped.txt (100%)
 rename src/Microsoft.TestPlatform.Common/PublicAPI/{net7.0 => net9.0}/PublicAPI.Unshipped.txt (100%)
 rename src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/{net6.0 => net8.0}/PublicAPI.Shipped.txt (100%)
 rename src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/{net6.0 => net8.0}/PublicAPI.Unshipped.txt (100%)
 delete mode 100644 src/Microsoft.TestPlatform.CoreUtilities/Extensions/StringBuilderPolyfill.cs
 create mode 100644 src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net481/PublicAPI.Shipped.txt
 rename src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/{net6.0_and_net7.0 => net481}/PublicAPI.Unshipped.txt (100%)
 rename src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/{net6.0_and_net7.0 => net8.0}/PublicAPI.Shipped.txt (100%)
 rename src/{Microsoft.TestPlatform.ObjectModel/PublicAPI/net7.0 => Microsoft.TestPlatform.CoreUtilities/PublicAPI/net8.0}/PublicAPI.Unshipped.txt (100%)
 rename src/{Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net7.0 => Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net8.0}/PublicAPI.Shipped.txt (100%)
 rename src/{Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net7.0 => Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net8.0}/PublicAPI.Unshipped.txt (100%)
 rename src/{Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net6.0 => Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net48}/PublicAPI.Shipped.txt (100%)
 rename src/{Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net6.0 => Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net48}/PublicAPI.Unshipped.txt (100%)
 rename src/{Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net7.0 => Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net8.0}/PublicAPI.Shipped.txt (100%)
 rename src/{Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net7.0 => Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net8.0}/PublicAPI.Unshipped.txt (100%)
 rename src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/{net472 => net9.0}/PublicAPI.Shipped.txt (100%)
 rename src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/{net472 => net9.0}/PublicAPI.Unshipped.txt (100%)
 rename src/{Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net6.0 => Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net48}/PublicAPI.Shipped.txt (100%)
 rename src/{Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net6.0 => Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net48}/PublicAPI.Unshipped.txt (100%)
 rename src/Microsoft.TestPlatform.ObjectModel/PublicAPI/{net7.0 => net6.0}/PublicAPI.Shipped.txt (100%)
 rename src/Microsoft.TestPlatform.ObjectModel/PublicAPI/{netcoreapp3.1 => net6.0}/PublicAPI.Unshipped.txt (100%)
 rename src/Microsoft.TestPlatform.ObjectModel/PublicAPI/{netcoreapp3.1 => net8.0}/PublicAPI.Shipped.txt (100%)
 rename src/{Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net6.0_and_net7.0 => Microsoft.TestPlatform.ObjectModel/PublicAPI/net8.0}/PublicAPI.Unshipped.txt (100%)
 rename src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/{net6.0_and_net7.0 => net8.0}/PublicAPI.Shipped.txt (100%)
 create mode 100644 src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net8.0/PublicAPI.Unshipped.txt
 rename src/{Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net7.0 => Microsoft.TestPlatform.TestHostProvider/PublicAPI/net48}/PublicAPI.Shipped.txt (100%)
 rename src/{Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net7.0 => Microsoft.TestPlatform.TestHostProvider/PublicAPI/net48}/PublicAPI.Unshipped.txt (100%)
 rename src/{Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net462 => Microsoft.TestPlatform.TestHostProvider/PublicAPI/net8.0}/PublicAPI.Shipped.txt (100%)
 rename src/{Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net462 => Microsoft.TestPlatform.TestHostProvider/PublicAPI/net8.0}/PublicAPI.Unshipped.txt (100%)
 rename src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/{net462 => net9.0}/PublicAPI.Shipped.txt (100%)
 rename src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/{net462 => net9.0}/PublicAPI.Unshipped.txt (100%)
 rename src/{Microsoft.TestPlatform.TestHostProvider/PublicAPI/net6.0 => Microsoft.TestPlatform.Utilities/PublicAPI/net8.0}/PublicAPI.Shipped.txt (100%)
 rename src/{Microsoft.TestPlatform.TestHostProvider/PublicAPI/net6.0 => Microsoft.TestPlatform.Utilities/PublicAPI/net8.0}/PublicAPI.Unshipped.txt (100%)
 rename src/{Microsoft.TestPlatform.TestHostProvider/PublicAPI/net7.0 => Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net8.0}/PublicAPI.Shipped.txt (100%)
 rename src/{Microsoft.TestPlatform.TestHostProvider/PublicAPI/net7.0 => Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net8.0}/PublicAPI.Unshipped.txt (100%)
 rename src/{Microsoft.TestPlatform.Utilities/PublicAPI/net6.0 => datacollector/PublicAPI/net48}/PublicAPI.Shipped.txt (100%)
 rename src/{Microsoft.TestPlatform.Utilities/PublicAPI/net6.0 => datacollector/PublicAPI/net48}/PublicAPI.Unshipped.txt (100%)
 delete mode 100644 src/datacollector/PublicAPI/net6.0/PublicAPI.Shipped.txt
 delete mode 100644 src/datacollector/PublicAPI/net6.0/PublicAPI.Unshipped.txt
 delete mode 100644 src/datacollector/PublicAPI/net7.0/PublicAPI.Shipped.txt
 delete mode 100644 src/datacollector/PublicAPI/net7.0/PublicAPI.Unshipped.txt
 rename src/{Microsoft.TestPlatform.Utilities/PublicAPI/net7.0 => datacollector/PublicAPI/net8.0}/PublicAPI.Shipped.txt (100%)
 rename src/{Microsoft.TestPlatform.Utilities/PublicAPI/net7.0 => datacollector/PublicAPI/net8.0}/PublicAPI.Unshipped.txt (100%)
 rename src/{Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net6.0 => datacollector/PublicAPI/net9.0}/PublicAPI.Shipped.txt (100%)
 rename src/{Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net6.0 => datacollector/PublicAPI/net9.0}/PublicAPI.Unshipped.txt (100%)
 delete mode 100644 src/datacollector/PublicAPI/netcoreapp3.1/PublicAPI.Shipped.txt
 delete mode 100644 src/datacollector/PublicAPI/netcoreapp3.1/PublicAPI.Unshipped.txt
 delete mode 100644 src/vstest.console/PublicAPI/net462/PublicAPI.Shipped.txt
 delete mode 100644 src/vstest.console/PublicAPI/net462/PublicAPI.Unshipped.txt
 rename src/{Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net7.0 => vstest.console/PublicAPI/net48}/PublicAPI.Shipped.txt (100%)
 rename src/{Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net7.0 => vstest.console/PublicAPI/net48}/PublicAPI.Unshipped.txt (100%)
 delete mode 100644 src/vstest.console/PublicAPI/net6.0/PublicAPI.Shipped.txt
 delete mode 100644 src/vstest.console/PublicAPI/net6.0/PublicAPI.Unshipped.txt
 delete mode 100644 src/vstest.console/PublicAPI/net7.0/PublicAPI.Shipped.txt
 delete mode 100644 src/vstest.console/PublicAPI/net7.0/PublicAPI.Unshipped.txt
 rename src/{datacollector/PublicAPI/net462 => vstest.console/PublicAPI/net8.0}/PublicAPI.Shipped.txt (100%)
 rename src/{datacollector/PublicAPI/net462 => vstest.console/PublicAPI/net8.0}/PublicAPI.Unshipped.txt (100%)
 rename src/{datacollector/PublicAPI/net472 => vstest.console/PublicAPI/net9.0}/PublicAPI.Shipped.txt (100%)
 rename src/{datacollector/PublicAPI/net472 => vstest.console/PublicAPI/net9.0}/PublicAPI.Unshipped.txt (100%)
 rename test/TestAssets/{SimpleTestProjectARM/SimpleTestProjectARM.csproj => SimpleTestProjectARM64/SimpleTestProjectARM64.csproj} (88%)
 rename test/TestAssets/{SimpleTestProjectARM => SimpleTestProjectARM64}/UnitTest1.cs (100%)

diff --git a/Directory.Build.props b/Directory.Build.props
index 778e8f488c..59d4f521d2 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -26,7 +26,7 @@
     <Version Condition="'$(Version)' == ''">$(TPVersionPrefix)-dev</Version>
     <!-- Override the AssemblyVersion as 15.0.0 since protocol depends on this version for serialization. This is also defined in build script. -->
     <AssemblyVersion Condition="'$(AssemblyVersion)' == ''">15.0.0</AssemblyVersion>
-    <!-- Auto generating binding redirects breaks testhost when running under netcoreapp3.1 vstest.console as .NET Framework net462.  -->
+    <!-- Auto generating binding redirects breaks testhost when running under net8.0 vstest.console as .NET Framework net462.  -->
     <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
     <!-- But not autogenerating binding redirects also breaks build occasionally, so we tell MSBuild to unify assembly versions,
     without outputting binding redirectes. -->
@@ -52,15 +52,72 @@
   <PropertyGroup>
     <!-- Naming is based on dotnet/runtime one -->
     <NetFrameworkMinimum>net462</NetFrameworkMinimum>
-    <!-- When not building from source, hardcode the NetCurrent TFM value as it is hardcoded in a number of places, i.e. nuspec files. -->
-    <NetCurrent Condition="'$(DotNetBuildSourceOnly)' != 'true'">net9.0</NetCurrent>
-    <NetCoreAppMinimum>netcoreapp3.1</NetCoreAppMinimum>
+    <NetCoreAppMinimum>net8.0</NetCoreAppMinimum>
+    <NetCoreAppStable>net9.0</NetCoreAppStable>
     <!--
       Arcade is making things hard to work with. This property is unset when its value is equal to NetMinimum.
       https://github.com/dotnet/arcade/blob/66c9c5397d599af40f2a94989241944f5a73442a/src/Microsoft.DotNet.Arcade.Sdk/tools/TargetFrameworkDefaults.props#L16-L18
       Because I don't want to complexify further the logic on VSTest just for that, I will set it to NetMinimum.
-      -->
+    -->
     <NetPrevious Condition=" $(NetPrevious) == '' ">$(NetMinimum)</NetPrevious>
+
+    <!--
+      vstest.console.exe is shipped with VS, we can use the version of .NET Framework that VS requires to run (this might differ from the version is requires to install).
+      https://learn.microsoft.com/en-us/visualstudio/releases/2022/system-requirements#additional-requirements-and-guidance
+    -->
+    <NetFrameworkRunnerTargetFramework>net48</NetFrameworkRunnerTargetFramework>
+    <!--
+      vstest.console.dll or datacollector.dll are shipped with .NET SDK, target the tfms into which we insert.
+    -->
+    <NetSDKTargetFramework>$(NetCoreAppStable)</NetSDKTargetFramework>
+    <!--
+      vstest.console.dll and datacollector.dll are shipped in TestPlatform.Portable package, that should support
+      the oldest currently supported .NET, because we don't know with which runtime it will be used.
+      vstest.console.exe and datacollector.exe are shipped in there as well, choose the lowest version of
+      .NET Frameowork to support as well.
+    -->
+    <NetPortableTargetFrameworks>$(NetCoreAppMinimum)</NetPortableTargetFrameworks>
+    <NetRunnerTargetFrameworks>$(NetSDKTargetFramework);$(NetPortableTargetFrameworks)</NetRunnerTargetFrameworks>
+    <RunnerTargetFrameworks>$(NetFrameworkRunnerTargetFramework);$(NetRunnerTargetFrameworks)</RunnerTargetFrameworks>
+    
+    <!--
+      
+    -->
+    <BundledExtensionTargetFrameworks>$(RunnerTargetFrameworks)</BundledExtensionTargetFrameworks>
+    <!--
+      Extensions that are shipped as standalone packages need to be netstandard2.0, because we don't know on which runtime
+      we will run.
+
+      This is the same for bundled extensions that are shipped together with vstest.console or datacollector. In ideal case
+      they would not need netstandard, but we load the same dll into .NET and .NET Framework datacollector.
+      So the need to target netstandard2.0 as well.
+    -->
+    <ExtensionTargetFrameworks>netstandard2.0</ExtensionTargetFrameworks>
+
+    <!--
+      Testhosts need to run on all currently supported target frameworks and newer.
+      https://learn.microsoft.com/en-us/visualstudio/releases/2022/compatibility#-visual-studio-2022-support-for-net-development
+      https://dotnet.microsoft.com/en-us/platform/support/policy
+      https://learn.microsoft.com/en-us/lifecycle/products/microsoft-net-framework
+
+      Currently that is net8 (until November 10, 2026) and .NET Framework 4.6.2 (until Jan 12, 2027).
+    -->
+    <TestHostMinimumTargetFrameworks>$(NetCoreAppMinimum);$(NetFrameworkMinimum)</TestHostMinimumTargetFrameworks>
+    <!--
+      Testhost needs to support every target framework from the minimum, and it also needs to build
+      all the .NET Framework target frameworks that are newer than the minimum, because we ship each of those
+      executables separately, and use it to load dlls into specific version of .NET Framework based on user
+      settings.
+
+      https://learn.microsoft.com/en-us/dotnet/standard/frameworks#supported-target-frameworks
+    -->
+    <TestHostAllTargetFrameworks>$(TestHostMinimumTargetFrameworks);net47;net471;net472;net48;net481</TestHostAllTargetFrameworks>
+    
+    <!--
+      Library that is loaded by others and by us. We don't know where it will run (e.b. TranslationLayer),
+      we need to support all frameworks from minimum, and also netstandard2.0.
+    -->
+    <LibraryTargetFrameworks>$(NetFrameworkMinimum);netstandard2.0</LibraryTargetFrameworks>
   </PropertyGroup>
 
   <!-- Build & pack config -->
diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
index 7b3507d431..41ef5852c2 100644
--- a/azure-pipelines-official.yml
+++ b/azure-pipelines-official.yml
@@ -127,7 +127,7 @@ extends:
         enabled: true
     pool:
       name: $(DncEngInternalBuildPool)
-      image: 1es-windows-2022
+      image: windows.vs2022preview.amd64
       os: windows
     customBuildTags:
     - ES365AIMigrationTooling
@@ -151,7 +151,7 @@ extends:
             timeoutInMinutes: 120
             pool:
               name: $(DncEngInternalBuildPool)
-              image: 1es-windows-2022
+              image: windows.vs2022preview.amd64
               os: windows
             steps:
             # This steps help to understand versions of .NET runtime installed on the machine,
@@ -255,7 +255,7 @@ extends:
                 - ${{ pool.os }}
             pool:
                 name: $(DncEngInternalBuildPool)
-                image: 1es-windows-2022
+                image: windows.vs2022preview.amd64
                 os: windows
             steps:
               # The template job needs a log, otherwise it writes a warning. We can disable log uploading only for
diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index 60430ce23a..7ea9e1d42c 100644
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -3,18 +3,24 @@
 
 <UsageData>
   <IgnorePatterns>
-    <!-- Caused by dependency on System.ComponentModel.Composition.4.5.0. This version is overridden in full source-build. -->
+    <!-- 
+      These dependencies are replaced with their live versions when building in real source build.
+       https://github.com/dotnet/dotnet/blob/d966d07fa1f7a5bdddbb9aa39603f1a9c739eb1d/repo-projects/vstest.proj#L13
+    -->
+    <!-- Caused by dependency on System.ComponentModel.Composition.8.0.0. This version is overridden in full source-build. -->
     <UsagePattern IdentityGlob="Microsoft.NETCore.Platforms/2.0.0" />
     <!-- This version is overridden in full source-build. -->
-    <UsagePattern IdentityGlob="System.ComponentModel.Composition/4.5.0" />
-    <!-- Caused by dependency on System.ComponentModel.Composition.4.5.0. This version is overridden in full source-build. -->
-    <UsagePattern IdentityGlob="System.Security.AccessControl/4.5.0" />
-    <!-- Caused by dependency on System.ComponentModel.Composition.4.5.0. This version is overridden in full source-build. -->
-    <UsagePattern IdentityGlob="System.Security.Permissions/4.5.0" />
-    <!-- Caused by dependency on System.ComponentModel.Composition.4.5.0. This version is overridden in full source-build. -->
-    <UsagePattern IdentityGlob="System.Security.Principal.Windows/4.5.0" />
-    <UsagePattern IdentityGlob="Microsoft.Diagnostics.NETCore.Client/0.2.452401" />
+    <UsagePattern IdentityGlob="System.ComponentModel.Composition/8.0.0" />
+    <!-- Caused by dependency on System.ComponentModel.Composition.8.0.0. This version is overridden in full source-build. -->
+    <UsagePattern IdentityGlob="System.Security.AccessControl/8.0.0" />
+    <!-- Caused by dependency on System.ComponentModel.Composition.8.0.0. This version is overridden in full source-build. -->
+    <UsagePattern IdentityGlob="System.Security.Permissions/8.0.0" />
+    <!-- Caused by dependency on System.ComponentModel.Composition.8.0.0. This version is overridden in full source-build. -->
+    <UsagePattern IdentityGlob="System.Security.Principal.Windows/8.0.0" />
+    
+
     <!-- Caused by multi-targeting source build for repo builds/CI. Product source build only targets NetCurrent. -->
+    <UsagePattern IdentityGlob="Microsoft.Diagnostics.NETCore.Client/0.2.*" />
     <UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Ref/8.0.*" />
     <UsagePattern IdentityGlob="Microsoft.NetCore.App.Ref/8.0.*" />
     <UsagePattern IdentityGlob="Microsoft.NETCore.App.Host.linux-x64/8.0.*" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 33d2c7c568..55294cdb75 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -29,7 +29,7 @@
     </Dependency>
     <!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
     <Dependency Name="System.ComponentModel.Composition" Version="4.5.0">
-      <Uri>https://github.com/dotnet/corefx</Uri>
+      <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>30ab651fcb4354552bd4891619a0bdd81e0ebdbf</Sha>
     </Dependency>
     <!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
diff --git a/eng/Versions.props b/eng/Versions.props
index b205af0cc8..77c3694aa1 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -29,6 +29,12 @@
         Because you will need to update Microsoft.TestPlatform.Build.UnitTests to build using that concrete .NET TFM, e.g. net8.0 for 17.8.3.
         Otherwise it will restore the netstandard2.0 *reference* library into test project bin, and the test project will fail
         with File not found error.
+
+        Could not load file or assembly 'Microsoft.Build.Utilities.Core...
+    -->
+    <!-- 
+      Lot of these versions are not the latest present on nuget.org, we need to use versions that are present in SourceBuild to
+      avoid introducing pre-builts. https://github.com/dotnet/source-build-reference-packages/tree/main/src/referencePackages/src
     -->
     <MicrosoftBuildFrameworkPackageVersion>17.8.3</MicrosoftBuildFrameworkPackageVersion>
     <MicrosoftBuildPackageVersion>$(MicrosoftBuildFrameworkPackageVersion)</MicrosoftBuildPackageVersion>
@@ -36,32 +42,34 @@
     <MicrosoftBuildFrameworkReferenceOnly>$(MicrosoftBuildFrameworkPackageVersion)</MicrosoftBuildFrameworkReferenceOnly>
     <MicrosoftBuildReferenceOnly>$(MicrosoftBuildFrameworkPackageVersion)</MicrosoftBuildReferenceOnly>
     <MicrosoftBuildUtilitiesCoreReferenceOnly>$(MicrosoftBuildFrameworkPackageVersion)</MicrosoftBuildUtilitiesCoreReferenceOnly>
-    <MicrosoftCodeAnalysisVersion>3.11.0</MicrosoftCodeAnalysisVersion>
-    <MicrosoftCodeAnalysisBannedApiAnalyzersVersion>3.11.0-beta1.23525.2</MicrosoftCodeAnalysisBannedApiAnalyzersVersion>
-    <MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.11.0-beta1.23525.2</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
+    <MicrosoftCodeAnalysisVersion>4.11.0</MicrosoftCodeAnalysisVersion>
+    <MicrosoftCodeAnalysisBannedApiAnalyzersVersion>3.3.4</MicrosoftCodeAnalysisBannedApiAnalyzersVersion>
+    <MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.3.4</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
     <MicrosoftCodeCoverageIOVersion>17.7.0</MicrosoftCodeCoverageIOVersion>
     <MicrosoftDiagnosticsNETCoreClientVersion>0.2.606601</MicrosoftDiagnosticsNETCoreClientVersion>
-    <MicrosoftExtensionsDependencyModelPackageVersion>3.1.0</MicrosoftExtensionsDependencyModelPackageVersion>
-    <MicrosoftExtensionsFileSystemGlobbingVersion>2.0.0</MicrosoftExtensionsFileSystemGlobbingVersion>
-    <MicrosoftFakesVersion>17.9.0-beta.24058.4</MicrosoftFakesVersion>
+    <MicrosoftExtensionsDependencyModelPackageVersion>6.0.0</MicrosoftExtensionsDependencyModelPackageVersion>
+    <MicrosoftExtensionsFileSystemGlobbingVersion>6.0.0</MicrosoftExtensionsFileSystemGlobbingVersion>
+    <MicrosoftFakesVersion>17.12.0</MicrosoftFakesVersion>
     <MicrosoftInternalCodeCoverageVersion>17.14.0-preview.25067.3</MicrosoftInternalCodeCoverageVersion>
     <MicrosoftVisualStudioDiagnosticsUtilitiesVersion>17.13.35716.53</MicrosoftVisualStudioDiagnosticsUtilitiesVersion>
     <MicrosoftVisualStudioEnterpriseAspNetHelper>$(MicrosoftVisualStudioDiagnosticsUtilitiesVersion)</MicrosoftVisualStudioEnterpriseAspNetHelper>
-    <MicrosoftVisualStudioInteropVersion>17.10.525-preview.1</MicrosoftVisualStudioInteropVersion>
-    <MicrosoftVSTelemetryVersion>17.6.46</MicrosoftVSTelemetryVersion>
-    <MicrosoftVSUtilitiesInternalVersion>16.3.42</MicrosoftVSUtilitiesInternalVersion>
+    <MicrosoftVisualStudioInteropVersion>17.12.40418</MicrosoftVisualStudioInteropVersion>
+    <MicrosoftVSTelemetryVersion>17.13.24</MicrosoftVSTelemetryVersion>
+    <MicrosoftVSUtilitiesInternalVersion>16.3.90</MicrosoftVSUtilitiesInternalVersion>
     <MicrosoftVSSDKBuildToolsVersion>17.4.2124</MicrosoftVSSDKBuildToolsVersion>
+    <MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
     <NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
-    <NewtonsoftJsonVersion Condition="'$(DotNetBuildSourceOnly)' == 'true'">13.0.3</NewtonsoftJsonVersion>
-    <SystemCollectionsImmutableVersion>1.5.0</SystemCollectionsImmutableVersion>
-    <SystemComponentModelCompositionVersion>4.5.0</SystemComponentModelCompositionVersion>
+    <SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
+    <SystemComponentModelCompositionVersion>8.0.0</SystemComponentModelCompositionVersion>
     <SystemMemoryVersion>4.5.5</SystemMemoryVersion>
     <SystemNetHttpVersion>4.3.4</SystemNetHttpVersion>
-    <SystemReflectionMetadataVersion>1.6.0</SystemReflectionMetadataVersion>
+    <SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
     <SystemUriVersion>4.3.2</SystemUriVersion>
     <TestPlatformExternalsVersion>17.10.0-preview-2-34602-162</TestPlatformExternalsVersion>
     <MicrosoftInternalTestPlatformExtensions>17.10.0-preview-2-34602-162</MicrosoftInternalTestPlatformExtensions>
-    <TestPlatformMSDiaVersion>17.9.34504.149</TestPlatformMSDiaVersion>
+    <TestPlatformMSDiaVersion>17.12.35519.223</TestPlatformMSDiaVersion>
+    <SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
+    <SystemRuntimeCompilerServicesUnsafeVersion>6.1.0</SystemRuntimeCompilerServicesUnsafeVersion>
   </PropertyGroup>
   <PropertyGroup Label="VSTest test settings">
     <!-- Name of the elements must be in sync with test\Microsoft.TestPlatform.TestUtilities\IntegrationTestBase.cs -->
@@ -74,7 +82,6 @@
     <MSTestTestFrameworkVersion>3.4.3</MSTestTestFrameworkVersion>
     <MSTestTestAdapterVersion>3.4.3</MSTestTestAdapterVersion>
     <MSTestAssertExtensionVersion>1.0.3-preview</MSTestAssertExtensionVersion>
-    <!-- This is the newest version of XUnit that still supports netcoreapp3.1 that we also use to run tests -->
     <XUnitFrameworkVersion>2.4.2</XUnitFrameworkVersion>
     <XUnitAdapterVersion>2.4.5</XUnitAdapterVersion>
     <XUnitConsoleRunnerVersion>2.4.2</XUnitConsoleRunnerVersion>
diff --git a/eng/verify-nupkgs.ps1 b/eng/verify-nupkgs.ps1
index 6fb1274ada..e5915567eb 100644
--- a/eng/verify-nupkgs.ps1
+++ b/eng/verify-nupkgs.ps1
@@ -19,13 +19,13 @@ function Verify-Nuget-Packages {
     $expectedNumOfFiles = @{
         "Microsoft.CodeCoverage"                      = 59;
         "Microsoft.NET.Test.Sdk"                      = 15;
-        "Microsoft.TestPlatform"                      = 609;
+        "Microsoft.TestPlatform"                      = 619;
         "Microsoft.TestPlatform.Build"                = 20;
-        "Microsoft.TestPlatform.CLI"                  = 471;
+        "Microsoft.TestPlatform.CLI"                  = 481;
         "Microsoft.TestPlatform.Extensions.TrxLogger" = 34;
         "Microsoft.TestPlatform.ObjectModel"          = 92;
-        "Microsoft.TestPlatform.AdapterUtilities"     = 75;
-        "Microsoft.TestPlatform.Portable"             = 592;
+        "Microsoft.TestPlatform.AdapterUtilities"     = 61;
+        "Microsoft.TestPlatform.Portable"             = 608;
         "Microsoft.TestPlatform.TestHost"             = 62;
         "Microsoft.TestPlatform.TranslationLayer"     = 122;
         "Microsoft.TestPlatform.Internal.Uwp"         = 38;
@@ -63,7 +63,7 @@ function Verify-Nuget-Packages {
 
 
     Write-Host "Found $(@($nugetPackages).Count) nuget packages:`n    $($nugetPackages.FullName -join "`n    ")"
-    Write-Host "Unzipping NuGet packages."
+    Write-Host "Unzipping NuGet packages to '$tmpDirectory'."
     $unzipNugetPackageDirs = @()
     foreach ($nugetPackage in $nugetPackages) {
         $unzipNugetPackageDir = Join-Path $tmpDirectory $nugetPackage.BaseName
diff --git a/playground/MSTest1/MSTest1.csproj b/playground/MSTest1/MSTest1.csproj
index 407633246a..302cbc6a14 100644
--- a/playground/MSTest1/MSTest1.csproj
+++ b/playground/MSTest1/MSTest1.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(TargetFrameworks);net472;net5.0;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>$(TargetFrameworks);net48;net9.0;net8.0</TargetFrameworks>
     <Prefer32Bit>false</Prefer32Bit>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -11,7 +11,7 @@
     <PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
     <PackageReference Include="coverlet.collector" Version="1.2.0" />
   </ItemGroup>
-  <ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) AND '$(OS)' != 'Windows_NT' ">
+  <ItemGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) AND '$(OS)' != 'Windows_NT' ">
     <Reference Include="System" />
     <Reference Include="System.Runtime" />
     <Reference Include="System.Xml" />
diff --git a/playground/MSTest2/MSTest2.csproj b/playground/MSTest2/MSTest2.csproj
index 407633246a..302cbc6a14 100644
--- a/playground/MSTest2/MSTest2.csproj
+++ b/playground/MSTest2/MSTest2.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(TargetFrameworks);net472;net5.0;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>$(TargetFrameworks);net48;net9.0;net8.0</TargetFrameworks>
     <Prefer32Bit>false</Prefer32Bit>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -11,7 +11,7 @@
     <PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
     <PackageReference Include="coverlet.collector" Version="1.2.0" />
   </ItemGroup>
-  <ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) AND '$(OS)' != 'Windows_NT' ">
+  <ItemGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) AND '$(OS)' != 'Windows_NT' ">
     <Reference Include="System" />
     <Reference Include="System.Runtime" />
     <Reference Include="System.Xml" />
diff --git a/playground/TestPlatform.Playground/TestPlatform.Playground.csproj b/playground/TestPlatform.Playground/TestPlatform.Playground.csproj
index 9a5dcbffbe..620c160e2d 100644
--- a/playground/TestPlatform.Playground/TestPlatform.Playground.csproj
+++ b/playground/TestPlatform.Playground/TestPlatform.Playground.csproj
@@ -8,7 +8,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>$(TargetFrameworks);net472</TargetFrameworks>
+    <TargetFrameworks>$(RunnerTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -17,10 +17,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool.arm64\DumpMinitool.arm64.csproj" />
-    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool.x86\DumpMinitool.x86.csproj" />
-    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool\DumpMinitool.csproj" />
-    <ProjectReference Include="$(RepoRoot)src\DataCollectors\Microsoft.TestPlatform.Extensions.EventLogCollector\Microsoft.TestPlatform.Extensions.EventLogCollector.csproj" />
+    <!-- We are forcing the reference here to .NET Framework project for both .NET and .NET Framework builds.
+    This is because we are offloading the dumping to this tool on Windows, and we need this tool to run anywhere with any selected architecture, and using .NET Framework (or eventually .NET Native)
+    prevents us from having to lookup the correct .NET runtime. -->
+    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool\DumpMinitool.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkMinimum)" />
+    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool.x86\DumpMinitool.x86.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkMinimum)" />
+    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool.arm64\DumpMinitool.arm64.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkMinimum)" />
+
+    <!-- Event log collector only works on .NET Framework, and so we build it only for that. -->
+    <ProjectReference Include="$(RepoRoot)src\DataCollectors\Microsoft.TestPlatform.Extensions.EventLogCollector\Microsoft.TestPlatform.Extensions.EventLogCollector.csproj"  SetTargetFramework="TargetFramework=$(NetFrameworkRunnerTargetFramework)"  />
+
     <ProjectReference Include="$(RepoRoot)src\datacollector\datacollector.csproj" />
     <ProjectReference Include="$(RepoRoot)src\Microsoft.TestPlatform.Extensions.BlameDataCollector\Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj" />
     <ProjectReference Include="$(RepoRoot)src\Microsoft.TestPlatform.TestHostProvider\Microsoft.TestPlatform.TestHostProvider.csproj" />
@@ -34,7 +40,7 @@
     <ProjectReference Include="$(RepoRoot)src\Microsoft.TestPlatform.Extensions.HtmlLogger\Microsoft.TestPlatform.Extensions.HtmlLogger.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.TestPlatform.Extensions.TrxLogger\Microsoft.TestPlatform.Extensions.TrxLogger.csproj" />
   </ItemGroup>
-  <ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) AND '$(OS)' != 'Windows_NT' ">
+  <ItemGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) AND '$(OS)' != 'Windows_NT' ">
     <Reference Include="System" />
     <Reference Include="System.Runtime" />
     <Reference Include="System.Xml" />
@@ -53,24 +59,26 @@
       <FileToCopy Include="$(SourcePath)bin\vstest.console\$(Configuration)\$(NetFrameworkMinimum)\win7-x64\**\*.*" SubFolder="netfx" />
       <FileToCopy Include="$(SourcePath)bin\Microsoft.TestPlatform.TestHostProvider\$(Configuration)\$(NetFrameworkMinimum)\**\*.*" SubFolder="netfx\Extensions\" />
 
-      <!-- copy net462, net47, net471, net472 and net48 testhosts -->
-      <FileToCopy Include="$(SourcePath)bin\testhost.x86\$(Configuration)\$(NetFrameworkMinimum)\win7-x86\**\*.*" SubFolder="netfx\TestHostNetFramework\" />
+      <!-- copy net462, net47, net471, net472, net48 and net481 testhosts -->
+      <FileToCopy Include="$(SourcePath)bin\testhost.x86\$(Configuration)\$(NetFrameworkMinimum)\win-x86\**\*.*" SubFolder="netfx\TestHostNetFramework\" />
       <FileToCopy Include="$(SourcePath)bin\testhost\$(Configuration)\$(NetFrameworkMinimum)\win7-x64\**\*.*" SubFolder="netfx\TestHostNetFramework\" />
-      <FileToCopy Include="$(SourcePath)bin\testhost.x86\$(Configuration)\net47\win7-x86\**\*.*" SubFolder="netfx\TestHostNetFramework\" />
+      <FileToCopy Include="$(SourcePath)bin\testhost.x86\$(Configuration)\net47\win-x86\**\*.*" SubFolder="netfx\TestHostNetFramework\" />
       <FileToCopy Include="$(SourcePath)bin\testhost\$(Configuration)\net47\win7-x64\**\*.*" SubFolder="netfx\TestHostNetFramework\" />
-      <FileToCopy Include="$(SourcePath)bin\testhost.x86\$(Configuration)\net471\win7-x86\**\*.*" SubFolder="netfx\TestHostNetFramework\" />
+      <FileToCopy Include="$(SourcePath)bin\testhost.x86\$(Configuration)\net471\win-x86\**\*.*" SubFolder="netfx\TestHostNetFramework\" />
       <FileToCopy Include="$(SourcePath)bin\testhost\$(Configuration)\net471\win7-x64\**\*.*" SubFolder="netfx\TestHostNetFramework\" />
-      <FileToCopy Include="$(SourcePath)bin\testhost.x86\$(Configuration)\net472\win7-x86\**\*.*" SubFolder="netfx\TestHostNetFramework\" />
+      <FileToCopy Include="$(SourcePath)bin\testhost.x86\$(Configuration)\net472\win-x86\**\*.*" SubFolder="netfx\TestHostNetFramework\" />
       <FileToCopy Include="$(SourcePath)bin\testhost\$(Configuration)\net472\win7-x64\**\*.*" SubFolder="netfx\TestHostNetFramework\" />
-      <FileToCopy Include="$(SourcePath)bin\testhost.x86\$(Configuration)\net48\win7-x86\**\*.*" SubFolder="netfx\TestHostNetFramework\" />
+      <FileToCopy Include="$(SourcePath)bin\testhost.x86\$(Configuration)\net48\win-x86\**\*.*" SubFolder="netfx\TestHostNetFramework\" />
       <FileToCopy Include="$(SourcePath)bin\testhost\$(Configuration)\net48\win7-x64\**\*.*" SubFolder="netfx\TestHostNetFramework\" />
+      <FileToCopy Include="$(SourcePath)bin\testhost.x86\$(Configuration)\net481\win-x86\**\*.*" SubFolder="netfx\TestHostNetFramework\" />
+      <FileToCopy Include="$(SourcePath)bin\testhost\$(Configuration)\net481\win7-x64\**\*.*" SubFolder="netfx\TestHostNetFramework\" />
 
       <!-- copy datacollectors -->
       <FileToCopy Include="$(SourcePath)bin\datacollector\$(Configuration)\net472\win7-x64\**\*.*" SubFolder="netfx\" />
       <FileToCopy Include="$(SourcePath)bin\Microsoft.TestPlatform.Extensions.BlameDataCollector\$(Configuration)\net472\**\*.*" SubFolder="netfx\Extensions\" />
       <FileToCopy Include="$(SourcePath)bin\DataCollectors\Microsoft.TestPlatform.Extensions.EventLogCollector\$(Configuration)\$(NetFrameworkMinimum)\**\*.*" SubFolder="netfx\Extensions\" />
       <FileToCopy Include="$(SourcePath)bin\DataCollectors\DumpMinitool\$(Configuration)\$(NetFrameworkMinimum)\win7-x64\**\*.*" SubFolder="netfx\Extensions\blame\" />
-      <FileToCopy Include="$(SourcePath)bin\DataCollectors\DumpMinitool.x86\$(Configuration)\$(NetFrameworkMinimum)\win7-x86\**\*.*" SubFolder="netfx\Extensions\blame\" />
+      <FileToCopy Include="$(SourcePath)bin\DataCollectors\DumpMinitool.x86\$(Configuration)\$(NetFrameworkMinimum)\win-x86\**\*.*" SubFolder="netfx\Extensions\blame\" />
       <FileToCopy Include="$(SourcePath)bin\DataCollectors\DumpMinitool.arm64\$(Configuration)\$(NetFrameworkMinimum)\win10-arm64\**\*.*" SubFolder="netfx\Extensions\blame\" />
 
       <!-- copy loggers -->
@@ -89,7 +97,7 @@
       <FileToCopy Include="$(SourcePath)bin\Microsoft.TestPlatform.Extensions.BlameDataCollector\$(Configuration)\net472\**\*.*" SubFolder="net\Extensions\" />
       <FileToCopy Include="$(SourcePath)bin\DataCollectors\Microsoft.TestPlatform.Extensions.EventLogCollector\$(Configuration)\$(NetCoreAppMinimum)\**\*.*" SubFolder="net\Extensions\" />
       <FileToCopy Include="$(SourcePath)bin\DataCollectors\DumpMinitool\$(Configuration)\$(NetCoreAppMinimum)\**\*.*" SubFolder="net\Extensions\blame\" />
-      <FileToCopy Include="$(SourcePath)bin\DataCollectors\DumpMinitool.x86\$(Configuration)\$(NetCoreAppMinimum)\win7-x86\**\*.*" SubFolder="net\Extensions\blame\" />
+      <FileToCopy Include="$(SourcePath)bin\DataCollectors\DumpMinitool.x86\$(Configuration)\$(NetCoreAppMinimum)\win-x86\**\*.*" SubFolder="net\Extensions\blame\" />
       <FileToCopy Include="$(SourcePath)bin\DataCollectors\DumpMinitool.arm64\$(Configuration)\$(NetCoreAppMinimum)\win10-arm64\**\*.*" SubFolder="net\Extensions\blame\" />-->
 
       <!-- copy loggers --><!--
diff --git a/scripts/perf/perf.ps1 b/scripts/perf/perf.ps1
index 29de7c6867..a4daca2484 100644
--- a/scripts/perf/perf.ps1
+++ b/scripts/perf/perf.ps1
@@ -6,12 +6,12 @@ Param(
     [System.String] $Configuration = "Release",
 
     [Parameter(Mandatory=$false)]
-    [ValidateSet("win7-x64", "win7-x86")]
+    [ValidateSet("win7-x64", "win-x86")]
     [Alias("r")]
     [System.String] $TargetRuntime = "win7-x64",
 
     [Parameter(Mandatory=$false)]
-    [ValidateSet("netcoreapp3.1", "net462")]
+    [ValidateSet("net9.0", "net462")]
     [Alias("f")]
     [System.String] $TargetFramework,
 
@@ -40,11 +40,11 @@ $env:TP_OUT_DIR = Join-Path $env:TP_ROOT_DIR "artifacts"
 # Test configuration
 #
 $TPT_TargetFrameworkFullCLR = "net462"
-$TPT_TargetFramework31Core = "netcoreapp3.1"
+$TPT_TargetFramework6Core = "net6.0"
 Write-Verbose "Setup build configuration."
 $Script:TPT_Configuration = $Configuration
 $Script:TPT_SourceFolders =  @(Join-Path $env:TP_ROOT_DIR "test\TestAssets")
-$Script:TPT_TargetFrameworks =@($TPT_TargetFramework31Core, $TPT_TargetFrameworkFullCLR)
+$Script:TPT_TargetFrameworks =@($TPT_TargetFramework6Core, $TPT_TargetFrameworkFullCLR)
 $Script:TPT_TargetFramework = $TargetFramework
 $Script:TPT_TargetRuntime = $TargetRuntime
 $Script:TPT_Pattern = $Pattern
@@ -151,11 +151,11 @@ function Get-ConsoleRunnerPath($runner, $targetFrameWork)
 {
     if($runner -eq "vstest.console")
     {
-        if($targetFrameWork -eq $TPT_TargetFramework31Core)
+        if($targetFrameWork -eq $TPT_TargetFramework6Core)
         {
             $vstestConsoleFileName = "vstest.console.dll"
             $targetRunTime = ""
-            $vstestConsolePath = Join-Path (Get-PackageDirectory $TPT_TargetFramework31Core $targetRuntime) $vstestConsoleFileName
+            $vstestConsolePath = Join-Path (Get-PackageDirectory $TPT_TargetFramework6Core $targetRuntime) $vstestConsoleFileName
         } else {
             $vstestConsoleFileName = "vstest.console.exe"
             $targetRunTime = $Script:TPT_TargetRuntime
diff --git a/scripts/test.ps1 b/scripts/test.ps1
index a3aa6de7f3..d777fbd3dd 100644
--- a/scripts/test.ps1
+++ b/scripts/test.ps1
@@ -9,12 +9,12 @@ Param(
     [System.String] $Configuration = "Debug",
 
     [Parameter(Mandatory=$false)]
-    [ValidateSet("win7-x64", "win7-x86")]
+    [ValidateSet("win7-x64", "win-x86")]
     [Alias("r")]
     [System.String] $TargetRuntime = "win7-x64",
 
     [Parameter(Mandatory=$false)]
-    [ValidateSet("net48", "net6.0")]
+    [ValidateSet("net48", "net9.0")]
     [Alias("f")]
     [System.String] $TargetFramework,
 
@@ -96,12 +96,12 @@ $env:NUGET_PACKAGES = $env:TP_PACKAGES_DIR
 #
 $TPT_TargetFrameworkNet462 = "net462"
 $TPT_TargetFrameworkNet48 = "net48"
-$TPT_TargetFrameworkCore31 = "netcoreapp3.1"
-$TPT_TargetFrameworkNet60 = "net6.0"
+$TPT_TargetFrameworkNet80 = "net8.0"
+$TPT_TargetFrameworkNet90 = "net9.0"
 Write-Verbose "Setup build configuration."
 $Script:TPT_Configuration = $Configuration
 $Script:TPT_SourceFolders =  @("test")
-$Script:TPT_TargetFrameworks =@($TPT_TargetFrameworkNet48, $TPT_TargetFrameworkNet60)
+$Script:TPT_TargetFrameworks =@($TPT_TargetFrameworkNet48, $TPT_TargetFrameworkNet90)
 $Script:TPT_TargetFramework = $TargetFramework
 $Script:TPT_TargetRuntime = $TargetRuntime
 $Script:TPT_SkipProjects = @("_none_");
@@ -227,11 +227,11 @@ function Invoke-Test
                 $testFilter = "/testCaseFilter:`"$TPT_TestFilter`""
             }
 
-            if($fx -eq $TPT_TargetFrameworkNet60)
+            if($fx -eq $TPT_TargetFrameworkNet90)
             {
                 $vstestConsoleFileName = "vstest.console.dll"
                 $targetRunTime = ""
-                $vstestConsolePath = Join-Path (Get-PackageDirectory $TPT_TargetFrameworkCore31 $targetRuntime) $vstestConsoleFileName
+                $vstestConsolePath = Join-Path (Get-PackageDirectory $TPT_TargetFrameworkNet80 $targetRuntime) $vstestConsoleFileName
             }
             else
             {
diff --git a/scripts/test.sh b/scripts/test.sh
index cc7ab86f90..e9d11c24d7 100644
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -57,7 +57,7 @@ done
 #
 # Variables
 #
-PROJECT_NAME_PATTERNS=**$PROJECT_NAME_PATTERNS*bin*$CONFIGURATION*net6.0*$PROJECT_NAME_PATTERNS*Tests*dll
+PROJECT_NAME_PATTERNS=**$PROJECT_NAME_PATTERNS*bin*$CONFIGURATION*net9.0*$PROJECT_NAME_PATTERNS*Tests*dll
 TP_ROOT_DIR=$(cd "$(dirname "$0")"; pwd -P)
 TP_TOOLS_DIR="$TP_ROOT_DIR/tools"
 TP_PACKAGES_DIR="$TP_ROOT_DIR/packages"
@@ -76,7 +76,7 @@ DOTNET_CLI_VERSION="latest"
 # Build configuration
 #
 TPB_Solution="TestPlatform.sln"
-TPB_TargetFrameworkCore="netcoreapp3.1"
+TPB_TargetFrameworkCore="net8.0"
 TPB_Configuration=$CONFIGURATION
 TPB_TargetRuntime=$TARGET_RUNTIME
 TPB_Verbose=$VERBOSE
diff --git a/src/AttachVS/AttachVS.csproj b/src/AttachVS/AttachVS.csproj
index 480945c0e3..9e6fbc3166 100644
--- a/src/AttachVS/AttachVS.csproj
+++ b/src/AttachVS/AttachVS.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net7;net472</TargetFrameworks>
+    <TargetFrameworks>$(TestHostMinimumTargetFrameworks)</TargetFrameworks>
     <AssemblyName>AttachVS</AssemblyName>
     <ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
   </PropertyGroup>
diff --git a/src/DataCollectors/DumpMinitool.arm64/DumpMinitool.arm64.csproj b/src/DataCollectors/DumpMinitool.arm64/DumpMinitool.arm64.csproj
index 1163b54034..9e59a211fa 100644
--- a/src/DataCollectors/DumpMinitool.arm64/DumpMinitool.arm64.csproj
+++ b/src/DataCollectors/DumpMinitool.arm64/DumpMinitool.arm64.csproj
@@ -2,8 +2,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0;$(NetFrameworkMinimum)</TargetFrameworks>
-    <Prefer32Bit Condition="'$(TargetFramework)' == '$(NetFrameworkMinimum)'">false</Prefer32Bit>
+    <!--
+      This is targetting .NET Framework only on purpose. We want the exe, and we want it to run as different architecture.
+      Using .NET Framework for this makes it much easier, than .NET because we don't have to lookup the correct arch of the runtime.
+      Alternative to this would be using .NET AOT, but it makes it harder to just build, since you need to publish to get the exe.
+    -->
+    <TargetFrameworks>$(NetFrameworkMinimum)</TargetFrameworks>
+    <Prefer32Bit>false</Prefer32Bit>
     <OutputType>Exe</OutputType>
     <IsTestProject>false</IsTestProject>
     <RuntimeIdentifier Condition="'$(DotNetBuildSourceOnly)' != 'true'">win10-arm64</RuntimeIdentifier>
diff --git a/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj b/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj
index 6216d6b5c0..e1613e1b01 100644
--- a/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj
+++ b/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj
@@ -2,12 +2,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;$(NetFrameworkMinimum)</TargetFrameworks>
+    <!--
+      This is targetting .NET Framework only on purpose. We want the exe, and we want it to run as different architecture.
+      Using .NET Framework for this makes it much easier, than .NET because we don't have to lookup the correct arch of the runtime.
+      Alternative to this would be using .NET AOT, but it makes it harder to just build, since you need to publish to get the exe.
+    -->
+    <TargetFrameworks>$(NetFrameworkMinimum)</TargetFrameworks>
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <Prefer32Bit Condition="$(TargetFramework.StartsWith('net4'))">true</Prefer32Bit>
+    <Prefer32Bit Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">true</Prefer32Bit>
     <OutputType>Exe</OutputType>
     <IsTestProject>false</IsTestProject>
-    <RuntimeIdentifier Condition="'$(DotNetBuildSourceOnly)' != 'true'">win7-x86</RuntimeIdentifier>
+    <RuntimeIdentifier Condition="'$(DotNetBuildSourceOnly)' != 'true'">win-x86</RuntimeIdentifier>
     <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
     <ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
     <!--
diff --git a/src/DataCollectors/DumpMinitool/DumpMinitool.csproj b/src/DataCollectors/DumpMinitool/DumpMinitool.csproj
index b07e20dd1d..a3038987b1 100644
--- a/src/DataCollectors/DumpMinitool/DumpMinitool.csproj
+++ b/src/DataCollectors/DumpMinitool/DumpMinitool.csproj
@@ -2,9 +2,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0;$(NetFrameworkMinimum)</TargetFrameworks>
+    <!--
+      This is targetting .NET Framework only on purpose. We want the exe, and we want it to run as different architecture.
+      Using .NET Framework for this makes it much easier, than .NET because we don't have to lookup the correct arch of the runtime.
+      Alternative to this would be using .NET AOT, but it makes it harder to just build, since you need to publish to get the exe.
+    -->
+    <TargetFrameworks>$(NetFrameworkMinimum)</TargetFrameworks>
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <Prefer32Bit Condition="'$(TargetFramework)' == '$(NetFrameworkMinimum)'">false</Prefer32Bit>
+    <Prefer32Bit>false</Prefer32Bit>
     <OutputType>Exe</OutputType>
     <IsTestProject>false</IsTestProject>
     <RuntimeIdentifier Condition="'$(DotNetBuildSourceOnly)' != 'true'">win7-x64</RuntimeIdentifier>
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 2fea4d4fb1..f7c86f1bae 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
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <AssemblyName>Microsoft.TestPlatform.Extensions.EventLogCollector</AssemblyName>
-    <TargetFrameworks>net7.0;$(NetFrameworkMinimum)</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreMinimum);$(NetFrameworkRunnerTargetFramework)</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
     <UseBannedApiAnalyzers>true</UseBannedApiAnalyzers>
   </PropertyGroup>
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net462/PublicAPI.Shipped.txt b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net48/PublicAPI.Shipped.txt
similarity index 100%
rename from src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net462/PublicAPI.Shipped.txt
rename to src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net48/PublicAPI.Shipped.txt
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net462/PublicAPI.Unshipped.txt b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net48/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net462/PublicAPI.Unshipped.txt
rename to src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net48/PublicAPI.Unshipped.txt
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net6.0/PublicAPI.Shipped.txt b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net8.0/PublicAPI.Shipped.txt
similarity index 100%
rename from src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net6.0/PublicAPI.Shipped.txt
rename to src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net8.0/PublicAPI.Shipped.txt
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net6.0/PublicAPI.Unshipped.txt b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net8.0/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net6.0/PublicAPI.Unshipped.txt
rename to src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net8.0/PublicAPI.Unshipped.txt
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net7.0/PublicAPI.Shipped.txt b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net9.0/PublicAPI.Shipped.txt
similarity index 100%
rename from src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net7.0/PublicAPI.Shipped.txt
rename to src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net9.0/PublicAPI.Shipped.txt
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net7.0/PublicAPI.Unshipped.txt b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net9.0/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net7.0/PublicAPI.Unshipped.txt
rename to src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net9.0/PublicAPI.Unshipped.txt
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj
index 53049b4413..9f62e98bb9 100644
--- a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj
@@ -1,7 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(NetFrameworkMinimum);net6.0;net8.0;$(NetCurrent)</TargetFrameworks>
+    <!--
+      This library is consumed by test frameworks and will run in testhosts, ship as that, and netstandard so everyone can use it.
+
+      Adding newer tfms for .NET here is okay if we need to use features that are specific to them.
+      17.11.0 started supporting net9 and net8 explicitly so we can condition serialization attributes.
+    -->
+    <TargetFrameworks>$(TestHostMinimumTargetFrameworks);$(ExtensionTargetFrameworks);net9.0</TargetFrameworks>
     <AssemblyName>Microsoft.TestPlatform.AdapterUtilities</AssemblyName>
     <RootNamespace>Microsoft.TestPlatform.AdapterUtilities</RootNamespace>
   </PropertyGroup>
@@ -17,7 +23,7 @@
     </PackageDescription>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == '$(NetFrameworkMinimum)'">
+  <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
   </PropertyGroup>
 
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.nuspec b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.nuspec
index c3a40455c8..1b93aed8de 100644
--- a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.nuspec
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.nuspec
@@ -6,7 +6,6 @@
     <dependencies>
       <group targetFramework="netstandard2.0" />
       <group targetFramework="net462" />
-      <group targetFramework="net6.0" />
       <group targetFramework="net8.0" />
       <group targetFramework="net9.0" />
     </dependencies>
@@ -17,7 +16,6 @@
 
     <file src="netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="lib\netstandard2.0" />
     <file src="net462\Microsoft.TestPlatform.AdapterUtilities.dll" target="lib\net462" />
-    <file src="net6.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="lib\net6.0" />
     <file src="net8.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="lib\net8.0" />
     <file src="net9.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="lib\net9.0" />
 
@@ -49,20 +47,6 @@
     <file src="netstandard2.0\zh-Hans\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\netstandard2.0\zh-Hans" />
     <file src="netstandard2.0\zh-Hant\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\netstandard2.0\zh-Hant" />
 
-    <file src="net6.0\cs\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net6.0\cs" />
-    <file src="net6.0\de\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net6.0\de" />
-    <file src="net6.0\es\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net6.0\es" />
-    <file src="net6.0\fr\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net6.0\fr" />
-    <file src="net6.0\it\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net6.0\it" />
-    <file src="net6.0\ja\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net6.0\ja" />
-    <file src="net6.0\ko\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net6.0\ko" />
-    <file src="net6.0\pl\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net6.0\pl" />
-    <file src="net6.0\pt-BR\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net6.0\pt-BR" />
-    <file src="net6.0\ru\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net6.0\ru" />
-    <file src="net6.0\tr\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net6.0\tr" />
-    <file src="net6.0\zh-Hans\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net6.0\zh-Hans" />
-    <file src="net6.0\zh-Hant\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net6.0\zh-Hant" />
-
     <file src="net8.0\cs\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net8.0\cs" />
     <file src="net8.0\de\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net8.0\de" />
     <file src="net8.0\es\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net8.0\es" />
diff --git a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj
index 0fdd27966b..0707e1b107 100644
--- a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj
+++ b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj
@@ -3,7 +3,12 @@
 
   <PropertyGroup>
     <AssemblyName>Microsoft.TestPlatform.Build</AssemblyName>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <!--
+      All extensions for MSBuild should target netstandard2.0, unless they multitarget.
+      https://learn.microsoft.com/en-us/visualstudio/msbuild/tutorial-custom-task-code-generation?view=vs-2022#optional-support-multitargeting
+      We also ship this as nuget, so we don't know who is using it where.
+    -->
+    <TargetFrameworks>$(ExtensionTargetFrameworks)</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
     <UseBannedApiAnalyzers>true</UseBannedApiAnalyzers>
   </PropertyGroup>
diff --git a/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj b/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj
index 26f5d313c7..ec5cfaeae2 100644
--- a/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj
+++ b/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj
@@ -3,7 +3,10 @@
 
   <PropertyGroup>
     <AssemblyName>Microsoft.VisualStudio.TestPlatform.Client</AssemblyName>
-    <TargetFrameworks>net7.0;netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
+    <!--
+      This project is client that is used only by runners, and shipped only in runner packages.
+    -->
+    <TargetFrameworks>$(NetFrameworkRunnerTargetFramework);$(ExtensionTargetFrameworks)</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
   <ItemGroup>
@@ -17,7 +20,7 @@
       <FromP2P>true</FromP2P>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <Reference Include="System" />
     <Reference Include="System.Runtime" />
     <Reference Include="System.Runtime.Serialization" />
@@ -46,5 +49,7 @@
     <!-- Framework specific API -->
     <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" />
     <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
+    <AdditionalFiles Include="PublicAPI\netstandard2.0\PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI\netstandard2.0\PublicAPI.Unshipped.txt" />
   </ItemGroup>
 </Project>
diff --git a/src/Microsoft.TestPlatform.Client/PublicAPI/net462/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Client/PublicAPI/net48/PublicAPI.Shipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.Client/PublicAPI/net462/PublicAPI.Shipped.txt
rename to src/Microsoft.TestPlatform.Client/PublicAPI/net48/PublicAPI.Shipped.txt
diff --git a/src/Microsoft.TestPlatform.Client/PublicAPI/net462/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Client/PublicAPI/net48/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.Client/PublicAPI/net462/PublicAPI.Unshipped.txt
rename to src/Microsoft.TestPlatform.Client/PublicAPI/net48/PublicAPI.Unshipped.txt
diff --git a/src/Microsoft.TestPlatform.Client/PublicAPI/net6.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Client/PublicAPI/net8.0/PublicAPI.Shipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.Client/PublicAPI/net6.0/PublicAPI.Shipped.txt
rename to src/Microsoft.TestPlatform.Client/PublicAPI/net8.0/PublicAPI.Shipped.txt
diff --git a/src/Microsoft.TestPlatform.Client/PublicAPI/net6.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Client/PublicAPI/net8.0/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.Client/PublicAPI/net6.0/PublicAPI.Unshipped.txt
rename to src/Microsoft.TestPlatform.Client/PublicAPI/net8.0/PublicAPI.Unshipped.txt
diff --git a/src/Microsoft.TestPlatform.Client/PublicAPI/net7.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Client/PublicAPI/net9.0/PublicAPI.Shipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.Client/PublicAPI/net7.0/PublicAPI.Shipped.txt
rename to src/Microsoft.TestPlatform.Client/PublicAPI/net9.0/PublicAPI.Shipped.txt
diff --git a/src/Microsoft.TestPlatform.Client/PublicAPI/net7.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Client/PublicAPI/net9.0/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.Client/PublicAPI/net7.0/PublicAPI.Unshipped.txt
rename to src/Microsoft.TestPlatform.Client/PublicAPI/net9.0/PublicAPI.Unshipped.txt
diff --git a/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj b/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj
index ba248dc576..d117107a34 100644
--- a/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj
+++ b/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj
@@ -3,11 +3,11 @@
 
   <PropertyGroup>
     <AssemblyName>Microsoft.VisualStudio.TestPlatform.Common</AssemblyName>
-    <TargetFrameworks>net7.0;net6.0;netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
+    <TargetFrameworks>$(NetFrameworkMinimum);$(ExtensionTargetFrameworks)</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
     <UseBannedApiAnalyzers>true</UseBannedApiAnalyzers>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.IO" />
diff --git a/src/Microsoft.TestPlatform.Common/PublicAPI/net6.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Common/PublicAPI/net8.0/PublicAPI.Shipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.Common/PublicAPI/net6.0/PublicAPI.Shipped.txt
rename to src/Microsoft.TestPlatform.Common/PublicAPI/net8.0/PublicAPI.Shipped.txt
diff --git a/src/Microsoft.TestPlatform.Common/PublicAPI/net6.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Common/PublicAPI/net8.0/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.Common/PublicAPI/net6.0/PublicAPI.Unshipped.txt
rename to src/Microsoft.TestPlatform.Common/PublicAPI/net8.0/PublicAPI.Unshipped.txt
diff --git a/src/Microsoft.TestPlatform.Common/PublicAPI/net7.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Common/PublicAPI/net9.0/PublicAPI.Shipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.Common/PublicAPI/net7.0/PublicAPI.Shipped.txt
rename to src/Microsoft.TestPlatform.Common/PublicAPI/net9.0/PublicAPI.Shipped.txt
diff --git a/src/Microsoft.TestPlatform.Common/PublicAPI/net7.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Common/PublicAPI/net9.0/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.Common/PublicAPI/net7.0/PublicAPI.Unshipped.txt
rename to src/Microsoft.TestPlatform.Common/PublicAPI/net9.0/PublicAPI.Unshipped.txt
diff --git a/src/Microsoft.TestPlatform.Common/Utilities/AssemblyProperties.cs b/src/Microsoft.TestPlatform.Common/Utilities/AssemblyProperties.cs
index 7e285db13f..f46c3e3735 100644
--- a/src/Microsoft.TestPlatform.Common/Utilities/AssemblyProperties.cs
+++ b/src/Microsoft.TestPlatform.Common/Utilities/AssemblyProperties.cs
@@ -45,7 +45,7 @@ public AssemblyType GetAssemblyType(string filePath)
             using var peReader = new PEReader(fileStream);
             // Resources for PEReader:
             // 1. https://msdn.microsoft.com/library/windows/desktop/ms680547(v=vs.85).aspx?id=19509
-            // 2. https://github.com/dotnet/corefx/tree/master/src/System.Reflection.Metadata
+            // 2. https://github.com/dotnet/runtime/tree/master/src/libraries/System.Reflection.Metadata
 
             var peHeaders = peReader.PEHeaders;
             var corHeader = peHeaders.CorHeader;
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj b/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj
index a8f956eba5..ba1a60a643 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AssemblyName>Microsoft.TestPlatform.CommunicationUtilities</AssemblyName>
-    <TargetFrameworks>net7.0;net6.0;netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
+    <TargetFrameworks>$(NetFrameworkMinimum);$(ExtensionTargetFrameworks)</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
   <ItemGroup>
@@ -13,7 +13,7 @@
       <Version>$(NewtonsoftJsonVersion)</Version>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <Reference Include="System" />
     <Reference Include="System.Runtime" />
   </ItemGroup>
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net6.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net8.0/PublicAPI.Shipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net6.0/PublicAPI.Shipped.txt
rename to src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net8.0/PublicAPI.Shipped.txt
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net6.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net8.0/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net6.0/PublicAPI.Unshipped.txt
rename to src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net8.0/PublicAPI.Unshipped.txt
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Extensions/StringBuilderPolyfill.cs b/src/Microsoft.TestPlatform.CoreUtilities/Extensions/StringBuilderPolyfill.cs
deleted file mode 100644
index 7da7dee54e..0000000000
--- a/src/Microsoft.TestPlatform.CoreUtilities/Extensions/StringBuilderPolyfill.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace System.Text;
-internal static class StringBuilderPolyfill
-{
-#if !NET7_0_OR_GREATER
-    [Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "Added to match new API.")]
-    public static StringBuilder Append(this StringBuilder builder, IFormatProvider? provider, string? value)
-        => builder.Append(value);
-#endif
-}
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Friends.cs b/src/Microsoft.TestPlatform.CoreUtilities/Friends.cs
index d20fd5f552..542dbfeacc 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Friends.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Friends.cs
@@ -10,16 +10,19 @@
 [assembly: InternalsVisibleTo("testhost.net471, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("testhost.net472, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("testhost.net48, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net481, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("testhost.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("testhost.net47.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("testhost.net471.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("testhost.net472.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("testhost.net48.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net481.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("testhost.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("testhost.net47.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("testhost.net471.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("testhost.net472.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("testhost.net48.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net481.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("vstest.console, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("vstest.console.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("Microsoft.TestPlatform.CommunicationUtilities, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj
index ea9329bd81..919bb26e7e 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj
@@ -3,11 +3,11 @@
 
   <PropertyGroup>
     <AssemblyName>Microsoft.TestPlatform.CoreUtilities</AssemblyName>
-    <TargetFrameworks>net7.0;net6.0;netstandard2.0;$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks>
+    <TargetFrameworks>$(TestHostMinimumTargetFrameworks);$(ExtensionTargetFrameworks)</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <Reference Include="System.Configuration" />
     <Reference Include="System" />
     <Reference Include="System.IO" />
@@ -16,13 +16,12 @@
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' != '$(NetFrameworkMinimum)' ">
-    <PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" />
-    <PackageReference Include="Microsoft.Win32.Registry" Version="4.0.0" />
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryVersion)" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Reflection.Metadata" Version="1.6.0" />
+    <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
   </ItemGroup>
 
   <ItemGroup>
@@ -54,11 +53,11 @@
     <AdditionalFiles Include="PublicAPI\net\PublicAPI.Shipped.txt" />
     <AdditionalFiles Include="PublicAPI\net\PublicAPI.Unshipped.txt" />
     <!-- Framework specific API -->
-    <AdditionalFiles Condition=" '$(TargetFramework)' != 'net6.0' and '$(TargetFramework)' != 'net7.0' " Include="PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" />
-    <AdditionalFiles Condition=" '$(TargetFramework)' != 'net6.0' and '$(TargetFramework)' != 'net7.0' " Include="PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
-    <!-- Framework specific API for Net6.0 and Net7.0 -->
-    <AdditionalFiles Condition=" '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0' " Include="PublicAPI/net6.0_and_net7.0/PublicAPI.Shipped.txt" />
-    <AdditionalFiles Condition=" '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0' " Include="PublicAPI/net6.0_and_net7.0/PublicAPI.Unshipped.txt" />
+    <AdditionalFiles Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))&#xD;&#xA;                                or '$(TargetFramework)' == 'netstandard2.0' " Include="PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))&#xD;&#xA;                                or '$(TargetFramework)' == 'netstandard2.0' " Include="PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
+    <!-- Framework specific API net8.0+ -->
+    <AdditionalFiles Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)')) " Include="PublicAPI\net8.0\PublicAPI.Shipped.txt" />
+    <AdditionalFiles Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)')) " Include="PublicAPI\net8.0\PublicAPI.Unshipped.txt" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net481/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net481/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..32196d81df
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net481/PublicAPI.Shipped.txt
@@ -0,0 +1,15 @@
+#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.SetupListener(System.Diagnostics.TraceListener? listener) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.SetupRemoteEqtTraceListeners(System.AppDomain? childDomain) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.get -> System.Diagnostics.TraceLevel
+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/net6.0_and_net7.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net481/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net6.0_and_net7.0/PublicAPI.Unshipped.txt
rename to src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net481/PublicAPI.Unshipped.txt
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net6.0_and_net7.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net8.0/PublicAPI.Shipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net6.0_and_net7.0/PublicAPI.Shipped.txt
rename to src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net8.0/PublicAPI.Shipped.txt
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net7.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net8.0/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net7.0/PublicAPI.Unshipped.txt
rename to src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net8.0/PublicAPI.Unshipped.txt
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Friends.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Friends.cs
index 35ea0e6b25..f25602a188 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Friends.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Friends.cs
@@ -14,16 +14,19 @@
 [assembly: InternalsVisibleTo("testhost.net471, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("testhost.net472, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("testhost.net48, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net481, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("testhost.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("testhost.net47.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("testhost.net471.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("testhost.net472.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("testhost.net48.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net481.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("testhost.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("testhost.net47.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("testhost.net471.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("testhost.net472.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("testhost.net48.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net481.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("vstest.console, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("vstest.console.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("vstest.ProgrammerTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj b/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj
index a1d89d2589..c643cab47b 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <AssemblyName>Microsoft.TestPlatform.CrossPlatEngine</AssemblyName>
-    <TargetFrameworks>net7.0;net6.0;netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
+    <TargetFrameworks>$(NetFrameworkMinimum);$(ExtensionTargetFrameworks)</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
   <ItemGroup>
@@ -21,7 +21,7 @@
       <FromP2P>true</FromP2P>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <Reference Include="System" />
     <Reference Include="System.Runtime" />
     <Reference Include="System.Xml" />
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net7.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net8.0/PublicAPI.Shipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net7.0/PublicAPI.Shipped.txt
rename to src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net8.0/PublicAPI.Shipped.txt
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net7.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net8.0/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net7.0/PublicAPI.Unshipped.txt
rename to src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net8.0/PublicAPI.Unshipped.txt
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/HangDumperFactory.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/HangDumperFactory.cs
index 3ca7beb8c4..99d4ba1c0e 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/HangDumperFactory.cs
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/HangDumperFactory.cs
@@ -70,7 +70,7 @@ public IHangDumper Create(string targetFramework)
                 return new SigtrapDumper();
             }
 
-            EqtTrace.Info($"HangDumperFactory: This is Linux netcoreapp3.1 or newer, returning the standard NETClient library dumper.");
+            EqtTrace.Info($"HangDumperFactory: This is Linux net6.0 or newer, returning the standard NETClient library dumper.");
             return new NetClientHangDumper();
         }
 
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 c337afa54b..414e1bba56 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 @@
   </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.TestPlatform.Extensions.BlameDataCollector</AssemblyName>
-    <TargetFrameworks>net7.0;netstandard2.0;net472</TargetFrameworks>
+    <TargetFrameworks>$(NetFrameworkRunnerTargetFramework);$(ExtensionTargetFrameworks)</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
     <!-- to copy the netcore.client dependency to bin folder on build -->
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
@@ -33,11 +33,14 @@
     <ProjectReference Include="$(RepoRoot)src\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
   </ItemGroup>
   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
-    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool\DumpMinitool.csproj" />
-    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool.x86\DumpMinitool.x86.csproj" />
-    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool.arm64\DumpMinitool.arm64.csproj" />
+    <!-- We are forcing the reference here to .NET Framework project for both .NET and .NET Framework builds.
+    This is because we are offloading the dumping to this tool on Windows, and we need this tool to run anywhere with any selected architecture, and using .NET Framework (or eventually .NET Native)
+    prevents us from having to lookup the correct .NET runtime. -->
+    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool\DumpMinitool.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkMinimum)" />
+    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool.x86\DumpMinitool.x86.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkMinimum)" />
+    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool.arm64\DumpMinitool.arm64.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkMinimum)" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net472' AND '$(OS)' != 'Windows_NT' ">
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <Reference Include="System" />
     <Reference Include="System.Runtime" />
     <Reference Include="System.Xml" />
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ProcDumpArgsBuilder.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ProcDumpArgsBuilder.cs
index d68b9b569b..2893f41bc5 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ProcDumpArgsBuilder.cs
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ProcDumpArgsBuilder.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Text;
 
 using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
@@ -11,6 +10,8 @@
 
 namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
 
+#pragma warning disable CA1305
+
 public class ProcDumpArgsBuilder : IProcDumpArgsBuilder
 {
     private readonly IEnvironmentVariableHelper _environmentVariableHelper;
@@ -51,10 +52,10 @@ public string BuildTriggerBasedProcDumpArgs(int processId, string filename, IEnu
 
         foreach (var exceptionFilter in procDumpExceptionsList)
         {
-            procDumpArgument.Append(CultureInfo.InvariantCulture, $"-f {exceptionFilter} ");
+            procDumpArgument.Append($"-f {exceptionFilter} ");
         }
 
-        procDumpArgument.Append(CultureInfo.InvariantCulture, $"{processId} {filename}.dmp");
+        procDumpArgument.Append($"{processId} {filename}.dmp");
 
         var argument = procdumpArgumentsFromEnv.IsNullOrWhiteSpace()
             ? procDumpArgument.ToString()
@@ -80,9 +81,11 @@ public string BuildHangBasedProcDumpArgs(int processId, string filename, bool is
             procDumpArgument.Append(" -ma");
         }
 
-        procDumpArgument.Append(CultureInfo.InvariantCulture, $" {processId} {filename}.dmp");
+        procDumpArgument.Append($" {processId} {filename}.dmp");
         var argument = procDumpArgument.ToString();
 
         return argument;
     }
 }
+
+#pragma warning restore CA1305
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net6.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net48/PublicAPI.Shipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net6.0/PublicAPI.Shipped.txt
rename to src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net48/PublicAPI.Shipped.txt
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net6.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net48/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net6.0/PublicAPI.Unshipped.txt
rename to src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net48/PublicAPI.Unshipped.txt
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net7.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net8.0/PublicAPI.Shipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net7.0/PublicAPI.Shipped.txt
rename to src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net8.0/PublicAPI.Shipped.txt
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net7.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net8.0/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net7.0/PublicAPI.Unshipped.txt
rename to src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net8.0/PublicAPI.Unshipped.txt
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net472/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net9.0/PublicAPI.Shipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net472/PublicAPI.Shipped.txt
rename to src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net9.0/PublicAPI.Shipped.txt
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net472/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net9.0/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net472/PublicAPI.Unshipped.txt
rename to src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net9.0/PublicAPI.Unshipped.txt
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 e88c5447ff..5e87c3b024 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj
@@ -3,19 +3,13 @@
 
   <PropertyGroup>
     <AssemblyName>Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger</AssemblyName>
-    <TargetFrameworks>net7.0;netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
+    <TargetFrameworks>$(NetFrameworkRunnerTargetFramework);$(ExtensionTargetFrameworks)</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
     <UseBannedApiAnalyzers>true</UseBannedApiAnalyzers>
   </PropertyGroup>
   <ItemGroup>
     <EmbeddedResource Include="Html.xslt" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
-    <Reference Include="System" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="$(RepoRoot)src\Microsoft.TestPlatform.TestHostProvider\Properties\TestExtensionTypesAttribute.cs" Link="Properties\TestExtensionTypesAttribute.cs" />
     <Compile Include="..\..\shared\NullableAttributes.cs" Link="NullableAttributes.cs" />
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net6.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net48/PublicAPI.Shipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net6.0/PublicAPI.Shipped.txt
rename to src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net48/PublicAPI.Shipped.txt
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net6.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net48/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net6.0/PublicAPI.Unshipped.txt
rename to src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net48/PublicAPI.Unshipped.txt
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 a19675874c..3f81980538 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj
@@ -3,7 +3,12 @@
 
   <PropertyGroup>
     <AssemblyName>Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger</AssemblyName>
-    <TargetFrameworks>netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
+    <!--
+      Targetting netstandard2.0 and also net462, because we already had explicit packaging of net462 libraries,
+      and this article recommends to provide net462 along netstandard2.0
+      https://learn.microsoft.com/en-us/dotnet/standard/library-guidance/cross-platform-targeting#multi-targeting
+    -->
+    <TargetFrameworks>$(ExtensionTargetFrameworks);net462</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
 
@@ -23,13 +28,6 @@
     <NuspecProperty Include="SrcPackageFolder=$(SrcPackageFolder)" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
-    <Reference Include="System" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Include="$(RepoRoot)src\Microsoft.TestPlatform.TestHostProvider\Properties\TestExtensionTypesAttribute.cs" Link="Properties\TestExtensionTypesAttribute.cs" />
   </ItemGroup>
@@ -39,12 +37,9 @@
     <ProjectReference Include="$(RepoRoot)src\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="System.Security.Principal.Windows" Version="4.0.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-    <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
+  <ItemGroup>
+    <!-- On .NET5 and newer this dependency moved to be shipped inbox. -->
+    <PackageReference Include="System.Security.Principal.Windows" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net5')) != true" Version="$(SystemSecurityPrincipalWindowsVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
index 9278611cbd..034807a589 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
+++ b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <AssemblyName>Microsoft.VisualStudio.TestPlatform.ObjectModel</AssemblyName>
-    <TargetFrameworks>net7.0;$(NetFrameworkMinimum);$(NetCoreAppMinimum);netstandard2.0;</TargetFrameworks>
+    <TargetFrameworks>$(TestHostMinimumTargetFrameworks);$(ExtensionTargetFrameworks)</TargetFrameworks>
     <!-- Suppress warning that is caused by Nuget.Frameworks code that we copy. -->
     <NoWarn>$(NoWarn);SYSLIB0051</NoWarn>
   </PropertyGroup>
@@ -23,7 +23,7 @@
     <ProjectReference Include="..\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <Reference Include="System.Xml" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Runtime" />
@@ -33,7 +33,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Reflection.Metadata" Version="1.6.0" />
+    <!-- net48 includes tuple, we need to reference it in previous versions but only on .net framework. -->
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" 
+        Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net48')) != true
+                    and $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net4'))" />
+    <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.nuspec b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.nuspec
index 105050657a..e0781a6594 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.nuspec
+++ b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.nuspec
@@ -5,15 +5,15 @@
 
     <dependencies>
       <group targetFramework="net462">
-        <dependency id="System.Reflection.Metadata" version="[1.6.0, )" />
+        <dependency id="System.Reflection.Metadata" version="[8.0.0, )" />
       </group>
 
-      <group targetFramework="netcoreapp3.1">
-        <dependency id="System.Reflection.Metadata" version="[1.6.0, )" />
+      <group targetFramework="net8.0">
+        <dependency id="System.Reflection.Metadata" version="[8.0.0, )" />
       </group>
 
       <group targetFramework="netstandard2.0">
-        <dependency id="System.Reflection.Metadata" version="[1.6.0, )" />
+        <dependency id="System.Reflection.Metadata" version="[8.0.0, )" />
       </group>
     </dependencies>
 
@@ -67,16 +67,16 @@
     <file src="net462\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll"             target="lib\net462\zh-Hant" />
     <!-- /net462 -->
 
-    <!-- netcoreapp3.1 -->
-    <file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="lib\netcoreapp3.1\" />
-    <file src="netcoreapp3.1\Microsoft.TestPlatform.CoreUtilities.dll"            target="lib\netcoreapp3.1\" />
-    <file src="netcoreapp3.1\Microsoft.TestPlatform.PlatformAbstractions.dll"     target="lib\netcoreapp3.1\" />
+    <!-- net8.0 -->
+    <file src="net8.0\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="lib\net8.0\" />
+    <file src="net8.0\Microsoft.TestPlatform.CoreUtilities.dll"            target="lib\net8.0\" />
+    <file src="net8.0\Microsoft.TestPlatform.PlatformAbstractions.dll"     target="lib\net8.0\" />
 
 
     <!-- Add localized resources -->
-    <file src="netcoreapp3.1\**\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"   exclude="**\TestHost*\**\*.*" target="lib\netcoreapp3.1\" />
-    <file src="netcoreapp3.1\**\Microsoft.TestPlatform.CoreUtilities.resources.dll"               exclude="**\TestHost*\**\*.*" target="lib\netcoreapp3.1\" />
-    <!-- /netcoreapp3.1 -->
+    <file src="net8.0\**\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"   exclude="**\TestHost*\**\*.*" target="lib\net8.0\" />
+    <file src="net8.0\**\Microsoft.TestPlatform.CoreUtilities.resources.dll"               exclude="**\TestHost*\**\*.*" target="lib\net8.0\" />
+    <!-- /net8.0 -->
 
     <!-- netstandard 2.0 -->
     <file src="netstandard2.0\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="lib\netstandard2.0\" />
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/PublicAPI.Shipped.txt
index 221f78d7d1..681d90bb9e 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/PublicAPI.Shipped.txt
+++ b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/PublicAPI.Shipped.txt
@@ -970,7 +970,6 @@ static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.UapConstants.Uap
 virtual Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.Properties.get -> System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty!>!
 virtual Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.ProtectedGetPropertyValue(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty! property, object? defaultValue) -> object?
 virtual Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.ProtectedSetPropertyValue(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty! property, object? value) -> void
-virtual Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateValueCallback.Invoke(object? value) -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.RiscV64 = 8 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.CaptureStandardOutput.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.ForwardStandardOutput.get -> bool
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net7.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net6.0/PublicAPI.Shipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net7.0/PublicAPI.Shipped.txt
rename to src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net6.0/PublicAPI.Shipped.txt
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netcoreapp3.1/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net6.0/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netcoreapp3.1/PublicAPI.Unshipped.txt
rename to src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net6.0/PublicAPI.Unshipped.txt
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netcoreapp3.1/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net8.0/PublicAPI.Shipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netcoreapp3.1/PublicAPI.Shipped.txt
rename to src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net8.0/PublicAPI.Shipped.txt
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net6.0_and_net7.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net8.0/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net6.0_and_net7.0/PublicAPI.Unshipped.txt
rename to src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net8.0/PublicAPI.Unshipped.txt
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj
index 5aae32c1cb..7bc1805000 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj
@@ -4,22 +4,12 @@
   <PropertyGroup>
     <AssemblyName>Microsoft.TestPlatform.PlatformAbstractions</AssemblyName>
     <RootNamespace>Microsoft.TestPlatform.PlatformAbstractions</RootNamespace>
-    <TargetFrameworks>net7.0;$(NetFrameworkMinimum);$(NetCoreAppMinimum);netstandard2.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>$(TestHostMinimumTargetFrameworks);$(ExtensionTargetFrameworks)</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
     <NoWarn>$(NoWarn);NU1605</NoWarn>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetCoreAppMinimum)' ">
-    <PackageReference Include="System.Threading.Thread" Version="4.0.0" />
-    <PackageReference Include="System.Diagnostics.Process" Version="4.1.0" />
-    <PackageReference Include="System.Diagnostics.TextWriterTraceListener" Version="4.0.0" />
-    <PackageReference Include="System.Diagnostics.TraceSource" Version="4.0.0" />
-    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.0.0" />
-    <PackageReference Include="System.Runtime.Loader" Version="4.0.0" />
-    <PackageReference Include="System.Net.Http" Version="$(SystemNetHttpVersion)" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <Reference Include="System.Configuration" />
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
@@ -32,11 +22,11 @@
     <AdditionalFiles Include="PublicAPI\net\PublicAPI.Shipped.txt" />
     <AdditionalFiles Include="PublicAPI\net\PublicAPI.Unshipped.txt" />
     <!-- Framework specific API -->
-    <AdditionalFiles Condition=" '$(TargetFramework)' != 'net6.0' and '$(TargetFramework)' != 'net7.0' " Include="PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" />
-    <AdditionalFiles Condition=" '$(TargetFramework)' != 'net6.0' and '$(TargetFramework)' != 'net7.0' " Include="PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
-    <!-- Framework specific API for Net6.0 and Net7.0 -->
-    <AdditionalFiles Condition=" '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0' " Include="PublicAPI/net6.0_and_net7.0/PublicAPI.Shipped.txt" />
-    <AdditionalFiles Condition=" '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0' " Include="PublicAPI/net6.0_and_net7.0/PublicAPI.Unshipped.txt" />
+    <AdditionalFiles Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))&#xD;&#xA;                                or '$(TargetFramework)' == 'netstandard2.0' " Include="PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))&#xD;&#xA;                                or '$(TargetFramework)' == 'netstandard2.0' " Include="PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
+    <!-- Framework specific API for net8.0+ -->
+    <AdditionalFiles Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)')) " Include="PublicAPI\net8.0\PublicAPI.Shipped.txt" />
+    <AdditionalFiles Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)')) " Include="PublicAPI\net8.0\PublicAPI.Unshipped.txt" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/PublicAPI.Shipped.txt
index 60e7d5e4a9..99667b0d8c 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/PublicAPI.Shipped.txt
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/PublicAPI.Shipped.txt
@@ -119,6 +119,5 @@ Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ThreadApartmentStateNot
 static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.ErrorOnInitialization.get -> string?
 static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.ErrorOnInitialization.set -> void
 static Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyExtensions.GetAssemblyLocation(this System.Reflection.Assembly! assembly) -> string!
-virtual Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.AssemblyResolveEventHandler.Invoke(object? sender, Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.AssemblyResolveEventArgs? args) -> System.Reflection.Assembly?
 virtual Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyResolver.Dispose(bool disposing) -> void
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture.RiscV64 = 6 -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net6.0_and_net7.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net8.0/PublicAPI.Shipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net6.0_and_net7.0/PublicAPI.Shipped.txt
rename to src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net8.0/PublicAPI.Shipped.txt
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net8.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..ab058de62d
--- /dev/null
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net8.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DefaultTestHostManager.cs b/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DefaultTestHostManager.cs
index 21b343dad7..ffddd06178 100644
--- a/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DefaultTestHostManager.cs
+++ b/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DefaultTestHostManager.cs
@@ -194,7 +194,7 @@ public virtual TestProcessStartInfo GetTestHostProcessStartInfo(
         if (!_fileHelper.Exists(testhostProcessPath))
         {
             // We assume that we could not find testhost.exe in the root folder so we are going to lookup in the
-            // TestHostNetFramework folder (assuming we are currently running under netcoreapp3.1) or in dotnet SDK
+            // TestHostNetFramework folder (assuming we are currently running under .NET) or in dotnet SDK
             // context.
             testHostProcessName = Path.Combine("TestHostNetFramework", originalTestHostProcessName);
             testhostProcessPath = Path.Combine(currentWorkingDirectory, "..", testHostProcessName);
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs b/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs
index 70c9481a8f..a20519373b 100644
--- a/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs
+++ b/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs
@@ -306,8 +306,8 @@ public virtual TestProcessStartInfo GetTestHostProcessStartInfo(
                 testHostPath = GetTestHostPath(runtimeConfigDevPath, depsFilePath, sourceDirectory);
                 if (!testHostPath.IsNullOrWhiteSpace() && testHostPath.IndexOf("microsoft.testplatform.testhost", StringComparison.OrdinalIgnoreCase) >= 0)
                 {
-                    // testhost.dll is present in path {testHostNugetRoot}\lib\netcoreapp3.1\testhost.dll
-                    // testhost.(x86).exe is present in location {testHostNugetRoot}\build\netcoreapp3.1\{x86/x64}\{testhost.x86.exe/testhost.exe}
+                    // testhost.dll is present in path {testHostNugetRoot}\lib\net8.0\testhost.dll
+                    // testhost.(x86).exe is present in location {testHostNugetRoot}\build\net8.0\{x86/x64}\{testhost.x86.exe/testhost.exe}
                     var folderName = _architecture is Architecture.X64 or Architecture.Default or Architecture.AnyCPU
                         ? Architecture.X64.ToString().ToLowerInvariant()
                         : _architecture.ToString().ToLowerInvariant();
@@ -321,7 +321,7 @@ public virtual TestProcessStartInfo GetTestHostProcessStartInfo(
                         testHostExeNugetPath = Path.Combine(testHostNugetRoot.FullName, "build", "net9.0", folderName, exeName);
                     }
 #else
-                    var testHostExeNugetPath = Path.Combine(testHostNugetRoot.FullName, "build", "netcoreapp3.1", folderName, exeName);
+                    var testHostExeNugetPath = Path.Combine(testHostNugetRoot.FullName, "build", "net8.0", folderName, exeName);
 #endif
 
                     if (_fileHelper.Exists(testHostExeNugetPath))
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj b/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj
index 8191a31a24..3bd5ea9246 100644
--- a/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj
+++ b/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj
@@ -3,11 +3,14 @@
 
   <PropertyGroup>
     <AssemblyName>Microsoft.TestPlatform.TestHostRuntimeProvider</AssemblyName>
-    <TargetFrameworks>net7.0;net6.0;netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
+    <!--
+      This project is client that is used only by runners, and shipped only in runner packages.
+    -->
+    <TargetFrameworks>$(NetFrameworkRunnerTargetFramework);$(ExtensionTargetFrameworks)</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
     <UseBannedApiAnalyzers>true</UseBannedApiAnalyzers>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <Reference Include="System" />
     <Reference Include="System.Runtime" />
     <Reference Include="System.Configuration" />
@@ -26,7 +29,6 @@
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.1" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
   </ItemGroup>
   <ItemGroup>
     <Compile Update="NullableHelpers.cs">
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net7.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net48/PublicAPI.Shipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net7.0/PublicAPI.Shipped.txt
rename to src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net48/PublicAPI.Shipped.txt
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net7.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net48/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net7.0/PublicAPI.Unshipped.txt
rename to src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net48/PublicAPI.Unshipped.txt
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net462/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net8.0/PublicAPI.Shipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net462/PublicAPI.Shipped.txt
rename to src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net8.0/PublicAPI.Shipped.txt
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net462/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net8.0/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net462/PublicAPI.Unshipped.txt
rename to src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net8.0/PublicAPI.Unshipped.txt
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net462/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net9.0/PublicAPI.Shipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net462/PublicAPI.Shipped.txt
rename to src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net9.0/PublicAPI.Shipped.txt
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net462/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net9.0/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net462/PublicAPI.Unshipped.txt
rename to src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net9.0/PublicAPI.Unshipped.txt
diff --git a/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj b/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj
index 71ae94e3ed..8fd6b0b3cd 100644
--- a/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj
+++ b/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj
@@ -3,15 +3,9 @@
 
   <PropertyGroup>
     <AssemblyName>Microsoft.TestPlatform.Utilities</AssemblyName>
-    <TargetFrameworks>net7.0;netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
+    <TargetFrameworks>$(NetFrameworkMinimum);$(ExtensionTargetFrameworks)</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == '$(NetFrameworkMinimum)'">
-    <Reference Include="System" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
     <ProjectReference Include="..\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net6.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Utilities/PublicAPI/net8.0/PublicAPI.Shipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net6.0/PublicAPI.Shipped.txt
rename to src/Microsoft.TestPlatform.Utilities/PublicAPI/net8.0/PublicAPI.Shipped.txt
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net6.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Utilities/PublicAPI/net8.0/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net6.0/PublicAPI.Unshipped.txt
rename to src/Microsoft.TestPlatform.Utilities/PublicAPI/net8.0/PublicAPI.Unshipped.txt
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 a9278a3e86..cda5cf5075 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <AssemblyName>Microsoft.TestPlatform.VsTestConsole.TranslationLayer</AssemblyName>
-    <TargetFrameworks>net7.0;net6.0;netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
+    <TargetFrameworks>$(LibraryTargetFrameworks)</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
 
@@ -34,7 +34,7 @@
     <ProjectReference Include="..\Microsoft.TestPlatform.CommunicationUtilities\Microsoft.TestPlatform.CommunicationUtilities.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <Reference Include="System.Xml" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System" />
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net7.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net8.0/PublicAPI.Shipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net7.0/PublicAPI.Shipped.txt
rename to src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net8.0/PublicAPI.Shipped.txt
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net7.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net8.0/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net7.0/PublicAPI.Unshipped.txt
rename to src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net8.0/PublicAPI.Unshipped.txt
diff --git a/src/SettingsMigrator/SettingsMigrator.csproj b/src/SettingsMigrator/SettingsMigrator.csproj
index 23ea657fd7..e87d54f8dc 100644
--- a/src/SettingsMigrator/SettingsMigrator.csproj
+++ b/src/SettingsMigrator/SettingsMigrator.csproj
@@ -3,16 +3,19 @@
 
   <PropertyGroup>
     <AssemblyName>SettingsMigrator</AssemblyName>
-    <TargetFrameworks>net7.0;$(NetFrameworkMinimum)</TargetFrameworks>
+    <!--
+      Shipped with TestPlatform package.
+    -->
+    <TargetFrameworks>$(NetFrameworkRunnerTargetFramework)</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <IsTestProject>false</IsTestProject>
-    <Prefer32Bit Condition="$(TargetFramework.StartsWith('net4'))">true</Prefer32Bit>
+    <Prefer32Bit Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">true</Prefer32Bit>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' == '$(NetFrameworkMinimum)'">
+  <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <Reference Include="System" />
     <Reference Include="System.IO" />
     <Reference Include="System.Runtime" />
diff --git a/src/datacollector.arm64/datacollector.arm64.csproj b/src/datacollector.arm64/datacollector.arm64.csproj
index bb147867ac..c2584b21dc 100644
--- a/src/datacollector.arm64/datacollector.arm64.csproj
+++ b/src/datacollector.arm64/datacollector.arm64.csproj
@@ -9,16 +9,17 @@
 
   <PropertyGroup>
     <AssemblyName>datacollector.arm64</AssemblyName>
-    <TargetFrameworks>$(NetCoreAppMinimum)</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'WINDOWS_NT' ">$(TargetFrameworks);net472;$(NetFrameworkMinimum)</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' != 'WINDOWS_NT' ">$(TargetFrameworks);$(NetFrameworkMinimum)</TargetFrameworks>
-    <TargetFrameworks>$(TargetFrameworks);net7.0;net6.0;</TargetFrameworks>
-    <RuntimeIdentifier Condition="$(TargetFramework.StartsWith('net4'))">win10-arm64</RuntimeIdentifier>
+    <TargetFrameworks>$(RunnerTargetFrameworks)</TargetFrameworks>
+    <RuntimeIdentifier Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">win10-arm64</RuntimeIdentifier>
     <!-- Setting both RuntimeIdentifier and PlatformTarget ends up building as AnyCPU and selecting the default x86 architecture, irregardles of RuntimeIdentifier,
     so order here matters. -->
-    <PlatformTarget Condition=" $(TargetFramework.StartsWith('net4')) AND '$(RuntimeIdentifier)' == '' ">AnyCPU</PlatformTarget>
+    <PlatformTarget Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) AND '$(RuntimeIdentifier)' == '' ">AnyCPU</PlatformTarget>
     <OutputType>Exe</OutputType>
-    <!-- Prevent the creation of the ".exe" for .NET Core. This was the default on .NET Core 2.1, behavior changed for .NET Core 3.1 -->
+    <!--
+      Prevent the creation of the ".exe" for .NET Core. This was the default on .NET Core 2.1, behavior changed for .NET Core 3.1.
+      We don't want the exe because we will start datacollector via dotnet exec datacollector.dll, because we don't know on which
+      OS or architecture we will be running. So there is no point in shipping the exe.
+    -->
     <UseAppHost>false</UseAppHost>
     <RollForward>Major</RollForward>
     <IsTestProject>false</IsTestProject>
@@ -52,7 +53,7 @@
     <AdditionalFiles Include="..\datacollector\PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
   </ItemGroup>
 
-  <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Xml" />
diff --git a/src/Microsoft.TestPlatform.Utilities/PublicAPI/net6.0/PublicAPI.Shipped.txt b/src/datacollector/PublicAPI/net48/PublicAPI.Shipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.Utilities/PublicAPI/net6.0/PublicAPI.Shipped.txt
rename to src/datacollector/PublicAPI/net48/PublicAPI.Shipped.txt
diff --git a/src/Microsoft.TestPlatform.Utilities/PublicAPI/net6.0/PublicAPI.Unshipped.txt b/src/datacollector/PublicAPI/net48/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.Utilities/PublicAPI/net6.0/PublicAPI.Unshipped.txt
rename to src/datacollector/PublicAPI/net48/PublicAPI.Unshipped.txt
diff --git a/src/datacollector/PublicAPI/net6.0/PublicAPI.Shipped.txt b/src/datacollector/PublicAPI/net6.0/PublicAPI.Shipped.txt
deleted file mode 100644
index 7dc5c58110..0000000000
--- a/src/datacollector/PublicAPI/net6.0/PublicAPI.Shipped.txt
+++ /dev/null
@@ -1 +0,0 @@
-#nullable enable
diff --git a/src/datacollector/PublicAPI/net6.0/PublicAPI.Unshipped.txt b/src/datacollector/PublicAPI/net6.0/PublicAPI.Unshipped.txt
deleted file mode 100644
index 7dc5c58110..0000000000
--- a/src/datacollector/PublicAPI/net6.0/PublicAPI.Unshipped.txt
+++ /dev/null
@@ -1 +0,0 @@
-#nullable enable
diff --git a/src/datacollector/PublicAPI/net7.0/PublicAPI.Shipped.txt b/src/datacollector/PublicAPI/net7.0/PublicAPI.Shipped.txt
deleted file mode 100644
index 7dc5c58110..0000000000
--- a/src/datacollector/PublicAPI/net7.0/PublicAPI.Shipped.txt
+++ /dev/null
@@ -1 +0,0 @@
-#nullable enable
diff --git a/src/datacollector/PublicAPI/net7.0/PublicAPI.Unshipped.txt b/src/datacollector/PublicAPI/net7.0/PublicAPI.Unshipped.txt
deleted file mode 100644
index 7dc5c58110..0000000000
--- a/src/datacollector/PublicAPI/net7.0/PublicAPI.Unshipped.txt
+++ /dev/null
@@ -1 +0,0 @@
-#nullable enable
diff --git a/src/Microsoft.TestPlatform.Utilities/PublicAPI/net7.0/PublicAPI.Shipped.txt b/src/datacollector/PublicAPI/net8.0/PublicAPI.Shipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.Utilities/PublicAPI/net7.0/PublicAPI.Shipped.txt
rename to src/datacollector/PublicAPI/net8.0/PublicAPI.Shipped.txt
diff --git a/src/Microsoft.TestPlatform.Utilities/PublicAPI/net7.0/PublicAPI.Unshipped.txt b/src/datacollector/PublicAPI/net8.0/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.Utilities/PublicAPI/net7.0/PublicAPI.Unshipped.txt
rename to src/datacollector/PublicAPI/net8.0/PublicAPI.Unshipped.txt
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net6.0/PublicAPI.Shipped.txt b/src/datacollector/PublicAPI/net9.0/PublicAPI.Shipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net6.0/PublicAPI.Shipped.txt
rename to src/datacollector/PublicAPI/net9.0/PublicAPI.Shipped.txt
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net6.0/PublicAPI.Unshipped.txt b/src/datacollector/PublicAPI/net9.0/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net6.0/PublicAPI.Unshipped.txt
rename to src/datacollector/PublicAPI/net9.0/PublicAPI.Unshipped.txt
diff --git a/src/datacollector/PublicAPI/netcoreapp3.1/PublicAPI.Shipped.txt b/src/datacollector/PublicAPI/netcoreapp3.1/PublicAPI.Shipped.txt
deleted file mode 100644
index 7dc5c58110..0000000000
--- a/src/datacollector/PublicAPI/netcoreapp3.1/PublicAPI.Shipped.txt
+++ /dev/null
@@ -1 +0,0 @@
-#nullable enable
diff --git a/src/datacollector/PublicAPI/netcoreapp3.1/PublicAPI.Unshipped.txt b/src/datacollector/PublicAPI/netcoreapp3.1/PublicAPI.Unshipped.txt
deleted file mode 100644
index 7dc5c58110..0000000000
--- a/src/datacollector/PublicAPI/netcoreapp3.1/PublicAPI.Unshipped.txt
+++ /dev/null
@@ -1 +0,0 @@
-#nullable enable
diff --git a/src/datacollector/app.config b/src/datacollector/app.config
index 439c6d5fd8..8e3b9f898c 100644
--- a/src/datacollector/app.config
+++ b/src/datacollector/app.config
@@ -20,6 +20,18 @@
         <assemblyIdentity name="Microsoft.Extensions.FileSystemGlobbing" publicKeyToken="adb9793829ddae60" culture="neutral" />
         <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="1.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="1.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="1.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/src/datacollector/datacollector.csproj b/src/datacollector/datacollector.csproj
index 6c7facedc0..94ba8f6058 100644
--- a/src/datacollector/datacollector.csproj
+++ b/src/datacollector/datacollector.csproj
@@ -9,13 +9,14 @@
 
   <PropertyGroup>
     <AssemblyName>datacollector</AssemblyName>
-    <TargetFrameworks>$(NetCoreAppMinimum)</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'WINDOWS_NT' ">$(TargetFrameworks);net472;$(NetFrameworkMinimum)</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' != 'WINDOWS_NT' ">$(TargetFrameworks);$(NetFrameworkMinimum)</TargetFrameworks>
-    <TargetFrameworks>$(TargetFrameworks);net7.0;net6.0</TargetFrameworks>
-    <PlatformTarget Condition=" $(TargetFramework.StartsWith('net4')) AND '$(RuntimeIdentifier)' == '' ">AnyCPU</PlatformTarget>
+    <TargetFrameworks>$(RunnerTargetFrameworks)</TargetFrameworks>
+    <PlatformTarget Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) AND '$(RuntimeIdentifier)' == '' ">AnyCPU</PlatformTarget>
     <OutputType>Exe</OutputType>
-    <!-- Prevent the creation of the ".exe" for .NET Core. This was the default on .NET Core 2.1, behavior changed for .NET Core 3.1 -->
+    <!--
+      Prevent the creation of the ".exe" for .NET Core. This was the default on .NET Core 2.1, behavior changed for .NET Core 3.1.
+      We don't want the exe because we will start datacollector via dotnet exec datacollector.dll, because we don't know on which
+      OS or architecture we will be running. So there is no point in shipping the exe.
+    -->
     <UseAppHost>false</UseAppHost>
     <RollForward>Major</RollForward>
     <IsTestProject>false</IsTestProject>
@@ -23,7 +24,7 @@
     <MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);MSB3276</MSBuildWarningsAsMessages>
   </PropertyGroup>
 
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
+  <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
   </PropertyGroup>
 
@@ -39,7 +40,7 @@
     </ProjectReference>
   </ItemGroup>
 
-  <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Xml" />
diff --git a/src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.csproj b/src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.csproj
index 961ffc151c..64ed693b4c 100644
--- a/src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.csproj
+++ b/src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.csproj
@@ -1,6 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetFrameworkMinimum)</TargetFrameworks>
+    <!--
+      This is shipped as nuget package, it needs to be installable to all projects that would be able to run
+      via testhost. The dlls will then be loaded by datacollector, which will have the same or newer TFMs.
+    -->
+    <TargetFrameworks>$(TestHostMinimumTargetFrameworks);$(ExtensionTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.nuspec b/src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.nuspec
index 530ba92536..4f6491dc4a 100644
--- a/src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.nuspec
+++ b/src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.nuspec
@@ -5,7 +5,7 @@
 
     <dependencies>
       <group targetFramework="net462"></group>
-      <group targetFramework="netcoreapp3.1"></group>
+      <group targetFramework="net8.0"></group>
     </dependencies>
   </metadata>
 
@@ -62,7 +62,7 @@
     <file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\macos\x64\libInstrumentationEngine.dylib"	target="build\netstandard2.0\macos\x64\libInstrumentationEngine.dylib" />
     <file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\macos\x64\Cov_x64.config"	target="build\netstandard2.0\macos\x64\Cov_x64.config" />
 
-    <file src="net462\Microsoft.Internal.CodeCoverage\Shim\netcoreapp1.0\Microsoft.VisualStudio.CodeCoverage.Shim.dll" target="lib\netcoreapp3.1\" />
+    <file src="net462\Microsoft.Internal.CodeCoverage\Shim\netcoreapp1.0\Microsoft.VisualStudio.CodeCoverage.Shim.dll" target="lib\net8.0\" />
     <file src="net462\Microsoft.Internal.CodeCoverage\Shim\net45\Microsoft.VisualStudio.CodeCoverage.Shim.dll" target="lib\net462\" />
 
 
diff --git a/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.nuspec b/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.nuspec
index e95212b77a..54e0694f48 100644
--- a/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.nuspec
+++ b/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.nuspec
@@ -4,7 +4,7 @@
     $CommonMetadataElements$
 
     <dependencies>
-      <group targetFramework="netcoreapp3.1">
+      <group targetFramework="net8.0">
         <dependency id="Microsoft.TestPlatform.TestHost" version="$Version$" />
         <dependency id="Microsoft.CodeCoverage" version="$Version$" />
       </group>
@@ -18,14 +18,14 @@
   <files>
     $CommonFileElements$
 
-    <file src="netstandard2.0\netcoreapp\*" target="build\netcoreapp3.1\" />
+    <file src="netstandard2.0\netcoreapp\*" target="build\net8.0\" />
     <file src="netstandard2.0\netfx\*" target="build\net462\" />
 
     <file src="netstandard2.0\Microsoft.NET.Test.Sdk.props" target="buildMultiTargeting\" />
-    <file src="netstandard2.0\Microsoft.NET.Test.Sdk.props" target="build\netcoreapp3.1\" />
+    <file src="netstandard2.0\Microsoft.NET.Test.Sdk.props" target="build\net8.0\" />
     <file src="netstandard2.0\Microsoft.NET.Test.Sdk.props" target="build\net462\" />
 
-    <file src="netstandard2.0\_._" target="lib/netcoreapp3.1" />
+    <file src="netstandard2.0\_._" target="lib/net8.0" />
     <file src="netstandard2.0\_._" target="lib/net462" />
   </files>
 </package>
diff --git a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj
index b9f8595348..6881b77466 100644
--- a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj
+++ b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppMinimum);$(NetFrameworkMinimum);net47;net471;net472;net48</TargetFrameworks>
+    <TargetFrameworks>$(NetSDKTargetFramework);$(TestHostAllTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -39,24 +39,41 @@
     <MSBuildWarningsAsMessages>NU1702</MSBuildWarningsAsMessages>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\datacollector\datacollector.csproj" />
-    <ProjectReference Include="..\..\datacollector.arm64\datacollector.arm64.csproj" />
-    <ProjectReference Include="..\..\testhost\testhost.csproj" />
-    <ProjectReference Include="..\..\testhost.x86\testhost.x86.csproj" />
-    <ProjectReference Include="..\..\testhost.arm64\testhost.arm64.csproj" />
+  <!-- runner and runner dependencies -->
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetSDKTargetFramework)'))
+                        or '$(DotNetBuildSourceOnly)' == 'true'">
     <ProjectReference Include="..\..\vstest.console\vstest.console.csproj" />
-    <ProjectReference Include="..\..\DataCollectors\Microsoft.TestPlatform.Extensions.EventLogCollector\Microsoft.TestPlatform.Extensions.EventLogCollector.csproj" />
+    <!-- EventLogCollector only works on Windows and .NET Framework. -->
+    <ProjectReference Include="..\..\DataCollectors\Microsoft.TestPlatform.Extensions.EventLogCollector\Microsoft.TestPlatform.Extensions.EventLogCollector.csproj"
+                      SetTargetFramework="TargetFramework=$(NetFrameworkRunnerTargetFramework)"
+                      Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
     <ProjectReference Include="..\..\Microsoft.TestPlatform.Extensions.BlameDataCollector\Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj" />
     <ProjectReference Include="..\..\Microsoft.TestPlatform.Extensions.TrxLogger\Microsoft.TestPlatform.Extensions.TrxLogger.csproj" />
     <ProjectReference Include="..\..\Microsoft.TestPlatform.Extensions.HtmlLogger\Microsoft.TestPlatform.Extensions.HtmlLogger.csproj" />
     <ProjectReference Include="..\..\Microsoft.TestPlatform.TestHostProvider\Microsoft.TestPlatform.TestHostProvider.csproj" />
   </ItemGroup>
 
+  <!-- datacollectors are taken from both .NET and .NET Framework -->
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetSDKTargetFramework)'))
+              or $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkRunnerTargetFramework)'))
+              or '$(DotNetBuildSourceOnly)' == 'true'">
+    <ProjectReference Include="..\..\datacollector\datacollector.csproj" />
+    <ProjectReference Include="..\..\datacollector.arm64\datacollector.arm64.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\testhost\testhost.csproj" />
+    <ProjectReference Include="..\..\testhost.x86\testhost.x86.csproj" />
+    <ProjectReference Include="..\..\testhost.arm64\testhost.arm64.csproj" />
+  </ItemGroup>
+
   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
-    <ProjectReference Include="..\..\DataCollectors\DumpMinitool\DumpMinitool.csproj" />
-    <ProjectReference Include="..\..\DataCollectors\DumpMinitool.arm64\DumpMinitool.arm64.csproj" />
-    <ProjectReference Include="..\..\DataCollectors\DumpMinitool.x86\DumpMinitool.x86.csproj" />
+    <!-- We are forcing the reference here to .NET Framework project for both .NET and .NET Framework builds.
+    This is because we are offloading the dumping to this tool on Windows, and we need this tool to run anywhere with any selected architecture, and using .NET Framework (or eventually .NET Native)
+    prevents us from having to lookup the correct .NET runtime. -->
+    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool\DumpMinitool.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkMinimum)" />
+    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool.x86\DumpMinitool.x86.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkMinimum)" />
+    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool.arm64\DumpMinitool.arm64.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkMinimum)" />
   </ItemGroup>
 
   <ItemGroup>
@@ -65,8 +82,8 @@
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" GeneratePathProperty="true" />
     <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingVersion)" GeneratePathProperty="true" />
     <PackageReference Include="Microsoft.Diagnostics.NETCore.Client" Version="$(MicrosoftDiagnosticsNETCoreClientVersion)" PrivateAssets="All" GeneratePathProperty="true" />
-    <PackageReference Include="Microsoft.Internal.Dia" Version="$(TestPlatformMSDiaVersion)" PrivateAssets="All" GeneratePathProperty="true" Condition="'$(TargetFramework)'=='net472'" />
-    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" GeneratePathProperty="true" Condition="'$(TargetFramework)' != 'net472'" />
+    <PackageReference Include="Microsoft.Internal.Dia" Version="$(TestPlatformMSDiaVersion)" PrivateAssets="All" GeneratePathProperty="true" Condition="'$(TargetFramework)'=='$(NetFrameworkRunnerTargetFramework)'" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" GeneratePathProperty="true" Condition="'$(TargetFramework)' != 'NetFrameworkRunnerTargetFramework'" />
   </ItemGroup>
 
   <Target Name="CopyFiles" AfterTargets="Build">
diff --git a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.nuspec b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.nuspec
index e5d37dcb48..905e3042f3 100644
--- a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.nuspec
+++ b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.nuspec
@@ -13,408 +13,414 @@
     <!-- Add a third party notice file -->
     <file src="$SrcPackageFolder$ThirdPartyNotices.txt" target="" />
 
-    <file src="netcoreapp3.1\datacollector.dll" target="contentFiles\any\netcoreapp3.1" />
-    <file src="netcoreapp3.1\datacollector.dll.config" target="contentFiles\any\netcoreapp3.1" />
-    <file src="netcoreapp3.1\datacollector.deps.json" target="contentFiles\any\netcoreapp3.1" />
-    <file src="netcoreapp3.1\datacollector.runtimeconfig.json" target="contentFiles\any\netcoreapp3.1" />
-
-    <file src="netcoreapp3.1\Microsoft.CodeCoverage.IO\Microsoft.CodeCoverage.IO.dll" target="contentFiles\any\netcoreapp3.1" />
-    <file src="netcoreapp3.1\Microsoft.Extensions.DependencyModel\Microsoft.Extensions.DependencyModel.dll" target="contentFiles\any\netcoreapp3.1" />
-    <file src="netcoreapp3.1\Microsoft.Extensions.FileSystemGlobbing\Microsoft.Extensions.FileSystemGlobbing.dll" target="contentFiles\any\netcoreapp3.1" />
-
-    <file src="netcoreapp3.1\Microsoft.TestPlatform.CommunicationUtilities.dll" target="contentFiles\any\netcoreapp3.1" />
-    <file src="netcoreapp3.1\Microsoft.TestPlatform.CoreUtilities.dll" target="contentFiles\any\netcoreapp3.1" />
-    <file src="netcoreapp3.1\Microsoft.TestPlatform.CrossPlatEngine.dll" target="contentFiles\any\netcoreapp3.1" />
-    <file src="netcoreapp3.1\Microsoft.TestPlatform.PlatformAbstractions.dll" target="contentFiles\any\netcoreapp3.1" />
-    <file src="netcoreapp3.1\Microsoft.TestPlatform.Utilities.dll" target="contentFiles\any\netcoreapp3.1" />
-    <file src="netcoreapp3.1\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" target="contentFiles\any\netcoreapp3.1" />
-    <file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.Client.dll" target="contentFiles\any\netcoreapp3.1" />
-    <file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.Common.dll" target="contentFiles\any\netcoreapp3.1" />
-    <file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="contentFiles\any\netcoreapp3.1" />
-
-    <file src="netcoreapp3.1\Newtonsoft.Json\Newtonsoft.Json.dll" target="contentFiles\any\netcoreapp3.1" />
-    <file src="netcoreapp3.1\System.ComponentModel.Composition.dll" target="contentFiles\any\netcoreapp3.1" />
-
-    <file src="$TesthostRuntimeconfig$\testhost-1.0.runtimeconfig.json" target="contentFiles\any\netcoreapp3.1" />
-    <file src="$TesthostRuntimeconfig$\testhost-1.1.runtimeconfig.json" target="contentFiles\any\netcoreapp3.1" />
-    <file src="$TesthostRuntimeconfig$\testhost-2.0.runtimeconfig.json" target="contentFiles\any\netcoreapp3.1" />
-    <file src="$TesthostRuntimeconfig$\testhost-2.1.runtimeconfig.json" target="contentFiles\any\netcoreapp3.1" />
-    <file src="$TesthostRuntimeconfig$\testhost-3.0.runtimeconfig.json" target="contentFiles\any\netcoreapp3.1" />
-    <file src="$TesthostRuntimeconfig$\testhost-3.1.runtimeconfig.json" target="contentFiles\any\netcoreapp3.1" />
-    <file src="$TesthostRuntimeconfig$\testhost-5.0.runtimeconfig.json" target="contentFiles\any\netcoreapp3.1" />
-    <file src="$TesthostRuntimeconfig$\testhost-6.0.runtimeconfig.json" target="contentFiles\any\netcoreapp3.1" />
-    <file src="$TesthostRuntimeconfig$\testhost-7.0.runtimeconfig.json" target="contentFiles\any\netcoreapp3.1" />
-    <file src="$TesthostRuntimeconfig$\testhost-8.0.runtimeconfig.json" target="contentFiles\any\netcoreapp3.1" />
-    <file src="$TesthostRuntimeconfig$\testhost-9.0.runtimeconfig.json" target="contentFiles\any\netcoreapp3.1" />
-    <file src="$TesthostRuntimeconfig$\testhost-latest.runtimeconfig.json" target="contentFiles\any\netcoreapp3.1" />
-    <file src="netcoreapp3.1\testhost.dll" target="contentFiles\any\netcoreapp3.1" />
-    <file src="netcoreapp3.1\testhost.deps.json" target="contentFiles\any\netcoreapp3.1" />
-
-    <file src="netcoreapp3.1\vstest.console.dll" target="contentFiles\any\netcoreapp3.1" />
-    <file src="netcoreapp3.1\vstest.console.dll.config" target="contentFiles\any\netcoreapp3.1" />
-    <file src="netcoreapp3.1\vstest.console.deps.json" target="contentFiles\any\netcoreapp3.1" />
-    <file src="netcoreapp3.1\vstest.console.runtimeconfig.json" target="contentFiles\any\netcoreapp3.1" />
+    <file src="net9.0\datacollector.dll" target="contentFiles\any\net9.0" />
+    <file src="net9.0\datacollector.dll.config" target="contentFiles\any\net9.0" />
+    <file src="net9.0\datacollector.deps.json" target="contentFiles\any\net9.0" />
+    <file src="net9.0\datacollector.runtimeconfig.json" target="contentFiles\any\net9.0" />
+
+    <file src="net9.0\Microsoft.CodeCoverage.IO\Microsoft.CodeCoverage.IO.dll" target="contentFiles\any\net9.0" />
+    <file src="net9.0\Microsoft.Extensions.DependencyModel\Microsoft.Extensions.DependencyModel.dll" target="contentFiles\any\net9.0" />
+    <file src="net9.0\Microsoft.Extensions.FileSystemGlobbing\Microsoft.Extensions.FileSystemGlobbing.dll" target="contentFiles\any\net9.0" />
+
+    <file src="net9.0\Microsoft.TestPlatform.CommunicationUtilities.dll" target="contentFiles\any\net9.0" />
+    <file src="net9.0\Microsoft.TestPlatform.CoreUtilities.dll" target="contentFiles\any\net9.0" />
+    <file src="net9.0\Microsoft.TestPlatform.CrossPlatEngine.dll" target="contentFiles\any\net9.0" />
+    <file src="net9.0\Microsoft.TestPlatform.PlatformAbstractions.dll" target="contentFiles\any\net9.0" />
+    <file src="net9.0\Microsoft.TestPlatform.Utilities.dll" target="contentFiles\any\net9.0" />
+    <file src="net9.0\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" target="contentFiles\any\net9.0" />
+    <file src="net9.0\Microsoft.VisualStudio.TestPlatform.Client.dll" target="contentFiles\any\net9.0" />
+    <file src="net9.0\Microsoft.VisualStudio.TestPlatform.Common.dll" target="contentFiles\any\net9.0" />
+    <file src="net9.0\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="contentFiles\any\net9.0" />
+
+    <file src="net9.0\Newtonsoft.Json\Newtonsoft.Json.dll" target="contentFiles\any\net9.0" />
+    <file src="net9.0\System.ComponentModel.Composition.dll" target="contentFiles\any\net9.0" />
+
+    <file src="$TesthostRuntimeconfig$\testhost-1.0.runtimeconfig.json" target="contentFiles\any\net9.0" />
+    <file src="$TesthostRuntimeconfig$\testhost-1.1.runtimeconfig.json" target="contentFiles\any\net9.0" />
+    <file src="$TesthostRuntimeconfig$\testhost-2.0.runtimeconfig.json" target="contentFiles\any\net9.0" />
+    <file src="$TesthostRuntimeconfig$\testhost-2.1.runtimeconfig.json" target="contentFiles\any\net9.0" />
+    <file src="$TesthostRuntimeconfig$\testhost-3.0.runtimeconfig.json" target="contentFiles\any\net9.0" />
+    <file src="$TesthostRuntimeconfig$\testhost-3.1.runtimeconfig.json" target="contentFiles\any\net9.0" />
+    <file src="$TesthostRuntimeconfig$\testhost-5.0.runtimeconfig.json" target="contentFiles\any\net9.0" />
+    <file src="$TesthostRuntimeconfig$\testhost-6.0.runtimeconfig.json" target="contentFiles\any\net9.0" />
+    <file src="$TesthostRuntimeconfig$\testhost-7.0.runtimeconfig.json" target="contentFiles\any\net9.0" />
+    <file src="$TesthostRuntimeconfig$\testhost-8.0.runtimeconfig.json" target="contentFiles\any\net9.0" />
+    <file src="$TesthostRuntimeconfig$\testhost-9.0.runtimeconfig.json" target="contentFiles\any\net9.0" />
+    <file src="$TesthostRuntimeconfig$\testhost-latest.runtimeconfig.json" target="contentFiles\any\net9.0" />
+    <file src="net9.0\testhost.dll" target="contentFiles\any\net9.0" />
+    <file src="net9.0\testhost.deps.json" target="contentFiles\any\net9.0" />
+
+    <file src="net9.0\vstest.console.dll" target="contentFiles\any\net9.0" />
+    <file src="net9.0\vstest.console.dll.config" target="contentFiles\any\net9.0" />
+    <file src="net9.0\vstest.console.deps.json" target="contentFiles\any\net9.0" />
+    <file src="net9.0\vstest.console.runtimeconfig.json" target="contentFiles\any\net9.0" />
 
     <!-- Extensions -->
-    <file src="netcoreapp3.1\DumpMinitool.exe" target="contentFiles\any\netcoreapp3.1\Extensions\dump" />
-    <file src="netcoreapp3.1\DumpMinitool.exe.config" target="contentFiles\any\netcoreapp3.1\Extensions\dump" />
-    <file src="netcoreapp3.1\DumpMinitool.x86.exe" target="contentFiles\any\netcoreapp3.1\Extensions\dump" />
-    <file src="netcoreapp3.1\DumpMinitool.x86.exe.config" target="contentFiles\any\netcoreapp3.1\Extensions\dump" />
-    <file src="netcoreapp3.1\DumpMinitool.arm64.exe" target="contentFiles\any\netcoreapp3.1\Extensions\dump" />
-    <file src="netcoreapp3.1\DumpMinitool.arm64.exe.config" target="contentFiles\any\netcoreapp3.1\Extensions\dump" />
-    <file src="netcoreapp3.1\Microsoft.Diagnostics.NETCore.Client\Microsoft.Diagnostics.NETCore.Client.dll" target="contentFiles\any\netcoreapp3.1\Extensions" />
-    <file src="netcoreapp3.1\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" target="contentFiles\any\netcoreapp3.1\Extensions" />
-    <file src="netcoreapp3.1\Microsoft.TestPlatform.Extensions.EventLogCollector.dll" target="contentFiles\any\netcoreapp3.1\Extensions" />
-    <file src="netcoreapp3.1\Microsoft.TestPlatform.TesthostRuntimeProvider.dll" target="contentFiles\any\netcoreapp3.1\Extensions" />
-    <file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" target="contentFiles\any\netcoreapp3.1\Extensions" />
-    <file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" target="contentFiles\any\netcoreapp3.1\Extensions" />
+    <file src="net9.0\DumpMinitool.exe" target="contentFiles\any\net9.0\Extensions\dump" />
+    <file src="net9.0\DumpMinitool.exe.config" target="contentFiles\any\net9.0\Extensions\dump" />
+    <file src="net9.0\DumpMinitool.x86.exe" target="contentFiles\any\net9.0\Extensions\dump" />
+    <file src="net9.0\DumpMinitool.x86.exe.config" target="contentFiles\any\net9.0\Extensions\dump" />
+    <file src="net9.0\DumpMinitool.arm64.exe" target="contentFiles\any\net9.0\Extensions\dump" />
+    <file src="net9.0\DumpMinitool.arm64.exe.config" target="contentFiles\any\net9.0\Extensions\dump" />
+    <file src="net9.0\Microsoft.Diagnostics.NETCore.Client\Microsoft.Diagnostics.NETCore.Client.dll" target="contentFiles\any\net9.0\Extensions" />
+    <file src="net9.0\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" target="contentFiles\any\net9.0\Extensions" />
+    <file src="net9.0\Microsoft.TestPlatform.Extensions.EventLogCollector.dll" target="contentFiles\any\net9.0\Extensions" />
+    <file src="net9.0\Microsoft.TestPlatform.TesthostRuntimeProvider.dll" target="contentFiles\any\net9.0\Extensions" />
+    <file src="net9.0\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" target="contentFiles\any\net9.0\Extensions" />
+    <file src="net9.0\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" target="contentFiles\any\net9.0\Extensions" />
 
     <!-- TestHostNetFramework -->
-    <file src="net472\Microsoft.Internal.Dia\x64\msdia140.dll"          target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\x64" />
-    <file src="net472\Microsoft.Internal.Dia\x64\msdia140.dll.manifest" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\x64" />
-    <file src="net472\Microsoft.Internal.Dia\x86\msdia140.dll"          target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\x86" />
-    <file src="net472\Microsoft.Internal.Dia\x86\msdia140.dll.manifest" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\x86" />
-
-    <file src="net472\datacollector.exe" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net472\datacollector.exe.config" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-
-    <file src="net472\datacollector.arm64.exe" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net472\datacollector.arm64.exe.config" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-
-    <file src="net472\Microsoft.TestPlatform.CommunicationUtilities.dll" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net472\Microsoft.TestPlatform.CoreUtilities.dll" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net472\Microsoft.TestPlatform.CrossPlatEngine.dll" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net472\Microsoft.TestPlatform.PlatformAbstractions.dll" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net472\Microsoft.TestPlatform.Utilities.dll" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net472\Microsoft.VisualStudio.TestPlatform.Common.dll" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net472\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-
-    <file src="net462\testhost.exe"               target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net462\testhost.exe.config"        target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net47\testhost.net47.exe"          target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net47\testhost.net47.exe.config"   target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net471\testhost.net471.exe"        target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net471\testhost.net471.exe.config" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net472\testhost.net472.exe"        target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net472\testhost.net472.exe.config" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net48\testhost.net48.exe"          target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net48\testhost.net48.exe.config"   target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-
-    <file src="net462\testhost.x86.exe"               target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net462\testhost.x86.exe.config"        target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net47\testhost.net47.x86.exe"          target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net47\testhost.net47.x86.exe.config"   target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net471\testhost.net471.x86.exe"        target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net471\testhost.net471.x86.exe.config" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net472\testhost.net472.x86.exe"        target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net472\testhost.net472.x86.exe.config" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net48\testhost.net48.x86.exe"          target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net48\testhost.net48.x86.exe.config"   target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-
-    <file src="net462\testhost.arm64.exe"               target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net462\testhost.arm64.exe.config"        target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net47\testhost.net47.arm64.exe"          target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net47\testhost.net47.arm64.exe.config"   target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net471\testhost.net471.arm64.exe"        target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net471\testhost.net471.arm64.exe.config" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net472\testhost.net472.arm64.exe"        target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net472\testhost.net472.arm64.exe.config" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net48\testhost.net48.arm64.exe"          target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net48\testhost.net48.arm64.exe.config"   target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-
-    <file src="net462\Newtonsoft.Json.dll" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-
-    <file src="net462\System*.dll" exclude="net462\System.Buffers.dll;net462\System.ComponentModel.Composition.dll;net462\System.Memory.dll;net462\System.Numerics.Vectors.dll;net462\System.Runtime.CompilerServices.Unsafe.dll;net462\System.Threading.Tasks.Extensions.dll;net462\System.Diagnostics.DiagnosticSource.dll" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net462\netstandard.dll" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
-    <file src="net462\Microsoft.Win32.Primitives.dll" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework" />
+    <file src="net48\Microsoft.Internal.Dia\x64\msdia140.dll"          target="contentFiles\any\net9.0\TestHostNetFramework\x64" />
+    <file src="net48\Microsoft.Internal.Dia\x64\msdia140.dll.manifest" target="contentFiles\any\net9.0\TestHostNetFramework\x64" />
+    <file src="net48\Microsoft.Internal.Dia\x86\msdia140.dll"          target="contentFiles\any\net9.0\TestHostNetFramework\x86" />
+    <file src="net48\Microsoft.Internal.Dia\x86\msdia140.dll.manifest" target="contentFiles\any\net9.0\TestHostNetFramework\x86" />
+
+    <file src="net48\datacollector.exe" target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net48\datacollector.exe.config" target="contentFiles\any\net9.0\TestHostNetFramework" />
+
+    <file src="net48\datacollector.arm64.exe" target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net48\datacollector.arm64.exe.config" target="contentFiles\any\net9.0\TestHostNetFramework" />
+
+    <file src="net48\Microsoft.TestPlatform.CommunicationUtilities.dll" target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net48\Microsoft.TestPlatform.CoreUtilities.dll" target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net48\Microsoft.TestPlatform.CrossPlatEngine.dll" target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net48\Microsoft.TestPlatform.PlatformAbstractions.dll" target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net48\Microsoft.TestPlatform.Utilities.dll" target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net48\Microsoft.VisualStudio.TestPlatform.Common.dll" target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net48\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="contentFiles\any\net9.0\TestHostNetFramework" />
+
+    <file src="net462\testhost.exe"               target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net462\testhost.exe.config"        target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net47\testhost.net47.exe"          target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net47\testhost.net47.exe.config"   target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net471\testhost.net471.exe"        target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net471\testhost.net471.exe.config" target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net472\testhost.net472.exe"        target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net472\testhost.net472.exe.config" target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net48\testhost.net48.exe"          target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net48\testhost.net48.exe.config"   target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net481\testhost.net481.exe"          target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net481\testhost.net481.exe.config"   target="contentFiles\any\net9.0\TestHostNetFramework" />
+
+    <file src="net462\testhost.x86.exe"               target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net462\testhost.x86.exe.config"        target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net47\testhost.net47.x86.exe"          target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net47\testhost.net47.x86.exe.config"   target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net471\testhost.net471.x86.exe"        target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net471\testhost.net471.x86.exe.config" target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net472\testhost.net472.x86.exe"        target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net472\testhost.net472.x86.exe.config" target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net48\testhost.net48.x86.exe"          target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net48\testhost.net48.x86.exe.config"   target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net481\testhost.net481.x86.exe"          target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net481\testhost.net481.x86.exe.config"   target="contentFiles\any\net9.0\TestHostNetFramework" />
+
+    <file src="net462\testhost.arm64.exe"               target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net462\testhost.arm64.exe.config"        target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net47\testhost.net47.arm64.exe"          target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net47\testhost.net47.arm64.exe.config"   target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net471\testhost.net471.arm64.exe"        target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net471\testhost.net471.arm64.exe.config" target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net472\testhost.net472.arm64.exe"        target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net472\testhost.net472.arm64.exe.config" target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net48\testhost.net48.arm64.exe"          target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net48\testhost.net48.arm64.exe.config"   target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net481\testhost.net481.arm64.exe"          target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net481\testhost.net481.arm64.exe.config"   target="contentFiles\any\net9.0\TestHostNetFramework" />
+
+    <file src="net462\Newtonsoft.Json.dll" target="contentFiles\any\net9.0\TestHostNetFramework" />
+
+    <file src="net462\System*.dll" exclude="net462\System.ComponentModel.Composition.dll;net462\System.Threading.Tasks.Extensions.dll;net462\System.Diagnostics.DiagnosticSource.dll;net462\System.Text.Json.dll;net462\System.Text.Encodings.Web.dll;net462\System.IO.Pipelines.dll" target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net462\netstandard.dll" target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net462\Microsoft.Win32.Primitives.dll" target="contentFiles\any\net9.0\TestHostNetFramework" />
 
     <!-- Resources -->
-    <file src="netcoreapp3.1\Microsoft.CodeCoverage.IO\cs\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\netcoreapp3.1\cs" />
-    <file src="netcoreapp3.1\Microsoft.CodeCoverage.IO\de\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\netcoreapp3.1\de" />
-    <file src="netcoreapp3.1\Microsoft.CodeCoverage.IO\es\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\netcoreapp3.1\es" />
-    <file src="netcoreapp3.1\Microsoft.CodeCoverage.IO\fr\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\netcoreapp3.1\fr" />
-    <file src="netcoreapp3.1\Microsoft.CodeCoverage.IO\it\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\netcoreapp3.1\it" />
-    <file src="netcoreapp3.1\Microsoft.CodeCoverage.IO\ja\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\netcoreapp3.1\ja" />
-    <file src="netcoreapp3.1\Microsoft.CodeCoverage.IO\ko\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\netcoreapp3.1\ko" />
-    <file src="netcoreapp3.1\Microsoft.CodeCoverage.IO\pl\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\netcoreapp3.1\pl" />
-    <file src="netcoreapp3.1\Microsoft.CodeCoverage.IO\pt-BR\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\netcoreapp3.1\pt-BR" />
-    <file src="netcoreapp3.1\Microsoft.CodeCoverage.IO\ru\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\netcoreapp3.1\ru" />
-    <file src="netcoreapp3.1\Microsoft.CodeCoverage.IO\tr\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\netcoreapp3.1\tr" />
-    <file src="netcoreapp3.1\Microsoft.CodeCoverage.IO\zh-Hans\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\netcoreapp3.1\zh-Hans" />
-    <file src="netcoreapp3.1\Microsoft.CodeCoverage.IO\zh-Hant\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\netcoreapp3.1\zh-Hant" />
-
-    <file src="netcoreapp3.1\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\cs" />
-    <file src="netcoreapp3.1\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\cs" />
-    <file src="netcoreapp3.1\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\de" />
-    <file src="netcoreapp3.1\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\de" />
-    <file src="netcoreapp3.1\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\es" />
-    <file src="netcoreapp3.1\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\es" />
-    <file src="netcoreapp3.1\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\fr" />
-    <file src="netcoreapp3.1\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\fr" />
-    <file src="netcoreapp3.1\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\it" />
-    <file src="netcoreapp3.1\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\it" />
-    <file src="netcoreapp3.1\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\ja" />
-    <file src="netcoreapp3.1\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\ja" />
-    <file src="netcoreapp3.1\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\ko" />
-    <file src="netcoreapp3.1\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\ko" />
-    <file src="netcoreapp3.1\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\pl" />
-    <file src="netcoreapp3.1\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\pl" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"   target="contentFiles\any\netcoreapp3.1\pt-BR" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"   target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\pt-BR" />
-    <file src="netcoreapp3.1\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\ru" />
-    <file src="netcoreapp3.1\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\ru" />
-    <file src="netcoreapp3.1\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\tr" />
-    <file src="netcoreapp3.1\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\tr" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="contentFiles\any\netcoreapp3.1\zh-Hans" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\zh-Hans" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="contentFiles\any\netcoreapp3.1\zh-Hant" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\zh-Hant" />
-
-    <file src="netcoreapp3.1\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\cs" />
-    <file src="netcoreapp3.1\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\cs" />
-    <file src="netcoreapp3.1\de\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\de" />
-    <file src="netcoreapp3.1\de\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\de" />
-    <file src="netcoreapp3.1\es\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\es" />
-    <file src="netcoreapp3.1\es\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\es" />
-    <file src="netcoreapp3.1\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\fr" />
-    <file src="netcoreapp3.1\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\fr" />
-    <file src="netcoreapp3.1\it\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\it" />
-    <file src="netcoreapp3.1\it\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\it" />
-    <file src="netcoreapp3.1\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\ja" />
-    <file src="netcoreapp3.1\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\ja" />
-    <file src="netcoreapp3.1\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\ko" />
-    <file src="netcoreapp3.1\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\ko" />
-    <file src="netcoreapp3.1\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\pl" />
-    <file src="netcoreapp3.1\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\pl" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll"   target="contentFiles\any\netcoreapp3.1\pt-BR" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll"   target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\pt-BR" />
-    <file src="netcoreapp3.1\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\ru" />
-    <file src="netcoreapp3.1\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\ru" />
-    <file src="netcoreapp3.1\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\tr" />
-    <file src="netcoreapp3.1\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\tr" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="contentFiles\any\netcoreapp3.1\zh-Hans" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\zh-Hans" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="contentFiles\any\netcoreapp3.1\zh-Hant" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\zh-Hant" />
-
-    <file src="netcoreapp3.1\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\netcoreapp3.1\cs" />
-    <file src="netcoreapp3.1\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\cs" />
-    <file src="netcoreapp3.1\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\netcoreapp3.1\de" />
-    <file src="netcoreapp3.1\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\de" />
-    <file src="netcoreapp3.1\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\netcoreapp3.1\es" />
-    <file src="netcoreapp3.1\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\es" />
-    <file src="netcoreapp3.1\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\netcoreapp3.1\fr" />
-    <file src="netcoreapp3.1\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\fr" />
-    <file src="netcoreapp3.1\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\netcoreapp3.1\it" />
-    <file src="netcoreapp3.1\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\it" />
-    <file src="netcoreapp3.1\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\netcoreapp3.1\ja" />
-    <file src="netcoreapp3.1\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\ja" />
-    <file src="netcoreapp3.1\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\netcoreapp3.1\ko" />
-    <file src="netcoreapp3.1\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\ko" />
-    <file src="netcoreapp3.1\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\netcoreapp3.1\pl" />
-    <file src="netcoreapp3.1\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\pl" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"   target="contentFiles\any\netcoreapp3.1\pt-BR" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"   target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\pt-BR" />
-    <file src="netcoreapp3.1\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\netcoreapp3.1\ru" />
-    <file src="netcoreapp3.1\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\ru" />
-    <file src="netcoreapp3.1\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\netcoreapp3.1\tr" />
-    <file src="netcoreapp3.1\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\tr" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="contentFiles\any\netcoreapp3.1\zh-Hans" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\zh-Hans" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="contentFiles\any\netcoreapp3.1\zh-Hant" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\zh-Hant" />
-
-    <file src="netcoreapp3.1\cs\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\cs" />
-    <file src="netcoreapp3.1\cs\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\cs" />
-    <file src="netcoreapp3.1\de\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\de" />
-    <file src="netcoreapp3.1\de\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\de" />
-    <file src="netcoreapp3.1\es\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\es" />
-    <file src="netcoreapp3.1\es\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\es" />
-    <file src="netcoreapp3.1\fr\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\fr" />
-    <file src="netcoreapp3.1\fr\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\fr" />
-    <file src="netcoreapp3.1\it\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\it" />
-    <file src="netcoreapp3.1\it\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\it" />
-    <file src="netcoreapp3.1\ja\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\ja" />
-    <file src="netcoreapp3.1\ja\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\ja" />
-    <file src="netcoreapp3.1\ko\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\ko" />
-    <file src="netcoreapp3.1\ko\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\ko" />
-    <file src="netcoreapp3.1\pl\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\pl" />
-    <file src="netcoreapp3.1\pl\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\pl" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll"   target="contentFiles\any\netcoreapp3.1\pt-BR" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll"   target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\pt-BR" />
-    <file src="netcoreapp3.1\ru\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\ru" />
-    <file src="netcoreapp3.1\ru\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\ru" />
-    <file src="netcoreapp3.1\tr\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\tr" />
-    <file src="netcoreapp3.1\tr\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\tr" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" target="contentFiles\any\netcoreapp3.1\zh-Hans" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\zh-Hans" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" target="contentFiles\any\netcoreapp3.1\zh-Hant" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\zh-Hant" />
-
-    <file src="netcoreapp3.1\cs\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\netcoreapp3.1\cs" />
-    <file src="netcoreapp3.1\de\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\netcoreapp3.1\de" />
-    <file src="netcoreapp3.1\es\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\netcoreapp3.1\es" />
-    <file src="netcoreapp3.1\fr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\netcoreapp3.1\fr" />
-    <file src="netcoreapp3.1\it\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\netcoreapp3.1\it" />
-    <file src="netcoreapp3.1\ja\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\netcoreapp3.1\ja" />
-    <file src="netcoreapp3.1\ko\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\netcoreapp3.1\ko" />
-    <file src="netcoreapp3.1\pl\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\netcoreapp3.1\pl" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\netcoreapp3.1\pt-BR" />
-    <file src="netcoreapp3.1\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\netcoreapp3.1\ru" />
-    <file src="netcoreapp3.1\tr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\netcoreapp3.1\tr" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\netcoreapp3.1\zh-Hans" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\netcoreapp3.1\zh-Hant" />
-
-    <file src="netcoreapp3.1\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\netcoreapp3.1\cs" />
-    <file src="netcoreapp3.1\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\netcoreapp3.1\de" />
-    <file src="netcoreapp3.1\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\netcoreapp3.1\es" />
-    <file src="netcoreapp3.1\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\netcoreapp3.1\fr" />
-    <file src="netcoreapp3.1\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\netcoreapp3.1\it" />
-    <file src="netcoreapp3.1\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\netcoreapp3.1\ja" />
-    <file src="netcoreapp3.1\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\netcoreapp3.1\ko" />
-    <file src="netcoreapp3.1\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\netcoreapp3.1\pl" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\netcoreapp3.1\pt-BR" />
-    <file src="netcoreapp3.1\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\netcoreapp3.1\ru" />
-    <file src="netcoreapp3.1\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\netcoreapp3.1\tr" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\netcoreapp3.1\zh-Hans" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\netcoreapp3.1\zh-Hant" />
-
-    <file src="netcoreapp3.1\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\netcoreapp3.1\cs" />
-    <file src="netcoreapp3.1\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\cs" />
-    <file src="netcoreapp3.1\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\netcoreapp3.1\de" />
-    <file src="netcoreapp3.1\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\de" />
-    <file src="netcoreapp3.1\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\netcoreapp3.1\es" />
-    <file src="netcoreapp3.1\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\es" />
-    <file src="netcoreapp3.1\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\netcoreapp3.1\fr" />
-    <file src="netcoreapp3.1\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\fr" />
-    <file src="netcoreapp3.1\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\netcoreapp3.1\it" />
-    <file src="netcoreapp3.1\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\it" />
-    <file src="netcoreapp3.1\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\netcoreapp3.1\ja" />
-    <file src="netcoreapp3.1\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\ja" />
-    <file src="netcoreapp3.1\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\netcoreapp3.1\ko" />
-    <file src="netcoreapp3.1\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\ko" />
-    <file src="netcoreapp3.1\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\netcoreapp3.1\pl" />
-    <file src="netcoreapp3.1\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\pl" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"   target="contentFiles\any\netcoreapp3.1\pt-BR" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"   target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\pt-BR" />
-    <file src="netcoreapp3.1\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\netcoreapp3.1\ru" />
-    <file src="netcoreapp3.1\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\ru" />
-    <file src="netcoreapp3.1\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\netcoreapp3.1\tr" />
-    <file src="netcoreapp3.1\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\tr" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="contentFiles\any\netcoreapp3.1\zh-Hans" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\zh-Hans" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="contentFiles\any\netcoreapp3.1\zh-Hant" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\zh-Hant" />
-
-    <file src="netcoreapp3.1\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\netcoreapp3.1\cs" />
-    <file src="netcoreapp3.1\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\cs" />
-    <file src="netcoreapp3.1\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\netcoreapp3.1\de" />
-    <file src="netcoreapp3.1\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\de" />
-    <file src="netcoreapp3.1\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\netcoreapp3.1\es" />
-    <file src="netcoreapp3.1\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\es" />
-    <file src="netcoreapp3.1\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\netcoreapp3.1\fr" />
-    <file src="netcoreapp3.1\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\fr" />
-    <file src="netcoreapp3.1\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\netcoreapp3.1\it" />
-    <file src="netcoreapp3.1\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\it" />
-    <file src="netcoreapp3.1\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\netcoreapp3.1\ja" />
-    <file src="netcoreapp3.1\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\ja" />
-    <file src="netcoreapp3.1\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\netcoreapp3.1\ko" />
-    <file src="netcoreapp3.1\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\ko" />
-    <file src="netcoreapp3.1\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\netcoreapp3.1\pl" />
-    <file src="netcoreapp3.1\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\pl" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"   target="contentFiles\any\netcoreapp3.1\pt-BR" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"   target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\pt-BR" />
-    <file src="netcoreapp3.1\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\netcoreapp3.1\ru" />
-    <file src="netcoreapp3.1\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\ru" />
-    <file src="netcoreapp3.1\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\netcoreapp3.1\tr" />
-    <file src="netcoreapp3.1\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\tr" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="contentFiles\any\netcoreapp3.1\zh-Hans" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\zh-Hans" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="contentFiles\any\netcoreapp3.1\zh-Hant" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="contentFiles\any\netcoreapp3.1\TestHostNetFramework\zh-Hant" />
-
-    <file src="netcoreapp3.1\cs\vstest.console.resources.dll" target="contentFiles\any\netcoreapp3.1\cs" />
-    <file src="netcoreapp3.1\de\vstest.console.resources.dll" target="contentFiles\any\netcoreapp3.1\de" />
-    <file src="netcoreapp3.1\es\vstest.console.resources.dll" target="contentFiles\any\netcoreapp3.1\es" />
-    <file src="netcoreapp3.1\fr\vstest.console.resources.dll" target="contentFiles\any\netcoreapp3.1\fr" />
-    <file src="netcoreapp3.1\it\vstest.console.resources.dll" target="contentFiles\any\netcoreapp3.1\it" />
-    <file src="netcoreapp3.1\ja\vstest.console.resources.dll" target="contentFiles\any\netcoreapp3.1\ja" />
-    <file src="netcoreapp3.1\ko\vstest.console.resources.dll" target="contentFiles\any\netcoreapp3.1\ko" />
-    <file src="netcoreapp3.1\pl\vstest.console.resources.dll" target="contentFiles\any\netcoreapp3.1\pl" />
-    <file src="netcoreapp3.1\pt-BR\vstest.console.resources.dll" target="contentFiles\any\netcoreapp3.1\pt-BR" />
-    <file src="netcoreapp3.1\ru\vstest.console.resources.dll" target="contentFiles\any\netcoreapp3.1\ru" />
-    <file src="netcoreapp3.1\tr\vstest.console.resources.dll" target="contentFiles\any\netcoreapp3.1\tr" />
-    <file src="netcoreapp3.1\zh-Hans\vstest.console.resources.dll" target="contentFiles\any\netcoreapp3.1\zh-Hans" />
-    <file src="netcoreapp3.1\zh-Hant\vstest.console.resources.dll" target="contentFiles\any\netcoreapp3.1\zh-Hant" />
-
-    <file src="netcoreapp3.1\cs\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\cs" />
-    <file src="netcoreapp3.1\de\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\de" />
-    <file src="netcoreapp3.1\es\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\es" />
-    <file src="netcoreapp3.1\fr\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\fr" />
-    <file src="netcoreapp3.1\it\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\it" />
-    <file src="netcoreapp3.1\ja\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\ja" />
-    <file src="netcoreapp3.1\ko\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\ko" />
-    <file src="netcoreapp3.1\pl\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\pl" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\pt-BR" />
-    <file src="netcoreapp3.1\ru\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\ru" />
-    <file src="netcoreapp3.1\tr\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\tr" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\zh-Hans" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\zh-Hant" />
-
-    <file src="netcoreapp3.1\cs\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\cs" />
-    <file src="netcoreapp3.1\de\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\de" />
-    <file src="netcoreapp3.1\es\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\es" />
-    <file src="netcoreapp3.1\fr\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\fr" />
-    <file src="netcoreapp3.1\it\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\it" />
-    <file src="netcoreapp3.1\ja\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\ja" />
-    <file src="netcoreapp3.1\ko\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\ko" />
-    <file src="netcoreapp3.1\pl\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\pl" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\pt-BR" />
-    <file src="netcoreapp3.1\ru\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\ru" />
-    <file src="netcoreapp3.1\tr\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\tr" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\zh-Hans" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\zh-Hant" />
-
-    <file src="netcoreapp3.1\cs\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\cs" />
-    <file src="netcoreapp3.1\de\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\de" />
-    <file src="netcoreapp3.1\es\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\es" />
-    <file src="netcoreapp3.1\fr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\fr" />
-    <file src="netcoreapp3.1\it\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\it" />
-    <file src="netcoreapp3.1\ja\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\ja" />
-    <file src="netcoreapp3.1\ko\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\ko" />
-    <file src="netcoreapp3.1\pl\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\pl" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\pt-BR" />
-    <file src="netcoreapp3.1\ru\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\ru" />
-    <file src="netcoreapp3.1\tr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\tr" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\zh-Hans" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\zh-Hant" />
-
-    <file src="netcoreapp3.1\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\cs" />
-    <file src="netcoreapp3.1\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\de" />
-    <file src="netcoreapp3.1\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\es" />
-    <file src="netcoreapp3.1\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\fr" />
-    <file src="netcoreapp3.1\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\it" />
-    <file src="netcoreapp3.1\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\ja" />
-    <file src="netcoreapp3.1\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\ko" />
-    <file src="netcoreapp3.1\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\pl" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\pt-BR" />
-    <file src="netcoreapp3.1\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\ru" />
-    <file src="netcoreapp3.1\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\tr" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\zh-Hans" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\zh-Hant" />
-
-    <file src="netcoreapp3.1\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\cs" />
-    <file src="netcoreapp3.1\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\de" />
-    <file src="netcoreapp3.1\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\es" />
-    <file src="netcoreapp3.1\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\fr" />
-    <file src="netcoreapp3.1\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\it" />
-    <file src="netcoreapp3.1\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\ja" />
-    <file src="netcoreapp3.1\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\ko" />
-    <file src="netcoreapp3.1\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\pl" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\pt-BR" />
-    <file src="netcoreapp3.1\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\ru" />
-    <file src="netcoreapp3.1\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\tr" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\zh-Hans" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\zh-Hant" />
+    <file src="net9.0\Microsoft.CodeCoverage.IO\cs\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\net9.0\cs" />
+    <file src="net9.0\Microsoft.CodeCoverage.IO\de\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\net9.0\de" />
+    <file src="net9.0\Microsoft.CodeCoverage.IO\es\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\net9.0\es" />
+    <file src="net9.0\Microsoft.CodeCoverage.IO\fr\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\net9.0\fr" />
+    <file src="net9.0\Microsoft.CodeCoverage.IO\it\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\net9.0\it" />
+    <file src="net9.0\Microsoft.CodeCoverage.IO\ja\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\net9.0\ja" />
+    <file src="net9.0\Microsoft.CodeCoverage.IO\ko\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\net9.0\ko" />
+    <file src="net9.0\Microsoft.CodeCoverage.IO\pl\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\net9.0\pl" />
+    <file src="net9.0\Microsoft.CodeCoverage.IO\pt-BR\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\net9.0\pt-BR" />
+    <file src="net9.0\Microsoft.CodeCoverage.IO\ru\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\net9.0\ru" />
+    <file src="net9.0\Microsoft.CodeCoverage.IO\tr\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\net9.0\tr" />
+    <file src="net9.0\Microsoft.CodeCoverage.IO\zh-Hans\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\net9.0\zh-Hans" />
+    <file src="net9.0\Microsoft.CodeCoverage.IO\zh-Hant\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\net9.0\zh-Hant" />
+
+    <file src="net9.0\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\cs" />
+    <file src="net9.0\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\cs" />
+    <file src="net9.0\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\de" />
+    <file src="net9.0\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\de" />
+    <file src="net9.0\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\es" />
+    <file src="net9.0\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\es" />
+    <file src="net9.0\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\fr" />
+    <file src="net9.0\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\fr" />
+    <file src="net9.0\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\it" />
+    <file src="net9.0\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\it" />
+    <file src="net9.0\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\ja" />
+    <file src="net9.0\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ja" />
+    <file src="net9.0\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\ko" />
+    <file src="net9.0\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ko" />
+    <file src="net9.0\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\pl" />
+    <file src="net9.0\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\pl" />
+    <file src="net9.0\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"   target="contentFiles\any\net9.0\pt-BR" />
+    <file src="net9.0\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"   target="contentFiles\any\net9.0\TestHostNetFramework\pt-BR" />
+    <file src="net9.0\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\ru" />
+    <file src="net9.0\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ru" />
+    <file src="net9.0\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\tr" />
+    <file src="net9.0\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\tr" />
+    <file src="net9.0\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="contentFiles\any\net9.0\zh-Hans" />
+    <file src="net9.0\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="contentFiles\any\net9.0\TestHostNetFramework\zh-Hans" />
+    <file src="net9.0\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="contentFiles\any\net9.0\zh-Hant" />
+    <file src="net9.0\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="contentFiles\any\net9.0\TestHostNetFramework\zh-Hant" />
+
+    <file src="net9.0\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\cs" />
+    <file src="net9.0\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\cs" />
+    <file src="net9.0\de\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\de" />
+    <file src="net9.0\de\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\de" />
+    <file src="net9.0\es\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\es" />
+    <file src="net9.0\es\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\es" />
+    <file src="net9.0\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\fr" />
+    <file src="net9.0\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\fr" />
+    <file src="net9.0\it\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\it" />
+    <file src="net9.0\it\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\it" />
+    <file src="net9.0\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\ja" />
+    <file src="net9.0\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ja" />
+    <file src="net9.0\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\ko" />
+    <file src="net9.0\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ko" />
+    <file src="net9.0\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\pl" />
+    <file src="net9.0\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\pl" />
+    <file src="net9.0\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll"   target="contentFiles\any\net9.0\pt-BR" />
+    <file src="net9.0\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll"   target="contentFiles\any\net9.0\TestHostNetFramework\pt-BR" />
+    <file src="net9.0\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\ru" />
+    <file src="net9.0\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ru" />
+    <file src="net9.0\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\tr" />
+    <file src="net9.0\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\tr" />
+    <file src="net9.0\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="contentFiles\any\net9.0\zh-Hans" />
+    <file src="net9.0\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="contentFiles\any\net9.0\TestHostNetFramework\zh-Hans" />
+    <file src="net9.0\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="contentFiles\any\net9.0\zh-Hant" />
+    <file src="net9.0\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="contentFiles\any\net9.0\TestHostNetFramework\zh-Hant" />
+
+    <file src="net9.0\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\cs" />
+    <file src="net9.0\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\cs" />
+    <file src="net9.0\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\de" />
+    <file src="net9.0\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\de" />
+    <file src="net9.0\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\es" />
+    <file src="net9.0\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\es" />
+    <file src="net9.0\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\fr" />
+    <file src="net9.0\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\fr" />
+    <file src="net9.0\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\it" />
+    <file src="net9.0\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\it" />
+    <file src="net9.0\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\ja" />
+    <file src="net9.0\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ja" />
+    <file src="net9.0\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\ko" />
+    <file src="net9.0\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ko" />
+    <file src="net9.0\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\pl" />
+    <file src="net9.0\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\pl" />
+    <file src="net9.0\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"   target="contentFiles\any\net9.0\pt-BR" />
+    <file src="net9.0\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"   target="contentFiles\any\net9.0\TestHostNetFramework\pt-BR" />
+    <file src="net9.0\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\ru" />
+    <file src="net9.0\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ru" />
+    <file src="net9.0\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\tr" />
+    <file src="net9.0\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\tr" />
+    <file src="net9.0\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="contentFiles\any\net9.0\zh-Hans" />
+    <file src="net9.0\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="contentFiles\any\net9.0\TestHostNetFramework\zh-Hans" />
+    <file src="net9.0\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="contentFiles\any\net9.0\zh-Hant" />
+    <file src="net9.0\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="contentFiles\any\net9.0\TestHostNetFramework\zh-Hant" />
+
+    <file src="net9.0\cs\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\cs" />
+    <file src="net9.0\cs\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\cs" />
+    <file src="net9.0\de\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\de" />
+    <file src="net9.0\de\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\de" />
+    <file src="net9.0\es\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\es" />
+    <file src="net9.0\es\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\es" />
+    <file src="net9.0\fr\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\fr" />
+    <file src="net9.0\fr\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\fr" />
+    <file src="net9.0\it\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\it" />
+    <file src="net9.0\it\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\it" />
+    <file src="net9.0\ja\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\ja" />
+    <file src="net9.0\ja\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ja" />
+    <file src="net9.0\ko\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\ko" />
+    <file src="net9.0\ko\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ko" />
+    <file src="net9.0\pl\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\pl" />
+    <file src="net9.0\pl\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\pl" />
+    <file src="net9.0\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll"   target="contentFiles\any\net9.0\pt-BR" />
+    <file src="net9.0\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll"   target="contentFiles\any\net9.0\TestHostNetFramework\pt-BR" />
+    <file src="net9.0\ru\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\ru" />
+    <file src="net9.0\ru\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ru" />
+    <file src="net9.0\tr\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\tr" />
+    <file src="net9.0\tr\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\tr" />
+    <file src="net9.0\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" target="contentFiles\any\net9.0\zh-Hans" />
+    <file src="net9.0\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" target="contentFiles\any\net9.0\TestHostNetFramework\zh-Hans" />
+    <file src="net9.0\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" target="contentFiles\any\net9.0\zh-Hant" />
+    <file src="net9.0\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" target="contentFiles\any\net9.0\TestHostNetFramework\zh-Hant" />
+
+    <file src="net9.0\cs\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\net9.0\cs" />
+    <file src="net9.0\de\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\net9.0\de" />
+    <file src="net9.0\es\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\net9.0\es" />
+    <file src="net9.0\fr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\net9.0\fr" />
+    <file src="net9.0\it\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\net9.0\it" />
+    <file src="net9.0\ja\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\net9.0\ja" />
+    <file src="net9.0\ko\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\net9.0\ko" />
+    <file src="net9.0\pl\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\net9.0\pl" />
+    <file src="net9.0\pt-BR\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\net9.0\pt-BR" />
+    <file src="net9.0\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\net9.0\ru" />
+    <file src="net9.0\tr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\net9.0\tr" />
+    <file src="net9.0\zh-Hans\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\net9.0\zh-Hans" />
+    <file src="net9.0\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\net9.0\zh-Hant" />
+
+    <file src="net9.0\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\net9.0\cs" />
+    <file src="net9.0\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\net9.0\de" />
+    <file src="net9.0\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\net9.0\es" />
+    <file src="net9.0\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\net9.0\fr" />
+    <file src="net9.0\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\net9.0\it" />
+    <file src="net9.0\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\net9.0\ja" />
+    <file src="net9.0\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\net9.0\ko" />
+    <file src="net9.0\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\net9.0\pl" />
+    <file src="net9.0\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\net9.0\pt-BR" />
+    <file src="net9.0\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\net9.0\ru" />
+    <file src="net9.0\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\net9.0\tr" />
+    <file src="net9.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\net9.0\zh-Hans" />
+    <file src="net9.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\net9.0\zh-Hant" />
+
+    <file src="net9.0\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\cs" />
+    <file src="net9.0\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\cs" />
+    <file src="net9.0\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\de" />
+    <file src="net9.0\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\de" />
+    <file src="net9.0\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\es" />
+    <file src="net9.0\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\es" />
+    <file src="net9.0\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\fr" />
+    <file src="net9.0\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\fr" />
+    <file src="net9.0\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\it" />
+    <file src="net9.0\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\it" />
+    <file src="net9.0\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\ja" />
+    <file src="net9.0\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ja" />
+    <file src="net9.0\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\ko" />
+    <file src="net9.0\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ko" />
+    <file src="net9.0\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\pl" />
+    <file src="net9.0\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\pl" />
+    <file src="net9.0\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"   target="contentFiles\any\net9.0\pt-BR" />
+    <file src="net9.0\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"   target="contentFiles\any\net9.0\TestHostNetFramework\pt-BR" />
+    <file src="net9.0\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\ru" />
+    <file src="net9.0\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ru" />
+    <file src="net9.0\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\tr" />
+    <file src="net9.0\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\tr" />
+    <file src="net9.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="contentFiles\any\net9.0\zh-Hans" />
+    <file src="net9.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="contentFiles\any\net9.0\TestHostNetFramework\zh-Hans" />
+    <file src="net9.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="contentFiles\any\net9.0\zh-Hant" />
+    <file src="net9.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="contentFiles\any\net9.0\TestHostNetFramework\zh-Hant" />
+
+    <file src="net9.0\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\cs" />
+    <file src="net9.0\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\cs" />
+    <file src="net9.0\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\de" />
+    <file src="net9.0\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\de" />
+    <file src="net9.0\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\es" />
+    <file src="net9.0\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\es" />
+    <file src="net9.0\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\fr" />
+    <file src="net9.0\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\fr" />
+    <file src="net9.0\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\it" />
+    <file src="net9.0\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\it" />
+    <file src="net9.0\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\ja" />
+    <file src="net9.0\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ja" />
+    <file src="net9.0\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\ko" />
+    <file src="net9.0\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ko" />
+    <file src="net9.0\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\pl" />
+    <file src="net9.0\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\pl" />
+    <file src="net9.0\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"   target="contentFiles\any\net9.0\pt-BR" />
+    <file src="net9.0\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"   target="contentFiles\any\net9.0\TestHostNetFramework\pt-BR" />
+    <file src="net9.0\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\ru" />
+    <file src="net9.0\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ru" />
+    <file src="net9.0\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\tr" />
+    <file src="net9.0\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\tr" />
+    <file src="net9.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="contentFiles\any\net9.0\zh-Hans" />
+    <file src="net9.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="contentFiles\any\net9.0\TestHostNetFramework\zh-Hans" />
+    <file src="net9.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="contentFiles\any\net9.0\zh-Hant" />
+    <file src="net9.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="contentFiles\any\net9.0\TestHostNetFramework\zh-Hant" />
+
+    <file src="net9.0\cs\vstest.console.resources.dll" target="contentFiles\any\net9.0\cs" />
+    <file src="net9.0\de\vstest.console.resources.dll" target="contentFiles\any\net9.0\de" />
+    <file src="net9.0\es\vstest.console.resources.dll" target="contentFiles\any\net9.0\es" />
+    <file src="net9.0\fr\vstest.console.resources.dll" target="contentFiles\any\net9.0\fr" />
+    <file src="net9.0\it\vstest.console.resources.dll" target="contentFiles\any\net9.0\it" />
+    <file src="net9.0\ja\vstest.console.resources.dll" target="contentFiles\any\net9.0\ja" />
+    <file src="net9.0\ko\vstest.console.resources.dll" target="contentFiles\any\net9.0\ko" />
+    <file src="net9.0\pl\vstest.console.resources.dll" target="contentFiles\any\net9.0\pl" />
+    <file src="net9.0\pt-BR\vstest.console.resources.dll" target="contentFiles\any\net9.0\pt-BR" />
+    <file src="net9.0\ru\vstest.console.resources.dll" target="contentFiles\any\net9.0\ru" />
+    <file src="net9.0\tr\vstest.console.resources.dll" target="contentFiles\any\net9.0\tr" />
+    <file src="net9.0\zh-Hans\vstest.console.resources.dll" target="contentFiles\any\net9.0\zh-Hans" />
+    <file src="net9.0\zh-Hant\vstest.console.resources.dll" target="contentFiles\any\net9.0\zh-Hant" />
+
+    <file src="net9.0\cs\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\cs" />
+    <file src="net9.0\de\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\de" />
+    <file src="net9.0\es\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\es" />
+    <file src="net9.0\fr\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\fr" />
+    <file src="net9.0\it\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\it" />
+    <file src="net9.0\ja\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\ja" />
+    <file src="net9.0\ko\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\ko" />
+    <file src="net9.0\pl\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\pl" />
+    <file src="net9.0\pt-BR\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\pt-BR" />
+    <file src="net9.0\ru\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\ru" />
+    <file src="net9.0\tr\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\tr" />
+    <file src="net9.0\zh-Hans\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\zh-Hans" />
+    <file src="net9.0\zh-Hant\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\zh-Hant" />
+
+    <file src="net9.0\cs\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\cs" />
+    <file src="net9.0\de\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\de" />
+    <file src="net9.0\es\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\es" />
+    <file src="net9.0\fr\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\fr" />
+    <file src="net9.0\it\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\it" />
+    <file src="net9.0\ja\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\ja" />
+    <file src="net9.0\ko\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\ko" />
+    <file src="net9.0\pl\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\pl" />
+    <file src="net9.0\pt-BR\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\pt-BR" />
+    <file src="net9.0\ru\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\ru" />
+    <file src="net9.0\tr\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\tr" />
+    <file src="net9.0\zh-Hans\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\zh-Hans" />
+    <file src="net9.0\zh-Hant\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\zh-Hant" />
+
+    <file src="net9.0\cs\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\net9.0\Extensions\cs" />
+    <file src="net9.0\de\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\net9.0\Extensions\de" />
+    <file src="net9.0\es\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\net9.0\Extensions\es" />
+    <file src="net9.0\fr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\net9.0\Extensions\fr" />
+    <file src="net9.0\it\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\net9.0\Extensions\it" />
+    <file src="net9.0\ja\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\net9.0\Extensions\ja" />
+    <file src="net9.0\ko\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\net9.0\Extensions\ko" />
+    <file src="net9.0\pl\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\net9.0\Extensions\pl" />
+    <file src="net9.0\pt-BR\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\net9.0\Extensions\pt-BR" />
+    <file src="net9.0\ru\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\net9.0\Extensions\ru" />
+    <file src="net9.0\tr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\net9.0\Extensions\tr" />
+    <file src="net9.0\zh-Hans\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\net9.0\Extensions\zh-Hans" />
+    <file src="net9.0\zh-Hant\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\net9.0\Extensions\zh-Hant" />
+
+    <file src="net9.0\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\cs" />
+    <file src="net9.0\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\de" />
+    <file src="net9.0\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\es" />
+    <file src="net9.0\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\fr" />
+    <file src="net9.0\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\it" />
+    <file src="net9.0\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\ja" />
+    <file src="net9.0\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\ko" />
+    <file src="net9.0\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\pl" />
+    <file src="net9.0\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\pt-BR" />
+    <file src="net9.0\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\ru" />
+    <file src="net9.0\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\tr" />
+    <file src="net9.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\zh-Hans" />
+    <file src="net9.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\zh-Hant" />
+
+    <file src="net9.0\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\cs" />
+    <file src="net9.0\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\de" />
+    <file src="net9.0\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\es" />
+    <file src="net9.0\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\fr" />
+    <file src="net9.0\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\it" />
+    <file src="net9.0\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\ja" />
+    <file src="net9.0\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\ko" />
+    <file src="net9.0\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\pl" />
+    <file src="net9.0\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\pt-BR" />
+    <file src="net9.0\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\ru" />
+    <file src="net9.0\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\tr" />
+    <file src="net9.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\zh-Hans" />
+    <file src="net9.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\zh-Hant" />
   </files>
 </package>
diff --git a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.sourcebuild.nuspec b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.sourcebuild.nuspec
index 163cd961fd..1abbdfd81a 100644
--- a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.sourcebuild.nuspec
+++ b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.sourcebuild.nuspec
@@ -94,8 +94,6 @@
     <file src="$SourceBuildTfmCurrent$\Microsoft.Diagnostics.NETCore.Client\Microsoft.Diagnostics.NETCore.Client.dll" target="contentFiles\any\$SourceBuildTfmCurrent$\Extensions" />
     <file src="$SourceBuildTfmPrevious$\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" target="contentFiles\any\$SourceBuildTfmPrevious$\Extensions" />
     <file src="$SourceBuildTfmCurrent$\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" target="contentFiles\any\$SourceBuildTfmCurrent$\Extensions" />
-    <file src="$SourceBuildTfmPrevious$\Microsoft.TestPlatform.Extensions.EventLogCollector.dll" target="contentFiles\any\$SourceBuildTfmPrevious$\Extensions" />
-    <file src="$SourceBuildTfmCurrent$\Microsoft.TestPlatform.Extensions.EventLogCollector.dll" target="contentFiles\any\$SourceBuildTfmCurrent$\Extensions" />
     <file src="$SourceBuildTfmPrevious$\Microsoft.TestPlatform.TesthostRuntimeProvider.dll" target="contentFiles\any\$SourceBuildTfmPrevious$\Extensions" />
     <file src="$SourceBuildTfmCurrent$\Microsoft.TestPlatform.TesthostRuntimeProvider.dll" target="contentFiles\any\$SourceBuildTfmCurrent$\Extensions" />
     <file src="$SourceBuildTfmPrevious$\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" target="contentFiles\any\$SourceBuildTfmPrevious$\Extensions" />
diff --git a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.sourcebuild.product.nuspec b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.sourcebuild.product.nuspec
index e53eaba922..d3f85a89df 100644
--- a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.sourcebuild.product.nuspec
+++ b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.sourcebuild.product.nuspec
@@ -56,8 +56,6 @@
 
     <!-- Extensions -->
     <file src="$SourceBuildTfmCurrent$\Microsoft.Diagnostics.NETCore.Client\Microsoft.Diagnostics.NETCore.Client.dll" target="contentFiles\any\$SourceBuildTfmCurrent$\Extensions" />
-    <file src="$SourceBuildTfmCurrent$\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" target="contentFiles\any\$SourceBuildTfmCurrent$\Extensions" />
-    <file src="$SourceBuildTfmCurrent$\Microsoft.TestPlatform.Extensions.EventLogCollector.dll" target="contentFiles\any\$SourceBuildTfmCurrent$\Extensions" />
     <file src="$SourceBuildTfmCurrent$\Microsoft.TestPlatform.TesthostRuntimeProvider.dll" target="contentFiles\any\$SourceBuildTfmCurrent$\Extensions" />
     <file src="$SourceBuildTfmCurrent$\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" target="contentFiles\any\$SourceBuildTfmCurrent$\Extensions" />
     <file src="$SourceBuildTfmCurrent$\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" target="contentFiles\any\$SourceBuildTfmCurrent$\Extensions" />
diff --git a/src/package/Microsoft.TestPlatform.Portable/Microsoft.TestPlatform.Portable.csproj b/src/package/Microsoft.TestPlatform.Portable/Microsoft.TestPlatform.Portable.csproj
index 116098d402..60aef566c6 100644
--- a/src/package/Microsoft.TestPlatform.Portable/Microsoft.TestPlatform.Portable.csproj
+++ b/src/package/Microsoft.TestPlatform.Portable/Microsoft.TestPlatform.Portable.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppMinimum);$(NetFrameworkMinimum);net47;net471;net472;net48;netstandard2.0</TargetFrameworks>
+    <!--  $(NetPortableTargetFrameworks); should be added here, but it makes net8.0 duplicate and nuget restore fails.  -->
+    <TargetFrameworks>$(TestHostAllTargetFrameworks);netstandard2.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -38,18 +39,20 @@
     <NuspecProperty Include="SrcPackageFolder=$(SrcPackageFolder)" />
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkRunnerTargetFramework)')) or $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)'))">
     <ProjectReference Include="..\..\vstest.console\vstest.console.csproj" />
     <ProjectReference Include="..\..\vstest.console.arm64\vstest.console.arm64.csproj" />
-    <ProjectReference Include="..\..\testhost\testhost.csproj" />
-    <ProjectReference Include="..\..\testhost.x86\testhost.x86.csproj" />
-    <ProjectReference Include="..\..\testhost.arm64\testhost.arm64.csproj" />
     <ProjectReference Include="..\..\datacollector\datacollector.csproj" />
     <ProjectReference Include="..\..\datacollector.arm64\datacollector.arm64.csproj" />
-    <ProjectReference Include="..\..\DataCollectors\DumpMinitool\DumpMinitool.csproj" />
-    <ProjectReference Include="..\..\DataCollectors\DumpMinitool.arm64\DumpMinitool.arm64.csproj" />
-    <ProjectReference Include="..\..\DataCollectors\DumpMinitool.x86\DumpMinitool.x86.csproj" />
-    <ProjectReference Include="..\..\DataCollectors\Microsoft.TestPlatform.Extensions.EventLogCollector\Microsoft.TestPlatform.Extensions.EventLogCollector.csproj" />
+
+    <!-- We are forcing the reference here to .NET Framework project for both .NET and .NET Framework builds.
+    This is because we are offloading the dumping to this tool on Windows, and we need this tool to run anywhere with any selected architecture, and using .NET Framework (or eventually .NET Native)
+    prevents us from having to lookup the correct .NET runtime. -->
+    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool\DumpMinitool.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkMinimum)" />
+    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool.x86\DumpMinitool.x86.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkMinimum)" />
+    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool.arm64\DumpMinitool.arm64.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkMinimum)" />
+    
+    <ProjectReference Include="..\..\DataCollectors\Microsoft.TestPlatform.Extensions.EventLogCollector\Microsoft.TestPlatform.Extensions.EventLogCollector.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkRunnerTargetFramework)" />
     <ProjectReference Include="..\..\Microsoft.TestPlatform.Extensions.BlameDataCollector\Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj" />
     <ProjectReference Include="..\..\Microsoft.TestPlatform.Extensions.TrxLogger\Microsoft.TestPlatform.Extensions.TrxLogger.csproj" />
     <ProjectReference Include="..\..\Microsoft.TestPlatform.Extensions.HtmlLogger\Microsoft.TestPlatform.Extensions.HtmlLogger.csproj" />
@@ -57,13 +60,19 @@
     <ProjectReference Include="..\..\Microsoft.TestPlatform.PlatformAbstractions\Microsoft.TestPlatform.PlatformAbstractions.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\testhost\testhost.csproj" />
+    <ProjectReference Include="..\..\testhost.x86\testhost.x86.csproj" />
+    <ProjectReference Include="..\..\testhost.arm64\testhost.arm64.csproj" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeCoverage.IO" Version="$(MicrosoftCodeCoverageIOVersion)" GeneratePathProperty="true" />
-    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" GeneratePathProperty="true"/>
-    <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingVersion)" GeneratePathProperty="true"/>
-    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" GeneratePathProperty="true"/>
-    <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" GeneratePathProperty="true"/>
-    <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" GeneratePathProperty="true"/>
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" GeneratePathProperty="true" />
     <PackageReference Include="Microsoft.Internal.Dia" Version="$(TestPlatformMSDiaVersion)" PrivateAssets="All" GeneratePathProperty="true" />
   </ItemGroup>
 
diff --git a/src/package/Microsoft.TestPlatform.Portable/Microsoft.TestPlatform.Portable.nuspec b/src/package/Microsoft.TestPlatform.Portable/Microsoft.TestPlatform.Portable.nuspec
index ceaecfc3ac..404c1ad2c0 100644
--- a/src/package/Microsoft.TestPlatform.Portable/Microsoft.TestPlatform.Portable.nuspec
+++ b/src/package/Microsoft.TestPlatform.Portable/Microsoft.TestPlatform.Portable.nuspec
@@ -10,47 +10,53 @@
     <!-- Add a third party notice file -->
     <file src="$SrcPackageFolder$ThirdPartyNotices.txt" target="" />
 
-    <!-- net472 -->
-    <file src="net472\datacollector.exe" target="tools\net462\datacollector.exe" />
-    <file src="net472\datacollector.exe.config" target="tools\net462\datacollector.exe.config" />
-
-    <file src="net472\datacollector.arm64.exe" target="tools\net462\datacollector.arm64.exe" />
-    <file src="net472\datacollector.arm64.exe.config"	target="tools\net462\datacollector.arm64.exe.config" />
-
-    <file src="net472\Microsoft.Extensions.DependencyModel.dll"	target="tools\net462\Microsoft.Extensions.DependencyModel.dll" />
-    <file src="net472\Microsoft.Extensions.FileSystemGlobbing.dll"	target="tools\net462\Microsoft.Extensions.FileSystemGlobbing.dll" />
-    <file src="net472\Microsoft.TestPlatform.CommunicationUtilities.dll"	target="tools\net462\Microsoft.TestPlatform.CommunicationUtilities.dll" />
-    <file src="net472\Microsoft.TestPlatform.CoreUtilities.dll"	target="tools\net462\Microsoft.TestPlatform.CoreUtilities.dll" />
-    <file src="net472\Microsoft.TestPlatform.CrossPlatEngine.dll"	target="tools\net462\Microsoft.TestPlatform.CrossPlatEngine.dll" />
-    <file src="net472\Microsoft.TestPlatform.PlatformAbstractions.dll" target="tools\net462\Microsoft.TestPlatform.PlatformAbstractions.dll" />
-
-    <file src="net472\Microsoft.TestPlatform.Utilities.dll"	target="tools\net462\Microsoft.TestPlatform.Utilities.dll" />
-    <file src="net472\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" target="tools\net462\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" />
-
-    <file src="net472\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xml" target="tools\net462\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xml" />
-    <file src="net472\Microsoft.VisualStudio.TestPlatform.Client.dll"	target="tools\net462\Microsoft.VisualStudio.TestPlatform.Client.dll" />
-    <file src="net472\Microsoft.VisualStudio.TestPlatform.Common.dll"	target="tools\net462\Microsoft.VisualStudio.TestPlatform.Common.dll" />
-    <file src="net472\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="tools\net462\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
-
-    <file src="net472\Microsoft.CodeCoverage.IO\Microsoft.CodeCoverage.IO.dll" target="tools\net462\Microsoft.CodeCoverage.IO.dll" />
-
-    <file src="net472\cs\Microsoft.CodeCoverage.IO.resources.dll"	    target="tools\net462\cs\Microsoft.CodeCoverage.IO.dll" />
-    <file src="net472\de\Microsoft.CodeCoverage.IO.resources.dll"	    target="tools\net462\de\Microsoft.CodeCoverage.IO.dll" />
-    <file src="net472\es\Microsoft.CodeCoverage.IO.resources.dll"	    target="tools\net462\es\Microsoft.CodeCoverage.IO.dll" />
-    <file src="net472\fr\Microsoft.CodeCoverage.IO.resources.dll"	    target="tools\net462\fr\Microsoft.CodeCoverage.IO.dll" />
-    <file src="net472\it\Microsoft.CodeCoverage.IO.resources.dll"	    target="tools\net462\it\Microsoft.CodeCoverage.IO.dll" />
-    <file src="net472\ja\Microsoft.CodeCoverage.IO.resources.dll"	    target="tools\net462\ja\Microsoft.CodeCoverage.IO.dll" />
-    <file src="net472\ko\Microsoft.CodeCoverage.IO.resources.dll"	    target="tools\net462\ko\Microsoft.CodeCoverage.IO.dll" />
-    <file src="net472\pl\Microsoft.CodeCoverage.IO.resources.dll"	    target="tools\net462\pl\Microsoft.CodeCoverage.IO.dll" />
-    <file src="net472\pt-BR\Microsoft.CodeCoverage.IO.resources.dll"	  target="tools\net462\pt-BR\Microsoft.CodeCoverage.IO.dll" />
-    <file src="net472\ru\Microsoft.CodeCoverage.IO.resources.dll"	    target="tools\net462\ru\Microsoft.CodeCoverage.IO.dll" />
-    <file src="net472\tr\Microsoft.CodeCoverage.IO.resources.dll"	    target="tools\net462\tr\Microsoft.CodeCoverage.IO.dll" />
-    <file src="net472\zh-Hans\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\net462\zh-Hans\Microsoft.CodeCoverage.IO.dll" />
-    <file src="net472\zh-Hant\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\net462\zh-Hant\Microsoft.CodeCoverage.IO.dll" />
-
-    <file src="net472\Newtonsoft.Json.dll"	target="tools\net462\Newtonsoft.Json.dll" />
-    <file src="net472\System.Collections.Immutable.dll"	target="tools\net462\System.Collections.Immutable.dll" />
-    <file src="net472\System.Reflection.Metadata.dll"	target="tools\net462\System.Reflection.Metadata.dll" />
+    <!-- net48 -->
+    <file src="net48\datacollector.exe" target="tools\net462\datacollector.exe" />
+    <file src="net48\datacollector.exe.config" target="tools\net462\datacollector.exe.config" />
+
+    <file src="net48\datacollector.arm64.exe" target="tools\net462\datacollector.arm64.exe" />
+    <file src="net48\datacollector.arm64.exe.config"	target="tools\net462\datacollector.arm64.exe.config" />
+
+    <file src="net48\Microsoft.Extensions.DependencyModel.dll"	target="tools\net462\Microsoft.Extensions.DependencyModel.dll" />
+    <file src="net48\Microsoft.Extensions.FileSystemGlobbing.dll"	target="tools\net462\Microsoft.Extensions.FileSystemGlobbing.dll" />
+    <file src="net48\Microsoft.TestPlatform.CommunicationUtilities.dll"	target="tools\net462\Microsoft.TestPlatform.CommunicationUtilities.dll" />
+    <file src="net48\Microsoft.TestPlatform.CoreUtilities.dll"	target="tools\net462\Microsoft.TestPlatform.CoreUtilities.dll" />
+    <file src="net48\Microsoft.TestPlatform.CrossPlatEngine.dll"	target="tools\net462\Microsoft.TestPlatform.CrossPlatEngine.dll" />
+    <file src="net48\Microsoft.TestPlatform.PlatformAbstractions.dll" target="tools\net462\Microsoft.TestPlatform.PlatformAbstractions.dll" />
+
+    <file src="net48\Microsoft.TestPlatform.Utilities.dll"	target="tools\net462\Microsoft.TestPlatform.Utilities.dll" />
+    <file src="net48\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" target="tools\net462\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" />
+
+    <file src="net48\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xml" target="tools\net462\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xml" />
+    <file src="net48\Microsoft.VisualStudio.TestPlatform.Client.dll"	target="tools\net462\Microsoft.VisualStudio.TestPlatform.Client.dll" />
+    <file src="net48\Microsoft.VisualStudio.TestPlatform.Common.dll"	target="tools\net462\Microsoft.VisualStudio.TestPlatform.Common.dll" />
+    <file src="net48\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="tools\net462\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
+
+    <file src="net48\Microsoft.CodeCoverage.IO\Microsoft.CodeCoverage.IO.dll" target="tools\net462\Microsoft.CodeCoverage.IO.dll" />
+
+    <file src="net48\cs\Microsoft.CodeCoverage.IO.resources.dll"	    target="tools\net462\cs\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\de\Microsoft.CodeCoverage.IO.resources.dll"	    target="tools\net462\de\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\es\Microsoft.CodeCoverage.IO.resources.dll"	    target="tools\net462\es\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\fr\Microsoft.CodeCoverage.IO.resources.dll"	    target="tools\net462\fr\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\it\Microsoft.CodeCoverage.IO.resources.dll"	    target="tools\net462\it\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\ja\Microsoft.CodeCoverage.IO.resources.dll"	    target="tools\net462\ja\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\ko\Microsoft.CodeCoverage.IO.resources.dll"	    target="tools\net462\ko\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\pl\Microsoft.CodeCoverage.IO.resources.dll"	    target="tools\net462\pl\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\pt-BR\Microsoft.CodeCoverage.IO.resources.dll"	  target="tools\net462\pt-BR\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\ru\Microsoft.CodeCoverage.IO.resources.dll"	    target="tools\net462\ru\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\tr\Microsoft.CodeCoverage.IO.resources.dll"	    target="tools\net462\tr\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\zh-Hans\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\net462\zh-Hans\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\zh-Hant\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\net462\zh-Hant\Microsoft.CodeCoverage.IO.dll" />
+
+    <file src="net48\Newtonsoft.Json.dll"	target="tools\net462\Newtonsoft.Json.dll" />
+    <file src="net48\System.Collections.Immutable.dll"	target="tools\net462\System.Collections.Immutable.dll" />
+    
+    <file src="net48\System.Reflection.Metadata.dll"	target="tools\net462\System.Reflection.Metadata.dll" />
+    <file src="net48\System.Memory.dll" target="tools\net462\System.Memory.dll" />
+    <file src="net48\System.Runtime.CompilerServices.Unsafe.dll" target="tools\net462\System.Runtime.CompilerServices.Unsafe.dll" />
+    <file src="net48\System.Numerics.Vectors.dll" target="tools\net462\System.Numerics.Vectors.dll" />
+    <file src="net48\System.Buffers.dll" target="tools\net462\System.Buffers.dll" />
+    
     <file src="net462\System.Runtime.InteropServices.RuntimeInformation.dll"	target="tools\net462\System.Runtime.InteropServices.RuntimeInformation.dll" />
     <file src="net462\testhost.exe"	target="tools\net462\testhost.exe" />
     <file src="net462\testhost.exe.config"	target="tools\net462\testhost.exe.config" />
@@ -62,6 +68,9 @@
     <file src="net472\testhost.net472.exe.config"	target="tools\net462\testhost.net472.exe.config" />
     <file src="net48\testhost.net48.exe"	target="tools\net462\testhost.net48.exe" />
     <file src="net48\testhost.net48.exe.config"	target="tools\net462\testhost.net48.exe.config" />
+    <file src="net481\testhost.net481.exe"	target="tools\net462\testhost.net481.exe" />
+    <file src="net481\testhost.net481.exe.config"	target="tools\net462\testhost.net481.exe.config" />
+
     <file src="net462\testhost.x86.exe"	target="tools\net462\testhost.x86.exe" />
     <file src="net462\testhost.x86.exe.config"	target="tools\net462\testhost.x86.exe.config" />
     <file src="net47\testhost.net47.x86.exe"	target="tools\net462\testhost.net47.x86.exe" />
@@ -72,6 +81,8 @@
     <file src="net472\testhost.net472.x86.exe.config"	target="tools\net462\testhost.net472.x86.exe.config" />
     <file src="net48\testhost.net48.x86.exe"	target="tools\net462\testhost.net48.x86.exe" />
     <file src="net48\testhost.net48.x86.exe.config"	target="tools\net462\testhost.net48.x86.exe.config" />
+    <file src="net481\testhost.net481.x86.exe"	target="tools\net462\testhost.net481.x86.exe" />
+    <file src="net481\testhost.net481.x86.exe.config"	target="tools\net462\testhost.net481.x86.exe.config" />
 
     <file src="net462\testhost.arm64.exe"	target="tools\net462\testhost.arm64.exe" />
     <file src="net462\testhost.arm64.exe.config"	target="tools\net462\testhost.arm64.exe.config" />
@@ -83,555 +94,563 @@
     <file src="net472\testhost.net472.arm64.exe.config"	target="tools\net462\testhost.net472.arm64.exe.config" />
     <file src="net48\testhost.net48.arm64.exe"	target="tools\net462\testhost.net48.arm64.exe" />
     <file src="net48\testhost.net48.arm64.exe.config"	target="tools\net462\testhost.net48.arm64.exe.config" />
-
-    <file src="net472\vstest.console.exe"	target="tools\net462\vstest.console.exe" />
-    <file src="net472\vstest.console.exe.config"	target="tools\net462\vstest.console.exe.config" />
-    <file src="net472\vstest.console.arm64.exe"	target="tools\net462\vstest.console.arm64.exe" />
-    <file src="net472\vstest.console.arm64.exe.config"	target="tools\net462\vstest.console.arm64.exe.config" />
-
-    <file src="net472\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\cs\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\cs\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net472\cs\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\cs\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\cs\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\cs\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net472\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net472\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\cs\vstest.console.resources.dll"	target="tools\net462\cs\vstest.console.resources.dll" />
-    <file src="net472\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\de\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\de\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\de\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net472\de\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\de\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\de\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\de\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net472\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net472\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\de\vstest.console.resources.dll"	target="tools\net462\de\vstest.console.resources.dll" />
-    <file src="net472\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\es\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\es\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\es\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net472\es\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\es\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\es\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\es\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net472\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net472\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\es\vstest.console.resources.dll"	target="tools\net462\es\vstest.console.resources.dll" />
-
-    <file src="net472\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll"	target="tools\net462\Extensions\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" />
-
-    <file src="net472\DumpMinitool.exe" target="tools\net462\Extensions\dump\DumpMinitool.exe" />
-    <file src="net472\DumpMinitool.exe.config" target="tools\net462\Extensions\dump\DumpMinitool.exe.config" />
-
-    <file src="net472\DumpMinitool.x86.exe" target="tools\net462\Extensions\dump\DumpMinitool.x86.exe" />
-    <file src="net472\DumpMinitool.x86.exe.config" target="tools\net462\Extensions\dump\DumpMinitool.x86.exe.config" />
-
-    <file src="net472\DumpMinitool.arm64.exe" target="tools\net462\Extensions\dump\DumpMinitool.arm64.exe" />
-    <file src="net472\DumpMinitool.arm64.exe.config" target="tools\net462\Extensions\dump\DumpMinitool.arm64.exe.config" />
-
-    <file src="net472\Microsoft.TestPlatform.TestHostRuntimeProvider.dll"	target="tools\net462\Extensions\Microsoft.TestPlatform.TestHostRuntimeProvider.dll" />
-    <file src="net472\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll"	target="tools\net462\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" />
-
-    <file src="net472\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net472\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net472\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net472\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net472\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net472\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net472\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net472\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net472\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net472\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net472\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net472\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net472\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-
-    <file src="net472\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll"	target="tools\net462\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" />
-    <file src="net472\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net472\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net472\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net472\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net472\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net472\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net472\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net472\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net472\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net472\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net472\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net472\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net472\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net472\cs\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\cs\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
-    <file src="net472\fr\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\fr\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
-    <file src="net472\it\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\it\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
-    <file src="net472\ja\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\ja\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
-    <file src="net472\ko\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\ko\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
-    <file src="net472\pl\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\pl\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
-    <file src="net472\pt-BR\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\pt-BR\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
-    <file src="net472\ru\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\ru\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
-    <file src="net472\tr\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\tr\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
-    <file src="net472\zh-Hans\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\zh-Hans\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
-    <file src="net472\zh-Hant\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\zh-Hant\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
-    <file src="net472\de\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\de\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
-    <file src="net472\es\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\es\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
-    <file src="net472\cs\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\cs\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
-    <file src="net472\fr\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\fr\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
-    <file src="net472\it\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\it\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
-    <file src="net472\ja\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\ja\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
-    <file src="net472\ko\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\ko\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
-    <file src="net472\pl\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\pl\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
-    <file src="net472\pt-BR\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\pt-BR\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
-    <file src="net472\ru\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\ru\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
-    <file src="net472\tr\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\tr\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
-    <file src="net472\zh-Hans\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\zh-Hans\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
-    <file src="net472\zh-Hant\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\zh-Hant\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
-    <file src="net472\de\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\de\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
-    <file src="net472\es\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\es\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
-
-    <file src="net472\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\fr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\fr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net472\fr\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\fr\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\fr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\fr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net472\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net472\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\fr\vstest.console.resources.dll"	target="tools\net462\fr\vstest.console.resources.dll" />
-    <file src="net472\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\it\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\it\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\it\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net472\it\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\it\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\it\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\it\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net472\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net472\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\it\vstest.console.resources.dll"	target="tools\net462\it\vstest.console.resources.dll" />
-    <file src="net472\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\ja\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\ja\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net472\ja\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\ja\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\ja\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\ja\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net472\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net472\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\ja\vstest.console.resources.dll"	target="tools\net462\ja\vstest.console.resources.dll" />
-    <file src="net472\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\ko\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\ko\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net472\ko\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\ko\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\ko\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\ko\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net472\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net472\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\ko\vstest.console.resources.dll"	target="tools\net462\ko\vstest.console.resources.dll" />
-    <file src="net472\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\pl\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\pl\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net472\pl\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\pl\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\pl\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\pl\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net472\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net472\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\pl\vstest.console.resources.dll"	target="tools\net462\pl\vstest.console.resources.dll" />
-    <file src="net472\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\pt-BR\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\pt-BR\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net472\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\pt-BR\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\pt-BR\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net472\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net472\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\pt-BR\vstest.console.resources.dll"	target="tools\net462\pt-BR\vstest.console.resources.dll" />
-    <file src="net472\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\ru\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\ru\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net472\ru\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\ru\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net472\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net472\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\ru\vstest.console.resources.dll"	target="tools\net462\ru\vstest.console.resources.dll" />
-    <file src="net472\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\tr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\tr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net472\tr\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\tr\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\tr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\tr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net472\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net472\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\tr\vstest.console.resources.dll"	target="tools\net462\tr\vstest.console.resources.dll" />
-    <file src="net472\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\zh-Hans\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\zh-Hans\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net472\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\zh-Hans\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\zh-Hans\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net472\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net472\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\zh-Hans\vstest.console.resources.dll"	target="tools\net462\zh-Hans\vstest.console.resources.dll" />
-    <file src="net472\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\zh-Hant\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\zh-Hant\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net472\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net472\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net472\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\zh-Hant\vstest.console.resources.dll"	target="tools\net462\zh-Hant\vstest.console.resources.dll" />
-
-    <!-- netcoreapp3.1 -->
-    <file src="netcoreapp3.1\datacollector.deps.json"	target="tools\netcoreapp3.1\datacollector.deps.json" />
-    <file src="netcoreapp3.1\datacollector.dll"	target="tools\netcoreapp3.1\datacollector.dll" />
-    <file src="netcoreapp3.1\datacollector.dll.config"	target="tools\netcoreapp3.1\datacollector.dll.config" />
-    <file src="netcoreapp3.1\datacollector.runtimeconfig.json"	target="tools\netcoreapp3.1\datacollector.runtimeconfig.json" />
-    <file src="netstandard2.0\Microsoft.Extensions.DependencyModel.dll"	target="tools\netcoreapp3.1\Microsoft.Extensions.DependencyModel.dll" />
-    <file src="netstandard2.0\Microsoft.Extensions.FileSystemGlobbing.dll"	target="tools\netcoreapp3.1\Microsoft.Extensions.FileSystemGlobbing.dll" />
-    <file src="netcoreapp3.1\Microsoft.TestPlatform.CommunicationUtilities.dll"	target="tools\netcoreapp3.1\Microsoft.TestPlatform.CommunicationUtilities.dll" />
-    <file src="netcoreapp3.1\Microsoft.TestPlatform.CoreUtilities.dll"	target="tools\netcoreapp3.1\Microsoft.TestPlatform.CoreUtilities.dll" />
-    <file src="netcoreapp3.1\Microsoft.TestPlatform.CrossPlatEngine.dll"	target="tools\netcoreapp3.1\Microsoft.TestPlatform.CrossPlatEngine.dll" />
-    <file src="netcoreapp3.1\Microsoft.TestPlatform.PlatformAbstractions.dll"	target="tools\netcoreapp3.1\Microsoft.TestPlatform.PlatformAbstractions.dll" />
-    <file src="netcoreapp3.1\Microsoft.TestPlatform.Utilities.dll"	target="tools\netcoreapp3.1\Microsoft.TestPlatform.Utilities.dll" />
-    <file src="netcoreapp3.1\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll"	target="tools\netcoreapp3.1\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" />
-    <file src="netcoreapp3.1\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xml"	target="tools\netcoreapp3.1\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xml" />
-    <file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.Client.dll"	target="tools\netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.Client.dll" />
-    <file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.Common.dll"	target="tools\netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.Common.dll" />
-    <file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll"	target="tools\netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
-
-    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\Microsoft.CodeCoverage.IO.dll"	target="tools\netcoreapp3.1\Microsoft.CodeCoverage.IO.dll" />
-    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\cs\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\netcoreapp3.1\cs\Microsoft.CodeCoverage.IO.dll" />
-    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\de\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\netcoreapp3.1\de\Microsoft.CodeCoverage.IO.dll" />
-    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\es\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\netcoreapp3.1\es\Microsoft.CodeCoverage.IO.dll" />
-    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\fr\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\netcoreapp3.1\fr\Microsoft.CodeCoverage.IO.dll" />
-    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\it\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\netcoreapp3.1\it\Microsoft.CodeCoverage.IO.dll" />
-    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\ja\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\netcoreapp3.1\ja\Microsoft.CodeCoverage.IO.dll" />
-    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\ko\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\netcoreapp3.1\ko\Microsoft.CodeCoverage.IO.dll" />
-    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\pl\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\netcoreapp3.1\pl\Microsoft.CodeCoverage.IO.dll" />
-    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\pt-BR\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\netcoreapp3.1\pt-BR\Microsoft.CodeCoverage.IO.dll" />
-    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\ru\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\netcoreapp3.1\ru\Microsoft.CodeCoverage.IO.dll" />
-    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\tr\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\netcoreapp3.1\tr\Microsoft.CodeCoverage.IO.dll" />
-    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\zh-Hans\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\netcoreapp3.1\zh-Hans\Microsoft.CodeCoverage.IO.dll" />
-    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\zh-Hant\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\netcoreapp3.1\zh-Hant\Microsoft.CodeCoverage.IO.dll" />
-
-    <file src="netstandard2.0\Newtonsoft.Json.dll"	target="tools\netcoreapp3.1\Newtonsoft.Json.dll" />
-    <file src="netcoreapp3.1\vstest.console.deps.json"	target="tools\netcoreapp3.1\vstest.console.deps.json" />
-    <file src="netcoreapp3.1\vstest.console.dll"	target="tools\netcoreapp3.1\vstest.console.dll" />
-    <file src="netcoreapp3.1\vstest.console.dll.config"	target="tools\netcoreapp3.1\vstest.console.dll.config" />
-    <file src="netcoreapp3.1\vstest.console.runtimeconfig.json"	target="tools\netcoreapp3.1\vstest.console.runtimeconfig.json" />
-
-    <file src="netcoreapp3.1\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp3.1\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp3.1\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp3.1\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp3.1\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp3.1\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp3.1\cs\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\netcoreapp3.1\Extensions\cs\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="netcoreapp3.1\cs\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp3.1\cs\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp3.1\cs\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\netcoreapp3.1\cs\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="netcoreapp3.1\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp3.1\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="netcoreapp3.1\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp3.1\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp3.1\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp3.1\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="netcoreapp3.1\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp3.1\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="netcoreapp3.1\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp3.1\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp3.1\cs\vstest.console.resources.dll"	target="tools\netcoreapp3.1\cs\vstest.console.resources.dll" />
-    <file src="netcoreapp3.1\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp3.1\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp3.1\de\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp3.1\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp3.1\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp3.1\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp3.1\de\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\netcoreapp3.1\Extensions\de\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="netcoreapp3.1\de\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp3.1\de\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp3.1\de\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\netcoreapp3.1\de\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="netcoreapp3.1\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp3.1\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="netcoreapp3.1\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp3.1\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp3.1\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp3.1\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="netcoreapp3.1\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp3.1\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="netcoreapp3.1\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp3.1\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp3.1\de\vstest.console.resources.dll"	target="tools\netcoreapp3.1\de\vstest.console.resources.dll" />
-    <file src="netcoreapp3.1\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp3.1\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp3.1\es\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp3.1\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp3.1\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp3.1\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp3.1\es\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\netcoreapp3.1\Extensions\es\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="netcoreapp3.1\es\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp3.1\es\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp3.1\es\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\netcoreapp3.1\es\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="netcoreapp3.1\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp3.1\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="netcoreapp3.1\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp3.1\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp3.1\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp3.1\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="netcoreapp3.1\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp3.1\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="netcoreapp3.1\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp3.1\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp3.1\es\vstest.console.resources.dll"	target="tools\netcoreapp3.1\es\vstest.console.resources.dll" />
-
-    <file src="netcoreapp3.1\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll"	target="tools\netcoreapp3.1\Extensions\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" />
-
-    <file src="netcoreapp3.1\DumpMinitool.exe" target="tools\netcoreapp3.1\Extensions\dump\DumpMinitool.exe" />
-    <file src="netcoreapp3.1\DumpMinitool.exe.config" target="tools\netcoreapp3.1\Extensions\dump\DumpMinitool.exe.config" />
-
-    <file src="netcoreapp3.1\DumpMinitool.x86.exe" target="tools\netcoreapp3.1\Extensions\dump\DumpMinitool.x86.exe" />
-    <file src="netcoreapp3.1\DumpMinitool.x86.exe.config" target="tools\netcoreapp3.1\Extensions\dump\DumpMinitool.x86.exe.config" />
-
-    <file src="netcoreapp3.1\DumpMinitool.arm64.exe" target="tools\netcoreapp3.1\Extensions\dump\DumpMinitool.arm64.exe" />
-    <file src="netcoreapp3.1\DumpMinitool.arm64.exe.config" target="tools\netcoreapp3.1\dump\Extensions\dump\DumpMinitool.arm64.exe.config" />
-
-    <file src="netcoreapp3.1\Microsoft.TestPlatform.TestHostRuntimeProvider.dll"	target="tools\netcoreapp3.1\Extensions\Microsoft.TestPlatform.TestHostRuntimeProvider.dll" />
-    <file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll"	target="tools\netcoreapp3.1\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" />
-    <file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll"	target="tools\netcoreapp3.1\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" />
-
-    <file src="netcoreapp3.1\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp3.1\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp3.1\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp3.1\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp3.1\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp3.1\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp3.1\fr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\netcoreapp3.1\Extensions\fr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="netcoreapp3.1\fr\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp3.1\fr\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp3.1\fr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\netcoreapp3.1\fr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="netcoreapp3.1\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp3.1\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="netcoreapp3.1\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp3.1\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp3.1\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp3.1\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="netcoreapp3.1\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp3.1\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="netcoreapp3.1\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp3.1\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp3.1\fr\vstest.console.resources.dll"	target="tools\netcoreapp3.1\fr\vstest.console.resources.dll" />
-    <file src="netcoreapp3.1\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp3.1\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp3.1\it\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp3.1\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp3.1\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp3.1\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp3.1\it\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\netcoreapp3.1\Extensions\it\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="netcoreapp3.1\it\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp3.1\it\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp3.1\it\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\netcoreapp3.1\it\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="netcoreapp3.1\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp3.1\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="netcoreapp3.1\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp3.1\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp3.1\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp3.1\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="netcoreapp3.1\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp3.1\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="netcoreapp3.1\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp3.1\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp3.1\it\vstest.console.resources.dll"	target="tools\netcoreapp3.1\it\vstest.console.resources.dll" />
-    <file src="netcoreapp3.1\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp3.1\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp3.1\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp3.1\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp3.1\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp3.1\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp3.1\ja\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\netcoreapp3.1\Extensions\ja\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="netcoreapp3.1\ja\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp3.1\ja\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp3.1\ja\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\netcoreapp3.1\ja\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="netcoreapp3.1\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp3.1\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="netcoreapp3.1\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp3.1\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp3.1\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp3.1\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="netcoreapp3.1\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp3.1\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="netcoreapp3.1\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp3.1\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp3.1\ja\vstest.console.resources.dll"	target="tools\netcoreapp3.1\ja\vstest.console.resources.dll" />
-    <file src="netcoreapp3.1\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp3.1\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp3.1\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp3.1\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp3.1\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp3.1\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp3.1\ko\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\netcoreapp3.1\Extensions\ko\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="netcoreapp3.1\ko\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp3.1\ko\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp3.1\ko\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\netcoreapp3.1\ko\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="netcoreapp3.1\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp3.1\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="netcoreapp3.1\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp3.1\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp3.1\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp3.1\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="netcoreapp3.1\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp3.1\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="netcoreapp3.1\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp3.1\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp3.1\ko\vstest.console.resources.dll"	target="tools\netcoreapp3.1\ko\vstest.console.resources.dll" />
-    <file src="netcoreapp3.1\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp3.1\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp3.1\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp3.1\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp3.1\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp3.1\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp3.1\pl\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\netcoreapp3.1\Extensions\pl\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="netcoreapp3.1\pl\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp3.1\pl\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp3.1\pl\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\netcoreapp3.1\pl\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="netcoreapp3.1\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp3.1\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="netcoreapp3.1\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp3.1\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp3.1\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp3.1\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="netcoreapp3.1\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp3.1\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="netcoreapp3.1\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp3.1\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp3.1\pl\vstest.console.resources.dll"	target="tools\netcoreapp3.1\pl\vstest.console.resources.dll" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp3.1\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp3.1\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp3.1\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\netcoreapp3.1\Extensions\pt-BR\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp3.1\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\netcoreapp3.1\pt-BR\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp3.1\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp3.1\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp3.1\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp3.1\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp3.1\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp3.1\pt-BR\vstest.console.resources.dll"	target="tools\netcoreapp3.1\pt-BR\vstest.console.resources.dll" />
-    <file src="netcoreapp3.1\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp3.1\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp3.1\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp3.1\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp3.1\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp3.1\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp3.1\ru\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\netcoreapp3.1\Extensions\ru\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="netcoreapp3.1\ru\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp3.1\ru\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp3.1\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\netcoreapp3.1\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="netcoreapp3.1\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp3.1\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="netcoreapp3.1\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp3.1\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp3.1\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp3.1\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="netcoreapp3.1\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp3.1\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="netcoreapp3.1\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp3.1\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp3.1\ru\vstest.console.resources.dll"	target="tools\netcoreapp3.1\ru\vstest.console.resources.dll" />
-
-    <file src="net472\datacollector.exe"	target="tools\netcoreapp3.1\TestHostNetFramework\datacollector.exe" />
-    <file src="net472\datacollector.exe.config"	target="tools\netcoreapp3.1\TestHostNetFramework\datacollector.exe.config" />
-
-    <file src="netcoreapp3.1\Microsoft.TestPlatform.CommunicationUtilities.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\Microsoft.TestPlatform.CommunicationUtilities.dll" />
-    <file src="netcoreapp3.1\Microsoft.TestPlatform.CoreUtilities.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\Microsoft.TestPlatform.CoreUtilities.dll" />
-    <file src="netcoreapp3.1\Microsoft.TestPlatform.CrossPlatEngine.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\Microsoft.TestPlatform.CrossPlatEngine.dll" />
-    <file src="netcoreapp3.1\Microsoft.TestPlatform.PlatformAbstractions.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\Microsoft.TestPlatform.PlatformAbstractions.dll" />
-    <file src="netcoreapp3.1\Microsoft.TestPlatform.Utilities.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\Microsoft.TestPlatform.Utilities.dll" />
-    <file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.Common.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\Microsoft.VisualStudio.TestPlatform.Common.dll" />
-    <file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
-    <file src="netstandard2.0\Newtonsoft.Json.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\Newtonsoft.Json.dll" />
-    <file src="netstandard2.0\System.Collections.Immutable.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\System.Collections.Immutable.dll" />
-    <file src="netstandard2.0\System.Reflection.Metadata.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\System.Reflection.Metadata.dll" />
-
-    <file src="net462\testhost.exe"	target="tools\netcoreapp3.1\TestHostNetFramework\testhost.exe" />
-    <file src="net462\testhost.exe.config"	target="tools\netcoreapp3.1\TestHostNetFramework\testhost.exe.config" />
-    <file src="net47\testhost.net47.exe"	target="tools\netcoreapp3.1\TestHostNetFramework\testhost.net47.exe" />
-    <file src="net47\testhost.net47.exe.config"	target="tools\netcoreapp3.1\TestHostNetFramework\testhost.net47.exe.config" />
-    <file src="net471\testhost.net471.exe"	target="tools\netcoreapp3.1\TestHostNetFramework\testhost.net471.exe" />
-    <file src="net471\testhost.net471.exe.config"	target="tools\netcoreapp3.1\TestHostNetFramework\testhost.net471.exe.config" />
-    <file src="net472\testhost.net472.exe"	target="tools\netcoreapp3.1\TestHostNetFramework\testhost.net472.exe" />
-    <file src="net472\testhost.net472.exe.config"	target="tools\netcoreapp3.1\TestHostNetFramework\testhost.net472.exe.config" />
-    <file src="net48\testhost.net48.exe"	target="tools\netcoreapp3.1\TestHostNetFramework\testhost.net48.exe" />
-    <file src="net48\testhost.net48.exe.config"	target="tools\netcoreapp3.1\TestHostNetFramework\testhost.net48.exe.config" />
-
-    <file src="net462\testhost.x86.exe"	target="tools\netcoreapp3.1\TestHostNetFramework\testhost.x86.exe" />
-    <file src="net462\testhost.x86.exe.config"	target="tools\netcoreapp3.1\TestHostNetFramework\testhost.x86.exe.config" />
-    <file src="net47\testhost.net47.x86.exe"	target="tools\netcoreapp3.1\TestHostNetFramework\testhost.net47.x86.exe" />
-    <file src="net47\testhost.net47.x86.exe.config"	target="tools\netcoreapp3.1\TestHostNetFramework\testhost.net47.x86.exe.config" />
-    <file src="net471\testhost.net471.x86.exe"	target="tools\netcoreapp3.1\TestHostNetFramework\testhost.net471.x86.exe" />
-    <file src="net471\testhost.net471.x86.exe.config"	target="tools\netcoreapp3.1\TestHostNetFramework\testhost.net471.x86.exe.config" />
-    <file src="net472\testhost.net472.x86.exe"	target="tools\netcoreapp3.1\TestHostNetFramework\testhost.net472.x86.exe" />
-    <file src="net472\testhost.net472.x86.exe.config"	target="tools\netcoreapp3.1\TestHostNetFramework\testhost.net472.x86.exe.config" />
-    <file src="net48\testhost.net48.x86.exe"	target="tools\netcoreapp3.1\TestHostNetFramework\testhost.net48.x86.exe" />
-    <file src="net48\testhost.net48.x86.exe.config"	target="tools\netcoreapp3.1\TestHostNetFramework\testhost.net48.x86.exe.config" />
-
-    <file src="net462\testhost.arm64.exe"	target="tools\netcoreapp3.1\TestHostNetFramework\testhost.arm64.exe" />
-    <file src="net462\testhost.arm64.exe.config"	target="tools\netcoreapp3.1\TestHostNetFramework\testhost.arm64.exe.config" />
-    <file src="net47\testhost.net47.arm64.exe"	target="tools\netcoreapp3.1\TestHostNetFramework\testhost.net47.arm64.exe" />
-    <file src="net47\testhost.net47.arm64.exe.config"	target="tools\netcoreapp3.1\TestHostNetFramework\testhost.net47.arm64.exe.config" />
-    <file src="net471\testhost.net471.arm64.exe"	target="tools\netcoreapp3.1\TestHostNetFramework\testhost.net471.arm64.exe" />
-    <file src="net471\testhost.net471.arm64.exe.config"	target="tools\netcoreapp3.1\TestHostNetFramework\testhost.net471.arm64.exe.config" />
-    <file src="net472\testhost.net472.arm64.exe"	target="tools\netcoreapp3.1\TestHostNetFramework\testhost.net472.arm64.exe" />
-    <file src="net472\testhost.net472.arm64.exe.config"	target="tools\netcoreapp3.1\TestHostNetFramework\testhost.net472.arm64.exe.config" />
-    <file src="net48\testhost.net48.arm64.exe"	target="tools\netcoreapp3.1\TestHostNetFramework\testhost.net48.arm64.exe" />
-    <file src="net48\testhost.net48.arm64.exe.config"	target="tools\netcoreapp3.1\TestHostNetFramework\testhost.net48.arm64.exe.config" />
-
-    <file src="netcoreapp3.1\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp3.1\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp3.1\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp3.1\cs\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\cs\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp3.1\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp3.1\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp3.1\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp3.1\de\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp3.1\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp3.1\de\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\de\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp3.1\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp3.1\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp3.1\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp3.1\es\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp3.1\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp3.1\es\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\es\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp3.1\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp3.1\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp3.1\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp3.1\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp3.1\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp3.1\fr\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\fr\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp3.1\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp3.1\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp3.1\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp3.1\it\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp3.1\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp3.1\it\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\it\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp3.1\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp3.1\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp3.1\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp3.1\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp3.1\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp3.1\ja\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\ja\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp3.1\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp3.1\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp3.1\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp3.1\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp3.1\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp3.1\ko\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\ko\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp3.1\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp3.1\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp3.1\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp3.1\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp3.1\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp3.1\pl\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\pl\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp3.1\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp3.1\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp3.1\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp3.1\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp3.1\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp3.1\ru\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\ru\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp3.1\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp3.1\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp3.1\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp3.1\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp3.1\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp3.1\tr\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\tr\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp3.1\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp3.1\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-
-    <file src="netcoreapp3.1\Microsoft.Internal.Dia\x64\msdia140.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\x64\msdia140.dll" />
-    <file src="netcoreapp3.1\Microsoft.Internal.Dia\x64\msdia140.dll.manifest"	target="tools\netcoreapp3.1\TestHostNetFramework\x64\msdia140.dll.manifest" />
-    <file src="netcoreapp3.1\Microsoft.Internal.Dia\x86\msdia140.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\x86\msdia140.dll" />
-    <file src="netcoreapp3.1\Microsoft.Internal.Dia\x86\msdia140.dll.manifest"	target="tools\netcoreapp3.1\TestHostNetFramework\x86\msdia140.dll.manifest" />
-
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp3.1\TestHostNetFramework\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp3.1\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp3.1\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp3.1\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp3.1\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp3.1\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp3.1\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp3.1\tr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\netcoreapp3.1\Extensions\tr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="netcoreapp3.1\tr\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp3.1\tr\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp3.1\tr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\netcoreapp3.1\tr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="netcoreapp3.1\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp3.1\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="netcoreapp3.1\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp3.1\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp3.1\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp3.1\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="netcoreapp3.1\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp3.1\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="netcoreapp3.1\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp3.1\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp3.1\tr\vstest.console.resources.dll"	target="tools\netcoreapp3.1\tr\vstest.console.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp3.1\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp3.1\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp3.1\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\netcoreapp3.1\Extensions\zh-Hans\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp3.1\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\netcoreapp3.1\zh-Hans\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp3.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp3.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp3.1\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp3.1\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp3.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hans\vstest.console.resources.dll"	target="tools\netcoreapp3.1\zh-Hans\vstest.console.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp3.1\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp3.1\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp3.1\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\netcoreapp3.1\Extensions\zh-Hant\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp3.1\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\netcoreapp3.1\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp3.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp3.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp3.1\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp3.1\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp3.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp3.1\zh-Hant\vstest.console.resources.dll"	target="tools\netcoreapp3.1\zh-Hant\vstest.console.resources.dll" />
+    <file src="net481\testhost.net481.arm64.exe"	target="tools\net462\testhost.net481.arm64.exe" />
+    <file src="net481\testhost.net481.arm64.exe.config"	target="tools\net462\testhost.net481.arm64.exe.config" />
+
+    <file src="net48\vstest.console.exe"	target="tools\net462\vstest.console.exe" />
+    <file src="net48\vstest.console.exe.config"	target="tools\net462\vstest.console.exe.config" />
+    <file src="net48\vstest.console.arm64.exe"	target="tools\net462\vstest.console.arm64.exe" />
+    <file src="net48\vstest.console.arm64.exe.config"	target="tools\net462\vstest.console.arm64.exe.config" />
+
+    <file src="net48\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\cs\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\cs\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\cs\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\cs\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\cs\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\cs\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\cs\vstest.console.resources.dll"	target="tools\net462\cs\vstest.console.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\de\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\de\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\de\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\de\vstest.console.resources.dll"	target="tools\net462\de\vstest.console.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\es\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\es\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\es\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\es\vstest.console.resources.dll"	target="tools\net462\es\vstest.console.resources.dll" />
+
+    <file src="net48\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll"	target="tools\net462\Extensions\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" />
+
+    <file src="net48\DumpMinitool.exe" target="tools\net462\Extensions\dump\DumpMinitool.exe" />
+    <file src="net48\DumpMinitool.exe.config" target="tools\net462\Extensions\dump\DumpMinitool.exe.config" />
+
+    <file src="net48\DumpMinitool.x86.exe" target="tools\net462\Extensions\dump\DumpMinitool.x86.exe" />
+    <file src="net48\DumpMinitool.x86.exe.config" target="tools\net462\Extensions\dump\DumpMinitool.x86.exe.config" />
+
+    <file src="net48\DumpMinitool.arm64.exe" target="tools\net462\Extensions\dump\DumpMinitool.arm64.exe" />
+    <file src="net48\DumpMinitool.arm64.exe.config" target="tools\net462\Extensions\dump\DumpMinitool.arm64.exe.config" />
+
+    <file src="net48\Microsoft.TestPlatform.TestHostRuntimeProvider.dll"	target="tools\net462\Extensions\Microsoft.TestPlatform.TestHostRuntimeProvider.dll" />
+    <file src="net48\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll"	target="tools\net462\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" />
+
+    <file src="net48\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+
+    <file src="net48\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll"	target="tools\net462\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" />
+    <file src="net48\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\cs\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\cs\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\fr\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\it\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\ja\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\ko\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\pl\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\pt-BR\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\ru\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\tr\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\zh-Hans\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\zh-Hant\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\de\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\es\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
+    <file src="net48\cs\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\cs\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\fr\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\it\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\ja\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\ko\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\pl\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\pt-BR\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\ru\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\tr\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\zh-Hans\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\zh-Hant\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\de\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\es\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
+
+    <file src="net48\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\fr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\fr\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\fr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\fr\vstest.console.resources.dll"	target="tools\net462\fr\vstest.console.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\it\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\it\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\it\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\it\vstest.console.resources.dll"	target="tools\net462\it\vstest.console.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\ja\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\ja\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\ja\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\ja\vstest.console.resources.dll"	target="tools\net462\ja\vstest.console.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\ko\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\ko\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\ko\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\ko\vstest.console.resources.dll"	target="tools\net462\ko\vstest.console.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\pl\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\pl\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\pl\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\pl\vstest.console.resources.dll"	target="tools\net462\pl\vstest.console.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\pt-BR\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\pt-BR\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\pt-BR\vstest.console.resources.dll"	target="tools\net462\pt-BR\vstest.console.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\ru\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\ru\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\ru\vstest.console.resources.dll"	target="tools\net462\ru\vstest.console.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\tr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\tr\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\tr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\tr\vstest.console.resources.dll"	target="tools\net462\tr\vstest.console.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\zh-Hans\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\zh-Hans\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\zh-Hans\vstest.console.resources.dll"	target="tools\net462\zh-Hans\vstest.console.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\zh-Hant\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\zh-Hant\vstest.console.resources.dll"	target="tools\net462\zh-Hant\vstest.console.resources.dll" />
+
+    <!-- net8.0 -->
+    <file src="net8.0\datacollector.deps.json"	target="tools\net8.0\datacollector.deps.json" />
+    <file src="net8.0\datacollector.dll"	target="tools\net8.0\datacollector.dll" />
+    <file src="net8.0\datacollector.dll.config"	target="tools\net8.0\datacollector.dll.config" />
+    <file src="net8.0\datacollector.runtimeconfig.json"	target="tools\net8.0\datacollector.runtimeconfig.json" />
+    <file src="netstandard2.0\Microsoft.Extensions.DependencyModel.dll"	target="tools\net8.0\Microsoft.Extensions.DependencyModel.dll" />
+    <file src="netstandard2.0\Microsoft.Extensions.FileSystemGlobbing.dll"	target="tools\net8.0\Microsoft.Extensions.FileSystemGlobbing.dll" />
+    <file src="net8.0\Microsoft.TestPlatform.CommunicationUtilities.dll"	target="tools\net8.0\Microsoft.TestPlatform.CommunicationUtilities.dll" />
+    <file src="net8.0\Microsoft.TestPlatform.CoreUtilities.dll"	target="tools\net8.0\Microsoft.TestPlatform.CoreUtilities.dll" />
+    <file src="net8.0\Microsoft.TestPlatform.CrossPlatEngine.dll"	target="tools\net8.0\Microsoft.TestPlatform.CrossPlatEngine.dll" />
+    <file src="net8.0\Microsoft.TestPlatform.PlatformAbstractions.dll"	target="tools\net8.0\Microsoft.TestPlatform.PlatformAbstractions.dll" />
+    <file src="net8.0\Microsoft.TestPlatform.Utilities.dll"	target="tools\net8.0\Microsoft.TestPlatform.Utilities.dll" />
+    <file src="net8.0\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll"	target="tools\net8.0\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" />
+    <file src="net8.0\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xml"	target="tools\net8.0\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xml" />
+    <file src="net8.0\Microsoft.VisualStudio.TestPlatform.Client.dll"	target="tools\net8.0\Microsoft.VisualStudio.TestPlatform.Client.dll" />
+    <file src="net8.0\Microsoft.VisualStudio.TestPlatform.Common.dll"	target="tools\net8.0\Microsoft.VisualStudio.TestPlatform.Common.dll" />
+    <file src="net8.0\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll"	target="tools\net8.0\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
+
+    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\Microsoft.CodeCoverage.IO.dll"	target="tools\net8.0\Microsoft.CodeCoverage.IO.dll" />
+    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\cs\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\net8.0\cs\Microsoft.CodeCoverage.IO.dll" />
+    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\de\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\net8.0\de\Microsoft.CodeCoverage.IO.dll" />
+    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\es\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\net8.0\es\Microsoft.CodeCoverage.IO.dll" />
+    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\fr\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\net8.0\fr\Microsoft.CodeCoverage.IO.dll" />
+    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\it\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\net8.0\it\Microsoft.CodeCoverage.IO.dll" />
+    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\ja\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\net8.0\ja\Microsoft.CodeCoverage.IO.dll" />
+    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\ko\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\net8.0\ko\Microsoft.CodeCoverage.IO.dll" />
+    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\pl\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\net8.0\pl\Microsoft.CodeCoverage.IO.dll" />
+    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\pt-BR\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\net8.0\pt-BR\Microsoft.CodeCoverage.IO.dll" />
+    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\ru\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\net8.0\ru\Microsoft.CodeCoverage.IO.dll" />
+    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\tr\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\net8.0\tr\Microsoft.CodeCoverage.IO.dll" />
+    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\zh-Hans\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\net8.0\zh-Hans\Microsoft.CodeCoverage.IO.dll" />
+    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\zh-Hant\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\net8.0\zh-Hant\Microsoft.CodeCoverage.IO.dll" />
+
+    <file src="netstandard2.0\Newtonsoft.Json.dll"	target="tools\net8.0\Newtonsoft.Json.dll" />
+    <file src="net8.0\vstest.console.deps.json"	target="tools\net8.0\vstest.console.deps.json" />
+    <file src="net8.0\vstest.console.dll"	target="tools\net8.0\vstest.console.dll" />
+    <file src="net8.0\vstest.console.dll.config"	target="tools\net8.0\vstest.console.dll.config" />
+    <file src="net8.0\vstest.console.runtimeconfig.json"	target="tools\net8.0\vstest.console.runtimeconfig.json" />
+
+    <file src="net8.0\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\cs\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net8.0\Extensions\cs\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net8.0\cs\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\cs\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\cs\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net8.0\cs\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net8.0\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net8.0\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net8.0\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net8.0\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net8.0\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net8.0\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net8.0\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\cs\vstest.console.resources.dll"	target="tools\net8.0\cs\vstest.console.resources.dll" />
+    <file src="net8.0\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\de\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\de\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net8.0\Extensions\de\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net8.0\de\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\de\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\de\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net8.0\de\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net8.0\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net8.0\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net8.0\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net8.0\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net8.0\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net8.0\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net8.0\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\de\vstest.console.resources.dll"	target="tools\net8.0\de\vstest.console.resources.dll" />
+    <file src="net8.0\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\es\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\es\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net8.0\Extensions\es\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net8.0\es\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\es\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\es\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net8.0\es\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net8.0\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net8.0\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net8.0\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net8.0\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net8.0\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net8.0\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net8.0\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\es\vstest.console.resources.dll"	target="tools\net8.0\es\vstest.console.resources.dll" />
+
+    <file src="net8.0\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll"	target="tools\net8.0\Extensions\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" />
+
+    <file src="net8.0\DumpMinitool.exe" target="tools\net8.0\Extensions\dump\DumpMinitool.exe" />
+    <file src="net8.0\DumpMinitool.exe.config" target="tools\net8.0\Extensions\dump\DumpMinitool.exe.config" />
+
+    <file src="net8.0\DumpMinitool.x86.exe" target="tools\net8.0\Extensions\dump\DumpMinitool.x86.exe" />
+    <file src="net8.0\DumpMinitool.x86.exe.config" target="tools\net8.0\Extensions\dump\DumpMinitool.x86.exe.config" />
+
+    <file src="net8.0\DumpMinitool.arm64.exe" target="tools\net8.0\Extensions\dump\DumpMinitool.arm64.exe" />
+    <file src="net8.0\DumpMinitool.arm64.exe.config" target="tools\net8.0\dump\Extensions\dump\DumpMinitool.arm64.exe.config" />
+
+    <file src="net8.0\Microsoft.TestPlatform.TestHostRuntimeProvider.dll"	target="tools\net8.0\Extensions\Microsoft.TestPlatform.TestHostRuntimeProvider.dll" />
+    <file src="net8.0\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll"	target="tools\net8.0\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" />
+    <file src="net8.0\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll"	target="tools\net8.0\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" />
+
+    <file src="net8.0\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\fr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net8.0\Extensions\fr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net8.0\fr\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\fr\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\fr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net8.0\fr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net8.0\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net8.0\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net8.0\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net8.0\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net8.0\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net8.0\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net8.0\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\fr\vstest.console.resources.dll"	target="tools\net8.0\fr\vstest.console.resources.dll" />
+    <file src="net8.0\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\it\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\it\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net8.0\Extensions\it\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net8.0\it\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\it\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\it\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net8.0\it\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net8.0\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net8.0\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net8.0\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net8.0\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net8.0\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net8.0\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net8.0\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\it\vstest.console.resources.dll"	target="tools\net8.0\it\vstest.console.resources.dll" />
+    <file src="net8.0\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\ja\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net8.0\Extensions\ja\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net8.0\ja\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\ja\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\ja\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net8.0\ja\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net8.0\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net8.0\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net8.0\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net8.0\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net8.0\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net8.0\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net8.0\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\ja\vstest.console.resources.dll"	target="tools\net8.0\ja\vstest.console.resources.dll" />
+    <file src="net8.0\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\ko\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net8.0\Extensions\ko\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net8.0\ko\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\ko\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\ko\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net8.0\ko\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net8.0\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net8.0\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net8.0\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net8.0\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net8.0\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net8.0\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net8.0\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\ko\vstest.console.resources.dll"	target="tools\net8.0\ko\vstest.console.resources.dll" />
+    <file src="net8.0\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\pl\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net8.0\Extensions\pl\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net8.0\pl\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\pl\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\pl\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net8.0\pl\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net8.0\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net8.0\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net8.0\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net8.0\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net8.0\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net8.0\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net8.0\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\pl\vstest.console.resources.dll"	target="tools\net8.0\pl\vstest.console.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net8.0\Extensions\pt-BR\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net8.0\pt-BR\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net8.0\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net8.0\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net8.0\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\pt-BR\vstest.console.resources.dll"	target="tools\net8.0\pt-BR\vstest.console.resources.dll" />
+    <file src="net8.0\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\ru\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net8.0\Extensions\ru\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net8.0\ru\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\ru\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net8.0\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net8.0\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net8.0\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net8.0\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net8.0\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net8.0\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net8.0\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net8.0\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\ru\vstest.console.resources.dll"	target="tools\net8.0\ru\vstest.console.resources.dll" />
+
+    <file src="net48\datacollector.exe"	target="tools\net8.0\TestHostNetFramework\datacollector.exe" />
+    <file src="net48\datacollector.exe.config"	target="tools\net8.0\TestHostNetFramework\datacollector.exe.config" />
+
+    <file src="net8.0\Microsoft.TestPlatform.CommunicationUtilities.dll"	target="tools\net8.0\TestHostNetFramework\Microsoft.TestPlatform.CommunicationUtilities.dll" />
+    <file src="net8.0\Microsoft.TestPlatform.CoreUtilities.dll"	target="tools\net8.0\TestHostNetFramework\Microsoft.TestPlatform.CoreUtilities.dll" />
+    <file src="net8.0\Microsoft.TestPlatform.CrossPlatEngine.dll"	target="tools\net8.0\TestHostNetFramework\Microsoft.TestPlatform.CrossPlatEngine.dll" />
+    <file src="net8.0\Microsoft.TestPlatform.PlatformAbstractions.dll"	target="tools\net8.0\TestHostNetFramework\Microsoft.TestPlatform.PlatformAbstractions.dll" />
+    <file src="net8.0\Microsoft.TestPlatform.Utilities.dll"	target="tools\net8.0\TestHostNetFramework\Microsoft.TestPlatform.Utilities.dll" />
+    <file src="net8.0\Microsoft.VisualStudio.TestPlatform.Common.dll"	target="tools\net8.0\TestHostNetFramework\Microsoft.VisualStudio.TestPlatform.Common.dll" />
+    <file src="net8.0\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll"	target="tools\net8.0\TestHostNetFramework\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
+    <file src="netstandard2.0\Newtonsoft.Json.dll"	target="tools\net8.0\TestHostNetFramework\Newtonsoft.Json.dll" />
+    <file src="netstandard2.0\System.Collections.Immutable.dll"	target="tools\net8.0\TestHostNetFramework\System.Collections.Immutable.dll" />
+    <file src="netstandard2.0\System.Reflection.Metadata.dll"	target="tools\net8.0\TestHostNetFramework\System.Reflection.Metadata.dll" />
+
+    <file src="net462\testhost.exe"	target="tools\net8.0\TestHostNetFramework\testhost.exe" />
+    <file src="net462\testhost.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.exe.config" />
+    <file src="net47\testhost.net47.exe"	target="tools\net8.0\TestHostNetFramework\testhost.net47.exe" />
+    <file src="net47\testhost.net47.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.net47.exe.config" />
+    <file src="net471\testhost.net471.exe"	target="tools\net8.0\TestHostNetFramework\testhost.net471.exe" />
+    <file src="net471\testhost.net471.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.net471.exe.config" />
+    <file src="net472\testhost.net472.exe"	target="tools\net8.0\TestHostNetFramework\testhost.net472.exe" />
+    <file src="net472\testhost.net472.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.net472.exe.config" />
+    <file src="net48\testhost.net48.exe"	target="tools\net8.0\TestHostNetFramework\testhost.net48.exe" />
+    <file src="net48\testhost.net48.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.net48.exe.config" />
+    <file src="net481\testhost.net481.exe"	target="tools\net8.0\TestHostNetFramework\testhost.net481.exe" />
+    <file src="net481\testhost.net481.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.net481.exe.config" />
+
+    <file src="net462\testhost.x86.exe"	target="tools\net8.0\TestHostNetFramework\testhost.x86.exe" />
+    <file src="net462\testhost.x86.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.x86.exe.config" />
+    <file src="net47\testhost.net47.x86.exe"	target="tools\net8.0\TestHostNetFramework\testhost.net47.x86.exe" />
+    <file src="net47\testhost.net47.x86.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.net47.x86.exe.config" />
+    <file src="net471\testhost.net471.x86.exe"	target="tools\net8.0\TestHostNetFramework\testhost.net471.x86.exe" />
+    <file src="net471\testhost.net471.x86.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.net471.x86.exe.config" />
+    <file src="net472\testhost.net472.x86.exe"	target="tools\net8.0\TestHostNetFramework\testhost.net472.x86.exe" />
+    <file src="net472\testhost.net472.x86.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.net472.x86.exe.config" />
+    <file src="net48\testhost.net48.x86.exe"	target="tools\net8.0\TestHostNetFramework\testhost.net48.x86.exe" />
+    <file src="net48\testhost.net48.x86.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.net48.x86.exe.config" />
+    <file src="net481\testhost.net481.x86.exe"	target="tools\net8.0\TestHostNetFramework\testhost.net481.x86.exe" />
+    <file src="net481\testhost.net481.x86.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.net481.x86.exe.config" />
+
+    <file src="net462\testhost.arm64.exe"	target="tools\net8.0\TestHostNetFramework\testhost.arm64.exe" />
+    <file src="net462\testhost.arm64.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.arm64.exe.config" />
+    <file src="net47\testhost.net47.arm64.exe"	target="tools\net8.0\TestHostNetFramework\testhost.net47.arm64.exe" />
+    <file src="net47\testhost.net47.arm64.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.net47.arm64.exe.config" />
+    <file src="net471\testhost.net471.arm64.exe"	target="tools\net8.0\TestHostNetFramework\testhost.net471.arm64.exe" />
+    <file src="net471\testhost.net471.arm64.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.net471.arm64.exe.config" />
+    <file src="net472\testhost.net472.arm64.exe"	target="tools\net8.0\TestHostNetFramework\testhost.net472.arm64.exe" />
+    <file src="net472\testhost.net472.arm64.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.net472.arm64.exe.config" />
+    <file src="net48\testhost.net48.arm64.exe"	target="tools\net8.0\TestHostNetFramework\testhost.net48.arm64.exe" />
+    <file src="net48\testhost.net48.arm64.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.net48.arm64.exe.config" />
+    <file src="net481\testhost.net481.arm64.exe"	target="tools\net8.0\TestHostNetFramework\testhost.net481.arm64.exe" />
+    <file src="net481\testhost.net481.arm64.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.net481.arm64.exe.config" />
+
+    <file src="net8.0\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\TestHostNetFramework\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\cs\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\cs\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\TestHostNetFramework\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\TestHostNetFramework\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\de\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\TestHostNetFramework\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\de\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\de\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\TestHostNetFramework\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\TestHostNetFramework\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\es\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\TestHostNetFramework\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\es\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\es\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\TestHostNetFramework\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\TestHostNetFramework\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\TestHostNetFramework\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\fr\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\fr\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\TestHostNetFramework\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\TestHostNetFramework\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\it\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\TestHostNetFramework\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\it\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\it\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\TestHostNetFramework\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\TestHostNetFramework\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\TestHostNetFramework\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\ja\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\ja\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\TestHostNetFramework\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\TestHostNetFramework\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\TestHostNetFramework\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\ko\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\ko\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\TestHostNetFramework\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\TestHostNetFramework\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\TestHostNetFramework\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\pl\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\pl\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\TestHostNetFramework\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\TestHostNetFramework\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\TestHostNetFramework\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\TestHostNetFramework\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\TestHostNetFramework\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\TestHostNetFramework\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\ru\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\ru\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\TestHostNetFramework\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\TestHostNetFramework\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\TestHostNetFramework\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\tr\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\tr\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\TestHostNetFramework\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\TestHostNetFramework\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+
+    <file src="net8.0\Microsoft.Internal.Dia\x64\msdia140.dll"	target="tools\net8.0\TestHostNetFramework\x64\msdia140.dll" />
+    <file src="net8.0\Microsoft.Internal.Dia\x64\msdia140.dll.manifest"	target="tools\net8.0\TestHostNetFramework\x64\msdia140.dll.manifest" />
+    <file src="net8.0\Microsoft.Internal.Dia\x86\msdia140.dll"	target="tools\net8.0\TestHostNetFramework\x86\msdia140.dll" />
+    <file src="net8.0\Microsoft.Internal.Dia\x86\msdia140.dll.manifest"	target="tools\net8.0\TestHostNetFramework\x86\msdia140.dll.manifest" />
+
+    <file src="net8.0\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\TestHostNetFramework\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\TestHostNetFramework\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\TestHostNetFramework\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\TestHostNetFramework\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\TestHostNetFramework\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\TestHostNetFramework\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\tr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net8.0\Extensions\tr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net8.0\tr\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\tr\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\tr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net8.0\tr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net8.0\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net8.0\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net8.0\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net8.0\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net8.0\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net8.0\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net8.0\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\tr\vstest.console.resources.dll"	target="tools\net8.0\tr\vstest.console.resources.dll" />
+    <file src="net8.0\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\zh-Hans\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net8.0\Extensions\zh-Hans\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net8.0\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\zh-Hans\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net8.0\zh-Hans\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net8.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net8.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net8.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net8.0\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net8.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net8.0\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net8.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\zh-Hans\vstest.console.resources.dll"	target="tools\net8.0\zh-Hans\vstest.console.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net8.0\Extensions\zh-Hant\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net8.0\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net8.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net8.0\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net8.0\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\zh-Hant\vstest.console.resources.dll"	target="tools\net8.0\zh-Hant\vstest.console.resources.dll" />
   </files>
 </package>
diff --git a/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.csproj b/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.csproj
index 356823b26f..b23cfbab55 100644
--- a/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.csproj
+++ b/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net462</TargetFrameworks>
+    <TargetFrameworks>$(TestHostMinimumTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -48,7 +48,7 @@
   </Target>
 
   <ItemGroup>
-    <None Update="Microsoft.TestPlatform.TestHost.props" Condition=" '$(TargetFramework)' == '$(NetCoreAppMinimum)' ">
+    <None Update="Microsoft.TestPlatform.TestHost.props" Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)')) ">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
diff --git a/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.nuspec b/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.nuspec
index 2b676ebbdb..903c26b98d 100644
--- a/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.nuspec
+++ b/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.nuspec
@@ -4,7 +4,7 @@
     $CommonMetadataElements$
 
     <dependencies>
-      <group targetFramework="netcoreapp3.1">
+      <group targetFramework="net8.0">
         <dependency id="Microsoft.TestPlatform.ObjectModel" version="$Version$"/>
         <dependency id="Newtonsoft.Json" version="$NewtonsoftJsonVersion$"/>
       </group>
@@ -20,21 +20,21 @@
     <file src="$SrcPackageFolder$ThirdPartyNotices.txt" target="" />
 
     <!-- net462 -->
-    <file src="netcoreapp3.1\_._" target="lib\net462\" />
+    <file src="net8.0\_._" target="lib\net462\" />
 
-    <!-- netcoreapp3.1 -->
-    <file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.*.dll" target="lib\netcoreapp3.1\" />
-    <file src="netcoreapp3.1\Microsoft.TestPlatform.*.dll" exclude="netcoreapp3.1\**\Microsoft.TestPlatform.TestHost.dll" target="lib\netcoreapp3.1\" />
+    <!-- net8.0 -->
+    <file src="net8.0\Microsoft.VisualStudio.TestPlatform.*.dll" target="lib\net8.0\" />
+    <file src="net8.0\Microsoft.TestPlatform.*.dll" exclude="net8.0\**\Microsoft.TestPlatform.TestHost.dll" target="lib\net8.0\" />
 
-    <file src="netcoreapp3.1\testhost.dll" target="lib\netcoreapp3.1\" />
-    <file src="netcoreapp3.1\testhost.deps.json" target="lib\netcoreapp3.1\" />
+    <file src="net8.0\testhost.dll" target="lib\net8.0\" />
+    <file src="net8.0\testhost.deps.json" target="lib\net8.0\" />
 
-    <file src="netcoreapp3.1\x86\msdia140.dll" target="lib\netcoreapp3.1\x86\" />
-    <file src="netcoreapp3.1\x64\msdia140.dll" target="lib\netcoreapp3.1\x64\" />
+    <file src="net8.0\x86\msdia140.dll" target="lib\net8.0\x86\" />
+    <file src="net8.0\x64\msdia140.dll" target="lib\net8.0\x64\" />
 
     <!--
           We move AnyCPU version of testhost.dll, at the moment we don't have native code that needs particular architecture inside testhost.dll.
-          This prevent possible issue related to override x64(testshost.dll) compilation inside Microsoft.TestPlatform.TestHost.NetCore.prop netcoreapp3.1\x64\testhost.dll to the bin folder
+          This prevent possible issue related to override x64(testshost.dll) compilation inside Microsoft.TestPlatform.TestHost.NetCore.prop net8.0\x64\testhost.dll to the bin folder
           that contains AnyCPU version.
           In case of -arch arm64/x86 with a x64 SDK on arm where we use only dotnet muxer+testhost.dll to do arch switch,
           if we copy x64 testshost.dll we'll fail to load with `arm64/dotnet.exe exec testhost.dll`.
@@ -43,56 +43,56 @@
           This means parse/understand -arch inside msbuild, not trivial, so for now we simply copy the AnyCPU version and we keep
           the package authoring as-is for back compatibiliy.
     -->
-    <file src="netcoreapp3.1\testhost.dll" target="build\netcoreapp3.1\x64\" />
-    <file src="netcoreapp3.1\testhost.exe" target="build\netcoreapp3.1\x64\" />
+    <file src="net8.0\testhost.dll" target="build\net8.0\x64\" />
+    <file src="net8.0\testhost.exe" target="build\net8.0\x64\" />
 
-    <file src="netcoreapp3.1\testhost.x86.dll" target="build\netcoreapp3.1\x86\" />
-    <file src="netcoreapp3.1\testhost.x86.exe" target="build\netcoreapp3.1\x86\" />
+    <file src="net8.0\testhost.x86.dll" target="build\net8.0\x86\" />
+    <file src="net8.0\testhost.x86.exe" target="build\net8.0\x86\" />
 
-    <file src="netcoreapp3.1\Microsoft.TestPlatform.TestHost.props" target="build\netcoreapp3.1\" />
+    <file src="net8.0\Microsoft.TestPlatform.TestHost.props" target="build\net8.0\" />
 
 
-    <!-- Add localized resources netcoreapp3.1 -->
-    <file src="netcoreapp3.1\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp3.1\cs" />
-    <file src="netcoreapp3.1\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp3.1\de" />
-    <file src="netcoreapp3.1\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp3.1\es" />
-    <file src="netcoreapp3.1\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp3.1\fr" />
-    <file src="netcoreapp3.1\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp3.1\it" />
-    <file src="netcoreapp3.1\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp3.1\ja" />
-    <file src="netcoreapp3.1\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp3.1\ko" />
-    <file src="netcoreapp3.1\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp3.1\pl" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp3.1\pt-BR" />
-    <file src="netcoreapp3.1\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp3.1\ru" />
-    <file src="netcoreapp3.1\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp3.1\tr" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp3.1\zh-Hans" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp3.1\zh-Hant" />
+    <!-- Add localized resources net8.0 -->
+    <file src="net8.0\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net8.0\cs" />
+    <file src="net8.0\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net8.0\de" />
+    <file src="net8.0\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net8.0\es" />
+    <file src="net8.0\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net8.0\fr" />
+    <file src="net8.0\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net8.0\it" />
+    <file src="net8.0\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net8.0\ja" />
+    <file src="net8.0\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net8.0\ko" />
+    <file src="net8.0\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net8.0\pl" />
+    <file src="net8.0\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net8.0\pt-BR" />
+    <file src="net8.0\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net8.0\ru" />
+    <file src="net8.0\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net8.0\tr" />
+    <file src="net8.0\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net8.0\zh-Hans" />
+    <file src="net8.0\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net8.0\zh-Hant" />
 
-    <file src="netcoreapp3.1\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp3.1\cs" />
-    <file src="netcoreapp3.1\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp3.1\de" />
-    <file src="netcoreapp3.1\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp3.1\es" />
-    <file src="netcoreapp3.1\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp3.1\fr" />
-    <file src="netcoreapp3.1\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp3.1\it" />
-    <file src="netcoreapp3.1\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp3.1\ja" />
-    <file src="netcoreapp3.1\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp3.1\ko" />
-    <file src="netcoreapp3.1\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp3.1\pl" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp3.1\pt-BR" />
-    <file src="netcoreapp3.1\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp3.1\ru" />
-    <file src="netcoreapp3.1\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp3.1\tr" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp3.1\zh-Hans" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp3.1\zh-Hant" />
+    <file src="net8.0\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\net8.0\cs" />
+    <file src="net8.0\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\net8.0\de" />
+    <file src="net8.0\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\net8.0\es" />
+    <file src="net8.0\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\net8.0\fr" />
+    <file src="net8.0\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\net8.0\it" />
+    <file src="net8.0\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\net8.0\ja" />
+    <file src="net8.0\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\net8.0\ko" />
+    <file src="net8.0\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\net8.0\pl" />
+    <file src="net8.0\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\net8.0\pt-BR" />
+    <file src="net8.0\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\net8.0\ru" />
+    <file src="net8.0\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\net8.0\tr" />
+    <file src="net8.0\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\net8.0\zh-Hans" />
+    <file src="net8.0\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\net8.0\zh-Hant" />
 
-    <file src="netcoreapp3.1\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp3.1\cs" />
-    <file src="netcoreapp3.1\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp3.1\de" />
-    <file src="netcoreapp3.1\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp3.1\es" />
-    <file src="netcoreapp3.1\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp3.1\fr" />
-    <file src="netcoreapp3.1\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp3.1\it" />
-    <file src="netcoreapp3.1\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp3.1\ja" />
-    <file src="netcoreapp3.1\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp3.1\ko" />
-    <file src="netcoreapp3.1\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp3.1\pl" />
-    <file src="netcoreapp3.1\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp3.1\pt-BR" />
-    <file src="netcoreapp3.1\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp3.1\ru" />
-    <file src="netcoreapp3.1\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp3.1\tr" />
-    <file src="netcoreapp3.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp3.1\zh-Hans" />
-    <file src="netcoreapp3.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp3.1\zh-Hant" />
+    <file src="net8.0\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net8.0\cs" />
+    <file src="net8.0\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net8.0\de" />
+    <file src="net8.0\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net8.0\es" />
+    <file src="net8.0\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net8.0\fr" />
+    <file src="net8.0\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net8.0\it" />
+    <file src="net8.0\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net8.0\ja" />
+    <file src="net8.0\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net8.0\ko" />
+    <file src="net8.0\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net8.0\pl" />
+    <file src="net8.0\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net8.0\pt-BR" />
+    <file src="net8.0\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net8.0\ru" />
+    <file src="net8.0\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net8.0\tr" />
+    <file src="net8.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net8.0\zh-Hans" />
+    <file src="net8.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net8.0\zh-Hant" />
   </files>
 </package>
diff --git a/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.csproj b/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.csproj
index b886bb0e37..4eaf14cca6 100644
--- a/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.csproj
+++ b/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppMinimum);$(NetFrameworkMinimum);net47;net471;net472;net48</TargetFrameworks>
+    <!-- $(NetFrameworkRunnerTargetFramework); should be added here, but it causes duplicates in tfm names and nuget restore fails -->
+    <TargetFrameworks>$(TestHostAllTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -41,29 +42,47 @@
     <NuspecProperty Include="TesthostRuntimeconfig=$(RepoRoot)temp\testhost" />
   </ItemGroup>
 
-  <ItemGroup>
+  <!--
+    Runner dependencies are copied to the output package, and target only .NET Framework.
+  -->
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkRunnerTargetFramework)'))">
     <ProjectReference Include="..\..\vstest.console\vstest.console.csproj" />
     <ProjectReference Include="..\..\vstest.console.arm64\vstest.console.arm64.csproj" />
-    <ProjectReference Include="..\..\testhost\testhost.csproj" />
-    <ProjectReference Include="..\..\testhost.x86\testhost.x86.csproj" />
-    <ProjectReference Include="..\..\testhost.arm64\testhost.arm64.csproj" />
+
     <ProjectReference Include="..\..\datacollector\datacollector.csproj" />
     <ProjectReference Include="..\..\datacollector.arm64\datacollector.arm64.csproj" />
-    <ProjectReference Include="..\..\DataCollectors\DumpMinitool\DumpMinitool.csproj" />
-    <ProjectReference Include="..\..\DataCollectors\DumpMinitool.arm64\DumpMinitool.arm64.csproj" />
-    <ProjectReference Include="..\..\DataCollectors\DumpMinitool.x86\DumpMinitool.x86.csproj" />
-    <ProjectReference Include="..\..\DataCollectors\Microsoft.TestPlatform.Extensions.EventLogCollector\Microsoft.TestPlatform.Extensions.EventLogCollector.csproj" />
+    
+    <!-- We are forcing the reference here to .NET Framework project for both .NET and .NET Framework builds.
+    This is because we are offloading the dumping to this tool on Windows, and we need this tool to run anywhere with any selected architecture, and using .NET Framework (or eventually .NET Native)
+    prevents us from having to lookup the correct .NET runtime. -->
+    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool\DumpMinitool.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkMinimum)" />
+    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool.x86\DumpMinitool.x86.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkMinimum)" />
+    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool.arm64\DumpMinitool.arm64.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkMinimum)" />
+
+    <ProjectReference Include="..\..\DataCollectors\Microsoft.TestPlatform.Extensions.EventLogCollector\Microsoft.TestPlatform.Extensions.EventLogCollector.csproj"  SetTargetFramework="TargetFramework=$(NetFrameworkRunnerTargetFramework)"/>
     <ProjectReference Include="..\..\Microsoft.TestPlatform.Extensions.BlameDataCollector\Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj" />
     <ProjectReference Include="..\..\Microsoft.TestPlatform.Extensions.TrxLogger\Microsoft.TestPlatform.Extensions.TrxLogger.csproj" />
-    <ProjectReference Include="..\..\Microsoft.TestPlatform.Extensions.HtmlLogger\Microsoft.TestPlatform.Extensions.HtmlLogger.csproj" />
+    <ProjectReference Include="..\..\Microsoft.TestPlatform.Extensions.HtmlLogger\Microsoft.TestPlatform.Extensions.HtmlLogger.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkRunnerTargetFramework)" />
     <ProjectReference Include="..\..\Microsoft.TestPlatform.TestHostProvider\Microsoft.TestPlatform.TestHostProvider.csproj" />
     <ProjectReference Include="..\..\Microsoft.TestPlatform.PlatformAbstractions\Microsoft.TestPlatform.PlatformAbstractions.csproj" />
     <ProjectReference Include="..\..\SettingsMigrator\SettingsMigrator.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
+  <!--
+    Testhost needs to be built for all versions of .NET Framework, and for the lowest supported version of .NET.
+  -->
+  <ItemGroup>
+    <ProjectReference Include="..\..\testhost\testhost.csproj" />
+    <ProjectReference Include="..\..\testhost.x86\testhost.x86.csproj" />
+    <ProjectReference Include="..\..\testhost.arm64\testhost.arm64.csproj" />
+  </ItemGroup>
+  
+  <!-- 
+    We copy files from these packages, we want to update them as much as we can, so we are using the runner TFM
+    which is most likely higher than what is the minimum supported .NET Framework.
+  -->
+  <ItemGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkRunnerTargetFramework)')) ">
     <PackageReference Include="System.ComponentModel.Composition" Version="$(SystemComponentModelCompositionVersion)" GeneratePathProperty="true" />
-    <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
     <PackageReference Include="Microsoft.CodeCoverage.Instrumentation" Version="$(MicrosoftInternalCodeCoverageVersion)" PrivateAssets="All" GeneratePathProperty="true" />
     <PackageReference Include="Microsoft.CodeCoverage.Instrumentation.Core" Version="$(MicrosoftInternalCodeCoverageVersion)" PrivateAssets="All" GeneratePathProperty="true" />
     <PackageReference Include="Microsoft.CodeCoverage.IO" Version="$(MicrosoftCodeCoverageIOVersion)" GeneratePathProperty="true" />
@@ -86,15 +105,15 @@
     <PackageReference Include="Microsoft.VisualStudio.CUIT" Version="$(TestPlatformExternalsVersion)" PrivateAssets="All" GeneratePathProperty="true" />
     <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="$(MicrosoftVSSDKBuildToolsVersion)" PrivateAssets="All" GeneratePathProperty="true" />
     <PackageReference Include="Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness" Version="$(MicrosoftFakesVersion)" PrivateAssets="All" GeneratePathProperty="true" />
-    <PackageReference Include="Microsoft.VisualStudio.Telemetry" Version="$(MicrosoftVSTelemetryVersion)" PrivateAssets="All" GeneratePathProperty="true"  />
+    <PackageReference Include="Microsoft.VisualStudio.Telemetry" Version="$(MicrosoftVSTelemetryVersion)" PrivateAssets="All" GeneratePathProperty="true" />
     <PackageReference Include="Microsoft.VisualStudio.Utilities.Internal" Version="$(MicrosoftVSUtilitiesInternalVersion)" PrivateAssets="All" GeneratePathProperty="true" />
   </ItemGroup>
 
-  <Target Name="CopyFiles" AfterTargets="Build" Condition=" '$(TargetFramework)' == 'net472' ">
+  <Target Name="CopyFiles" AfterTargets="Build" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkRunnerTargetFramework)'))">
     <ItemGroup>
       <MicrosoftCodeCoverageInstrumentationFiles Include="$(PkgMicrosoft_CodeCoverage_Instrumentation)\runtimes\win\native\*"></MicrosoftCodeCoverageInstrumentationFiles>
       <MicrosoftCodeCoverageIOFiles Include="$(PkgMicrosoft_CodeCoverage_IO)\lib\netstandard2.0\**\*"></MicrosoftCodeCoverageIOFiles>
-      <MicrosoftExtensionsDependencyModelFiles Include="$(PkgMicrosoft_Extensions_DependencyModel)\lib\net451\*"></MicrosoftExtensionsDependencyModelFiles>
+      <MicrosoftExtensionsDependencyModelFiles Include="$(PkgMicrosoft_Extensions_DependencyModel)\lib\net461\*"></MicrosoftExtensionsDependencyModelFiles>
       <MicrosoftExtensionsFileSystemGlobbingFiles Include="$(PkgMicrosoft_Extensions_FileSystemGlobbing)\lib\netstandard2.0\*"></MicrosoftExtensionsFileSystemGlobbingFiles>
       <PlatformAbstractionsDepsJsonFiles Include="..\..\Microsoft.TestPlatform.PlatformAbstractions\bin\$(Configuration)\$(TargetFramework)\*.deps.json"></PlatformAbstractionsDepsJsonFiles>
       <PackageDepsJsonFiles Include="..\..\Microsoft.TestPlatform.PlatformAbstractions\bin\$(Configuration)\$(TargetFramework)\*.deps.json"></PackageDepsJsonFiles>
diff --git a/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec b/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec
index 569b7be7d9..a2e27146bc 100644
--- a/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec
+++ b/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec
@@ -12,115 +12,122 @@
     <file src="$SrcPackageFolder$ThirdPartyNotices.txt" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ThirdPartyNotices.txt" />
 
     <!-- Intellitrace -->
-    <file src="net472\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\extension.vsixmanifest" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\extension.vsixmanifest" />
-    <file src="net472\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTrace.exe" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTrace.exe" />
-    <file src="net472\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTrace.exe.config" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTrace.exe.config" />
-    <file src="net472\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTrace.frontend.pkgdef" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTrace.frontend.pkgdef" />
-    <file src="net472\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTrace.pkgdef" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTrace.pkgdef" />
-    <file src="net472\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTraceCollection.cab" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTraceCollection.cab" />
-    <file src="net472\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Concord.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Concord.dll" />
-    <file src="net472\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Concord.vsdconfig" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Concord.vsdconfig" />
-    <file src="net472\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.ConfigUI.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.ConfigUI.dll" />
-    <file src="net472\Microsoft.IntelliTrace.Core.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Core.dll" />
-    <file src="net472\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Debugger.Common.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Debugger.Common.dll" />
-    <file src="net472\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Debugger.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Debugger.dll" />
-    <file src="net472\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.DebuggerMargin.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.DebuggerMargin.dll" />
-    <file src="net472\Microsoft.Internal.Intellitrace.Extensions\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.dll" />
-    <file src="net472\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Package.Common.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Package.Common.dll" />
-    <file src="net472\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Package.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Package.dll" />
-    <file src="net472\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Package.vsdconfig" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Package.vsdconfig" />
-    <file src="net472\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Profiler.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Profiler.dll" />
-    <file src="net472\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.SearchMargin.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.SearchMargin.dll" />
-    <file src="net472\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.TelemetryObserver.Common.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.TelemetryObserver.Common.dll" />
-    <file src="net472\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.TelemetryObserver.CoreClr.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.TelemetryObserver.CoreClr.dll" />
-    <file src="net472\Microsoft.Internal.Intellitrace.Extensions\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.TelemetryObserver.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.TelemetryObserver.dll" />
-    <file src="net472\Microsoft.Internal.Intellitrace.Extensions\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.DefaultDataQueries.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.DefaultDataQueries.dll" />
-    <file src="net472\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.Diagnostics.TfsSymbolResolver.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.Diagnostics.TfsSymbolResolver.dll" />
-    <file src="net472\Microsoft.VisualStudio.Diagnostics.Utilities.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.Diagnostics.Utilities.dll" />
-    <file src="net472\Microsoft.Internal.Intellitrace.Extensions\x64\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.VIL.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.VIL.dll" />
-    <file src="net472\Microsoft.Internal.Intellitrace.Extensions\x64\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.VIL.NotifyPointInProcHost.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.VIL.NotifyPointInProcHost.dll" />
-    <file src="net472\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProcessSnapshotCleanup.exe" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProcessSnapshotCleanup.exe" />
-    <file src="net472\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProcessSnapshotCleanup.exe.config" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProcessSnapshotCleanup.exe.config" />
-    <file src="net472\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\TDEnvCleanup.exe" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\TDEnvCleanup.exe" />
-    <file src="net472\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\TDEnvCleanup.exe.config" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\TDEnvCleanup.exe.config" />
-    <file src="net472\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\1033\Microsoft.IntelliTrace.Profilerui.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\1033\Microsoft.IntelliTrace.Profilerui.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Microsoft.DiaSymReader.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\deps\Microsoft.DiaSymReader.dll" />
-    <file src="net472\Microsoft.VisualStudio.Enterprise.AspNetHelper.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\deps\Microsoft.VisualStudio.Enterprise.AspNetHelper.dll" />
-    <file src="net472\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\en\collectionplan.xml" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\en\collectionplan.xml" />
-    <file src="net472\Microsoft.Internal.Intellitrace\x64\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\x64\Microsoft.IntelliTrace.Profiler.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\x64\Microsoft.IntelliTrace.Profiler.dll" />
-    <file src="net472\Microsoft.Internal.Intellitrace\x64\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\x64\1033\Microsoft.IntelliTrace.Profilerui.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\x64\1033\Microsoft.IntelliTrace.Profilerui.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\extension.vsixmanifest" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\extension.vsixmanifest" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTrace.exe" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTrace.exe" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTrace.exe.config" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTrace.exe.config" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTrace.frontend.pkgdef" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTrace.frontend.pkgdef" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTrace.pkgdef" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTrace.pkgdef" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTraceCollection.cab" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTraceCollection.cab" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Concord.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Concord.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Concord.vsdconfig" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Concord.vsdconfig" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.ConfigUI.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.ConfigUI.dll" />
+    <file src="net48\Microsoft.IntelliTrace.Core.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Core.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Debugger.Common.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Debugger.Common.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Debugger.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Debugger.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.DebuggerMargin.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.DebuggerMargin.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace.Extensions\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Package.Common.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Package.Common.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Package.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Package.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Package.vsdconfig" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Package.vsdconfig" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Profiler.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Profiler.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.SearchMargin.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.SearchMargin.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.TelemetryObserver.Common.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.TelemetryObserver.Common.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.TelemetryObserver.CoreClr.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.TelemetryObserver.CoreClr.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace.Extensions\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.TelemetryObserver.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.TelemetryObserver.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace.Extensions\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.DefaultDataQueries.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.DefaultDataQueries.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.Diagnostics.TfsSymbolResolver.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.Diagnostics.TfsSymbolResolver.dll" />
+    <file src="net48\Microsoft.VisualStudio.Diagnostics.Utilities.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.Diagnostics.Utilities.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace.Extensions\x64\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.VIL.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.VIL.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace.Extensions\x64\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.VIL.NotifyPointInProcHost.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.VIL.NotifyPointInProcHost.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProcessSnapshotCleanup.exe" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProcessSnapshotCleanup.exe" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProcessSnapshotCleanup.exe.config" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProcessSnapshotCleanup.exe.config" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\TDEnvCleanup.exe" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\TDEnvCleanup.exe" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\TDEnvCleanup.exe.config" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\TDEnvCleanup.exe.config" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\1033\Microsoft.IntelliTrace.Profilerui.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\1033\Microsoft.IntelliTrace.Profilerui.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Microsoft.DiaSymReader.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\deps\Microsoft.DiaSymReader.dll" />
+    <file src="net48\Microsoft.VisualStudio.Enterprise.AspNetHelper.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\deps\Microsoft.VisualStudio.Enterprise.AspNetHelper.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\en\collectionplan.xml" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\en\collectionplan.xml" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x64\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\x64\Microsoft.IntelliTrace.Profiler.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\x64\Microsoft.IntelliTrace.Profiler.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x64\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\x64\1033\Microsoft.IntelliTrace.Profilerui.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\x64\1033\Microsoft.IntelliTrace.Profilerui.dll" />
 
     <!-- Test Platform -->
-    <file src="net472\datacollector.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\datacollector.exe" />
-    <file src="net472\datacollector.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\datacollector.exe.config" />
-    <file src="net472\datacollector.arm64.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\datacollector.arm64.exe" />
-    <file src="net472\datacollector.arm64.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\datacollector.arm64.exe.config" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\LegacyTypes.testtype" target="tools\net462\Common7\IDE\Extensions\TestPlatform\LegacyTypes.testtype" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\ManualTests.testtype" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ManualTests.testtype" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Microsoft.DiaSymReader.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.DiaSymReader.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Microsoft.DiaSymReader.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.DiaSymReader.dll" />
-    <file src="net472\Microsoft.CodeCoverage.Instrumentation\*.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\" />
-    <file src="net462\Microsoft.Extensions.DependencyModel.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.Extensions.DependencyModel.dll" />
-    <file src="net472\Microsoft.Extensions.FileSystemGlobbing\Microsoft.Extensions.FileSystemGlobbing.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.Extensions.FileSystemGlobbing.dll" />
-    <file src="net472\Microsoft.IntelliTrace.Core.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.IntelliTrace.Core.dll" />
-    <file src="net472\Microsoft.TestPlatform.CommunicationUtilities.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.TestPlatform.CommunicationUtilities.dll" />
-    <file src="net472\Microsoft.TestPlatform.CoreUtilities.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.TestPlatform.CoreUtilities.dll" />
-    <file src="net472\Microsoft.TestPlatform.CrossPlatEngine.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.TestPlatform.CrossPlatEngine.dll" />
-    <file src="net472\Microsoft.TestPlatform.PlatformAbstractions.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.TestPlatform.PlatformAbstractions.dll" />
-    <file src="net472\Microsoft.TestPlatform.Utilities.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.TestPlatform.Utilities.dll" />
-    <file src="net472\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" />
-    <file src="net472\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xml" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xml" />
-    <file src="net472\Microsoft.VisualStudio.ArchitectureTools.PEReader.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.ArchitectureTools.PEReader.dll" />
-    <file src="net472\Microsoft.VisualStudio.Diagnostics.Utilities.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Diagnostics.Utilities.dll" />
-    <file src="net472\Microsoft.VisualStudio.Enterprise.AspNetHelper.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Enterprise.AspNetHelper.dll" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.AgentObject.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.AgentObject.dll" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.AgentProcessManager.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.AgentProcessManager.dll" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.Common.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Common.dll" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.ControllerObject.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.ControllerObject.dll" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools.DataCollectors\Microsoft.VisualStudio.QualityTools.DataCollectionAgentObject.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.DataCollectionAgentObject.dll" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.ExecutionCommon.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.ExecutionCommon.dll" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.HostAdapters.ASPNETAdapter.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.HostAdapters.ASPNETAdapter.dll" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.HostAdapters.ASPNETAgent.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.HostAdapters.ASPNETAgent.dll" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.LoadTest.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.LoadTest.dll" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.LoadTestFramework.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.LoadTestFramework.dll" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.Resource.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Resource.dll" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.WebTestFramework.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.WebTestFramework.dll" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.TMI.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.TMI.dll" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.Tips.ManualTest.Adapter.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Tips.ManualTest.Adapter.dll" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.Tips.ManualTest.ObjectModel.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Tips.ManualTest.ObjectModel.dll" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.Tips.ManualTest.Tip.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Tips.ManualTest.Tip.dll" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.Tips.UnitTest.Adapter.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Tips.UnitTest.Adapter.dll" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.Tips.UnitTest.AssemblyResolver.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Tips.UnitTest.AssemblyResolver.dll" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel.dll" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.Tips.UnitTest.Tip.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Tips.UnitTest.Tip.dll" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.Tips.WebLoadTest.Tip.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Tips.WebLoadTest.Tip.dll" />
-    <file src="net472\Microsoft.VisualStudio.TestPlatform.Client.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestPlatform.Client.dll" />
-    <file src="net472\Microsoft.VisualStudio.TestPlatform.Common.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestPlatform.Common.dll" />
-    <file src="net472\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.sxs.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.sxs.manifest" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.TestTools.UITest.Playback.Engine.sxs.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Playback.Engine.sxs.manifest" />
-    <file src="net472\Newtonsoft.Json.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Newtonsoft.Json.dll" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\QTAgent.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTAgent.exe" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\QTAgent.exe.Config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTAgent.exe.Config" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\QTAgent32.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTAgent32.exe" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\QTAgent32.exe.Config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTAgent32.exe.Config" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\QTAgent32_35.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTAgent32_35.exe" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\QTAgent32_35.exe.Config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTAgent32_35.exe.Config" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\QTAgent32_40.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTAgent32_40.exe" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\QTAgent32_40.exe.Config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTAgent32_40.exe.Config" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\QTAgent_35.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTAgent_35.exe" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\QTAgent_35.exe.Config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTAgent_35.exe.Config" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\QTAgent_40.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTAgent_40.exe" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\QTAgent_40.exe.Config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTAgent_40.exe.Config" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\QTDCAgent.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTDCAgent.exe" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\QTDCAgent.exe.Config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTDCAgent.exe.Config" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\QTDCAgent32.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTDCAgent32.exe" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools\QTDCAgent32.exe.Config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTDCAgent32.exe.Config" />
-
-    <file src="net462\System.Collections.Immutable.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\System.Collections.Immutable.dll" />
-    <file src="net462\System.Reflection.Metadata.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\System.Reflection.Metadata.dll" />
-    <file src="net462\System.Runtime.InteropServices.RuntimeInformation.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\System.Runtime.InteropServices.RuntimeInformation.dll" />
+    <file src="net48\datacollector.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\datacollector.exe" />
+    <file src="net48\datacollector.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\datacollector.exe.config" />
+    <file src="net48\datacollector.arm64.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\datacollector.arm64.exe" />
+    <file src="net48\datacollector.arm64.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\datacollector.arm64.exe.config" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\LegacyTypes.testtype" target="tools\net462\Common7\IDE\Extensions\TestPlatform\LegacyTypes.testtype" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\ManualTests.testtype" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ManualTests.testtype" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Microsoft.DiaSymReader.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.DiaSymReader.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Microsoft.DiaSymReader.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.DiaSymReader.dll" />
+    <file src="net48\Microsoft.CodeCoverage.Instrumentation\*.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\" />
+    <file src="net48\Microsoft.Extensions.DependencyModel.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.Extensions.DependencyModel.dll" />
+    <file src="net48\Microsoft.Extensions.FileSystemGlobbing\Microsoft.Extensions.FileSystemGlobbing.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.Extensions.FileSystemGlobbing.dll" />
+    <file src="net48\Microsoft.IntelliTrace.Core.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.IntelliTrace.Core.dll" />
+    <file src="net48\Microsoft.TestPlatform.CommunicationUtilities.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.TestPlatform.CommunicationUtilities.dll" />
+    <file src="net48\Microsoft.TestPlatform.CoreUtilities.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.TestPlatform.CoreUtilities.dll" />
+    <file src="net48\Microsoft.TestPlatform.CrossPlatEngine.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.TestPlatform.CrossPlatEngine.dll" />
+    <file src="net48\Microsoft.TestPlatform.PlatformAbstractions.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.TestPlatform.PlatformAbstractions.dll" />
+    <file src="net48\Microsoft.TestPlatform.Utilities.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.TestPlatform.Utilities.dll" />
+    <file src="net48\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" />
+    <file src="net48\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xml" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xml" />
+    <file src="net48\Microsoft.VisualStudio.ArchitectureTools.PEReader.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.ArchitectureTools.PEReader.dll" />
+    <file src="net48\Microsoft.VisualStudio.Diagnostics.Utilities.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Diagnostics.Utilities.dll" />
+    <file src="net48\Microsoft.VisualStudio.Enterprise.AspNetHelper.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Enterprise.AspNetHelper.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.AgentObject.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.AgentObject.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.AgentProcessManager.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.AgentProcessManager.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.Common.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Common.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.ControllerObject.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.ControllerObject.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools.DataCollectors\Microsoft.VisualStudio.QualityTools.DataCollectionAgentObject.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.DataCollectionAgentObject.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.ExecutionCommon.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.ExecutionCommon.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.HostAdapters.ASPNETAdapter.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.HostAdapters.ASPNETAdapter.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.HostAdapters.ASPNETAgent.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.HostAdapters.ASPNETAgent.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.LoadTest.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.LoadTest.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.LoadTestFramework.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.LoadTestFramework.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.Resource.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Resource.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.WebTestFramework.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.WebTestFramework.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.TMI.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.TMI.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.Tips.ManualTest.Adapter.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Tips.ManualTest.Adapter.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.Tips.ManualTest.ObjectModel.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Tips.ManualTest.ObjectModel.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.Tips.ManualTest.Tip.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Tips.ManualTest.Tip.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.Tips.UnitTest.Adapter.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Tips.UnitTest.Adapter.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.Tips.UnitTest.AssemblyResolver.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Tips.UnitTest.AssemblyResolver.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.Tips.UnitTest.Tip.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Tips.UnitTest.Tip.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.Tips.WebLoadTest.Tip.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Tips.WebLoadTest.Tip.dll" />
+    <file src="net48\Microsoft.VisualStudio.TestPlatform.Client.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestPlatform.Client.dll" />
+    <file src="net48\Microsoft.VisualStudio.TestPlatform.Common.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestPlatform.Common.dll" />
+    <file src="net48\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.sxs.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.sxs.manifest" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.TestTools.UITest.Playback.Engine.sxs.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Playback.Engine.sxs.manifest" />
+    <file src="net48\Newtonsoft.Json.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Newtonsoft.Json.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\QTAgent.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTAgent.exe" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\QTAgent.exe.Config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTAgent.exe.Config" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\QTAgent32.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTAgent32.exe" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\QTAgent32.exe.Config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTAgent32.exe.Config" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\QTAgent32_35.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTAgent32_35.exe" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\QTAgent32_35.exe.Config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTAgent32_35.exe.Config" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\QTAgent32_40.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTAgent32_40.exe" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\QTAgent32_40.exe.Config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTAgent32_40.exe.Config" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\QTAgent_35.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTAgent_35.exe" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\QTAgent_35.exe.Config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTAgent_35.exe.Config" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\QTAgent_40.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTAgent_40.exe" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\QTAgent_40.exe.Config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTAgent_40.exe.Config" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\QTDCAgent.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTDCAgent.exe" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\QTDCAgent.exe.Config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTDCAgent.exe.Config" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\QTDCAgent32.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTDCAgent32.exe" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\QTDCAgent32.exe.Config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTDCAgent32.exe.Config" />
+
+    <!-- This is needed by System.Reflection.Metadata and its dependencies. -->
+    <file src="net48\System.Reflection.Metadata.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\System.Reflection.Metadata.dll" />
+    <file src="net48\System.Collections.Immutable.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\System.Collections.Immutable.dll" />
+    <file src="net48\System.Memory.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\System.Memory.dll" />
+    <file src="net48\System.Runtime.CompilerServices.Unsafe.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\System.Runtime.CompilerServices.Unsafe.dll" />
+    <file src="net48\System.Numerics.Vectors.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\System.Numerics.Vectors.dll" />
+    <file src="net48\System.Buffers.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\System.Buffers.dll" />
+
+    <file src="net48\System.Collections.Immutable.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\System.Collections.Immutable.dll" />
+    <!-- end System.Reflection.Metadata -->
 
     <file src="net462\testhost.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.exe" />
     <file src="net462\testhost.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.exe.config" />
@@ -132,6 +139,8 @@
     <file src="net472\testhost.net472.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net472.exe.config" />
     <file src="net48\testhost.net48.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net48.exe" />
     <file src="net48\testhost.net48.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net48.exe.config" />
+    <file src="net481\testhost.net481.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net481.exe" />
+    <file src="net481\testhost.net481.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net481.exe.config" />
 
     <file src="net462\testhost.x86.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.x86.exe" />
     <file src="net462\testhost.x86.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.x86.exe.config" />
@@ -143,6 +152,8 @@
     <file src="net472\testhost.net472.x86.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net472.x86.exe.config" />
     <file src="net48\testhost.net48.x86.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net48.x86.exe" />
     <file src="net48\testhost.net48.x86.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net48.x86.exe.config" />
+    <file src="net481\testhost.net481.x86.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net481.x86.exe" />
+    <file src="net481\testhost.net481.x86.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net481.x86.exe.config" />
 
     <file src="net462\testhost.arm64.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.arm64.exe" />
     <file src="net462\testhost.arm64.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.arm64.exe.config" />
@@ -154,384 +165,386 @@
     <file src="net472\testhost.net472.arm64.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net472.arm64.exe.config" />
     <file src="net48\testhost.net48.arm64.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net48.arm64.exe" />
     <file src="net48\testhost.net48.arm64.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net48.arm64.exe.config" />
-
-    <file src="net472\vstest.console.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\vstest.console.exe" />
-    <file src="net472\vstest.console.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\vstest.console.exe.config" />
-    <file src="net472\vstest.console.arm64.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\vstest.console.arm64.exe" />
-    <file src="net472\vstest.console.arm64.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\vstest.console.arm64.exe.config" />
-    <file src="net472\SettingsMigrator.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\SettingsMigrator.exe" />
-
-    <file src="net472\Microsoft.VisualStudio.QualityTools\Webloadtest.testtype" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Webloadtest.testtype" />
-
-    <file src="net472\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\cs\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\cs\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net472\cs\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\cs\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net472\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net472\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net472\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net472\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\cs\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\vstest.console.resources.dll" />
-    <file src="net472\cs\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\SettingsMigrator.resources.dll" />
-    <file src="net472\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\de\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\de\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net472\de\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\de\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net472\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net472\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net472\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net472\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\de\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\vstest.console.resources.dll" />
-    <file src="net472\de\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\SettingsMigrator.resources.dll" />
-    <file src="net472\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\es\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\es\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net472\es\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\es\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net472\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net472\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net472\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net472\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\es\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\vstest.console.resources.dll" />
-    <file src="net472\es\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\SettingsMigrator.resources.dll" />
-
-    <file src="net472\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" />
-    <file src="net472\DumpMinitool.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\dump\DumpMinitool.exe" />
-    <file src="net472\DumpMinitool.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\dump\DumpMinitool.exe.config" />
-    <file src="net472\DumpMinitool.x86.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\dump\DumpMinitool.x86.exe" />
-    <file src="net472\DumpMinitool.x86.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\dump\DumpMinitool.x86.exe.config" />
-    <file src="net472\DumpMinitool.arm64.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\dump\DumpMinitool.arm64.exe" />
-    <file src="net472\DumpMinitool.arm64.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\dump\DumpMinitool.arm64.exe.config" />
-    <file src="net472\Microsoft.TestPlatform.Extensions.EventLogCollector.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.TestPlatform.Extensions.EventLogCollector.dll" />
-    <file src="net472\Microsoft.TestPlatform.TestHostRuntimeProvider.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.TestPlatform.TestHostRuntimeProvider.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\VideoRecorder\Microsoft.VisualStudio.QualityTools.VideoRecorderEngine.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\VideoRecorder\Microsoft.VisualStudio.QualityTools.VideoRecorderEngine.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.CodedWebTestAdapter.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.CodedWebTestAdapter.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.TmiAdapter.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.TmiAdapter.dll" />
-    <file src="net472\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" />
-    <file src="net472\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.VSTestIntegration.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.VSTestIntegration.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.WebTestAdapter.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.WebTestAdapter.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.ComInterfaces.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.ComInterfaces.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.CppUnitTestExtension.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.CppUnitTestExtension.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Microsoft.VisualStudio.TestTools.DataCollection.MediaRecorder.Model.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\VideoRecorder\Microsoft.VisualStudio.TestTools.DataCollection.MediaRecorder.Model.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Microsoft.VisualStudio.TestTools.DataCollection.MediaRecorder.Model.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestTools.DataCollection.MediaRecorder.Model.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Microsoft.VisualStudio.TestTools.DataCollection.VideoRecorderCollector.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestTools.DataCollection.VideoRecorderCollector.dll" />
-
-    <file src="net472\Microsoft.VisualStudio.TraceDataCollector.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TraceDataCollector.dll" />
-    <file src="net472\cs\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\cs\Microsoft.VisualStudio.TraceDataCollector.dll" />
-    <file src="net472\de\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\de\Microsoft.VisualStudio.TraceDataCollector.dll" />
-    <file src="net472\es\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\es\Microsoft.VisualStudio.TraceDataCollector.dll" />
-    <file src="net472\fr\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\fr\Microsoft.VisualStudio.TraceDataCollector.dll" />
-    <file src="net472\it\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\it\Microsoft.VisualStudio.TraceDataCollector.dll" />
-    <file src="net472\ja\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ja\Microsoft.VisualStudio.TraceDataCollector.dll" />
-    <file src="net472\ko\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ko\Microsoft.VisualStudio.TraceDataCollector.dll" />
-    <file src="net472\pl\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\pl\Microsoft.VisualStudio.TraceDataCollector.dll" />
-    <file src="net472\pt-BR\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\pt-BR\Microsoft.VisualStudio.TraceDataCollector.dll" />
-    <file src="net472\ru\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ru\Microsoft.VisualStudio.TraceDataCollector.dll" />
-    <file src="net472\tr\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\tr\Microsoft.VisualStudio.TraceDataCollector.dll" />
-    <file src="net472\zh-Hans\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hans\Microsoft.VisualStudio.TraceDataCollector.dll" />
-    <file src="net472\zh-Hant\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hant\Microsoft.VisualStudio.TraceDataCollector.dll" />
-
-    <file src="net472\Microsoft.CodeCoverage.Interprocess.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.CodeCoverage.Interprocess.dll" />
-    <file src="net472\Microsoft.CodeCoverage.Instrumentation.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.CodeCoverage.Instrumentation.dll" />
-    <file src="net472\Microsoft.CodeCoverage.Instrumentation.Core.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.CodeCoverage.Instrumentation.Core.dll" />
-    <file src="net472\Mono.Cecil.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Mono.Cecil.dll" />
-    <file src="net472\Mono.Cecil.Pdb.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Mono.Cecil.Pdb.dll" />
-    <file src="net472\Mono.Cecil.Rocks.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Mono.Cecil.Rocks.dll" />
-    <file src="net472\Microsoft.CodeCoverage.Core.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.CodeCoverage.Core.dll" />
-
-    <file src="net472\Microsoft.CodeCoverage.IO.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.CodeCoverage.IO.dll" />
-    <file src="net472\cs\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.CodeCoverage.IO.dll" />
-    <file src="net472\de\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\Microsoft.CodeCoverage.IO.dll" />
-    <file src="net472\es\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\Microsoft.CodeCoverage.IO.dll" />
-    <file src="net472\fr\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.CodeCoverage.IO.dll" />
-    <file src="net472\it\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\Microsoft.CodeCoverage.IO.dll" />
-    <file src="net472\ja\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.CodeCoverage.IO.dll" />
-    <file src="net472\ko\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.CodeCoverage.IO.dll" />
-    <file src="net472\pl\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.CodeCoverage.IO.dll" />
-    <file src="net472\pt-BR\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.CodeCoverage.IO.dll" />
-    <file src="net472\ru\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.CodeCoverage.IO.dll" />
-    <file src="net472\tr\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.CodeCoverage.IO.dll" />
-    <file src="net472\zh-Hans\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.CodeCoverage.IO.dll" />
-    <file src="net472\zh-Hant\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.CodeCoverage.IO.dll" />
-
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\VideoRecorder\VSTestVideoRecorder.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\VideoRecorder\VSTestVideoRecorder.exe" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\dbghelp.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\dbghelp.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Discoverer.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Discoverer.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll.manifest" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Resources.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Arm.Resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Arm.Resources.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll.manifest" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.arm64.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.arm64.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.arm64.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.arm64.dll.manifest" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Resources.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.TestEngine.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.TestEngine.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.x64.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.x64.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Arm.Resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Arm.Resources.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.arm64.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.arm64.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\x64\dbghelp.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\x64\dbghelp.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\arm64\dbghelp.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\arm64\dbghelp.dll" />
-    <file src="net472\Microsoft.Internal.Dia\x64\msdia140.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\TestImpact\ComComponents\x64\msdia140.dll" />
-    <file src="net472\Microsoft.Internal.Dia\x64\msdia140.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\TestImpact\ComComponents\x64\msdia140.dll.manifest" />
-    <file src="net472\Microsoft.Internal.Dia\x86\msdia140.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\TestImpact\ComComponents\x86\msdia140.dll" />
-    <file src="net472\Microsoft.Internal.Dia\x86\msdia140.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\TestImpact\ComComponents\x86\msdia140.dll.manifest" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools.DataCollectors\Extensions\V1\Microsoft.VisualStudio.QualityTools.Plugins.CodeCoverage.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.QualityTools.Plugins.CodeCoverage.dll" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools.DataCollectors\Extensions\V1\Microsoft.VisualStudio.QualityTools.Plugins.CodeCoverage.dll.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.QualityTools.Plugins.CodeCoverage.dll.config" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\VideoRecorder\Microsoft.VisualStudio.QualityTools.VideoRecorderEngine.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.QualityTools.VideoRecorderEngine.dll" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools.DataCollectors\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.EventLog.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.EventLog.dll" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools.DataCollectors\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.EventLog.dll.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.EventLog.dll.config" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\VideoRecorder\Microsoft.VisualStudio.TestTools.DataCollection.MediaRecorder.Model.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.MediaRecorder.Model.dll" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools.DataCollectors\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.SystemInfo.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.SystemInfo.dll" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools.DataCollectors\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.VideoRecorder.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.VideoRecorder.dll" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools.DataCollectors\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.VideoRecorder.dll.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.VideoRecorder.dll.config" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools.DataCollectors\Extensions\V1\Microsoft.VisualStudio.TraceCollector.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.TraceCollector.dll" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools.DataCollectors\Extensions\V1\Microsoft.VisualStudio.TraceCollector.dll.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.TraceCollector.dll.config" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\VideoRecorder\VSTestVideoRecorder.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\VSTestVideoRecorder.exe" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools.DataCollectors\Extensions\V1\VSTestVideoRecorder.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\VSTestVideoRecorder.exe.config" />
-    <file src="net472\Microsoft.Internal.Dia\x64\msdia140.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\TestImpact\ComComponents\x64\msdia140.dll" />
-    <file src="net472\Microsoft.Internal.Dia\x64\msdia140.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\TestImpact\ComComponents\x64\msdia140.dll.manifest" />
-    <file src="net472\Microsoft.Internal.Dia\x86\msdia140.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\TestImpact\ComComponents\x86\msdia140.dll" />
-    <file src="net472\Microsoft.Internal.Dia\x86\msdia140.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\TestImpact\ComComponents\x86\msdia140.dll.manifest" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools.DataCollectors\Extensions\V1\x64\Microsoft.VisualStudio.Coverage.Monitor.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\x64\Microsoft.VisualStudio.Coverage.Monitor.dll" />
-    <file src="net472\Microsoft.VisualStudio.QualityTools.DataCollectors\Extensions\V1\x86\Microsoft.VisualStudio.Coverage.Monitor.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\x86\Microsoft.VisualStudio.Coverage.Monitor.dll" />
-    <file src="net472\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\fr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\fr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net472\fr\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\fr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net472\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net472\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net472\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net472\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\fr\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\vstest.console.resources.dll" />
-    <file src="net472\fr\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\SettingsMigrator.resources.dll" />
-    <file src="net472\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\it\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\it\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net472\it\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\it\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net472\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net472\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net472\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net472\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\it\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\vstest.console.resources.dll" />
-    <file src="net472\it\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\SettingsMigrator.resources.dll" />
-    <file src="net472\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\ja\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ja\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net472\ja\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\ja\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net472\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net472\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net472\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net472\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\ja\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\vstest.console.resources.dll" />
-    <file src="net472\ja\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\SettingsMigrator.resources.dll" />
-    <file src="net472\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\ko\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ko\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net472\ko\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\ko\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net472\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net472\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net472\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net472\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\ko\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\vstest.console.resources.dll" />
-    <file src="net472\ko\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\SettingsMigrator.resources.dll" />
-    <file src="net472\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\pl\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\pl\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net472\pl\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\pl\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net472\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net472\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net472\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net472\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\pl\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\vstest.console.resources.dll" />
-    <file src="net472\pl\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\SettingsMigrator.resources.dll" />
-    <file src="net472\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\pt-BR\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\pt-BR\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net472\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\pt-BR\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net472\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net472\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net472\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net472\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\pt-BR\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\vstest.console.resources.dll" />
-    <file src="net472\pt-BR\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\SettingsMigrator.resources.dll" />
-    <file src="net472\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\ru\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ru\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net472\ru\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net472\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net472\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net472\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net472\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\ru\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\vstest.console.resources.dll" />
-    <file src="net472\ru\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\SettingsMigrator.resources.dll" />
-    <file src="net472\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\tr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\tr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net472\tr\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\tr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net472\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net472\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net472\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net472\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\tr\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\vstest.console.resources.dll" />
-    <file src="net472\tr\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\SettingsMigrator.resources.dll" />
-    <file src="net472\Microsoft.Internal.Dia\x64\msdia140.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\x64\msdia140.dll" />
-    <file src="net472\Microsoft.Internal.Dia\x64\msdia140.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\x64\msdia140.dll.manifest" />
-    <file src="net472\Microsoft.Internal.Dia\x86\msdia140.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\x86\msdia140.dll" />
-    <file src="net472\Microsoft.Internal.Dia\x86\msdia140.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\x86\msdia140.dll.manifest" />
-    <file src="net472\CodeCoverage\arm64\msdia140.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\arm64\msdia140.dll" />
-    <file src="net472\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\zh-Hans\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hans\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net472\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\zh-Hans\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net472\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net472\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net472\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net472\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\zh-Hans\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\vstest.console.resources.dll" />
-    <file src="net472\zh-Hans\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\SettingsMigrator.resources.dll" />
-    <file src="net472\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\zh-Hant\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hant\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net472\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net472\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net472\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net472\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net472\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\zh-Hant\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\vstest.console.resources.dll" />
-    <file src="net472\zh-Hant\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\SettingsMigrator.resources.dll" />
-    <file src="net472\Microsoft.IntelliTrace.Core.dll" target="tools\net462\Common7\IDE\PrivateAssemblies\Microsoft.IntelliTrace.Core.dll" />
-    <file src="net472\Microsoft.Internal.Intellitrace.Extensions\x86\Common7\IDE\PrivateAssemblies\Microsoft.IntelliTrace.ObjectModel.dll" target="tools\net462\Common7\IDE\PrivateAssemblies\Microsoft.IntelliTrace.ObjectModel.dll" />
-    <file src="net472\Microsoft.VisualStudio.ArchitectureTools.PEReader.dll" target="tools\net462\Common7\IDE\PrivateAssemblies\Microsoft.VisualStudio.ArchitectureTools.PEReader.dll" />
-
-    <file src="net472\CodeCoverage\CodeCoverage.config" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\" />
-    <file src="net472\CodeCoverage\CodeCoverage.exe" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\" />
-    <file src="net472\CodeCoverage\codecoveragemessages.dll" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\codecoveragemessages.dll" />
-    <file src="net472\CodeCoverage\covrun32.dll" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\" />
-    <file src="net472\CodeCoverage\msdia140.dll" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\" />
-    <file src="net472\CodeCoverage\Cov_x86.config" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\" />
-
-    <file src="net472\CodeCoverage\amd64\CodeCoverage.exe" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\amd64\" />
-    <file src="net472\CodeCoverage\amd64\covrun64.dll" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\amd64\" />
-    <file src="net472\CodeCoverage\amd64\msdia140.dll" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\amd64\" />
-    <file src="net472\CodeCoverage\amd64\Cov_x64.config" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\amd64\" />
-
-    <file src="net472\CodeCoverage\arm64\covrunarm64.dll" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\arm64\" />
-    <file src="net472\CodeCoverage\arm64\msdia140.dll" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\arm64\" />
-    <file src="net472\CodeCoverage\arm64\Cov_arm64.config" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\arm64\" />
-
-    <file src="net472\Microsoft.VisualStudio.Telemetry.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Telemetry.dll" />
-    <file src="net472\Microsoft.VisualStudio.Utilities.Internal.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Utilities.Internal.dll" />
-    <file src="net472\Shim\net45\Microsoft.VisualStudio.CodeCoverage.Shim.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.CodeCoverage.Shim.dll" />
+    <file src="net481\testhost.net481.arm64.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net481.arm64.exe" />
+    <file src="net481\testhost.net481.arm64.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net481.arm64.exe.config" />
+
+    <file src="net48\vstest.console.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\vstest.console.exe" />
+    <file src="net48\vstest.console.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\vstest.console.exe.config" />
+    <file src="net48\vstest.console.arm64.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\vstest.console.arm64.exe" />
+    <file src="net48\vstest.console.arm64.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\vstest.console.arm64.exe.config" />
+    <file src="net48\SettingsMigrator.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\SettingsMigrator.exe" />
+
+    <file src="net48\Microsoft.VisualStudio.QualityTools\Webloadtest.testtype" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Webloadtest.testtype" />
+
+    <file src="net48\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\cs\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\cs\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\cs\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\cs\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\cs\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\vstest.console.resources.dll" />
+    <file src="net48\cs\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\SettingsMigrator.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\de\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\de\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\vstest.console.resources.dll" />
+    <file src="net48\de\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\SettingsMigrator.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\es\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\es\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\vstest.console.resources.dll" />
+    <file src="net48\es\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\SettingsMigrator.resources.dll" />
+
+    <file src="net48\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" />
+    <file src="net48\DumpMinitool.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\dump\DumpMinitool.exe" />
+    <file src="net48\DumpMinitool.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\dump\DumpMinitool.exe.config" />
+    <file src="net48\DumpMinitool.x86.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\dump\DumpMinitool.x86.exe" />
+    <file src="net48\DumpMinitool.x86.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\dump\DumpMinitool.x86.exe.config" />
+    <file src="net48\DumpMinitool.arm64.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\dump\DumpMinitool.arm64.exe" />
+    <file src="net48\DumpMinitool.arm64.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\dump\DumpMinitool.arm64.exe.config" />
+    <file src="net48\Microsoft.TestPlatform.Extensions.EventLogCollector.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.TestPlatform.Extensions.EventLogCollector.dll" />
+    <file src="net48\Microsoft.TestPlatform.TestHostRuntimeProvider.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.TestPlatform.TestHostRuntimeProvider.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\VideoRecorder\Microsoft.VisualStudio.QualityTools.VideoRecorderEngine.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\VideoRecorder\Microsoft.VisualStudio.QualityTools.VideoRecorderEngine.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.CodedWebTestAdapter.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.CodedWebTestAdapter.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.TmiAdapter.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.TmiAdapter.dll" />
+    <file src="net48\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" />
+    <file src="net48\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.VSTestIntegration.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.VSTestIntegration.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.WebTestAdapter.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.WebTestAdapter.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.ComInterfaces.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.ComInterfaces.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.CppUnitTestExtension.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.CppUnitTestExtension.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Microsoft.VisualStudio.TestTools.DataCollection.MediaRecorder.Model.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\VideoRecorder\Microsoft.VisualStudio.TestTools.DataCollection.MediaRecorder.Model.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Microsoft.VisualStudio.TestTools.DataCollection.MediaRecorder.Model.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestTools.DataCollection.MediaRecorder.Model.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Microsoft.VisualStudio.TestTools.DataCollection.VideoRecorderCollector.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestTools.DataCollection.VideoRecorderCollector.dll" />
+
+    <file src="net48\Microsoft.VisualStudio.TraceDataCollector.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TraceDataCollector.dll" />
+    <file src="net48\cs\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\cs\Microsoft.VisualStudio.TraceDataCollector.dll" />
+    <file src="net48\de\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\de\Microsoft.VisualStudio.TraceDataCollector.dll" />
+    <file src="net48\es\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\es\Microsoft.VisualStudio.TraceDataCollector.dll" />
+    <file src="net48\fr\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\fr\Microsoft.VisualStudio.TraceDataCollector.dll" />
+    <file src="net48\it\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\it\Microsoft.VisualStudio.TraceDataCollector.dll" />
+    <file src="net48\ja\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ja\Microsoft.VisualStudio.TraceDataCollector.dll" />
+    <file src="net48\ko\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ko\Microsoft.VisualStudio.TraceDataCollector.dll" />
+    <file src="net48\pl\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\pl\Microsoft.VisualStudio.TraceDataCollector.dll" />
+    <file src="net48\pt-BR\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\pt-BR\Microsoft.VisualStudio.TraceDataCollector.dll" />
+    <file src="net48\ru\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ru\Microsoft.VisualStudio.TraceDataCollector.dll" />
+    <file src="net48\tr\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\tr\Microsoft.VisualStudio.TraceDataCollector.dll" />
+    <file src="net48\zh-Hans\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hans\Microsoft.VisualStudio.TraceDataCollector.dll" />
+    <file src="net48\zh-Hant\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hant\Microsoft.VisualStudio.TraceDataCollector.dll" />
+
+    <file src="net48\Microsoft.CodeCoverage.Interprocess.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.CodeCoverage.Interprocess.dll" />
+    <file src="net48\Microsoft.CodeCoverage.Instrumentation.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.CodeCoverage.Instrumentation.dll" />
+    <file src="net48\Microsoft.CodeCoverage.Instrumentation.Core.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.CodeCoverage.Instrumentation.Core.dll" />
+    <file src="net48\Mono.Cecil.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Mono.Cecil.dll" />
+    <file src="net48\Mono.Cecil.Pdb.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Mono.Cecil.Pdb.dll" />
+    <file src="net48\Mono.Cecil.Rocks.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Mono.Cecil.Rocks.dll" />
+    <file src="net48\Microsoft.CodeCoverage.Core.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.CodeCoverage.Core.dll" />
+
+    <file src="net48\Microsoft.CodeCoverage.IO.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\cs\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\de\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\es\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\fr\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\it\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\ja\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\ko\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\pl\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\pt-BR\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\ru\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\tr\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\zh-Hans\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\zh-Hant\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.CodeCoverage.IO.dll" />
+
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\VideoRecorder\VSTestVideoRecorder.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\VideoRecorder\VSTestVideoRecorder.exe" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\dbghelp.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\dbghelp.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Discoverer.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Discoverer.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll.manifest" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Resources.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Arm.Resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Arm.Resources.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll.manifest" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.arm64.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.arm64.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.arm64.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.arm64.dll.manifest" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Resources.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.TestEngine.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.TestEngine.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.x64.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.x64.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Arm.Resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Arm.Resources.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.arm64.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.arm64.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\x64\dbghelp.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\x64\dbghelp.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\arm64\dbghelp.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\arm64\dbghelp.dll" />
+    <file src="net48\Microsoft.Internal.Dia\x64\msdia140.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\TestImpact\ComComponents\x64\msdia140.dll" />
+    <file src="net48\Microsoft.Internal.Dia\x64\msdia140.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\TestImpact\ComComponents\x64\msdia140.dll.manifest" />
+    <file src="net48\Microsoft.Internal.Dia\x86\msdia140.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\TestImpact\ComComponents\x86\msdia140.dll" />
+    <file src="net48\Microsoft.Internal.Dia\x86\msdia140.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\TestImpact\ComComponents\x86\msdia140.dll.manifest" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools.DataCollectors\Extensions\V1\Microsoft.VisualStudio.QualityTools.Plugins.CodeCoverage.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.QualityTools.Plugins.CodeCoverage.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools.DataCollectors\Extensions\V1\Microsoft.VisualStudio.QualityTools.Plugins.CodeCoverage.dll.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.QualityTools.Plugins.CodeCoverage.dll.config" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\VideoRecorder\Microsoft.VisualStudio.QualityTools.VideoRecorderEngine.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.QualityTools.VideoRecorderEngine.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools.DataCollectors\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.EventLog.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.EventLog.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools.DataCollectors\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.EventLog.dll.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.EventLog.dll.config" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\VideoRecorder\Microsoft.VisualStudio.TestTools.DataCollection.MediaRecorder.Model.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.MediaRecorder.Model.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools.DataCollectors\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.SystemInfo.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.SystemInfo.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools.DataCollectors\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.VideoRecorder.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.VideoRecorder.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools.DataCollectors\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.VideoRecorder.dll.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.VideoRecorder.dll.config" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools.DataCollectors\Extensions\V1\Microsoft.VisualStudio.TraceCollector.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.TraceCollector.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools.DataCollectors\Extensions\V1\Microsoft.VisualStudio.TraceCollector.dll.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.TraceCollector.dll.config" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\VideoRecorder\VSTestVideoRecorder.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\VSTestVideoRecorder.exe" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools.DataCollectors\Extensions\V1\VSTestVideoRecorder.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\VSTestVideoRecorder.exe.config" />
+    <file src="net48\Microsoft.Internal.Dia\x64\msdia140.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\TestImpact\ComComponents\x64\msdia140.dll" />
+    <file src="net48\Microsoft.Internal.Dia\x64\msdia140.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\TestImpact\ComComponents\x64\msdia140.dll.manifest" />
+    <file src="net48\Microsoft.Internal.Dia\x86\msdia140.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\TestImpact\ComComponents\x86\msdia140.dll" />
+    <file src="net48\Microsoft.Internal.Dia\x86\msdia140.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\TestImpact\ComComponents\x86\msdia140.dll.manifest" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools.DataCollectors\Extensions\V1\x64\Microsoft.VisualStudio.Coverage.Monitor.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\x64\Microsoft.VisualStudio.Coverage.Monitor.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools.DataCollectors\Extensions\V1\x86\Microsoft.VisualStudio.Coverage.Monitor.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\x86\Microsoft.VisualStudio.Coverage.Monitor.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\fr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\fr\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\vstest.console.resources.dll" />
+    <file src="net48\fr\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\SettingsMigrator.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\it\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\it\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\vstest.console.resources.dll" />
+    <file src="net48\it\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\SettingsMigrator.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ja\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\ja\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\vstest.console.resources.dll" />
+    <file src="net48\ja\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\SettingsMigrator.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ko\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\ko\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\vstest.console.resources.dll" />
+    <file src="net48\ko\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\SettingsMigrator.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\pl\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\pl\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\vstest.console.resources.dll" />
+    <file src="net48\pl\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\SettingsMigrator.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\pt-BR\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\pt-BR\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\vstest.console.resources.dll" />
+    <file src="net48\pt-BR\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\SettingsMigrator.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ru\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\ru\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\vstest.console.resources.dll" />
+    <file src="net48\ru\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\SettingsMigrator.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\tr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\tr\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\vstest.console.resources.dll" />
+    <file src="net48\tr\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\SettingsMigrator.resources.dll" />
+    <file src="net48\Microsoft.Internal.Dia\x64\msdia140.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\x64\msdia140.dll" />
+    <file src="net48\Microsoft.Internal.Dia\x64\msdia140.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\x64\msdia140.dll.manifest" />
+    <file src="net48\Microsoft.Internal.Dia\x86\msdia140.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\x86\msdia140.dll" />
+    <file src="net48\Microsoft.Internal.Dia\x86\msdia140.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\x86\msdia140.dll.manifest" />
+    <file src="net48\CodeCoverage\arm64\msdia140.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\arm64\msdia140.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hans\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\zh-Hans\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\vstest.console.resources.dll" />
+    <file src="net48\zh-Hans\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\SettingsMigrator.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hant\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\zh-Hant\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\vstest.console.resources.dll" />
+    <file src="net48\zh-Hant\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\SettingsMigrator.resources.dll" />
+    <file src="net48\Microsoft.IntelliTrace.Core.dll" target="tools\net462\Common7\IDE\PrivateAssemblies\Microsoft.IntelliTrace.Core.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace.Extensions\x86\Common7\IDE\PrivateAssemblies\Microsoft.IntelliTrace.ObjectModel.dll" target="tools\net462\Common7\IDE\PrivateAssemblies\Microsoft.IntelliTrace.ObjectModel.dll" />
+    <file src="net48\Microsoft.VisualStudio.ArchitectureTools.PEReader.dll" target="tools\net462\Common7\IDE\PrivateAssemblies\Microsoft.VisualStudio.ArchitectureTools.PEReader.dll" />
+
+    <file src="net48\CodeCoverage\CodeCoverage.config" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\" />
+    <file src="net48\CodeCoverage\CodeCoverage.exe" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\" />
+    <file src="net48\CodeCoverage\codecoveragemessages.dll" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\codecoveragemessages.dll" />
+    <file src="net48\CodeCoverage\covrun32.dll" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\" />
+    <file src="net48\CodeCoverage\msdia140.dll" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\" />
+    <file src="net48\CodeCoverage\Cov_x86.config" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\" />
+
+    <file src="net48\CodeCoverage\amd64\CodeCoverage.exe" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\amd64\" />
+    <file src="net48\CodeCoverage\amd64\covrun64.dll" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\amd64\" />
+    <file src="net48\CodeCoverage\amd64\msdia140.dll" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\amd64\" />
+    <file src="net48\CodeCoverage\amd64\Cov_x64.config" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\amd64\" />
+
+    <file src="net48\CodeCoverage\arm64\covrunarm64.dll" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\arm64\" />
+    <file src="net48\CodeCoverage\arm64\msdia140.dll" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\arm64\" />
+    <file src="net48\CodeCoverage\arm64\Cov_arm64.config" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\arm64\" />
+
+    <file src="net48\Microsoft.VisualStudio.Telemetry.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Telemetry.dll" />
+    <file src="net48\Microsoft.VisualStudio.Utilities.Internal.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Utilities.Internal.dll" />
+    <file src="net48\Shim\net45\Microsoft.VisualStudio.CodeCoverage.Shim.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.CodeCoverage.Shim.dll" />
 
     <!-- CUIT -->
-    <file src="net472\Microsoft.VisualStudio.CUIT\Interop.UIAutomationClient.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Interop.UIAutomationClient.dll" />
-    <file src="net472\Microsoft.VisualStudio.CUIT\Microsoft.ShDocVw.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.ShDocVw.dll" />
-    <file src="net472\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.Diagnostics.Measurement.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Diagnostics.Measurement.dll" />
-    <file src="net472\Microsoft.VisualStudio.Interop.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Interop.dll" />
-    <file src="net472\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.QualityTools.CodedUITestFramework.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.CodedUITestFramework.dll" />
-    <file src="net472\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.QualityTools.Sqm.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Sqm.dll" />
-    <file src="net472\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Common.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Common.dll" />
-    <file src="net472\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Extension.dll" />
-    <file src="net472\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.MSAA.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Extension.MSAA.dll" />
-    <file src="net472\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.ExtensionUtilities.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.ExtensionUtilities.dll" />
-    <file src="net472\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Framework.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Framework.dll" />
-    <file src="net472\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Logging.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Logging.dll" />
-    <file src="net472\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Playback.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Playback.dll" />
-    <file src="net472\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.WindowsStoreUtility.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.WindowsStoreUtility.dll" />
-    <file src="net472\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITesting.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITesting.dll" />
-    <file src="net472\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.dll" />
-    <file src="net472\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.Interop.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.Interop.dll" />
-    <file src="net472\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Playback.Engine.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Playback.Engine.dll" />
-    <file src="net472\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Synchronization.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Synchronization.dll" />
-    <file src="net472\Microsoft.VisualStudio.CUIT\UIAComWrapper.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\UIAComWrapper.dll" />
-
-    <file src="net472\Microsoft.VisualStudio.CUIT\IEPropertyConfiguration.xml" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\IEPropertyConfiguration.xml" />
-    <file src="net472\Microsoft.VisualStudio.CUIT\IEPropertyConfiguration.xsd" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\IEPropertyConfiguration.xsd" />
-    <file src="net472\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.CrossBrowser.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.CrossBrowser.dll" />
-    <file src="net472\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.dll" />
-    <file src="net472\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.EventHelper.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.EventHelper.dll" />
-    <file src="net472\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.IE64.Communication.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.IE64.Communication.dll" />
-    <file src="net472\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.dll" />
-    <file src="net472\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.Interop.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.Interop.dll" />
-    <file src="net472\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.Uia.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.Uia.dll" />
-    <file src="net472\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.UiaWidget.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.UiaWidget.dll" />
-    <file src="net472\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.UiaWidget.UIAHtmlElementUtilities.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.UiaWidget.UIAHtmlElementUtilities.dll" />
+    <file src="net48\Microsoft.VisualStudio.CUIT\Interop.UIAutomationClient.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Interop.UIAutomationClient.dll" />
+    <file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.ShDocVw.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.ShDocVw.dll" />
+    <file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.Diagnostics.Measurement.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Diagnostics.Measurement.dll" />
+    <file src="net48\Microsoft.VisualStudio.Interop.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Interop.dll" />
+    <file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.QualityTools.CodedUITestFramework.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.CodedUITestFramework.dll" />
+    <file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.QualityTools.Sqm.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Sqm.dll" />
+    <file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Common.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Common.dll" />
+    <file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Extension.dll" />
+    <file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.MSAA.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Extension.MSAA.dll" />
+    <file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.ExtensionUtilities.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.ExtensionUtilities.dll" />
+    <file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Framework.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Framework.dll" />
+    <file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Logging.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Logging.dll" />
+    <file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Playback.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Playback.dll" />
+    <file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.WindowsStoreUtility.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.WindowsStoreUtility.dll" />
+    <file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITesting.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITesting.dll" />
+    <file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.dll" />
+    <file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.Interop.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.Interop.dll" />
+    <file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Playback.Engine.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Playback.Engine.dll" />
+    <file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Synchronization.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Synchronization.dll" />
+    <file src="net48\Microsoft.VisualStudio.CUIT\UIAComWrapper.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\UIAComWrapper.dll" />
+
+    <file src="net48\Microsoft.VisualStudio.CUIT\IEPropertyConfiguration.xml" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\IEPropertyConfiguration.xml" />
+    <file src="net48\Microsoft.VisualStudio.CUIT\IEPropertyConfiguration.xsd" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\IEPropertyConfiguration.xsd" />
+    <file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.CrossBrowser.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.CrossBrowser.dll" />
+    <file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.dll" />
+    <file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.EventHelper.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.EventHelper.dll" />
+    <file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.IE64.Communication.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.IE64.Communication.dll" />
+    <file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.dll" />
+    <file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.Interop.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.Interop.dll" />
+    <file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.Uia.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.Uia.dll" />
+    <file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.UiaWidget.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.UiaWidget.dll" />
+    <file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.UiaWidget.UIAHtmlElementUtilities.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.UiaWidget.UIAHtmlElementUtilities.dll" />
 
     <!-- .NET Core testhost and CPP adapter -->
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\dbghelp.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\dbghelp.dll" />
-    <file src="net472\Microsoft.TestPlatform.CommunicationUtilities.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.TestPlatform.CommunicationUtilities.dll" />
-
-    <file src="net472\Microsoft.TestPlatform.CoreUtilities.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.TestPlatform.CoreUtilities.dll" />
-
-    <file src="net472\Microsoft.TestPlatform.CrossPlatEngine.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.TestPlatform.CrossPlatEngine.dll" />
-
-    <file src="net472\Microsoft.TestPlatform.PlatformAbstractions.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.TestPlatform.PlatformAbstractions.dll" />
-
-    <file src="net472\Microsoft.TestPlatform.Utilities.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.TestPlatform.Utilities.dll" />
-
-    <file src="net472\Microsoft.VisualStudio.TestPlatform.Common.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestPlatform.Common.dll" />
-
-    <file src="net472\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Arm.Resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Arm.Resources.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.arm64.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.arm64.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.ComInterfaces.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.ComInterfaces.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.CppUnitTestExtension.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.CppUnitTestExtension.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Discoverer.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Discoverer.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Arm.Resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Arm.Resources.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.arm64.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.arm64.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.arm64.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.arm64.dll.manifest" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll.manifest" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Resources.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll.manifest" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Resources.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.TestEngine.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.TestEngine.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.x64.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.x64.dll" />
-    <file src="net472\Newtonsoft.Json.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Newtonsoft.Json.dll" />
-    <file src="net472\System.ComponentModel.Composition.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\System.ComponentModel.Composition.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\dbghelp.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\dbghelp.dll" />
+    <file src="net48\Microsoft.TestPlatform.CommunicationUtilities.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.TestPlatform.CommunicationUtilities.dll" />
+
+    <file src="net48\Microsoft.TestPlatform.CoreUtilities.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.TestPlatform.CoreUtilities.dll" />
+
+    <file src="net48\Microsoft.TestPlatform.CrossPlatEngine.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.TestPlatform.CrossPlatEngine.dll" />
+
+    <file src="net48\Microsoft.TestPlatform.PlatformAbstractions.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.TestPlatform.PlatformAbstractions.dll" />
+
+    <file src="net48\Microsoft.TestPlatform.Utilities.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.TestPlatform.Utilities.dll" />
+
+    <file src="net48\Microsoft.VisualStudio.TestPlatform.Common.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestPlatform.Common.dll" />
+
+    <file src="net48\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Arm.Resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Arm.Resources.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.arm64.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.arm64.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.ComInterfaces.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.ComInterfaces.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.CppUnitTestExtension.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.CppUnitTestExtension.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Discoverer.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Discoverer.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Arm.Resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Arm.Resources.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.arm64.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.arm64.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.arm64.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.arm64.dll.manifest" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll.manifest" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Resources.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll.manifest" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Resources.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.TestEngine.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.TestEngine.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.x64.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.x64.dll" />
+    <file src="net48\Newtonsoft.Json.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Newtonsoft.Json.dll" />
+    <file src="net48\System.ComponentModel.Composition.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\System.ComponentModel.Composition.dll" />
     <file src="$TesthostRuntimeconfig$\testhost-1.0.runtimeconfig.json" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\testhost-1.0.runtimeconfig.json" />
     <file src="$TesthostRuntimeconfig$\testhost-1.1.runtimeconfig.json" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\testhost-1.1.runtimeconfig.json" />
     <file src="$TesthostRuntimeconfig$\testhost-2.0.runtimeconfig.json" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\testhost-2.0.runtimeconfig.json" />
@@ -544,106 +557,106 @@
     <file src="$TesthostRuntimeconfig$\testhost-8.0.runtimeconfig.json" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\testhost-8.0.runtimeconfig.json" />
     <file src="$TesthostRuntimeconfig$\testhost-8.0.runtimeconfig.json" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\testhost-9.0.runtimeconfig.json" />
     <file src="$TesthostRuntimeconfig$\testhost-latest.runtimeconfig.json" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\testhost-latest.runtimeconfig.json" />
-    <file src="netcoreapp3.1\testhost.deps.json" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\testhost.deps.json" />
-    <file src="netcoreapp3.1\testhost.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\testhost.dll" />
-
-    <file src="netcoreapp3.1\testhost.dll.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\testhost.dll.config" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\arm64\dbghelp.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\arm64\dbghelp.dll" />
-    <file src="net472\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\cs\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\cs\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\de\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\de\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\es\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\es\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\fr\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\fr\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\it\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\it\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\ja\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ja\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\ko\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ko\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\pl\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pl\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\ru\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ru\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\tr\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\tr\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\x64\dbghelp.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\x64\dbghelp.dll" />
-    <file src="net472\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net472\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net472\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net472\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net472\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net472\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net472\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\testhost.deps.json" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\testhost.deps.json" />
+    <file src="net8.0\testhost.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\testhost.dll" />
+
+    <file src="net8.0\testhost.dll.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\testhost.dll.config" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\arm64\dbghelp.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\arm64\dbghelp.dll" />
+    <file src="net48\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\cs\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\cs\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\de\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\es\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\fr\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\it\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ja\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ko\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pl\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ru\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\tr\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\x64\dbghelp.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\x64\dbghelp.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
 
     <!-- External dependencies-->
-    <file src="net472\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\TestPlatform\Microsoft.VisualStudio.TestPlatform.Fakes.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestPlatform.Fakes.dll" />
+    <file src="net48\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\TestPlatform\Microsoft.VisualStudio.TestPlatform.Fakes.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestPlatform.Fakes.dll" />
 
-    <file src="net472\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\DataCollector\Microsoft.VisualStudio.Fakes.DataCollector.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.Fakes.DataCollector.dll" />
-    <file src="net472\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\DataCollector\Microsoft.Cci.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.Cci.dll" />
+    <file src="net48\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\DataCollector\Microsoft.VisualStudio.Fakes.DataCollector.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.Fakes.DataCollector.dll" />
+    <file src="net48\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\DataCollector\Microsoft.Cci.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.Cci.dll" />
 
-    <file src="net472\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\Instrumentation\x86\Microsoft.QualityTools.Testing.Fakes.Instrumentation.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Fakes\x86\Microsoft.QualityTools.Testing.Fakes.Instrumentation.dll" />
-    <file src="net472\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\Instrumentation\x86\FakesInstrumentationProfiler_x86.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Fakes\x86\FakesInstrumentationProfiler_x86.config" />
-    <file src="net472\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\Instrumentation\x64\Microsoft.QualityTools.Testing.Fakes.Instrumentation.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Fakes\x64\Microsoft.QualityTools.Testing.Fakes.Instrumentation.dll" />
-    <file src="net472\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\Instrumentation\x64\FakesInstrumentationProfiler_x64.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Fakes\x64\FakesInstrumentationProfiler_x64.config" />
-    <file src="net472\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\Instrumentation\arm64\Microsoft.QualityTools.Testing.Fakes.Instrumentation.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Fakes\arm64\Microsoft.QualityTools.Testing.Fakes.Instrumentation.dll" />
-    <file src="net472\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\Instrumentation\arm64\FakesInstrumentationProfiler_arm64.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Fakes\arm64\FakesInstrumentationProfiler_arm64.config" />
+    <file src="net48\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\Instrumentation\x86\Microsoft.QualityTools.Testing.Fakes.Instrumentation.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Fakes\x86\Microsoft.QualityTools.Testing.Fakes.Instrumentation.dll" />
+    <file src="net48\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\Instrumentation\x86\FakesInstrumentationProfiler_x86.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Fakes\x86\FakesInstrumentationProfiler_x86.config" />
+    <file src="net48\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\Instrumentation\x64\Microsoft.QualityTools.Testing.Fakes.Instrumentation.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Fakes\x64\Microsoft.QualityTools.Testing.Fakes.Instrumentation.dll" />
+    <file src="net48\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\Instrumentation\x64\FakesInstrumentationProfiler_x64.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Fakes\x64\FakesInstrumentationProfiler_x64.config" />
+    <file src="net48\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\Instrumentation\arm64\Microsoft.QualityTools.Testing.Fakes.Instrumentation.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Fakes\arm64\Microsoft.QualityTools.Testing.Fakes.Instrumentation.dll" />
+    <file src="net48\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\Instrumentation\arm64\FakesInstrumentationProfiler_arm64.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Fakes\arm64\FakesInstrumentationProfiler_arm64.config" />
 
-    <file src="net472\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\MicrosoftInstrumentationEngine\x86\MicrosoftInstrumentationEngine_x86.dll" target="tools\net462\Common7\IDE\CommonExtensions\Platform\InstrumentationEngine\x86\MicrosoftInstrumentationEngine_x86.dll" />
-    <file src="net472\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\MicrosoftInstrumentationEngine\x64\MicrosoftInstrumentationEngine_x64.dll" target="tools\net462\Common7\IDE\CommonExtensions\Platform\InstrumentationEngine\x64\MicrosoftInstrumentationEngine_x64.dll" />
-    <file src="net472\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\MicrosoftInstrumentationEngine\arm64\MicrosoftInstrumentationEngine_arm64.dll" target="tools\net462\Common7\IDE\CommonExtensions\Platform\InstrumentationEngine\arm64\MicrosoftInstrumentationEngine_arm64.dll" />
+    <file src="net48\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\MicrosoftInstrumentationEngine\x86\MicrosoftInstrumentationEngine_x86.dll" target="tools\net462\Common7\IDE\CommonExtensions\Platform\InstrumentationEngine\x86\MicrosoftInstrumentationEngine_x86.dll" />
+    <file src="net48\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\MicrosoftInstrumentationEngine\x64\MicrosoftInstrumentationEngine_x64.dll" target="tools\net462\Common7\IDE\CommonExtensions\Platform\InstrumentationEngine\x64\MicrosoftInstrumentationEngine_x64.dll" />
+    <file src="net48\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\MicrosoftInstrumentationEngine\arm64\MicrosoftInstrumentationEngine_arm64.dll" target="tools\net462\Common7\IDE\CommonExtensions\Platform\InstrumentationEngine\arm64\MicrosoftInstrumentationEngine_arm64.dll" />
   </files>
 </package>
diff --git a/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.csproj b/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.csproj
index 3112a6df2d..a5ebe3e406 100644
--- a/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.csproj
+++ b/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <IsVsixProject>true</IsVsixProject>
-    <TargetFrameworks>$(NetFrameworkMinimum)</TargetFrameworks>
+    <TargetFrameworks>$(NetFrameworkRunnerTargetFramework)</TargetFrameworks>
     <!-- MSB3270 Suppress warnings about platform specific projects imported in AnyCPU (MSIL) projects. -->
     <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
   </PropertyGroup>
@@ -29,7 +29,7 @@
     <!-- Properties for items we include in VSIX -->
     <ExtensionInstallationRelativeToVS>[installDir]\Common7\IDE\Extensions\TestPlatform</ExtensionInstallationRelativeToVS>
     <TestPlatformCliBinFolder>$(ArtifactsBinDir)Microsoft.TestPlatform.CLI\$(Configuration)\$(NetFrameworkMinimum)\</TestPlatformCliBinFolder>
-    <TestPlatformBinFolder>$(ArtifactsBinDir)Microsoft.TestPlatform\$(Configuration)\net472\</TestPlatformBinFolder>
+    <TestPlatformBinFolder>$(ArtifactsBinDir)Microsoft.TestPlatform\$(Configuration)\$(NetFrameworkRunnerTargetFramework)\</TestPlatformBinFolder>
     <MsDiaFolder>$(TestPlatformBinFolder)Microsoft.Internal.Dia\</MsDiaFolder>
     <CUITFolder>$(TestPlatformBinFolder)Microsoft.VisualStudio.CUIT\</CUITFolder>
     <CodeCoverageIOFolder>$(TestPlatformBinFolder)Microsoft.CodeCoverage.IO\</CodeCoverageIOFolder>
@@ -99,6 +99,7 @@
       <VsixSourceItem Include="$(ArtifactsBinDir)\testhost\$(Configuration)\net471\win*\testhost.net471.exe" Ngen="true" NgenArchitecture="X64" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net471.exe" />
       <VsixSourceItem Include="$(ArtifactsBinDir)\testhost\$(Configuration)\net472\win*\testhost.net472.exe" Ngen="true" NgenArchitecture="X64" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net472.exe" />
       <VsixSourceItem Include="$(ArtifactsBinDir)\testhost\$(Configuration)\net48\win*\testhost.net48.exe" Ngen="true" NgenArchitecture="X64" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net48.exe" />
+      <VsixSourceItem Include="$(ArtifactsBinDir)\testhost\$(Configuration)\net481\win*\testhost.net481.exe" Ngen="true" NgenArchitecture="X64" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net481.exe" />
 
       <VsixSourceItem Include="$(ArtifactsBinDir)\testhost.x86\$(Configuration)\net4*\win*\*.*" Exclude="$(ArtifactsBinDir)\testhost.x86\$(Configuration)\net4*\win*\testhost.x86.exe;$(ArtifactsBinDir)\testhost.x86\$(Configuration)\net4*\win*\testhost.net4*.x86.exe" />
       <VsixSourceItem Include="$(ArtifactsBinDir)\testhost.x86\$(Configuration)\$(NetFrameworkMinimum)\win*\testhost.x86.exe" Ngen="true" NgenArchitecture="X86" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.x86.exe" />
@@ -106,6 +107,7 @@
       <VsixSourceItem Include="$(ArtifactsBinDir)\testhost.x86\$(Configuration)\net471\win*\testhost.net471.x86.exe" Ngen="true" NgenArchitecture="X86" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net471.x86.exe" />
       <VsixSourceItem Include="$(ArtifactsBinDir)\testhost.x86\$(Configuration)\net472\win*\testhost.net472.x86.exe" Ngen="true" NgenArchitecture="X86" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net472.x86.exe" />
       <VsixSourceItem Include="$(ArtifactsBinDir)\testhost.x86\$(Configuration)\net48\win*\testhost.net48.x86.exe" Ngen="true" NgenArchitecture="X86" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net48.x86.exe" />
+      <VsixSourceItem Include="$(ArtifactsBinDir)\testhost.x86\$(Configuration)\net481\win*\testhost.net481.x86.exe" Ngen="true" NgenArchitecture="X86" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net481.x86.exe" />
 
       <VsixSourceItem Include="$(ArtifactsBinDir)\testhost.arm64\$(Configuration)\net4*\win*\*.*" Exclude="$(ArtifactsBinDir)\testhost.arm64\$(Configuration)\net4*\win*\testhost.arm64.exe;$(ArtifactsBinDir)\testhost.arm64\$(Configuration)\net4*\win*\testhost.net4*.arm64.exe" />
       <VsixSourceItem Include="$(ArtifactsBinDir)\testhost.arm64\$(Configuration)\$(NetFrameworkMinimum)\win*\testhost.arm64.exe" Ngen="true" NgenArchitecture="Arm64" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.arm64.exe" />
@@ -113,6 +115,7 @@
       <VsixSourceItem Include="$(ArtifactsBinDir)\testhost.arm64\$(Configuration)\net471\win*\testhost.net471.arm64.exe" Ngen="true" NgenArchitecture="Arm64" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net471.arm64.exe" />
       <VsixSourceItem Include="$(ArtifactsBinDir)\testhost.arm64\$(Configuration)\net472\win*\testhost.net472.arm64.exe" Ngen="true" NgenArchitecture="Arm64" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net472.arm64.exe" />
       <VsixSourceItem Include="$(ArtifactsBinDir)\testhost.arm64\$(Configuration)\net48\win*\testhost.net48.arm64.exe" Ngen="true" NgenArchitecture="Arm64" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net48.arm64.exe" />
+      <VsixSourceItem Include="$(ArtifactsBinDir)\testhost.arm64\$(Configuration)\net481\win*\testhost.net481.arm64.exe" Ngen="true" NgenArchitecture="Arm64" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net481.arm64.exe" />
     </ItemGroup>
 
     <!-- Cpp Extensions -->
@@ -322,7 +325,7 @@
     </Content>
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkRunnerTargetFramework)'))">
     <ProjectReference Include="..\..\datacollector.arm64\datacollector.arm64.csproj">
       <Ngen>false</Ngen>
     </ProjectReference>
diff --git a/src/testhost.arm64/testhost.arm64.csproj b/src/testhost.arm64/testhost.arm64.csproj
index 095fe3ca5d..07ea654d84 100644
--- a/src/testhost.arm64/testhost.arm64.csproj
+++ b/src/testhost.arm64/testhost.arm64.csproj
@@ -10,12 +10,12 @@
 
   <PropertyGroup>
     <AssemblyName>testhost.arm64</AssemblyName>
-    <TargetFrameworks>net7.0;$(NetCoreAppMinimum);$(NetFrameworkMinimum);net47;net471;net472;net48</TargetFrameworks>
+    <TargetFrameworks>$(TestHostAllTargetFrameworks)</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <IsTestProject>false</IsTestProject>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
-  <PropertyGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
+  <PropertyGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) ">
     <RuntimeIdentifier Condition="'$(DotNetBuildSourceOnly)' != 'true'">win10-arm64</RuntimeIdentifier>
     <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
     <TargetName Condition="'$(TargetFramework)' != '$(NetFrameworkMinimum)'">$(AssemblyName.Replace('.arm64', '')).$(TargetFramework).arm64</TargetName>
@@ -38,10 +38,10 @@
 
     <!-- CVE-2019-0657, CVE-2019-0980 and CVE-2019-0981 mitigation -->
     <PackageReference Include="System.Private.Uri" Version="$(SystemUriVersion)" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
-    <PackageReference Include="Microsoft.NETCore.Targets" Version="1.1.4" Condition=" $(TargetFramework.StartsWith('net4')) " />
+    <PackageReference Include="Microsoft.NETCore.Targets" Version="1.1.4" Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) " />
     <!-- CVE-2019-0657, CVE-2019-0980 and CVE-2019-0981 mitigation -->
   </ItemGroup>
-  <ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) AND '$(OS)' != 'Windows_NT' ">
+  <ItemGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) AND '$(OS)' != 'Windows_NT' ">
     <Reference Include="System" />
     <Reference Include="System.Runtime" />
     <Reference Include="System.Xml" />
diff --git a/src/testhost.x86/app.config b/src/testhost.x86/app.config
index 2e2ac5c43c..80f1fde929 100644
--- a/src/testhost.x86/app.config
+++ b/src/testhost.x86/app.config
@@ -53,6 +53,18 @@
         <assemblyIdentity name="Microsoft.Extensions.FileSystemGlobbing" publicKeyToken="adb9793829ddae60" culture="neutral" />
         <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="1.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="1.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="1.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <system.diagnostics>
diff --git a/src/testhost.x86/testhost.x86.csproj b/src/testhost.x86/testhost.x86.csproj
index 1a7de790bc..ebf12d08a8 100644
--- a/src/testhost.x86/testhost.x86.csproj
+++ b/src/testhost.x86/testhost.x86.csproj
@@ -10,10 +10,10 @@
 
   <PropertyGroup>
     <AssemblyName>testhost.x86</AssemblyName>
-    <TargetFrameworks>net7.0;$(NetCoreAppMinimum);$(NetFrameworkMinimum);net47;net471;net472;net48</TargetFrameworks>
+    <TargetFrameworks>$(TestHostAllTargetFrameworks)</TargetFrameworks>
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <RuntimeIdentifier Condition="'$(DotNetBuildSourceOnly)' != 'true'">win7-x86</RuntimeIdentifier>
-    <Prefer32Bit Condition=" $(TargetFramework.StartsWith('net4')) ">true</Prefer32Bit>
+    <RuntimeIdentifier Condition="'$(DotNetBuildSourceOnly)' != 'true'">win-x86</RuntimeIdentifier>
+    <Prefer32Bit Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) ">true</Prefer32Bit>
     <OutputType>Exe</OutputType>
     <IsTestProject>false</IsTestProject>
     <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -25,7 +25,7 @@
     <MSBuildWarningsAsMessages>NETSDK1201</MSBuildWarningsAsMessages>
     <NoWarn>$(NoWarn);NETSDK1201</NoWarn>
   </PropertyGroup>
-  <PropertyGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
+  <PropertyGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) ">
     <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
     <TargetName Condition="'$(TargetFramework)' != '$(NetFrameworkMinimum)'">$(AssemblyName.Replace('.x86', '')).$(TargetFramework).x86</TargetName>
   </PropertyGroup>
@@ -45,10 +45,10 @@
 
     <!-- CVE-2019-0657, CVE-2019-0980 and CVE-2019-0981 mitigation -->
     <PackageReference Include="System.Private.Uri" Version="$(SystemUriVersion)" Condition="'$(DotNetBuildSourceOnly)' != 'true'"/>
-    <PackageReference Include="Microsoft.NETCore.Targets" Version="1.1.4" Condition=" $(TargetFramework.StartsWith('net4')) " />
+    <PackageReference Include="Microsoft.NETCore.Targets" Version="1.1.4" Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) " />
     <!-- CVE-2019-0657, CVE-2019-0980 and CVE-2019-0981 mitigation -->
   </ItemGroup>
-  <ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) AND '$(OS)' != 'Windows_NT' ">
+  <ItemGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) AND '$(OS)' != 'Windows_NT' ">
     <Reference Include="System" />
     <Reference Include="System.Runtime" />
     <Reference Include="System.Xml" />
diff --git a/src/testhost/testhost.csproj b/src/testhost/testhost.csproj
index f3f4b9b979..5cb6999771 100644
--- a/src/testhost/testhost.csproj
+++ b/src/testhost/testhost.csproj
@@ -10,12 +10,12 @@
 
   <PropertyGroup>
     <AssemblyName>testhost</AssemblyName>
-    <TargetFrameworks>net7.0;$(NetCoreAppMinimum);$(NetFrameworkMinimum);net47;net471;net472;net48</TargetFrameworks>
+    <TargetFrameworks>$(TestHostAllTargetFrameworks)</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <IsTestProject>false</IsTestProject>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
-  <PropertyGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
+  <PropertyGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) ">
     <RuntimeIdentifier Condition="'$(DotNetBuildSourceOnly)' != 'true'">win7-x64</RuntimeIdentifier>
     <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
     <TargetName Condition="'$(TargetFramework)' != '$(NetFrameworkMinimum)'">$(AssemblyName).$(TargetFramework)</TargetName>
@@ -38,10 +38,10 @@
 
     <!-- CVE-2019-0657, CVE-2019-0980 and CVE-2019-0981 mitigation -->
     <PackageReference Include="System.Private.Uri" Version="$(SystemUriVersion)" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
-    <PackageReference Include="Microsoft.NETCore.Targets" Version="1.1.4" Condition=" $(TargetFramework.StartsWith('net4')) " />
+    <PackageReference Include="Microsoft.NETCore.Targets" Version="1.1.4" Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) " />
     <!-- CVE-2019-0657, CVE-2019-0980 and CVE-2019-0981 mitigation -->
   </ItemGroup>
-  <ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) AND '$(OS)' != 'Windows_NT' ">
+  <ItemGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) AND '$(OS)' != 'Windows_NT' ">
     <Reference Include="System" />
     <Reference Include="System.Runtime" />
     <Reference Include="System.Xml" />
diff --git a/src/vstest.console.arm64/vstest.console.arm64.csproj b/src/vstest.console.arm64/vstest.console.arm64.csproj
index 2cdfac3fc2..dd04b9ba0c 100644
--- a/src/vstest.console.arm64/vstest.console.arm64.csproj
+++ b/src/vstest.console.arm64/vstest.console.arm64.csproj
@@ -3,16 +3,16 @@
   <Import Project="$(RepoRoot)src\Microsoft.TestPlatform.Execution.Shared\Microsoft.TestPlatform.Execution.Shared.projitems" Label="Shared" />
   <PropertyGroup>
     <AssemblyName>vstest.console.arm64</AssemblyName>
-    <TargetFrameworks>net7.0;$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks>
+    <TargetFrameworks>$(RunnerTargetFrameworks)</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <!-- Prevent the creation of the ".exe" for .NET Core. This was the default on .NET Core 2.1, behavior changed for .NET Core 3.1 -->
     <UseAppHost>false</UseAppHost>
     <RollForward>Major</RollForward>
     <IsTestProject>false</IsTestProject>
-    <RuntimeIdentifier Condition="'$(TargetFramework)' == '$(NetFrameworkMinimum)'">win10-arm64</RuntimeIdentifier>
+    <RuntimeIdentifier Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">win10-arm64</RuntimeIdentifier>
     <!-- Setting both RuntimeIdentifier and PlatformTarget ends up building as AnyCPU and selecting the default x86 architecture, irregardles of RuntimeIdentifier,
     so order here matters. -->
-    <PlatformTarget Condition="'$(TargetFramework)' == '$(NetFrameworkMinimum)' AND '$(RuntimeIdentifier)' == '' ">AnyCPU</PlatformTarget>
+    <PlatformTarget Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) AND '$(RuntimeIdentifier)' == '' ">AnyCPU</PlatformTarget>
     <ApplicationManifest>..\vstest.console\app.manifest</ApplicationManifest>
     <RootNamespace>Microsoft.VisualStudio.TestPlatform.CommandLine</RootNamespace>
     <UseBannedApiAnalyzers>true</UseBannedApiAnalyzers>
@@ -29,7 +29,7 @@
       $(MSBuildWarningsAsMessages);MSB3276;
     </MSBuildWarningsAsMessages>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <Reference Include="System" />
     <Reference Include="System.IO" />
     <Reference Include="System.Runtime" />
diff --git a/src/vstest.console/InProcessVsTestConsoleWrapper.cs b/src/vstest.console/InProcessVsTestConsoleWrapper.cs
index 5dbdd0ea61..5c9236d358 100644
--- a/src/vstest.console/InProcessVsTestConsoleWrapper.cs
+++ b/src/vstest.console/InProcessVsTestConsoleWrapper.cs
@@ -93,7 +93,7 @@ internal InProcessVsTestConsoleWrapper(
 
         // Fill the parameters.
         consoleParameters.ParentProcessId =
-#if NET7_0_OR_GREATER
+#if NET6_0_OR_GREATER
             Environment.ProcessId;
 #else
             System.Diagnostics.Process.GetCurrentProcess().Id;
diff --git a/src/vstest.console/PublicAPI/net462/PublicAPI.Shipped.txt b/src/vstest.console/PublicAPI/net462/PublicAPI.Shipped.txt
deleted file mode 100644
index 7dc5c58110..0000000000
--- a/src/vstest.console/PublicAPI/net462/PublicAPI.Shipped.txt
+++ /dev/null
@@ -1 +0,0 @@
-#nullable enable
diff --git a/src/vstest.console/PublicAPI/net462/PublicAPI.Unshipped.txt b/src/vstest.console/PublicAPI/net462/PublicAPI.Unshipped.txt
deleted file mode 100644
index 7dc5c58110..0000000000
--- a/src/vstest.console/PublicAPI/net462/PublicAPI.Unshipped.txt
+++ /dev/null
@@ -1 +0,0 @@
-#nullable enable
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net7.0/PublicAPI.Shipped.txt b/src/vstest.console/PublicAPI/net48/PublicAPI.Shipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net7.0/PublicAPI.Shipped.txt
rename to src/vstest.console/PublicAPI/net48/PublicAPI.Shipped.txt
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net7.0/PublicAPI.Unshipped.txt b/src/vstest.console/PublicAPI/net48/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net7.0/PublicAPI.Unshipped.txt
rename to src/vstest.console/PublicAPI/net48/PublicAPI.Unshipped.txt
diff --git a/src/vstest.console/PublicAPI/net6.0/PublicAPI.Shipped.txt b/src/vstest.console/PublicAPI/net6.0/PublicAPI.Shipped.txt
deleted file mode 100644
index 7dc5c58110..0000000000
--- a/src/vstest.console/PublicAPI/net6.0/PublicAPI.Shipped.txt
+++ /dev/null
@@ -1 +0,0 @@
-#nullable enable
diff --git a/src/vstest.console/PublicAPI/net6.0/PublicAPI.Unshipped.txt b/src/vstest.console/PublicAPI/net6.0/PublicAPI.Unshipped.txt
deleted file mode 100644
index 7dc5c58110..0000000000
--- a/src/vstest.console/PublicAPI/net6.0/PublicAPI.Unshipped.txt
+++ /dev/null
@@ -1 +0,0 @@
-#nullable enable
diff --git a/src/vstest.console/PublicAPI/net7.0/PublicAPI.Shipped.txt b/src/vstest.console/PublicAPI/net7.0/PublicAPI.Shipped.txt
deleted file mode 100644
index 7dc5c58110..0000000000
--- a/src/vstest.console/PublicAPI/net7.0/PublicAPI.Shipped.txt
+++ /dev/null
@@ -1 +0,0 @@
-#nullable enable
diff --git a/src/vstest.console/PublicAPI/net7.0/PublicAPI.Unshipped.txt b/src/vstest.console/PublicAPI/net7.0/PublicAPI.Unshipped.txt
deleted file mode 100644
index 7dc5c58110..0000000000
--- a/src/vstest.console/PublicAPI/net7.0/PublicAPI.Unshipped.txt
+++ /dev/null
@@ -1 +0,0 @@
-#nullable enable
diff --git a/src/datacollector/PublicAPI/net462/PublicAPI.Shipped.txt b/src/vstest.console/PublicAPI/net8.0/PublicAPI.Shipped.txt
similarity index 100%
rename from src/datacollector/PublicAPI/net462/PublicAPI.Shipped.txt
rename to src/vstest.console/PublicAPI/net8.0/PublicAPI.Shipped.txt
diff --git a/src/datacollector/PublicAPI/net462/PublicAPI.Unshipped.txt b/src/vstest.console/PublicAPI/net8.0/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/datacollector/PublicAPI/net462/PublicAPI.Unshipped.txt
rename to src/vstest.console/PublicAPI/net8.0/PublicAPI.Unshipped.txt
diff --git a/src/datacollector/PublicAPI/net472/PublicAPI.Shipped.txt b/src/vstest.console/PublicAPI/net9.0/PublicAPI.Shipped.txt
similarity index 100%
rename from src/datacollector/PublicAPI/net472/PublicAPI.Shipped.txt
rename to src/vstest.console/PublicAPI/net9.0/PublicAPI.Shipped.txt
diff --git a/src/datacollector/PublicAPI/net472/PublicAPI.Unshipped.txt b/src/vstest.console/PublicAPI/net9.0/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/datacollector/PublicAPI/net472/PublicAPI.Unshipped.txt
rename to src/vstest.console/PublicAPI/net9.0/PublicAPI.Unshipped.txt
diff --git a/src/vstest.console/app.config b/src/vstest.console/app.config
index f133e90359..e6708ef2b7 100644
--- a/src/vstest.console/app.config
+++ b/src/vstest.console/app.config
@@ -29,6 +29,18 @@
         <assemblyIdentity name="Microsoft.Extensions.FileSystemGlobbing" publicKeyToken="adb9793829ddae60" culture="neutral" />
         <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="1.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="1.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="1.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <appSettings>
diff --git a/src/vstest.console/vstest.console.csproj b/src/vstest.console/vstest.console.csproj
index 34b9f565b5..262e80a41a 100644
--- a/src/vstest.console/vstest.console.csproj
+++ b/src/vstest.console/vstest.console.csproj
@@ -5,13 +5,17 @@
 
   <PropertyGroup>
     <AssemblyName>vstest.console</AssemblyName>
-    <TargetFrameworks>net7.0;$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks>
+    <TargetFrameworks>$(RunnerTargetFrameworks)</TargetFrameworks>
     <OutputType>Exe</OutputType>
-    <!-- Prevent the creation of the ".exe" for .NET Core. This was the default on .NET Core 2.1, behavior changed for .NET Core 3.1 -->
+    <!--
+      Prevent the creation of the ".exe" for .NET Core. This was the default on .NET Core 2.1, behavior changed for .NET Core 3.1.
+      We don't want the exe because we will start datacollector via dotnet exec datacollector.dll, because we don't know on which
+      OS or architecture we will be running. So there is no point in shipping the exe.
+    -->
     <UseAppHost>false</UseAppHost>
     <RollForward>Major</RollForward>
     <IsTestProject>false</IsTestProject>
-    <PlatformTarget Condition="'$(TargetFramework)' == '$(NetFrameworkMinimum)' AND '$(RuntimeIdentifier)' == '' " >AnyCPU</PlatformTarget>
+    <PlatformTarget Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) AND '$(RuntimeIdentifier)' == '' " >AnyCPU</PlatformTarget>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <RootNamespace>Microsoft.VisualStudio.TestPlatform.CommandLine</RootNamespace>
     <UseBannedApiAnalyzers>true</UseBannedApiAnalyzers>
@@ -24,10 +28,10 @@
 
     <MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);MSB3276</MSBuildWarningsAsMessages>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' == '$(NetFrameworkMinimum)'">
+  <PropertyGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) ">
     <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
+  <ItemGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) ">
     <Reference Include="System" />
     <Reference Include="System.IO" />
     <Reference Include="System.Runtime" />
diff --git a/test/.editorconfig b/test/.editorconfig
index c6e43695db..f44194a73b 100644
--- a/test/.editorconfig
+++ b/test/.editorconfig
@@ -32,4 +32,7 @@ dotnet_diagnostic.CA1051.severity = silent # Disabled on tests as it does not ma
 # CA1710: Identifiers should have correct suffix
 dotnet_diagnostic.CA1710.severity = warning
 
+# CA1822: Mark members as static
+dotnet_diagnostic.CA1822.severity = silent
+
 #### C# Naming styles ####
diff --git a/test/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests.csproj b/test/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests.csproj
index eea478833c..d0bf3ef5c3 100644
--- a/test/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests.csproj
+++ b/test/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests.csproj
@@ -18,7 +18,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\DataCollectors\Microsoft.TestPlatform.Extensions.EventLogCollector\Microsoft.TestPlatform.Extensions.EventLogCollector.csproj" />
+    <ProjectReference Include="..\..\..\src\DataCollectors\Microsoft.TestPlatform.Extensions.EventLogCollector\Microsoft.TestPlatform.Extensions.EventLogCollector.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkRunnerTargetFramework)" />
   </ItemGroup>
 
   <!-- We build this only for net48, and it fails to skip this on Linux in Aracade otherwise. -->
diff --git a/test/Intent.Primitives/Intent.Primitives.csproj b/test/Intent.Primitives/Intent.Primitives.csproj
index e251c464ae..5529e52d99 100644
--- a/test/Intent.Primitives/Intent.Primitives.csproj
+++ b/test/Intent.Primitives/Intent.Primitives.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/test/Intent/Intent.csproj b/test/Intent/Intent.csproj
index 45d0d9ea94..77abf82a4b 100644
--- a/test/Intent/Intent.csproj
+++ b/test/Intent/Intent.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/AcceptanceTestBase.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/AcceptanceTestBase.cs
index cac7da3fb0..716bab8b38 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/AcceptanceTestBase.cs
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/AcceptanceTestBase.cs
@@ -17,9 +17,9 @@ public class AcceptanceTestBase : IntegrationTestBase
     public const string Net471TargetFramework = "net471";
     public const string Net472TargetFramework = "net472";
     public const string Net48TargetFramework = "net48";
-    public const string Core31TargetFramework = "netcoreapp3.1";
-    public const string Core50TargetFramework = "net5.0";
-    public const string Core60TargetFramework = "net6.0";
+    public const string Core80TargetFramework = "net8.0";
+    public const string Core90TargetFramework = "net9.0";
+    public const string Core10TargetFramework = "net10.0";
 
     public const string DesktopFrameworkArgValue = Net462FrameworkArgValue;
     public const string Net462FrameworkArgValue = ".NETFramework,Version=v4.6.2";
@@ -28,24 +28,24 @@ public class AcceptanceTestBase : IntegrationTestBase
     public const string Net472FrameworkArgValue = ".NETFramework,Version=v4.7.2";
     public const string Net48FrameworkArgValue = ".NETFramework,Version=v4.8";
 
-    public const string Core31FrameworkArgValue = ".NETCoreApp,Version=v3.1";
-    public const string Core50FrameworkArgValue = ".NETCoreApp,Version=v5.0";
-    public const string Core60FrameworkArgValue = ".NETCoreApp,Version=v6.0";
+    public const string Core80FrameworkArgValue = ".NETCoreApp,Version=v8.0";
+    public const string Core90FrameworkArgValue = ".NETCoreApp,Version=v9.0";
+    public const string Core10FrameworkArgValue = ".NETCoreApp,Version=v10.0";
 
     public const string DesktopRunnerTargetRuntime = "win7-x64";
     public const string CoreRunnerTargetRuntime = "";
     public const string InIsolation = "/InIsolation";
 
     public const string NETFX462_48 = "net462;net472;net48";
-    public const string NETFX462_NET50 = "net462;net472;net48;netcoreapp3.1;net5.0";
+    public const string NETFX462_NET9 = "net462;net472;net48;net8.0;net9.0";
     public const string DEFAULT_RUNNER_NETFX = Net462TargetFramework;
     public const string DEFAULT_HOST_NETFX = Net462TargetFramework;
-    public const string DEFAULT_RUNNER_NETCORE = Core31TargetFramework;
-    public const string DEFAULT_HOST_NETCORE = Core31TargetFramework;
+    public const string DEFAULT_RUNNER_NETCORE = Core80TargetFramework;
+    public const string DEFAULT_HOST_NETCORE = Core80TargetFramework;
     /// <summary>
     /// Our current defaults for .NET and .NET Framework.
     /// </summary>
-    public const string DEFAULT_HOST_NETFX_AND_NET = "net462;netcoreapp3.1";
+    public const string DEFAULT_HOST_NETFX_AND_NET = "net462;net8.0";
     public const string LATEST_TO_LEGACY = "Latest;LatestPreview;LatestStable;RecentStable;MostDownloaded;PreviousStable;LegacyStable";
     public const string LATESTPREVIEW_TO_LEGACY = "LatestPreview;LatestStable;RecentStable;MostDownloaded;PreviousStable;LegacyStable";
     public const string LATEST = "Latest";
@@ -74,9 +74,9 @@ protected static void SetTestEnvironment(IntegrationTestEnvironment testEnvironm
     protected static string DeriveFrameworkArgValue(IntegrationTestEnvironment testEnvironment)
         => testEnvironment.TargetFramework switch
         {
-            Core31TargetFramework => Core31FrameworkArgValue,
-            Core50TargetFramework => Core50FrameworkArgValue,
-            Core60TargetFramework => Core60FrameworkArgValue,
+            Core80TargetFramework => Core80FrameworkArgValue,
+            Core90TargetFramework => Core90FrameworkArgValue,
+            Core10TargetFramework => Core10FrameworkArgValue,
             Net462TargetFramework => Net462FrameworkArgValue,
             Net47TargetFramework => Net47FrameworkArgValue,
             Net471TargetFramework => Net471FrameworkArgValue,
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/AssemblyMetadataProviderTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/AssemblyMetadataProviderTests.cs
index c52f1c2f5c..9fc136accb 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/AssemblyMetadataProviderTests.cs
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/AssemblyMetadataProviderTests.cs
@@ -55,7 +55,7 @@ public void Cleanup()
 
     [TestMethod]
     [DataRow("net462")]
-    [DataRow("netcoreapp3.1")]
+    [DataRow("net8.0")]
     public void GetArchitectureShouldReturnCorrentArchForx64Assembly(string framework)
     {
         TestDotnetAssemblyArch("SimpleTestProject3", framework, Architecture.X64, expectedElapsedTime: ExpectedTimeForFindingArchForDotNetAssembly);
@@ -63,7 +63,7 @@ public void GetArchitectureShouldReturnCorrentArchForx64Assembly(string framewor
 
     [TestMethod]
     [DataRow("net462")]
-    [DataRow("netcoreapp3.1")]
+    [DataRow("net8.0")]
     public void GetArchitectureShouldReturnCorrentArchForx86Assembly(string framework)
     {
         TestDotnetAssemblyArch("SimpleTestProjectx86", framework, Architecture.X86, expectedElapsedTime: ExpectedTimeForFindingArchForDotNetAssembly);
@@ -71,7 +71,7 @@ public void GetArchitectureShouldReturnCorrentArchForx86Assembly(string framewor
 
     [TestMethod]
     [DataRow("net462")]
-    [DataRow("netcoreapp3.1")]
+    [DataRow("net8.0")]
     public void GetArchitectureShouldReturnCorrentArchForAnyCpuAssembly(string framework)
     {
         TestDotnetAssemblyArch("SimpleTestProject", framework, Architecture.AnyCPU, expectedElapsedTime: ExpectedTimeForFindingArchForDotNetAssembly);
@@ -79,10 +79,10 @@ public void GetArchitectureShouldReturnCorrentArchForAnyCpuAssembly(string frame
 
     [TestMethod]
     [DataRow("net462")]
-    [DataRow("netcoreapp3.1")]
-    public void GetArchitectureShouldReturnCorrentArchForArmAssembly(string framework)
+    [DataRow("net8.0")]
+    public void GetArchitectureShouldReturnCorrentArchForArm64Assembly(string framework)
     {
-        TestDotnetAssemblyArch("SimpleTestProjectARM", framework, Architecture.ARM, expectedElapsedTime: ExpectedTimeForFindingArchForDotNetAssembly);
+        TestDotnetAssemblyArch("SimpleTestProjectARM64", framework, Architecture.ARM64, expectedElapsedTime: ExpectedTimeForFindingArchForDotNetAssembly);
     }
 
     [TestMethod]
@@ -108,7 +108,7 @@ public void GetArchitectureForNativeDll(string platform)
 
     [TestMethod]
     [DataRow("net462")]
-    [DataRow("netcoreapp3.1")]
+    [DataRow("net8.0")]
     public void GetFrameWorkForDotNetAssembly(string framework)
     {
         var expectedElapsedTime = 5;
@@ -126,7 +126,7 @@ public void GetFrameWorkForDotNetAssembly(string framework)
         }
         else
         {
-            Assert.AreEqual(".NETCoreApp,Version=v3.1", actualFx.FullName);
+            Assert.AreEqual(".NETCoreApp,Version=v8.0", actualFx.FullName);
         }
 
         Console.WriteLine("Framework:{0}, {1}", framework, string.Format(CultureInfo.CurrentCulture, PerfAssertMessageFormat, expectedElapsedTime, stopWatch.ElapsedMilliseconds));
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/AssemblyPropertiesTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/AssemblyPropertiesTests.cs
index aa98715583..df63b296d0 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/AssemblyPropertiesTests.cs
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/AssemblyPropertiesTests.cs
@@ -19,7 +19,7 @@ public AssemblyPropertiesTests()
 
     [TestMethod]
     [DataRow("net462")]
-    [DataRow("netcoreapp3.1")]
+    [DataRow("net8.0")]
     public void GetAssemblyTypeForManagedDll(string framework)
     {
         var assemblyPath = _testEnvironment.GetTestAsset("SimpleTestProject3.dll", framework);
@@ -47,7 +47,7 @@ public void GetAssemblyTypeForManagedExe()
     }
 
     [TestMethod]
-    [DataRow("netcoreapp3.1")]
+    [DataRow("net8.0")]
     public void GetAssemblyTypeForNetCoreManagedExe(string framework)
     {
         var assemblyPath = _testEnvironment.GetTestAsset("ConsoleManagedApp.dll", framework);
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/BlameDataCollectorTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/BlameDataCollectorTests.cs
index b36ace80bc..73cc7ed8aa 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/BlameDataCollectorTests.cs
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/BlameDataCollectorTests.cs
@@ -24,8 +24,8 @@ namespace Microsoft.TestPlatform.AcceptanceTests;
 [TestCategory("Windows-Review")]
 public class BlameDataCollectorTests : AcceptanceTestBase
 {
-    public const string NETCOREANDFX = "net462;net472;netcoreapp3.1";
-    public const string NET60 = "net6.0";
+    public const string NETCOREANDFX = "net462;net472;net8.0";
+    public const string NET60 = "net8.0";
     private readonly string _procDumpPath;
 
     public BlameDataCollectorTests()
@@ -108,8 +108,10 @@ public void BlameDataCollectorShouldNotOutputDumpFileWhenNoCrashOccurs(RunnerInf
 
     [TestMethod]
     [TestCategory("Windows-Review")]
+    // This tests .net runner and .net framework runner, together with .net framework testhost
     [NetFullTargetFrameworkDataSource]
-    [NetCoreTargetFrameworkDataSource]
+    // .NET does not support crash dump on exit
+    // [NetCoreTargetFrameworkDataSource]
     public void BlameDataCollectorShouldOutputDumpFileWhenNoCrashOccursButCollectAlwaysIsEnabled(RunnerInfo runnerInfo)
     {
 
@@ -131,9 +133,9 @@ public void BlameDataCollectorShouldOutputDumpFileWhenNoCrashOccursButCollectAlw
     }
 
     [TestMethod]
-    [NetCoreRunner("net462;net472;netcoreapp3.1;net6.0")]
+    [NetCoreRunner("net462;net472;net8.0;net9.0")]
     // should make no difference, keeping for easy debug
-    // [NetFrameworkRunner("net462;net472;netcoreapp3.1;net6.0")]
+    // [NetFrameworkRunner("net462;net472;net8.0;net9.0")]
     public void HangDumpOnTimeout(RunnerInfo runnerInfo)
     {
         SetTestEnvironment(_testEnvironment, runnerInfo);
@@ -153,10 +155,10 @@ public void HangDumpOnTimeout(RunnerInfo runnerInfo)
     }
 
     [TestMethod]
-    // net6.0 does not support dump on exit
-    [NetCoreRunner("net462;net472;netcoreapp3.1")]
+    // net8.0 does not support dump on exit
+    [NetCoreRunner("net462;net472")]
     // should make no difference, keeping for easy debug
-    // [NetFrameworkRunner("net462;net472;netcoreapp3.1")]
+    // [NetFrameworkRunner("net462;net472")]
 
     public void CrashDumpWhenThereIsNoTimeout(RunnerInfo runnerInfo)
     {
@@ -177,10 +179,9 @@ public void CrashDumpWhenThereIsNoTimeout(RunnerInfo runnerInfo)
     }
 
     [TestMethod]
-    // net6.0 does not support dump on exit
-    [NetCoreRunner("net462;net472;netcoreapp3.1")]
-    // should make no difference, keeping for easy debug
-    // [NetFrameworkRunner("net462;net472;netcoreapp3.1")]
+    // .NET tfms do not support dump on exit, but runner does
+    [NetCoreRunner("net462;net472")]
+    // [NetFrameworkRunner("net462;net472")]
 
     public void CrashDumpOnExit(RunnerInfo runnerInfo)
     {
@@ -201,9 +202,9 @@ public void CrashDumpOnExit(RunnerInfo runnerInfo)
     }
 
     [TestMethod]
-    [NetCoreRunner("net462;net472;netcoreapp3.1;net6.0")]
+    [NetCoreRunner("net462;net472;net8.0;net9.0")]
     // should make no difference, keeping for easy debug
-    // [NetFrameworkRunner("net462;net472;netcoreapp3.1;net6.0")]
+    // [NetFrameworkRunner("net462;net472;net8.0;net9.0")]
     public void CrashDumpOnStackOverflow(RunnerInfo runnerInfo)
     {
         SetTestEnvironment(_testEnvironment, runnerInfo);
@@ -239,9 +240,9 @@ public void CrashDumpChildProcesses(RunnerInfo runnerInfo)
     }
 
     [TestMethod]
-    [NetCoreRunner("net462;net472;netcoreapp3.1;net6.0")]
+    [NetCoreRunner("net462;net472;net8.0;net9.0")]
     // should make no difference, keeping for easy debug
-    // [NetFrameworkRunner("net462;net472;netcoreapp3.1;net6.0")]
+    // [NetFrameworkRunner("net462;net472;net8.0;net9.0")]
     public void HangDumpChildProcesses(RunnerInfo runnerInfo)
     {
         SetTestEnvironment(_testEnvironment, runnerInfo);
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DataCollectorTests.Coverlet.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DataCollectorTests.Coverlet.cs
index 82891c9c76..9931acf617 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DataCollectorTests.Coverlet.cs
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DataCollectorTests.Coverlet.cs
@@ -25,7 +25,7 @@ public void RunCoverletCoverage()
         }
 
         // We use netcoreapp runner
-        // "...\vstest\tools\dotnet\dotnet.exe "...\vstest\artifacts\Debug\netcoreapp3.1\vstest.console.dll" --collect:"XPlat Code Coverage" ...
+        // "...\vstest\tools\dotnet\dotnet.exe "...\vstest\artifacts\Debug\net8.0\vstest.console.dll" --collect:"XPlat Code Coverage" ...
         _testEnvironment.RunnerFramework = CoreRunnerFramework;
         var resultsDir = new TempDirectory();
 
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DiaSessionTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DiaSessionTests.cs
index f78fbaef84..debf1e1f3e 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DiaSessionTests.cs
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DiaSessionTests.cs
@@ -20,7 +20,7 @@ public class DiaSessionTests : AcceptanceTestBase
 #if NETFRAMEWORK
             "net462";
 #else
-            "netcoreapp3.1";
+            "net8.0";
 #endif
         return currentTargetFrameWork;
     }
@@ -130,17 +130,17 @@ private static void ValidateLineNumbers(int min, int max)
         }
         else
         {
-            if (max == 23)
+            if (max == 22)
             {
                 Assert.AreEqual(min + 1, max, "Incorrect min line number");
             }
-            else if (max == 27)
+            else if (max == 26)
             {
                 Assert.AreEqual(min + 1, max, "Incorrect min line number");
             }
             else
             {
-                Assert.Fail($"Incorrect min/max line number. Expected Max to be 23 or 27. And Min to be 22 or 26. But Min was {min}, and Max was {max}.");
+                Assert.Fail($"Incorrect min/max line number. Expected Max to be 22 or 26. And Min to be 21 or 25. But Min was {min}, and Max was {max}.");
             }
         }
     }
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DotnetArchitectureSwitchTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DotnetArchitectureSwitchTests.cs
index a03c0c9776..670e4cf715 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DotnetArchitectureSwitchTests.cs
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DotnetArchitectureSwitchTests.cs
@@ -18,7 +18,7 @@ namespace Microsoft.TestPlatform.AcceptanceTests;
 // >= x64 6.0.2xx
 // x64 5.0.4xx for Mac
 // x64 3.1.4XX for Win
-// Manual test './tools/.../dotnet test ./test/Microsoft.TestPlatform.AcceptanceTests/bin/Debug/netcoreapp3.1/Microsoft.TestPlatform.AcceptanceTests.dll --testcasefilter:"DotnetArchitectureSwitchTests"'
+// Manual test './tools/.../dotnet test ./test/Microsoft.TestPlatform.AcceptanceTests/bin/Debug/net8.0/Microsoft.TestPlatform.AcceptanceTests.dll --testcasefilter:"DotnetArchitectureSwitchTests"'
 [TestClass]
 [Ignore("Manual tests(for now). Tests in this class need some .NET SDK global installations")]
 public class DotnetArchitectureSwitchTests : AcceptanceTestBase
@@ -58,7 +58,7 @@ public void GlobalInstallation()
             };
 
         // Verify native architecture
-        ExecuteApplication(GetDefaultDotnetMuxerLocation, $"test {projectPath} --framework net6.0", out string stdOut, out _, out _, env, projectDirectory);
+        ExecuteApplication(GetDefaultDotnetMuxerLocation, $"test {projectPath} --framework net8.0", out string stdOut, out _, out _, env, projectDirectory);
         if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
         {
             Assert.IsTrue(stdOut.Contains("Runtime location: /usr/local/share/dotnet/shared/Microsoft.NETCore.App"));
@@ -72,11 +72,11 @@ public void GlobalInstallation()
 
 
         // Verify switch using csproj
-        ExecuteApplication(GetDefaultDotnetMuxerLocation, $"test {projectPath} --framework net6.0 --arch x64", out stdOut, out _, out _, env, projectDirectory);
+        ExecuteApplication(GetDefaultDotnetMuxerLocation, $"test {projectPath} --framework net8.0 --arch x64", out stdOut, out _, out _, env, projectDirectory);
         AssertSwitch(stdOut);
 
         // Verify switch using test container
-        var buildAssemblyPath = GetTestDllForFramework("ArchitectureSwitch.dll", "net6.0");
+        var buildAssemblyPath = GetTestDllForFramework("ArchitectureSwitch.dll", "net8.0");
         ExecuteApplication(GetDefaultDotnetMuxerLocation, $"test {buildAssemblyPath} --arch x64", out stdOut, out _, out _, env, projectDirectory);
         AssertSwitch(stdOut);
 
@@ -116,7 +116,7 @@ public void DOTNET_ROOTS_EnvironmentVariables(bool dotnetRoot, bool dotnetRootX6
         var projectDirectory = Path.GetDirectoryName(projectPath);
 
         // Verify native architecture
-        ExecuteApplication(GetDefaultDotnetMuxerLocation, $"test {projectPath} --framework net6.0", out string stdOut, out _, out _, env, projectDirectory);
+        ExecuteApplication(GetDefaultDotnetMuxerLocation, $"test {projectPath} --framework net8.0", out string stdOut, out _, out _, env, projectDirectory);
         if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
         {
             Assert.IsTrue(stdOut.Contains("Runtime location: /usr/local/share/dotnet/shared/Microsoft.NETCore.App"), "Unexpected runtime location");
@@ -142,12 +142,12 @@ public void DOTNET_ROOTS_EnvironmentVariables(bool dotnetRoot, bool dotnetRootX6
         }
 
         // Verify switch using csproj
-        ExecuteApplication($"{s_privateX64Installation}/{GetMuxerName}", $"test {projectPath} --framework net6.0 --arch x64", out stdOut, out _, out _, env, projectDirectory);
+        ExecuteApplication($"{s_privateX64Installation}/{GetMuxerName}", $"test {projectPath} --framework net8.0 --arch x64", out stdOut, out _, out _, env, projectDirectory);
         AssertSwitch(stdOut);
 
         // Verify switch using test container
-        var buildAssemblyPath = GetTestDllForFramework("ArchitectureSwitch.dll", "net6.0");
-        ExecuteApplication($"{s_privateX64Installation}/{GetMuxerName}", $"test {buildAssemblyPath} --framework net6.0 --arch x64", out stdOut, out _, out _, env, projectDirectory);
+        var buildAssemblyPath = GetTestDllForFramework("ArchitectureSwitch.dll", "net8.0");
+        ExecuteApplication($"{s_privateX64Installation}/{GetMuxerName}", $"test {buildAssemblyPath} --framework net8.0 --arch x64", out stdOut, out _, out _, env, projectDirectory);
         AssertSwitch(stdOut);
 
         void AssertSwitch(string output)
@@ -180,18 +180,18 @@ public void PrivateX64BuildToGlobalArmInstallation()
         var projectDirectory = Path.GetDirectoryName(projectPath);
 
         // Verify native architecture
-        ExecuteApplication(privateInstallationMuxer, $"test {projectPath} --framework net6.0", out string stdOut, out _, out _, env, projectDirectory);
+        ExecuteApplication(privateInstallationMuxer, $"test {projectPath} --framework net8.0", out string stdOut, out _, out _, env, projectDirectory);
         Assert.IsTrue(Regex.IsMatch(stdOut.Replace(@"\", "/"), $"Runtime location: .*{s_privateX64Installation.Replace(@"\", "/")}.*shared.*Microsoft.NETCore.App"), "Unexpected runtime location");
         Assert.IsTrue(stdOut.Contains("OSArchitecture: X64"), "Unexpected OSArchitecture");
         Assert.IsTrue(stdOut.Contains("ProcessArchitecture: X64"), "Unexpected ProcessArchitecture");
 
         // Verify switch using csproj
-        ExecuteApplication($"{s_privateX64Installation}/{GetMuxerName}", $"test {projectPath} --framework net6.0 --arch arm64", out stdOut, out _, out _, env, projectDirectory);
+        ExecuteApplication($"{s_privateX64Installation}/{GetMuxerName}", $"test {projectPath} --framework net8.0 --arch arm64", out stdOut, out _, out _, env, projectDirectory);
         AssertSwitch(stdOut);
 
         // Verify switch using test container
-        var buildAssemblyPath = GetTestDllForFramework("ArchitectureSwitch.dll", "net6.0");
-        ExecuteApplication($"{s_privateX64Installation}/{GetMuxerName}", $"test {buildAssemblyPath} --framework net6.0 --arch arm64", out stdOut, out _, out _, env, projectDirectory);
+        var buildAssemblyPath = GetTestDllForFramework("ArchitectureSwitch.dll", "net8.0");
+        ExecuteApplication($"{s_privateX64Installation}/{GetMuxerName}", $"test {buildAssemblyPath} --framework net8.0 --arch arm64", out stdOut, out _, out _, env, projectDirectory);
         AssertSwitch(stdOut);
 
         static void AssertSwitch(string output)
@@ -224,7 +224,7 @@ public void PrivateX64BuildToDOTNET_ROOTS_EnvironmentVariables(bool dotnetRoot,
         var projectDirectory = Path.GetDirectoryName(projectPath);
 
         // Verify native architecture
-        ExecuteApplication(privateInstallationMuxer, $"test {projectPath} --framework net6.0", out string stdOut, out _, out _, env, projectDirectory);
+        ExecuteApplication(privateInstallationMuxer, $"test {projectPath} --framework net8.0", out string stdOut, out _, out _, env, projectDirectory);
         Assert.IsTrue(Regex.IsMatch(stdOut.Replace(@"\", "/"), $"Runtime location: .*{s_privateX64Installation.Replace(@"\", "/")}.*shared.*Microsoft.NETCore.App"), "Unexpected runtime location");
         Assert.IsTrue(stdOut.Contains("OSArchitecture: X64"), "Unexpected OSArchitecture");
         Assert.IsTrue(stdOut.Contains("ProcessArchitecture: X64"), "Unexpected ProcessArchitecture");
@@ -243,12 +243,12 @@ public void PrivateX64BuildToDOTNET_ROOTS_EnvironmentVariables(bool dotnetRoot,
         }
 
         // Verify switch using csproj
-        ExecuteApplication($"{s_privateX64Installation}/{GetMuxerName}", $"test {projectPath} --framework net6.0 --arch arm64", out stdOut, out _, out _, env, projectDirectory);
+        ExecuteApplication($"{s_privateX64Installation}/{GetMuxerName}", $"test {projectPath} --framework net8.0 --arch arm64", out stdOut, out _, out _, env, projectDirectory);
         AssertSwitch(stdOut);
 
         // Verify switch using test container
-        var buildAssemblyPath = GetTestDllForFramework("ArchitectureSwitch.dll", "net6.0");
-        ExecuteApplication($"{s_privateX64Installation}/{GetMuxerName}", $"test {buildAssemblyPath} --framework net6.0 --arch arm64", out stdOut, out _, out _, env, projectDirectory);
+        var buildAssemblyPath = GetTestDllForFramework("ArchitectureSwitch.dll", "net8.0");
+        ExecuteApplication($"{s_privateX64Installation}/{GetMuxerName}", $"test {buildAssemblyPath} --framework net8.0 --arch arm64", out stdOut, out _, out _, env, projectDirectory);
         AssertSwitch(stdOut);
 
         void AssertSwitch(string output)
@@ -298,8 +298,8 @@ public void SilentlyForceX64()
         $@"{Environment.ExpandEnvironmentVariables("%ProgramFiles%")}\dotnet\x64";
 
     private static string GetFrameworkVersionToForceToX64 => RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ?
-        "net5.0" :
-        "netcoreapp3.1";
+        "net9.0" :
+        "net8.0";
 
     private static string GetDefaultLocation => RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ?
         $"/usr/local/share/dotnet" :
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DotnetHostArchitectureVerifierTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DotnetHostArchitectureVerifierTests.cs
index 3ff30740f4..04e6e08c3f 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DotnetHostArchitectureVerifierTests.cs
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DotnetHostArchitectureVerifierTests.cs
@@ -23,7 +23,7 @@ public class DotnetHostArchitectureVerifierTests : IntegrationTestBase
     // [DataRow("X86")]
     public void VerifyHostArchitecture(string architecture)
     {
-        _testEnvironment.RunnerFramework = "netcoreapp3.1";
+        _testEnvironment.RunnerFramework = "net8.0";
         string dotnetPath = GetDownloadedDotnetMuxerFromTools(architecture);
         var vstestConsolePath = GetDotnetRunnerPath();
         var dotnetRunnerPath = TempDirectory.CreateDirectory("dotnetrunner");
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DotnetTestMSBuildOutputTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DotnetTestMSBuildOutputTests.cs
index 70e18080ef..3aca6e7e04 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DotnetTestMSBuildOutputTests.cs
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DotnetTestMSBuildOutputTests.cs
@@ -30,9 +30,9 @@ public void MSBuildLoggerCanBeEnabledByBuildPropertyAndDoesNotEatSpecialChars(Ru
         // Determining projects to restore...
         //   Restored C:\Users\nohwnd\AppData\Local\Temp\vstest\xvoVt\SimpleTestProject.csproj (in 441 ms).
         //   SimpleTestProject -> C:\Users\nohwnd\AppData\Local\Temp\vstest\xvoVt\artifacts\bin\TestAssets\SimpleTestProject\Debug\net462\SimpleTestProject.dll
-        //   SimpleTestProject -> C:\Users\nohwnd\AppData\Local\Temp\vstest\xvoVt\artifacts\bin\TestAssets\SimpleTestProject\Debug\netcoreapp3.1\SimpleTestProject.dll
+        //   SimpleTestProject -> C:\Users\nohwnd\AppData\Local\Temp\vstest\xvoVt\artifacts\bin\TestAssets\SimpleTestProject\Debug\net8.0\SimpleTestProject.dll
         // C:\Users\nohwnd\AppData\Local\Temp\vstest\xvoVt\UnitTest1.cs(41): error VSTEST1: (FailingTest) SampleUnitTestProject.UnitTest1.FailingTest() Assert.AreEqual failed. Expected:<2>. Actual:<3>.  [C:\Users\nohwnd\AppData\Local\Temp\vstest\xvoVt\SimpleTestProject.csproj::TargetFramework=net462]
-        // C:\Users\nohwnd\AppData\Local\Temp\vstest\xvoVt\UnitTest1.cs(41): error VSTEST1: (FailingTest) SampleUnitTestProject.UnitTest1.FailingTest() Assert.AreEqual failed. Expected:<2>. Actual:<3>.  [C:\Users\nohwnd\AppData\Local\Temp\vstest\xvoVt\SimpleTestProject.csproj::TargetFramework=netcoreapp3.1]
+        // C:\Users\nohwnd\AppData\Local\Temp\vstest\xvoVt\UnitTest1.cs(41): error VSTEST1: (FailingTest) SampleUnitTestProject.UnitTest1.FailingTest() Assert.AreEqual failed. Expected:<2>. Actual:<3>.  [C:\Users\nohwnd\AppData\Local\Temp\vstest\xvoVt\SimpleTestProject.csproj::TargetFramework=net8.0]
 
         StdOutputContains("TESTERROR");
         StdOutputContains("FailingTest (");
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ExecutionTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ExecutionTests.cs
index 1678f6a13e..47761acff0 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ExecutionTests.cs
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ExecutionTests.cs
@@ -202,7 +202,7 @@ public void StackOverflowExceptionShouldBeLoggedToConsoleAndDiagLogFile(RunnerIn
         InvokeVsTest(arguments);
 
         var errorMessage = "Process is terminated due to StackOverflowException.";
-        if (runnerInfo.TargetFramework.StartsWith("netcoreapp"))
+        if (!runnerInfo.TargetFramework.StartsWith("net4"))
         {
             errorMessage = "Test host process crashed : Stack overflow.";
         }
@@ -232,7 +232,7 @@ public void UnhandleExceptionExceptionShouldBeLoggedToDiagLogFile(RunnerInfo run
         InvokeVsTest(arguments);
 
         var errorFirstLine =
-            runnerInfo.TargetFramework.StartsWith("netcoreapp")
+            !runnerInfo.TargetFramework.StartsWith("net4")
             ? "Test host standard error line: Unhandled exception. System.InvalidOperationException: Operation is not valid due to the current state of the object."
             : "Test host standard error line: Unhandled Exception: System.InvalidOperationException: Operation is not valid due to the current state of the object.";
         FileAssert.Contains(diagLogFilePath, errorFirstLine);
@@ -418,7 +418,7 @@ public void RunXunitTestsWhenProvidingAllDllsInBin(RunnerInfo runnerInfo)
         //       ! * *\*TestAdapter.dll
         //       ! * *\obj\**
         // Because of this in typical run we get a lot of dlls that we are sure don't have tests, like Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll
-        // or testhost.dll. Those dlls are built for netcoreapp3.1 tfm, so theoretically they should be tests, but attempting to run them fails to find runtimeconfig.json
+        // or testhost.dll. Those dlls are built for net8.0 tfm, so theoretically they should be tests, but attempting to run them fails to find runtimeconfig.json
         // or deps.json, and fails the run.
         SetTestEnvironment(_testEnvironment, runnerInfo);
 
@@ -443,7 +443,7 @@ public void RunMstestTestsWhenProvidingAllDllsInBin(RunnerInfo runnerInfo)
         //       ! * *\*TestAdapter.dll
         //       ! * *\obj\**
         // Because of this in typical run we get a lot of dlls that we are sure don't have tests, like Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll
-        // or testhost.dll. Those dlls are built for netcoreapp3.1 tfm, so theoretically they should be tests, but attempting to run them fails to find runtimeconfig.json
+        // or testhost.dll. Those dlls are built for net8.0 tfm, so theoretically they should be tests, but attempting to run them fails to find runtimeconfig.json
         // or deps.json, and fails the run.
         SetTestEnvironment(_testEnvironment, runnerInfo);
 
@@ -467,7 +467,7 @@ public void RunNunitTestsWhenProvidingAllDllsInBin(RunnerInfo runnerInfo)
         //       ! * *\*TestAdapter.dll
         //       ! * *\obj\**
         // Because of this in typical run we get a lot of dlls that we are sure don't have tests, like Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll
-        // or testhost.dll. Those dlls are built for netcoreapp3.1 tfm, so theoretically they should be tests, but attempting to run them fails to find runtimeconfig.json
+        // or testhost.dll. Those dlls are built for net8.0 tfm, so theoretically they should be tests, but attempting to run them fails to find runtimeconfig.json
         // or deps.json, and fails the run.
         SetTestEnvironment(_testEnvironment, runnerInfo);
 
@@ -490,7 +490,7 @@ public void RunTestsWhenProvidingJustPlatformDllsFailsTheRun(RunnerInfo runnerIn
         //       ! * *\*TestAdapter.dll
         //       ! * *\obj\**
         // Because of this in typical run we get a lot of dlls that we are sure don't have tests, like Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll
-        // or testhost.dll. Those dlls are built for netcoreapp3.1 tfm, so theoretically they should be tests, but attempting to run them fails to find runtimeconfig.json
+        // or testhost.dll. Those dlls are built for net8.0 tfm, so theoretically they should be tests, but attempting to run them fails to find runtimeconfig.json
         // or deps.json, and fails the run.
         SetTestEnvironment(_testEnvironment, runnerInfo);
 
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/CompatibilityRowsBuilder.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/CompatibilityRowsBuilder.cs
index d798463ae2..01f38e3639 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/CompatibilityRowsBuilder.cs
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/CompatibilityRowsBuilder.cs
@@ -366,7 +366,9 @@ true when NuGetVersion.TryParse(version, out var v)
             false when version.StartsWith("15.") => GetContentFilesPath("netcoreapp2.0"),
             false when NuGetVersion.TryParse(version, out var v)
                 && new NuGetVersion(v.Major, v.Minor, v.Patch) < new NuGetVersion("17.4.0") => GetContentFilesPath("netcoreapp2.1"),
-            false => GetContentFilesPath("netcoreapp3.1"),
+            false when NuGetVersion.TryParse(version, out var v)
+                && new NuGetVersion(v.Major, v.Minor, v.Patch) <= new NuGetVersion("17.12.0") => GetContentFilesPath("netcoreapp3.1"),
+            false => GetContentFilesPath("net9.0"),
         };
 
         return new VSTestConsoleInfo
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetCoreRunnerAttribute.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetCoreRunnerAttribute.cs
index a1362f1c56..4b29b27dad 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetCoreRunnerAttribute.cs
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetCoreRunnerAttribute.cs
@@ -16,7 +16,7 @@ namespace Microsoft.TestPlatform.AcceptanceTests;
 /// <summary>
 /// Runs tests using the dotnet vstest.console.dll built against .NET Core 3.1.
 /// Provide a list of target frameworks to run the tests from given as a ';' separated list, or using a constant containing that range such as
-/// AcceptanceTestBase.NETFX462_NET50 = "net462;net472;net48;netcoreapp3.1;net5.0" to determine which target framework of the project
+/// AcceptanceTestBase.NETFX462_NET9 = "net462;net472;net48;net8.0;net9.0" to determine which target framework of the project
 /// to test. The target project must list those TFMs in the TargetFrameworks property in csproj.
 /// </summary>
 [AttributeUsage(AttributeTargets.Method)]
@@ -28,7 +28,7 @@ public class NetCoreRunnerAttribute : Attribute, ITestDataSource
     /// Initializes a new instance of the <see cref="NetCoreRunnerAttribute"/> class.
     /// </summary>
     /// <param name="targetFrameworks">To run tests with desktop runner(vstest.console.exe), use AcceptanceTestBase.Net462TargetFramework or alike values.</param>
-    public NetCoreRunnerAttribute(string targetFrameworks = AcceptanceTestBase.NETFX462_NET50)
+    public NetCoreRunnerAttribute(string targetFrameworks = AcceptanceTestBase.NETFX462_NET9)
     {
         _targetFrameworks = targetFrameworks;
     }
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetCoreTargetFrameworkDataSourceAttribute.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetCoreTargetFrameworkDataSourceAttribute.cs
index a227c37af1..ad85630dbe 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetCoreTargetFrameworkDataSourceAttribute.cs
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetCoreTargetFrameworkDataSourceAttribute.cs
@@ -68,14 +68,14 @@ public IEnumerable<object[]> GetData(MethodInfo methodInfo)
         {
             var runnerFramework = IntegrationTestBase.DesktopRunnerFramework;
 
-            AddRunnerDataRow(dataRows, runnerFramework, AcceptanceTestBase.Core31TargetFramework);
+            AddRunnerDataRow(dataRows, runnerFramework, AcceptanceTestBase.Core80TargetFramework);
         }
 
         if (_useCoreRunner)
         {
             var runnerFramework = IntegrationTestBase.CoreRunnerFramework;
 
-            AddRunnerDataRow(dataRows, runnerFramework, AcceptanceTestBase.Core31TargetFramework);
+            AddRunnerDataRow(dataRows, runnerFramework, AcceptanceTestBase.Core80TargetFramework);
         }
 
         return dataRows;
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetFrameworkRunnerAttribute.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetFrameworkRunnerAttribute.cs
index 037bb03a1a..2de6985cfe 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetFrameworkRunnerAttribute.cs
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetFrameworkRunnerAttribute.cs
@@ -13,9 +13,9 @@
 namespace Microsoft.TestPlatform.AcceptanceTests;
 
 /// <summary>
-/// Runs tests using the dotnet vstest.console.dll built against .NET Core 2.1.
+/// Runs tests using the dotnet vstest.console.dll built against .NET 6.0.
 /// Provide a list of target frameworks to run the tests from given as a ';' separated list, or using a constant containing that range such as
-/// AcceptanceTestBase.NETFX462_NET50 = "net462;net472;net48;netcoreapp3.1;net5.0" to determine which target framework of the project
+/// AcceptanceTestBase.NETFX462_NET9 = "net462;net472;net48;net8.0;net9.0" to determine which target framework of the project
 /// to test. The target project must list those TFMs in the TargetFrameworks property in csproj.
 /// </summary>
 [AttributeUsage(AttributeTargets.Method)]
@@ -25,7 +25,7 @@ public class NetFrameworkRunnerAttribute : Attribute, ITestDataSource
     /// Initializes a new instance of the <see cref="NetCoreTargetFrameworkDataSourceAttribute"/> class.
     /// </summary>
     /// <param name="targetFrameworks">To run tests with desktop runner(vstest.console.exe), use AcceptanceTestBase.Net462TargetFramework or alike values.</param>
-    public NetFrameworkRunnerAttribute(string targetFrameworks = AcceptanceTestBase.NETFX462_NET50)
+    public NetFrameworkRunnerAttribute(string targetFrameworks = AcceptanceTestBase.NETFX462_NET9)
     {
         _targetFrameworks = targetFrameworks;
     }
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/TestPlatformCompatibilityDataSource.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/TestPlatformCompatibilityDataSource.cs
index be3724c6e0..58715203fb 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/TestPlatformCompatibilityDataSource.cs
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/TestPlatformCompatibilityDataSource.cs
@@ -11,7 +11,7 @@ namespace Microsoft.TestPlatform.AcceptanceTests;
 /// used only to test the most common scenarios, or special configurations that are candidates for their own
 /// specialized source.
 ///
-/// By default net462 and netcoreapp3.1 are used for both runner and host. (4 combinations)
+/// By default net462 and net8.0 are used for both runner and host. (4 combinations)
 /// Then run with every version of runner is added.
 /// Then run with every version of test.sdk is added.
 /// Then run with every combination of testhost and adapter is added.
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/FrameworkTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/FrameworkTests.cs
index 74edcf0713..29f2bccb69 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/FrameworkTests.cs
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/FrameworkTests.cs
@@ -80,17 +80,17 @@ public void RunSpecificTestsShouldWorkWithFrameworkInCompatibleWarning(RunnerInf
 
         InvokeVsTest(arguments);
 
-        // When this test runs it provides an incorrect desired framework for the run. E.g. the dll is actually netcoreapp3.1
-        // but we request to run as .NET Framework 4.0. On windows this has predictable results, for netcoreapp3.1 dll we fail
+        // When this test runs it provides an incorrect desired framework for the run. E.g. the dll is actually net8.0
+        // but we request to run as .NET Framework 4.0. On windows this has predictable results, for net8.0 dll we fail
         // to load it into .NET Framework testhost.exe, and fail with "No test is available". For .NET Framework dll, we
         // just log a warning saying that we provided .NET Framework 472 dlls (or whatever the current tfm for test dlls is),
         // but the settings requested .NET Framework 4.0. The test will still run because .NET Framework is compatible, and in reality
         // the system has .NET Framework 472 or newer installed, which runs even if we ask for .NET Framework 4.0 testhost.
         //
-        // On Linux and Mac we execute only netcoreapp3.1 tests, and even though we force .NET Framework, we end up running on mono
+        // On Linux and Mac we execute only net8.0 tests, and even though we force .NET Framework, we end up running on mono
         // which is suprisingly able to run the .NET CoreApp 3.1 dll, so we still just see a warning and 1 completed test.
         var isWindows = Environment.OSVersion.Platform.ToString().StartsWith("Win");
-        if (runnerInfo.TargetFramework.Contains("netcore") && isWindows)
+        if (runnerInfo.TargetFramework.Contains("net8") && isWindows)
         {
             StdOutputContains("No test is available");
         }
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Microsoft.TestPlatform.Acceptance.IntegrationTests.csproj b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Microsoft.TestPlatform.Acceptance.IntegrationTests.csproj
index 0780c80452..82eb7326ec 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Microsoft.TestPlatform.Acceptance.IntegrationTests.csproj
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Microsoft.TestPlatform.Acceptance.IntegrationTests.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <OutputType Condition=" $(TargetFramework.StartsWith('net6')) ">Exe</OutputType>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
+    <OutputType Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)')) ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="TestAssets\**" />
@@ -37,18 +37,10 @@
     <PackageReference Include="NuGet.Versioning" Version="6.1.0" />
     <PackageReference Include="Microsoft.CodeCoverage.Core" Version="$(MicrosoftInternalCodeCoverageVersion)" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
+  <ItemGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) ">
     <PackageReference Include="Microsoft.Internal.CodeCoverage" Version="$(MicrosoftInternalCodeCoverageVersion)" />
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0-preview2-26406-04" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
-    <Reference Include="System" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Reflection" />
-    <Reference Include="System.Text.RegularExpressions" />
-  </ItemGroup>
   <ItemGroup>
     <Folder Include="Performance\" />
   </ItemGroup>
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/TranslationLayer/TelemetryPerfTestBase.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/TranslationLayer/TelemetryPerfTestBase.cs
index cb4a59b220..31a6e4ad63 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/TranslationLayer/TelemetryPerfTestBase.cs
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/TranslationLayer/TelemetryPerfTestBase.cs
@@ -115,7 +115,7 @@ private static string GetAdapterName(string projectName)
     /// <returns></returns>
     public string[] GetPerfAssetFullPath(string name, string framework = "net48")
     {
-        // TODO: how was I doing it before? The build is for net48, were we running net6.0 here?
+        // TODO: how was I doing it before? The build is for net48, were we running net8.0 here?
         var dllPath = GetTestDllForFramework($"{name}.dll", framework);
         return !File.Exists(dllPath)
             ? throw new FileNotFoundException(null, dllPath)
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ProcessesInteractionTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ProcessesInteractionTests.cs
index 13208c4d69..32228f1da8 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ProcessesInteractionTests.cs
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ProcessesInteractionTests.cs
@@ -22,7 +22,7 @@ public void WhenTestHostProcessExitsBecauseTheTargetedRuntimeIsNoFoundThenTheMes
         // Arrange
         SetTestEnvironment(_testEnvironment, runnerInfo);
         const string testAssetProjectName = "SimpleTestProjectMessedUpTargetFramework";
-        var assemblyPath = GetTestDllForFramework(testAssetProjectName + ".dll", Core31TargetFramework);
+        var assemblyPath = GetTestDllForFramework(testAssetProjectName + ".dll", Core80TargetFramework);
         UpdateRuntimeConfigJsonWithInvalidFramework(assemblyPath, testAssetProjectName);
 
         // Act
@@ -39,7 +39,7 @@ static void UpdateRuntimeConfigJsonWithInvalidFramework(string assemblyPath, str
             // that's only meant to be used by this project.
             var runtimeConfigJson = Path.Combine(Path.GetDirectoryName(assemblyPath)!, testAssetProjectName + ".runtimeconfig.json");
             var fileContent = File.ReadAllText(runtimeConfigJson);
-            var updatedContent = fileContent.Replace("\"version\": \"3.1.0\"", "\"version\": \"0.0.0\"");
+            var updatedContent = fileContent.Replace("\"version\": \"8.0.0\"", "\"version\": \"0.0.0\"");
             File.WriteAllText(runtimeConfigJson, updatedContent);
         }
     }
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/SelfContainedAppTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/SelfContainedAppTests.cs
index fdfddcd95b..531f35c012 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/SelfContainedAppTests.cs
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/SelfContainedAppTests.cs
@@ -22,8 +22,8 @@ public void RunningApplicationThatIsBuiltAsSelfContainedWillNotFailToFindHostpol
         // see https://github.com/dotnet/runtime/issues/3569#issuecomment-595820524 and below for description of how it works
         SetTestEnvironment(_testEnvironment, runnerInfo);
 
-        // the app is published to win10-x64 because of the runtime identifier in the project
-        var assemblyPath = GetAssetFullPath($@"win10-x64{Path.DirectorySeparatorChar}SelfContainedAppTestProject.dll");
+        // the app is published to win-x64 because of the runtime identifier in the project
+        var assemblyPath = GetAssetFullPath($@"win-x64{Path.DirectorySeparatorChar}SelfContainedAppTestProject.dll");
         var arguments = PrepareArguments(assemblyPath, null, null, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
         InvokeVsTest(arguments);
 
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/DifferentTestFrameworkSimpleTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/DifferentTestFrameworkSimpleTests.cs
index c744db464b..8532a5d229 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/DifferentTestFrameworkSimpleTests.cs
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/DifferentTestFrameworkSimpleTests.cs
@@ -10,6 +10,7 @@
 using Microsoft.TestPlatform.TestUtilities;
 using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+//using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests;
@@ -77,8 +78,8 @@ public void RunTestsWithNunitAdapter(RunnerInfo runnerInfo)
     [TestMethod]
     // there are logs in the diagnostic log, it is failing with NullReferenceException because path is null
     [TestCategory("Windows-Review")]
-    [NetFullTargetFrameworkDataSource]
-    [NetCoreTargetFrameworkDataSource]
+    [NetFullTargetFrameworkDataSource(useCoreRunner: true, useDesktopRunner: false)]
+    // [NetCoreTargetFrameworkDataSource]
     public void RunTestsWithXunitAdapter(RunnerInfo runnerInfo)
     {
         SetTestEnvironment(_testEnvironment, runnerInfo);
@@ -91,7 +92,12 @@ public void RunTestsWithXunitAdapter(RunnerInfo runnerInfo)
 
         _vstestConsoleWrapper.RunTests(
             sources,
-            GetDefaultRunSettings(),
+             $@"<?xml version=""1.0"" encoding=""utf-8""?>
+            <RunSettings>
+                <RunConfiguration>
+                    <TargetFrameworkVersion>{runnerInfo.TargetFramework}</TargetFrameworkVersion>
+                </RunConfiguration>
+            </RunSettings>",
             _runEventHandler);
 
         var testCase =
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/RunTestsWithDifferentConfigurationTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/RunTestsWithDifferentConfigurationTests.cs
index 426ce341cf..abf6f49b7b 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/RunTestsWithDifferentConfigurationTests.cs
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/RunTestsWithDifferentConfigurationTests.cs
@@ -21,7 +21,7 @@ namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests;
 [TestClass]
 public class RunTestsWithDifferentConfigurationTests : AcceptanceTestBase
 {
-    private const string Netcoreapp = "netcoreapp";
+    private const string NetFramework = "net4";
     private const string Message = "VsTestConsoleWrapper does not support .Net Core Runner";
 
     private IVsTestConsoleWrapper? _vstestConsoleWrapper;
@@ -101,11 +101,11 @@ public void RunTestsWithRunSettingsWithParallel(RunnerInfo runnerInfo)
 
     [TestMethod]
     [TestCategory("Windows-Review")]
-    [NetFullTargetFrameworkDataSource]
+    [NetFullTargetFrameworkDataSource()]
     public void RunTestsWithTestSettings(RunnerInfo runnerInfo)
     {
         SetTestEnvironment(_testEnvironment, runnerInfo);
-        ExecuteNotSupportedRunnerFrameworkTests(runnerInfo.RunnerFramework, Netcoreapp, Message);
+        ExecuteNotSupportedRunnerFrameworkTests(runnerInfo.RunnerFramework, NetFramework, Message);
         Setup();
 
         var testsettingsFile = Path.Combine(TempDirectory.Path, "tempsettings.testsettings");
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 c2f98954c2..3a908e87bc 100644
--- a/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/Microsoft.TestPlatform.AdapterUtilities.UnitTests.csproj
+++ b/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/Microsoft.TestPlatform.AdapterUtilities.UnitTests.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('net6')) ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)')) ">Exe</OutputType>
     <AssemblyName>Microsoft.TestPlatform.AdapterUtilities.UnitTests</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>$(NoWarn);RS1024</NoWarn>
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 8a2c2516cf..9363812637 100644
--- a/test/Microsoft.TestPlatform.Build.UnitTests/Microsoft.TestPlatform.Build.UnitTests.csproj
+++ b/test/Microsoft.TestPlatform.Build.UnitTests/Microsoft.TestPlatform.Build.UnitTests.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net48</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('net8')) ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)')) ">Exe</OutputType>
     <AssemblyName>Microsoft.TestPlatform.Build.UnitTests</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
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 d3976dd0ef..5839ea296b 100644
--- a/test/Microsoft.TestPlatform.Client.UnitTests/Microsoft.TestPlatform.Client.UnitTests.csproj
+++ b/test/Microsoft.TestPlatform.Client.UnitTests/Microsoft.TestPlatform.Client.UnitTests.csproj
@@ -6,17 +6,11 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('net6')) ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)')) ">Exe</OutputType>
     <AssemblyName>Microsoft.TestPlatform.Client.UnitTests</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.TestPlatform.Client\Microsoft.TestPlatform.Client.csproj" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
 </Project>
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 5a72e7dc34..37e4ae7b0f 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/Microsoft.TestPlatform.Common.UnitTests.csproj
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/Microsoft.TestPlatform.Common.UnitTests.csproj
@@ -6,16 +6,10 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('net6')) ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)')) ">Exe</OutputType>
     <AssemblyName>Microsoft.TestPlatform.Common.UnitTests</AssemblyName>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.TestPlatform.TestUtilities\Microsoft.TestPlatform.TestUtilities.csproj" />
   </ItemGroup>
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests.csproj b/test/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests.csproj
index d63e9e4f6c..0605d93fd5 100644
--- a/test/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests.csproj
+++ b/test/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests.csproj
@@ -6,15 +6,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('net6')) ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)')) ">Exe</OutputType>
     <AssemblyName>Microsoft.TestPlatform.CommunicationUtilities.PlatformTests</AssemblyName>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Runtime.Serialization" />
-  </ItemGroup>
-
 </Project>
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 9fee3675c6..99354bbad1 100644
--- a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Microsoft.TestPlatform.CommunicationUtilities.UnitTests.csproj
+++ b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Microsoft.TestPlatform.CommunicationUtilities.UnitTests.csproj
@@ -6,11 +6,11 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('net6')) ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)')) ">Exe</OutputType>
     <AssemblyName>Microsoft.TestPlatform.CommunicationUtilities.UnitTests</AssemblyName>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
+  <ItemGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <Reference Include="System.Runtime" />
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
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 ba4499c758..0999799a02 100644
--- a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Microsoft.TestPlatform.CoreUtilities.UnitTests.csproj
+++ b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Microsoft.TestPlatform.CoreUtilities.UnitTests.csproj
@@ -6,30 +6,10 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('net6')) ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)')) ">Exe</OutputType>
     <AssemblyName>Microsoft.TestPlatform.CoreUtilities.UnitTests</AssemblyName>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-    <PackageReference Include="System.Diagnostics.Process">
-      <Version>4.3.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Diagnostics.TextWriterTraceListener">
-      <Version>4.3.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Diagnostics.TraceSource">
-      <Version>4.3.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Threading.Thread">
-      <Version>4.3.0</Version>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
-    <Reference Include="System" />
-    <Reference Include="System.Globalization" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
   <ItemGroup>
     <Folder Include="TestAssets\" />
   </ItemGroup>
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/InProcDataCollectionExtensionManagerTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/InProcDataCollectionExtensionManagerTests.cs
index 1edc315269..87c3f5dfb6 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/InProcDataCollectionExtensionManagerTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/InProcDataCollectionExtensionManagerTests.cs
@@ -101,7 +101,7 @@ public void InProcDataCollectionExtensionManagerLoadsDataCollectorFromDefaultCod
                                     </InProcDataCollectionRunSettings>
                                 </RunSettings>";
 
-        _mockFileHelper.Setup(fh => fh.Exists(Path.Combine(Temp, "repos", "MSTest", "src", "managed", "TestPlatform", "TestImpactListener.Tests", "bin", "Debug", "TestImpactListener.Tests.dll"))).Returns(true);
+        _mockFileHelper.Setup(fh => fh.Exists(Path.Combine(new[] { Temp, "repos", "MSTest", "src", "managed", "TestPlatform", "TestImpactListener.Tests", "bin", "Debug", "TestImpactListener.Tests.dll" }))).Returns(true);
         _inProcDataCollectionManager = new TestableInProcDataCollectionExtensionManager(settingsXml, _mockTestEventsPublisher.Object, _defaultCodebase, _testPluginCache, _mockFileHelper.Object);
 
         var codebase = ((MockDataCollector)_inProcDataCollectionManager.InProcDataCollectors.Values.First()).CodeBase;
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 4e7fb4dd64..b29e6d5637 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Microsoft.TestPlatform.CrossPlatEngine.UnitTests.csproj
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Microsoft.TestPlatform.CrossPlatEngine.UnitTests.csproj
@@ -7,8 +7,8 @@
 
   <PropertyGroup>
     <AssemblyName>Microsoft.TestPlatform.CrossPlatEngine.UnitTests</AssemblyName>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('net6')) ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)')) ">Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.TestPlatform.TestHostProvider\Microsoft.TestPlatform.TestHostProvider.csproj" />
@@ -18,12 +18,4 @@
     </ProjectReference>
     <ProjectReference Include="..\Microsoft.TestPlatform.TestUtilities\Microsoft.TestPlatform.TestUtilities.csproj" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Threading.Tasks" />
-  </ItemGroup>
-
 </Project>
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 836dd60c67..1fe46f071b 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
@@ -19,8 +19,8 @@
     <RootNamespace>Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests</RootNamespace>
   </PropertyGroup>
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('net6')) ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)')) ">Exe</OutputType>
     <AssemblyName>Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
@@ -31,11 +31,4 @@
     <ProjectReference Include="..\..\src\Microsoft.TestPlatform.Extensions.BlameDataCollector\Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj" />
     <PackageReference Include="NETStandard.Library" Version="2.0.3" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net472' AND '$(OS)' != 'Windows_NT' ">
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-
 </Project>
diff --git a/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/XmlReaderWriterTests.cs b/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/XmlReaderWriterTests.cs
index 59fe94e370..e23dc5a040 100644
--- a/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/XmlReaderWriterTests.cs
+++ b/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/XmlReaderWriterTests.cs
@@ -91,26 +91,6 @@ public void ReadTestSequenceShouldThrowExceptionIfFileNotFound()
         Assert.ThrowsException<FileNotFoundException>(() => _xmlReaderWriter.ReadTestSequence(string.Empty));
     }
 
-    /// <summary>
-    /// The read test sequence should read file stream.
-    /// </summary>
-    [TestMethod]
-    public void ReadTestSequenceShouldReadFileStream()
-    {
-        // Setup
-        _mockFileHelper.Setup(m => m.Exists(It.IsAny<string>())).Returns(true);
-        _mockFileHelper.Setup(m => m.GetStream("path.xml", FileMode.Open, FileAccess.ReadWrite)).Returns(_mockStream.Object);
-
-        // Call to Read Test Sequence
-        _xmlReaderWriter.ReadTestSequence("path.xml");
-
-        // Verify Call to fileHelper
-        _mockFileHelper.Verify(x => x.GetStream("path.xml", FileMode.Open, FileAccess.ReadWrite));
-
-        // Verify Call to stream read
-        _mockStream.Verify(x => x.Read(It.IsAny<byte[]>(), It.IsAny<int>(), It.IsAny<int>()));
-    }
-
     /// <summary>
     /// The write test sequence should write file stream.
     /// </summary>
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 a109012ab5..de607265a6 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
@@ -6,17 +6,10 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('net6')) ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)')) ">Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.TestPlatform.Extensions.HtmlLogger\Microsoft.TestPlatform.Extensions.HtmlLogger.csproj" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-
 </Project>
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 c8b9420b40..469621d359 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
@@ -6,18 +6,11 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('net6')) ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)')) ">Exe</OutputType>
     <AssemblyName>Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.TestPlatform.Extensions.TrxLogger\Microsoft.TestPlatform.Extensions.TrxLogger.csproj" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-
 </Project>
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 6429c9b26b..2f8a968278 100644
--- a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Microsoft.TestPlatform.ObjectModel.UnitTests.csproj
+++ b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Microsoft.TestPlatform.ObjectModel.UnitTests.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('net6')) ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)')) ">Exe</OutputType>
     <AssemblyName>Microsoft.TestPlatform.ObjectModel.UnitTests</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
@@ -15,11 +15,4 @@
       <Version>$(NewtonsoftJsonVersion)</Version>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-
 </Project>
diff --git a/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/DotnetTestHostManagerTests.cs b/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/DotnetTestHostManagerTests.cs
index 4b606e57bc..997d4741f0 100644
--- a/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/DotnetTestHostManagerTests.cs
+++ b/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/DotnetTestHostManagerTests.cs
@@ -302,7 +302,7 @@ public void GetTestHostProcessStartInfoShouldUseTestHostExeFromNugetIfNotFoundIn
         var testhostExePath = "testhost.exe";
         _dotnetHostManager.Initialize(_mockMessageLogger.Object, "<RunSettings><RunConfiguration><TargetPlatform>x64</TargetPlatform></RunConfiguration></RunSettings>");
         _mockFileHelper.Setup(ph => ph.Exists(testhostExePath)).Returns(false);
-        _mockFileHelper.Setup(ph => ph.Exists("C:\\packages\\microsoft.testplatform.testhost\\15.0.0-Dev\\build\\netcoreapp3.1\\x64\\testhost.exe")).Returns(true);
+        _mockFileHelper.Setup(ph => ph.Exists("C:\\packages\\microsoft.testplatform.testhost\\15.0.0-Dev\\build\\net8.0\\x64\\testhost.exe")).Returns(true);
         _mockEnvironment.Setup(ev => ev.OperatingSystem).Returns(PlatformOperatingSystem.Windows);
         var sourcePath = Path.Combine(_temp, "test.dll");
 
@@ -362,7 +362,10 @@ public void GetTestHostProcessStartInfoShouldUseTestHostExeFromNugetIfNotFoundIn
 
         var startInfo = _dotnetHostManager.GetTestHostProcessStartInfo(new[] { sourcePath }, null, _defaultConnectionInfo);
 
-        StringAssert.Contains(startInfo.FileName, "C:\\packages\\microsoft.testplatform.testhost\\15.0.0-Dev\\build\\netcoreapp3.1\\x64\\testhost.exe");
+
+        // If this starts failing after updating TFMs of packakges, the GetTestHostProcessStartInfo defines the default version
+        // to use in GetTestHostProcessStartInfo, change that to the lowest supported netcore version, and pass this test.
+        StringAssert.Contains(startInfo.FileName, "C:\\packages\\microsoft.testplatform.testhost\\15.0.0-Dev\\build\\net8.0\\x64\\testhost.exe");
     }
 
     [TestMethod]
@@ -372,7 +375,7 @@ public void GetTestHostProcessStartInfoShouldUseTestHostX86ExeFromNugetIfNotFoun
         var testhostExePath = "testhost.x86.exe";
         _dotnetHostManager.Initialize(_mockMessageLogger.Object, "<RunSettings><RunConfiguration><TargetPlatform>x86</TargetPlatform></RunConfiguration></RunSettings>");
         _mockFileHelper.Setup(ph => ph.Exists(testhostExePath)).Returns(false);
-        _mockFileHelper.Setup(ph => ph.Exists($"C:\\packages{Path.DirectorySeparatorChar}microsoft.testplatform.testhost\\15.0.0-Dev{Path.DirectorySeparatorChar}build\\netcoreapp3.1\\x86\\testhost.x86.exe")).Returns(true);
+        _mockFileHelper.Setup(ph => ph.Exists($"C:\\packages{Path.DirectorySeparatorChar}microsoft.testplatform.testhost\\15.0.0-Dev{Path.DirectorySeparatorChar}build\\net8.0\\x86\\testhost.x86.exe")).Returns(true);
         _mockEnvironment.Setup(ev => ev.OperatingSystem).Returns(PlatformOperatingSystem.Windows);
         var sourcePath = Path.Combine(_temp, "test.dll");
 
@@ -432,7 +435,9 @@ public void GetTestHostProcessStartInfoShouldUseTestHostX86ExeFromNugetIfNotFoun
 
         var startInfo = _dotnetHostManager.GetTestHostProcessStartInfo(new[] { sourcePath }, null, _defaultConnectionInfo);
 
-        StringAssert.Contains(startInfo.FileName, "C:\\packages\\microsoft.testplatform.testhost\\15.0.0-Dev\\build\\netcoreapp3.1\\x86\\testhost.x86.exe");
+        // If this starts failing after updating TFMs of packakges, the GetTestHostProcessStartInfo defines the default version
+        // to use in GetTestHostProcessStartInfo, change that to the lowest supported netcore version, and pass this test.
+        StringAssert.Contains(startInfo.FileName, "C:\\packages\\microsoft.testplatform.testhost\\15.0.0-Dev\\build\\net8.0\\x86\\testhost.x86.exe");
     }
 
     [TestMethod]
@@ -632,7 +637,7 @@ public void GetTestHostProcessStartInfoShouldIncludeTestHostPathFromSourceDirect
         StringAssert.Contains(startInfo.Arguments, expectedTestHostPath);
     }
 
-    // TODO: This assembly was previously compiled as net472 and so it was skipped and only ran as netcoreapp3.1. This fails in test, but works in code that is not isolated in appdomain. Might be worth fixing because we get one null here, and another in DotnetTestHostManager.
+    // TODO: This assembly was previously compiled as net472 and so it was skipped and only ran as net8.0. This fails in test, but works in code that is not isolated in appdomain. Might be worth fixing because we get one null here, and another in DotnetTestHostManager.
     // Assembly.GetEntryAssembly().Location is null because of running in app domain.
 #if NET
     [TestMethod]
@@ -660,7 +665,7 @@ public void GetTestHostProcessStartInfoShouldIncludeTestHostPathNextToTestRunner
 
 #endif
 
-    // TODO: This assembly was previously compiled as net472 and so it was skipped and only ran as netcoreapp3.1. This fails in test, but works in code that is not isolated in appdomain. Might be worth fixing because we get one null here, and another in DotnetTestHostManager.
+    // TODO: This assembly was previously compiled as net472 and so it was skipped and only ran as net8.0. This fails in test, but works in code that is not isolated in appdomain. Might be worth fixing because we get one null here, and another in DotnetTestHostManager.
     // Assembly.GetEntryAssembly().Location is null because of running in app domain.
 #if NET
 
@@ -669,14 +674,13 @@ public void GetTestHostProcessStartInfoShouldIncludeTestHostPathNextToTestRunner
     // we can't put in a "default" value, and we don't have other way to determine if this provided value is the
     // runtime default or the actual value that user provided, so right now the default will use the latest, instead
     // or the more correct 1.0, it should be okay, as that version is not supported anymore anyway
-    [DataRow("netcoreapp3.1", "3.1", true)]
-    [DataRow("net5.0", "5.0", true)]
-
-    // net6.0 is currently the latest released version, but it still has it's own runtime config, it is not the same as
-    // "latest" which means the latest you have on system. So if you have only 5.0 SDK then net6.0 will fail because it can't find net6.0,
-    // but latest would use net5.0 because that is the latest one on your system.
-    [DataRow("net6.0", "6.0", true)]
-    [DataRow("net6.0", "latest", false)]
+    [DataRow("net8.0", "8.0", true)]
+
+    // net9.0 is currently the latest released version, but it still has it's own runtime config, it is not the same as
+    // "latest" which means the latest you have on system. So if you have only 5.0 SDK then net8.0 will fail because it can't find net8.0,
+    // but latest would use net9.0 because that is the latest one on your system.
+    [DataRow("net9.0", "9.0", true)]
+    [DataRow("net9.0", "latest", false)]
     public void GetTestHostProcessStartInfoShouldIncludeTestHostPathNextToTestRunnerIfTesthostDllIsNoFoundAndDepsFileNotFoundWithTheCorrectTfm(string tfm, string suffix, bool runtimeConfigExists)
     {
         // Absolute path to the source directory
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 2fc30c8612..4768c56dcb 100644
--- a/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Microsoft.TestPlatform.TestHostProvider.UnitTests.csproj
+++ b/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Microsoft.TestPlatform.TestHostProvider.UnitTests.csproj
@@ -7,17 +7,10 @@
 
   <PropertyGroup>
     <AssemblyName>Microsoft.TestPlatform.TestHostProvider.UnitTests</AssemblyName>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('net6')) ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)')) ">Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.TestPlatform.TestHostProvider\Microsoft.TestPlatform.TestHostProvider.csproj" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net472' AND '$(OS)' != 'Windows_NT' ">
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-
 </Project>
diff --git a/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs b/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs
index 885b65906a..d1fe09ace2 100644
--- a/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs
+++ b/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs
@@ -30,7 +30,7 @@ namespace Microsoft.TestPlatform.TestUtilities;
 public class IntegrationTestBase
 {
     public const string DesktopRunnerFramework = "net462";
-    public const string CoreRunnerFramework = "netcoreapp3.1";
+    public const string CoreRunnerFramework = "net8.0";
 
     private const string TotalTestsMessage = "Total tests: {0}";
     private const string PassedTestsMessage = " Passed: {0}";
@@ -294,11 +294,11 @@ public void InvokeVsTestForDiscovery(string testAssembly, string testAdapterPath
     /// Execute Tests that are not supported with given Runner framework.
     /// </summary>
     /// <param name="runnerFramework">Runner Framework</param>
-    /// <param name="framework">Framework for which Tests are not supported</param>
+    /// <param name="framework">Framework for which Tests are supported</param>
     /// <param name="message">Message to be shown</param>
     public static void ExecuteNotSupportedRunnerFrameworkTests(string runnerFramework, string framework, string message)
     {
-        if (runnerFramework.StartsWith(framework))
+        if (!runnerFramework.StartsWith(framework, StringComparison.OrdinalIgnoreCase))
         {
             Assert.Inconclusive(message);
         }
@@ -605,7 +605,7 @@ protected string GetTestAdapterPath(UnitTestFramework testFramework = UnitTestFr
             var version = IntegrationTestEnvironment.DependencyVersions["MSTestTestAdapterVersion"];
             if (version.StartsWith("3"))
             {
-                var tfm = _testEnvironment.TargetFramework.StartsWith("net4") ? "net462" : _testEnvironment.TargetFramework;
+                var tfm = _testEnvironment.TargetFramework.StartsWith("net4") ? "net462" : "netcoreapp3.1";
                 adapterRelativePath = string.Format(CultureInfo.InvariantCulture, _msTestAdapterRelativePath, version, tfm);
             }
             else
@@ -990,7 +990,7 @@ protected static string GetDownloadedDotnetMuxerFromTools(string architecture)
     }
 
     protected string GetDotnetRunnerPath() =>
-        _testEnvironment.VSTestConsoleInfo?.Path ?? Path.Combine(IntegrationTestEnvironment.PublishDirectory, $"Microsoft.TestPlatform.CLI.{IntegrationTestEnvironment.LatestLocallyBuiltNugetVersion}.nupkg", "contentFiles", "any", "netcoreapp3.1", "vstest.console.dll");
+        _testEnvironment.VSTestConsoleInfo?.Path ?? Path.Combine(IntegrationTestEnvironment.PublishDirectory, $"Microsoft.TestPlatform.CLI.{IntegrationTestEnvironment.LatestLocallyBuiltNugetVersion}.nupkg", "contentFiles", "any", "net9.0", "vstest.console.dll");
 
     protected void StdOutHasNoWarnings()
     {
diff --git a/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestEnvironment.cs b/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestEnvironment.cs
index 9bcfc89cb9..d7743edb87 100644
--- a/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestEnvironment.cs
+++ b/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestEnvironment.cs
@@ -92,7 +92,7 @@ public static Dictionary<string, string> DependencyVersions
 
     /// <summary>
     /// Gets the target framework.
-    /// Supported values = <c>net462</c>, <c>netcoreapp3.1</c>.
+    /// Supported values = <c>net462</c>, <c>net8.0</c>.
     /// </summary>
     [NotNull]
     public string? TargetFramework { get; set; }
@@ -143,7 +143,7 @@ public string? TargetRuntime
 
     /// <summary>
     /// Gets the application type.
-    /// Supported values = <c>net462</c>, <c>netcoreapp3.1</c>.
+    /// Supported values = <c>net462</c>, <c>net8.0</c>.
     /// </summary>
     public string RunnerFramework { get; set; }
 
diff --git a/test/Microsoft.TestPlatform.TestUtilities/Microsoft.TestPlatform.TestUtilities.csproj b/test/Microsoft.TestPlatform.TestUtilities/Microsoft.TestPlatform.TestUtilities.csproj
index 1823de200f..9d44795e8f 100644
--- a/test/Microsoft.TestPlatform.TestUtilities/Microsoft.TestPlatform.TestUtilities.csproj
+++ b/test/Microsoft.TestPlatform.TestUtilities/Microsoft.TestPlatform.TestUtilities.csproj
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <AssemblyName>Microsoft.TestPlatform.TestUtilities</AssemblyName>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
     <UseBannedApiAnalyzers>true</UseBannedApiAnalyzers>
   </PropertyGroup>
@@ -29,15 +29,9 @@
     <PackageReference Include="Moq" Version="$(MoqVersion)" />
     <PackageReference Include="MSTest.TestFramework" Version="$(MSTestTestFrameworkVersion)" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
+  <ItemGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="1.0.41" />
     <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
-
-    <Reference Include="System" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.Text.RegularExpressions" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
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 2ef1dbe427..2247db2ab0 100644
--- a/test/Microsoft.TestPlatform.Utilities.UnitTests/Microsoft.TestPlatform.Utilities.UnitTests.csproj
+++ b/test/Microsoft.TestPlatform.Utilities.UnitTests/Microsoft.TestPlatform.Utilities.UnitTests.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('net6')) ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)')) ">Exe</OutputType>
     <AssemblyName>Microsoft.TestPlatform.Utilities.UnitTests</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
@@ -17,13 +17,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeCoverage.IO" Version="$(MicrosoftCodeCoverageIOVersion)" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Threading.Tasks" />
-  </ItemGroup>
   <ItemGroup>
     <None Update="TestFiles\**\*.*">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
diff --git a/test/SettingsMigrator.UnitTests/MigratorTests.cs b/test/SettingsMigrator.UnitTests/MigratorTests.cs
index 7ee4dfc83b..10dfd8440a 100644
--- a/test/SettingsMigrator.UnitTests/MigratorTests.cs
+++ b/test/SettingsMigrator.UnitTests/MigratorTests.cs
@@ -119,7 +119,9 @@ public void InvalidSettingsThrowsException()
     }
 
     [TestMethod]
-    [ExpectedException(typeof(DirectoryNotFoundException))]
+    // On some systems this throws file not found, on some it throws directory not found,
+    // I don't know why and it does not matter for the test. As long as it throws.
+    [ExpectedException(typeof(IOException), AllowDerivedTypes = true)]
     public void InvalidPathThrowsException()
     {
         string oldTestsettingsPath = @"X:\generatedRun,settings.runsettings";
diff --git a/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj b/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj
index e1eb198f26..b2eb1760e9 100644
--- a/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj
+++ b/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <!-- TODO: Do we need this for net6.0 as well? -->
+    <!-- TODO: Do we need this for net8.0 as well? -->
     <TargetFrameworks>net48</TargetFrameworks>
     <AssemblyName>SettingsMigrator.UnitTests</AssemblyName>
   </PropertyGroup>
diff --git a/test/TestAssets/ArchitectureSwitch/ArchitectureSwitch.csproj b/test/TestAssets/ArchitectureSwitch/ArchitectureSwitch.csproj
index 22232f257c..ca790a13f9 100644
--- a/test/TestAssets/ArchitectureSwitch/ArchitectureSwitch.csproj
+++ b/test/TestAssets/ArchitectureSwitch/ArchitectureSwitch.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">net7.0;net6.0;net5.0</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net7.0;net6.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net8.0;net9.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
diff --git a/test/TestAssets/Directory.Build.props b/test/TestAssets/Directory.Build.props
index 372f9f3c91..5e3b60555a 100644
--- a/test/TestAssets/Directory.Build.props
+++ b/test/TestAssets/Directory.Build.props
@@ -14,7 +14,7 @@
     <NoWarn>$(NoWarn);
     <!-- Suppress warnings about testhost being x64 (AMD64)/x86 when imported into AnyCPU (MSIL) test projects. -->
     MSB3270;
-    <!-- Suppress warnings about netcoreapp3.1 being used, and being out of support. -->
+    <!-- Suppress warnings about net8.0 being used, and being out of support. -->
     NETSDK1138;
     <!-- Suppress warning about nugets that we produce not being available when we did not build at least once -->
     NU1603</NoWarn>
@@ -24,7 +24,7 @@
     <!-- The TFMs to build and test against. -->
     <!-- Naming is based on dotnet/runtime one -->
     <NetFrameworkMinimum>net462</NetFrameworkMinimum>
-    <NetCoreAppMinimum>netcoreapp3.1</NetCoreAppMinimum>
+    <NetCoreAppMinimum>net8.0</NetCoreAppMinimum>
     <LangVersion>Latest</LangVersion>
   </PropertyGroup>
 
diff --git a/test/TestAssets/NewtonSoftDependency/NewtonSoftDependency.csproj b/test/TestAssets/NewtonSoftDependency/NewtonSoftDependency.csproj
index 2de419d35f..598ecfb843 100644
--- a/test/TestAssets/NewtonSoftDependency/NewtonSoftDependency.csproj
+++ b/test/TestAssets/NewtonSoftDependency/NewtonSoftDependency.csproj
@@ -25,7 +25,7 @@
     <PackageReference Include="MSTest.TestFramework" Version="$(MSTestTestAdapterVersion)" />
     <!-- TODO: This version would ideally be higher than the newtonsoft version we use in TP to show that the higher version is used.
     Currently there is no higher stable version. -->
-    <PackageReference Include="Newtonsoft.Json" Version="" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/TestAssets/SelfContainedAppTestProject/SelfContainedAppTestProject.csproj b/test/TestAssets/SelfContainedAppTestProject/SelfContainedAppTestProject.csproj
index e7382bf0a7..0ec96ca324 100644
--- a/test/TestAssets/SelfContainedAppTestProject/SelfContainedAppTestProject.csproj
+++ b/test/TestAssets/SelfContainedAppTestProject/SelfContainedAppTestProject.csproj
@@ -2,10 +2,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
 
     <!-- those two properties will make the app self-contained -->
-    <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/test/TestAssets/SimpleTestProjectARM/SimpleTestProjectARM.csproj b/test/TestAssets/SimpleTestProjectARM64/SimpleTestProjectARM64.csproj
similarity index 88%
rename from test/TestAssets/SimpleTestProjectARM/SimpleTestProjectARM.csproj
rename to test/TestAssets/SimpleTestProjectARM64/SimpleTestProjectARM64.csproj
index e2696f70d3..3f1c4b034e 100644
--- a/test/TestAssets/SimpleTestProjectARM/SimpleTestProjectARM.csproj
+++ b/test/TestAssets/SimpleTestProjectARM64/SimpleTestProjectARM64.csproj
@@ -4,11 +4,10 @@
   <PropertyGroup>
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
-    <PlatformTarget>ARM</PlatformTarget>
+    <PlatformTarget>ARM64</PlatformTarget>
   </PropertyGroup>
 
   <PropertyGroup>
-    <AssemblyName>SimpleTestProjectARM</AssemblyName>
     <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks>
     <OutputType Condition="$(NetCoreAppTargetFrameWork) == 'true' ">Exe</OutputType>
   </PropertyGroup>
diff --git a/test/TestAssets/SimpleTestProjectARM/UnitTest1.cs b/test/TestAssets/SimpleTestProjectARM64/UnitTest1.cs
similarity index 100%
rename from test/TestAssets/SimpleTestProjectARM/UnitTest1.cs
rename to test/TestAssets/SimpleTestProjectARM64/UnitTest1.cs
diff --git a/test/TestAssets/TestAssets.sln b/test/TestAssets/TestAssets.sln
index 7556f991e1..636eab172d 100644
--- a/test/TestAssets/TestAssets.sln
+++ b/test/TestAssets/TestAssets.sln
@@ -29,7 +29,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MstestV1UnitTestProject", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleTestProjectx86", "SimpleTestProjectx86\SimpleTestProjectx86.csproj", "{C4369F97-5D81-4D1A-BAE1-2AE3B2408D44}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleTestProjectARM", "SimpleTestProjectARM\SimpleTestProjectARM.csproj", "{7C865EAA-C6C2-4CAF-A6AD-D9CF29577A36}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleTestProjectARM64", "SimpleTestProjectARM64\SimpleTestProjectARM64.csproj", "{7C865EAA-C6C2-4CAF-A6AD-D9CF29577A36}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CUITTestProject", "CUITTestProject\CUITTestProject.csproj", "{CF46C8A0-E9FA-40E9-96CA-DCD3797546D8}"
 EndProject
diff --git a/test/TestAssets/Tools/Tools.csproj b/test/TestAssets/Tools/Tools.csproj
index b56dbd9b07..7c13e8ec53 100644
--- a/test/TestAssets/Tools/Tools.csproj
+++ b/test/TestAssets/Tools/Tools.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <RootNamespace>hanging_child</RootNamespace>
   </PropertyGroup>
diff --git a/test/TestAssets/child-crash/UnitTest1.cs b/test/TestAssets/child-crash/UnitTest1.cs
index 9262bc9bcb..6ea2e14d2d 100644
--- a/test/TestAssets/child-crash/UnitTest1.cs
+++ b/test/TestAssets/child-crash/UnitTest1.cs
@@ -24,7 +24,7 @@ public void TestMethod1()
             var directory = "Release";
 #endif
             // wait for two children to crash
-            var childProcess = Path.GetFullPath($@"../../../problematic-child/{directory}/net5.0/problematic-child{(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : ".dll")}");
+            var childProcess = Path.GetFullPath($@"../../../problematic-child/{directory}/net9.0/problematic-child{(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : ".dll")}");
             if (!File.Exists(childProcess))
             {
                 throw new FileNotFoundException(childProcess);
diff --git a/test/TestAssets/child-crash/child-crash.csproj b/test/TestAssets/child-crash/child-crash.csproj
index 20b4a41dae..5503a12b23 100644
--- a/test/TestAssets/child-crash/child-crash.csproj
+++ b/test/TestAssets/child-crash/child-crash.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <RootNamespace>child_crash</RootNamespace>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/test/TestAssets/child-hang/UnitTest1.cs b/test/TestAssets/child-hang/UnitTest1.cs
index 9e7e7679ac..621fc7b3e5 100644
--- a/test/TestAssets/child-hang/UnitTest1.cs
+++ b/test/TestAssets/child-hang/UnitTest1.cs
@@ -25,7 +25,7 @@ public void TestMethod1()
             var directory = "Release";
 #endif
             // wait for two children to crash
-            var childProcess = Path.GetFullPath($@"../../../hanging-child/{directory}/net5.0/hanging-child{(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : ".dll")}");
+            var childProcess = Path.GetFullPath($@"../../../hanging-child/{directory}/net9.0/hanging-child{(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : ".dll")}");
             // 2 chidren, that is 3 hanging processes
             var process = (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? Process.Start(childProcess, "2") : Process.Start(GetFullPath("dotnet"), $"{childProcess} 2"));
             process.WaitForExit();
diff --git a/test/TestAssets/child-hang/child-hang.csproj b/test/TestAssets/child-hang/child-hang.csproj
index 30f4c676a5..0a96b3dcf2 100644
--- a/test/TestAssets/child-hang/child-hang.csproj
+++ b/test/TestAssets/child-hang/child-hang.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>$(NetFrameworkMinimum);net472;net48;$(NetCoreAppMinimum);net7.0;net6.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>$(NetFrameworkMinimum);net472;net48;$(NetCoreAppMinimum);net8.0;net9.0</TargetFrameworks>
     <RootNamespace>child_hang</RootNamespace>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/test/TestAssets/crash/crash.csproj b/test/TestAssets/crash/crash.csproj
index 4c23615afb..8488ca3319 100644
--- a/test/TestAssets/crash/crash.csproj
+++ b/test/TestAssets/crash/crash.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>$(NetFrameworkMinimum);net472;net48;$(NetCoreAppMinimum);net7.0;net6.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>$(NetFrameworkMinimum);net472;net48;$(NetCoreAppMinimum);net8.0;net9.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/test/TestAssets/hanging-child/hanging-child.csproj b/test/TestAssets/hanging-child/hanging-child.csproj
index 787e5d84cd..2c46cb554d 100644
--- a/test/TestAssets/hanging-child/hanging-child.csproj
+++ b/test/TestAssets/hanging-child/hanging-child.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <RootNamespace>hanging_child</RootNamespace>
   </PropertyGroup>
diff --git a/test/TestAssets/performance/MSTest1000Passing/MSTest1000Passing.csproj b/test/TestAssets/performance/MSTest1000Passing/MSTest1000Passing.csproj
index b5aad4d303..003be862b0 100644
--- a/test/TestAssets/performance/MSTest1000Passing/MSTest1000Passing.csproj
+++ b/test/TestAssets/performance/MSTest1000Passing/MSTest1000Passing.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/test/TestAssets/performance/MSTest100Passing/MSTest100Passing.csproj b/test/TestAssets/performance/MSTest100Passing/MSTest100Passing.csproj
index b5aad4d303..003be862b0 100644
--- a/test/TestAssets/performance/MSTest100Passing/MSTest100Passing.csproj
+++ b/test/TestAssets/performance/MSTest100Passing/MSTest100Passing.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/test/TestAssets/performance/MSTest10kPassing/MSTest10kPassing.csproj b/test/TestAssets/performance/MSTest10kPassing/MSTest10kPassing.csproj
index df21b00d98..38220eb26e 100644
--- a/test/TestAssets/performance/MSTest10kPassing/MSTest10kPassing.csproj
+++ b/test/TestAssets/performance/MSTest10kPassing/MSTest10kPassing.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net48;net472</TargetFrameworks>
+    <TargetFrameworks>net8.0;net48;net472</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/test/TestAssets/performance/MSTest1Passing/MSTest1Passing.csproj b/test/TestAssets/performance/MSTest1Passing/MSTest1Passing.csproj
index f2a1a66533..b81e9fb18d 100644
--- a/test/TestAssets/performance/MSTest1Passing/MSTest1Passing.csproj
+++ b/test/TestAssets/performance/MSTest1Passing/MSTest1Passing.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/test/TestAssets/performance/NUnit1000Passing/NUnit1000Passing.csproj b/test/TestAssets/performance/NUnit1000Passing/NUnit1000Passing.csproj
index 62a772053e..2b873ab980 100644
--- a/test/TestAssets/performance/NUnit1000Passing/NUnit1000Passing.csproj
+++ b/test/TestAssets/performance/NUnit1000Passing/NUnit1000Passing.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/TestAssets/performance/NUnit100Passing/NUnit100Passing.csproj b/test/TestAssets/performance/NUnit100Passing/NUnit100Passing.csproj
index e15c0b0c66..4b0d0e5b87 100644
--- a/test/TestAssets/performance/NUnit100Passing/NUnit100Passing.csproj
+++ b/test/TestAssets/performance/NUnit100Passing/NUnit100Passing.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/TestAssets/performance/NUnit10kPassing/NUnit10kPassing.csproj b/test/TestAssets/performance/NUnit10kPassing/NUnit10kPassing.csproj
index e15c0b0c66..4b0d0e5b87 100644
--- a/test/TestAssets/performance/NUnit10kPassing/NUnit10kPassing.csproj
+++ b/test/TestAssets/performance/NUnit10kPassing/NUnit10kPassing.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/TestAssets/performance/NUnit1Passing/NUnit1Passing.csproj b/test/TestAssets/performance/NUnit1Passing/NUnit1Passing.csproj
index e15c0b0c66..4b0d0e5b87 100644
--- a/test/TestAssets/performance/NUnit1Passing/NUnit1Passing.csproj
+++ b/test/TestAssets/performance/NUnit1Passing/NUnit1Passing.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/TestAssets/performance/Perfy.TestAdapter/Perfy.TestAdapter.csproj b/test/TestAssets/performance/Perfy.TestAdapter/Perfy.TestAdapter.csproj
index e370f3059c..0ab7c46aa0 100644
--- a/test/TestAssets/performance/Perfy.TestAdapter/Perfy.TestAdapter.csproj
+++ b/test/TestAssets/performance/Perfy.TestAdapter/Perfy.TestAdapter.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0;net48;net472;net471;net5.0</TargetFrameworks>
+    <TargetFrameworks>net48;net472;net471;net9.0;net8.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/test/TestAssets/performance/XUnit1000Passing/XUnit1000Passing.csproj b/test/TestAssets/performance/XUnit1000Passing/XUnit1000Passing.csproj
index 77eebc9bcd..119a479786 100644
--- a/test/TestAssets/performance/XUnit1000Passing/XUnit1000Passing.csproj
+++ b/test/TestAssets/performance/XUnit1000Passing/XUnit1000Passing.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/test/TestAssets/performance/XUnit100Passing/XUnit100Passing.csproj b/test/TestAssets/performance/XUnit100Passing/XUnit100Passing.csproj
index 77eebc9bcd..119a479786 100644
--- a/test/TestAssets/performance/XUnit100Passing/XUnit100Passing.csproj
+++ b/test/TestAssets/performance/XUnit100Passing/XUnit100Passing.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/test/TestAssets/performance/XUnit10kPassing/XUnit10kPassing.csproj b/test/TestAssets/performance/XUnit10kPassing/XUnit10kPassing.csproj
index 66cfa47bed..393eb3be00 100644
--- a/test/TestAssets/performance/XUnit10kPassing/XUnit10kPassing.csproj
+++ b/test/TestAssets/performance/XUnit10kPassing/XUnit10kPassing.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/test/TestAssets/performance/XUnit1Passing/XUnit1Passing.csproj b/test/TestAssets/performance/XUnit1Passing/XUnit1Passing.csproj
index 66cfa47bed..393eb3be00 100644
--- a/test/TestAssets/performance/XUnit1Passing/XUnit1Passing.csproj
+++ b/test/TestAssets/performance/XUnit1Passing/XUnit1Passing.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/test/TestAssets/problematic-child/problematic-child.csproj b/test/TestAssets/problematic-child/problematic-child.csproj
index 3d9286d46f..f00b791029 100644
--- a/test/TestAssets/problematic-child/problematic-child.csproj
+++ b/test/TestAssets/problematic-child/problematic-child.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <RootNamespace>problematic_child</RootNamespace>
   </PropertyGroup>
diff --git a/test/TestAssets/timeout/timeout.csproj b/test/TestAssets/timeout/timeout.csproj
index 294bebab1c..8af7af2b2a 100644
--- a/test/TestAssets/timeout/timeout.csproj
+++ b/test/TestAssets/timeout/timeout.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>$(NetFrameworkMinimum);net472;net48;$(NetCoreAppMinimum);net7.0;net6.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>$(NetFrameworkMinimum);net472;net48;$(NetCoreAppMinimum);net8.0;net9.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/test/TranslationLayer.UnitTests/TranslationLayer.UnitTests.csproj b/test/TranslationLayer.UnitTests/TranslationLayer.UnitTests.csproj
index 5afb1d461e..e6d80a83ef 100644
--- a/test/TranslationLayer.UnitTests/TranslationLayer.UnitTests.csproj
+++ b/test/TranslationLayer.UnitTests/TranslationLayer.UnitTests.csproj
@@ -6,19 +6,13 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
     <OutputType Condition=" '$(TargetFramework)' != 'net48' ">Exe</OutputType>
     <AssemblyName>TranslationLayer.UnitTests</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.TestPlatform.VsTestConsole.TranslationLayer\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
-    <Reference Include="System" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.Threading.Tasks" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
 
   <Target Name="WorkAroundToSkipPreprocessingBinaries" BeforeTargets="RunProduceContentAssets">
     <ItemGroup>
diff --git a/test/coverlet.collector/coverlet.collector.csproj b/test/coverlet.collector/coverlet.collector.csproj
index 719388ac58..169286672b 100644
--- a/test/coverlet.collector/coverlet.collector.csproj
+++ b/test/coverlet.collector/coverlet.collector.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
     <!-- Don't change the version from 9.9.9.9 it is used in tests to recognize this "mock" library. -->
     <AssemblyVersion>9.9.9.9</AssemblyVersion>
diff --git a/test/datacollector.PlatformTests/datacollector.PlatformTests.csproj b/test/datacollector.PlatformTests/datacollector.PlatformTests.csproj
index d97d26cf66..c55879c711 100644
--- a/test/datacollector.PlatformTests/datacollector.PlatformTests.csproj
+++ b/test/datacollector.PlatformTests/datacollector.PlatformTests.csproj
@@ -8,8 +8,8 @@
     <RootNamespace>Microsoft.VisualStudio.TestPlatform.DataCollector.PlatformTests</RootNamespace>
   </PropertyGroup>
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('net6')) ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)')) ">Exe</OutputType>
     <AssemblyName>datacollector.PlatformTests</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
@@ -19,11 +19,4 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-
 </Project>
diff --git a/test/datacollector.UnitTests/datacollector.UnitTests.csproj b/test/datacollector.UnitTests/datacollector.UnitTests.csproj
index 9af01796fe..fca43a4842 100644
--- a/test/datacollector.UnitTests/datacollector.UnitTests.csproj
+++ b/test/datacollector.UnitTests/datacollector.UnitTests.csproj
@@ -9,18 +9,11 @@
     <RootNamespace>Microsoft.VisualStudio.TestPlatform.DataCollector.UnitTests</RootNamespace>
   </PropertyGroup>
   <PropertyGroup>
-    <OutputType Condition=" $(TargetFramework.StartsWith('net6')) ">Exe</OutputType>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
+    <OutputType Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)')) ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
     <AssemblyName>datacollector.UnitTests</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\datacollector\datacollector.csproj" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-
 </Project>
diff --git a/test/testhost.UnitTests/testhost.UnitTests.csproj b/test/testhost.UnitTests/testhost.UnitTests.csproj
index 74724c5158..26c49a05e5 100644
--- a/test/testhost.UnitTests/testhost.UnitTests.csproj
+++ b/test/testhost.UnitTests/testhost.UnitTests.csproj
@@ -6,18 +6,11 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('net6')) ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)')) ">Exe</OutputType>
     <AssemblyName>testhost.UnitTests</AssemblyName>
-    <PlatformTarget Condition="'$(TargetFramework)' == 'net48'">x64</PlatformTarget>
+    <PlatformTarget Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">x64</PlatformTarget>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
   <ItemGroup>
     <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
   </ItemGroup>
diff --git a/test/vstest.ProgrammerTests/vstest.ProgrammerTests.csproj b/test/vstest.ProgrammerTests/vstest.ProgrammerTests.csproj
index 5eab35bed3..f5c5d3c320 100644
--- a/test/vstest.ProgrammerTests/vstest.ProgrammerTests.csproj
+++ b/test/vstest.ProgrammerTests/vstest.ProgrammerTests.csproj
@@ -8,8 +8,8 @@
   <PropertyGroup>
     <Nullable>enable</Nullable>
     <ImplicitUsings>true</ImplicitUsings>
-    <TargetFrameworks>net6.0</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('net6')) ">Exe</OutputType>
+    <TargetFrameworks>net8.0</TargetFrameworks>
+    <OutputType Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)')) ">Exe</OutputType>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>
@@ -26,7 +26,7 @@
     </ProjectReference>
     <ProjectReference Include="..\Intent\Intent.csproj" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
+  <ItemGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) ">
     <Reference Include="System.Runtime" />
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
diff --git a/test/vstest.console.UnitTests/Internal/ConsoleLoggerTests.cs b/test/vstest.console.UnitTests/Internal/ConsoleLoggerTests.cs
index bc9d7cece8..946160b845 100644
--- a/test/vstest.console.UnitTests/Internal/ConsoleLoggerTests.cs
+++ b/test/vstest.console.UnitTests/Internal/ConsoleLoggerTests.cs
@@ -615,24 +615,24 @@ public void TestResultHandlerShouldShowFailedTestsAndPassedTestsForQuietVerbosit
         loggerEvents.WaitForEventCompletion();
 
         _mockOutput.Verify(o => o.Write(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummary,
-            (CommandLineResources.PassedTestIndicator + "!").PadRight(8),
+            new[] { (CommandLineResources.PassedTestIndicator + "!").PadRight(8),
             0.ToString(CultureInfo.InvariantCulture).PadLeft(5),
             1.ToString(CultureInfo.InvariantCulture).PadLeft(5),
             1.ToString(CultureInfo.InvariantCulture).PadLeft(5),
             2.ToString(CultureInfo.InvariantCulture).PadLeft(5),
-            "1 m 2 s"), OutputLevel.Information), Times.Once);
+            "1 m 2 s"}), OutputLevel.Information), Times.Once);
 
         _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryAssemblyAndFramework,
             "TestSourcePassed",
             expectedFramework), OutputLevel.Information), Times.Once);
 
         _mockOutput.Verify(o => o.Write(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummary,
-            (CommandLineResources.FailedTestIndicator + "!").PadRight(8),
+            new[] { (CommandLineResources.FailedTestIndicator + "!").PadRight(8),
             1.ToString(CultureInfo.InvariantCulture).PadLeft(5),
             1.ToString(CultureInfo.InvariantCulture).PadLeft(5),
             1.ToString(CultureInfo.InvariantCulture).PadLeft(5),
             3.ToString(CultureInfo.InvariantCulture).PadLeft(5),
-            "1 h 2 m"), OutputLevel.Information), Times.Once);
+            "1 h 2 m" }), OutputLevel.Information), Times.Once);
 
         _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryAssemblyAndFramework,
             "TestSource",
@@ -666,8 +666,8 @@ public void TestResultHandlerShouldNotShowformattedFailedTestsAndPassedTestsForO
         loggerEvents.RaiseTestRunComplete(new TestRunCompleteEventArgs(new Mock<ITestRunStatistics>().Object, false, false, null, new Collection<AttachmentSet>(), new Collection<InvokedDataCollector>(), TimeSpan.FromSeconds(1)));
         loggerEvents.WaitForEventCompletion();
 
-        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummary, CommandLineResources.PassedTestIndicator, 2, 1, 0, 1, "1 m 2 s", "TestSourcePassed", "(net462)"), OutputLevel.Information), Times.Never);
-        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummary, CommandLineResources.FailedTestIndicator, 5, 1, 1, 1, "1 h 6 m", "TestSource", "(net462)"), OutputLevel.Information), Times.Never);
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummary, new object[] { CommandLineResources.PassedTestIndicator, 2, 1, 0, 1, "1 m 2 s", "TestSourcePassed", "(net462)" }), OutputLevel.Information), Times.Never);
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummary, new object[] { CommandLineResources.FailedTestIndicator, 5, 1, 1, 1, "1 h 6 m", "TestSource", "(net462)" }), OutputLevel.Information), Times.Never);
     }
 
     [TestMethod]
@@ -940,7 +940,7 @@ public void TestRunCompleteHandlerShouldWriteToConsoleIfTestsCanceled()
         }
         loggerEvents.CompleteTestRun(null, true, false, null, null, null, new TimeSpan(1, 0, 0, 0));
 
-        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryForCanceledOrAbortedRun), OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryForCanceledOrAbortedRun, Array.Empty<string>()), OutputLevel.Information), Times.Once());
         _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryFailedTests, 1), OutputLevel.Information), Times.Once());
         _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryPassedTests, 0), OutputLevel.Information), Times.Never());
         _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummarySkippedTests, 0), OutputLevel.Information), Times.Never());
@@ -972,6 +972,7 @@ public void TestRunCompleteHandlerShouldWriteToConsoleIfTestsAborted()
         {
             { "verbosity", "normal" }
         };
+
         _consoleLogger.Initialize(loggerEvents, parameters);
 
         foreach (var testResult in GetTestResultObject(TestOutcome.Failed))
@@ -980,7 +981,7 @@ public void TestRunCompleteHandlerShouldWriteToConsoleIfTestsAborted()
         }
         loggerEvents.CompleteTestRun(null, false, true, null, null, null, new TimeSpan(1, 0, 0, 0));
 
-        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryForCanceledOrAbortedRun), OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryForCanceledOrAbortedRun, Array.Empty<string>()), OutputLevel.Information), Times.Once());
         _mockOutput.Verify(o => o.WriteLine(CommandLineResources.TestRunAborted, OutputLevel.Error), Times.Once());
     }
 
diff --git a/test/vstest.console.UnitTests/vstest.console.UnitTests.csproj b/test/vstest.console.UnitTests/vstest.console.UnitTests.csproj
index 6655577c90..78fd5ffa82 100644
--- a/test/vstest.console.UnitTests/vstest.console.UnitTests.csproj
+++ b/test/vstest.console.UnitTests/vstest.console.UnitTests.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('net6')) ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)')) ">Exe</OutputType>
     <AssemblyName>vstest.console.UnitTests</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
@@ -24,12 +24,4 @@
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Runtime.Serialization" />
-  </ItemGroup>
-
 </Project>