Target .NET 6 instead of .NET 5 (#1196)

2022-08-30 09:14:19 +02:00 · 2022-08-30 09:14:19 +02:00 · 993fe848a2
--- a/TestFx.sln
+++ b/TestFx.sln
@ -209,7 +209,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NetCore", "NetCore", "{D11C
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlatformServices.WinUI", "src\Adapter\PlatformServices.WinUI\PlatformServices.WinUI.csproj", "{F4E2876F-6E42-4DCF-B629-041A9DF7C579}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Net5", "Net5", "{35D010CC-CDF2-4115-BCFB-E2E3D21C1055}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Net6", "Net6", "{35D010CC-CDF2-4115-BCFB-E2E3D21C1055}"
 	ProjectSection(SolutionItems) = preProject
 		src\Adapter\Build\Net5\MSTest.TestAdapter.props = src\Adapter\Build\Net5\MSTest.TestAdapter.props
 		src\Adapter\Build\Net5\MSTest.TestAdapter.targets = src\Adapter\Build\Net5\MSTest.TestAdapter.targets
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@ -4,7 +4,7 @@
 jobs:
 - job: Windows
  pool:
-    vmImage: 'windows-2019'
+    vmImage: 'windows-latest'
  variables:
    buildConfiguration: 'Release'

--- a/eng/TFMConfiguration.props
+++ b/eng/TFMConfiguration.props
@ -1,7 +1,7 @@
 <Project>
  <!-- The TFMs to build and test against. -->
  <PropertyGroup>
-    <NetCoreAppCurrentVersion>5.0</NetCoreAppCurrentVersion>
+    <NetCoreAppCurrentVersion>6.0</NetCoreAppCurrentVersion>
    <NetCoreAppCurrentIdentifier>.NETCoreApp</NetCoreAppCurrentIdentifier>
    <NetCoreAppCurrentTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppCurrentVersion)</NetCoreAppCurrentTargetFrameworkMoniker>
    <MicrosoftNetCoreAppFrameworkName>Microsoft.NETCore.App</MicrosoftNetCoreAppFrameworkName>
@ -9,14 +9,14 @@
    <NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>
    <NetCoreAppMinimum>netcoreapp3.1</NetCoreAppMinimum>

-    <NetCoreAppToolCurrentVersion>5.0</NetCoreAppToolCurrentVersion>
+    <NetCoreAppToolCurrentVersion>6.0</NetCoreAppToolCurrentVersion>
    <NetCoreAppToolCurrent>net$(NetCoreAppToolCurrentVersion)</NetCoreAppToolCurrent>
    <NetCoreAppCurrentToolTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppToolCurrentVersion)</NetCoreAppCurrentToolTargetFrameworkMoniker>

-    <NetCoreAppLatestStableVersion>5.0</NetCoreAppLatestStableVersion>
+    <NetCoreAppLatestStableVersion>6.0</NetCoreAppLatestStableVersion>
    <NetCoreAppLatestStablePackageBaselineVersion>$(NetCoreAppLatestStableVersion).0</NetCoreAppLatestStablePackageBaselineVersion>
    <NetCoreAppLatestStable>net$(NetCoreAppLatestStableVersion)</NetCoreAppLatestStable>

    <NetFrameworkMinimum>net462</NetFrameworkMinimum>
  </PropertyGroup>
-</Project>
+</Project>
--- a/scripts/common.lib.ps1
+++ b/scripts/common.lib.ps1
@ -270,22 +270,21 @@ function Install-DotNetCli {
  New-Item -ItemType directory -Path $dotnetInstallPath -Force | Out-Null
  & $dotnetInstallScript -Channel "master" -InstallDir $dotnetInstallPath -Version $env:DOTNET_CLI_VERSION

-  & $dotnetInstallScript -InstallDir "$dotnetInstallPath" -Runtime 'dotnet' -Version '2.1.30' -Channel '2.1.30' -Architecture x64 -NoPath
-  $env:DOTNET_ROOT = $dotnetInstallPath
+  # Not passing -Version 'X.Y.Z' allows to always install the latest patch

-  & $dotnetInstallScript -InstallDir "${dotnetInstallPath}_x86" -Runtime 'dotnet' -Version '2.1.30' -Channel '2.1.30' -Architecture x86 -NoPath
+  & $dotnetInstallScript -InstallDir "$dotnetInstallPath" -Runtime 'dotnet' -Channel '2.1' -Architecture x64 -NoPath
+  $env:DOTNET_ROOT = $dotnetInstallPath
+  & $dotnetInstallScript -InstallDir "${dotnetInstallPath}_x86" -Runtime 'dotnet' -Channel '2.1' -Architecture x86 -NoPath
  ${env:DOTNET_ROOT(x86)} = "${dotnetInstallPath}_x86"

-  & $dotnetInstallScript -InstallDir "$dotnetInstallPath" -Runtime 'dotnet' -Version '3.1.24' -Channel '3.1.24' -Architecture x64 -NoPath
+  & $dotnetInstallScript -InstallDir "$dotnetInstallPath" -Runtime 'dotnet' -Channel '3.1' -Architecture x64 -NoPath
  $env:DOTNET_ROOT = $dotnetInstallPath
-
-  & $dotnetInstallScript -InstallDir "${dotnetInstallPath}_x86" -Runtime 'dotnet' -Version '3.1.24' -Channel '3.1.24' -Architecture x86 -NoPath
+  & $dotnetInstallScript -InstallDir "${dotnetInstallPath}_x86" -Runtime 'dotnet' -Channel '3.1' -Architecture x86 -NoPath
  ${env:DOTNET_ROOT(x86)} = "${dotnetInstallPath}_x86"

-  & $dotnetInstallScript -InstallDir "$dotnetInstallPath" -Runtime 'dotnet' -Version '5.0.16' -Channel '5.0.16' -Architecture x64 -NoPath
+  & $dotnetInstallScript -InstallDir "$dotnetInstallPath" -Runtime 'dotnet' -Channel '6.0' -Architecture x64 -NoPath
  $env:DOTNET_ROOT = $dotnetInstallPath
-
-  & $dotnetInstallScript -InstallDir "${dotnetInstallPath}_x86" -Runtime 'dotnet' -Version '5.0.16' -Channel '5.0.16' -Architecture x86 -NoPath
+  & $dotnetInstallScript -InstallDir "${dotnetInstallPath}_x86" -Runtime 'dotnet' -Channel '6.0' -Architecture x86 -NoPath
  ${env:DOTNET_ROOT(x86)} = "${dotnetInstallPath}_x86"

  $env:DOTNET_MULTILEVEL_LOOKUP = 0
--- a/src/Adapter/Build/Net6/MSTest.TestAdapter.props
+++ b/src/Adapter/Build/Net6/MSTest.TestAdapter.props
--- a/src/Adapter/Build/Net6/MSTest.TestAdapter.targets
+++ b/src/Adapter/Build/Net6/MSTest.TestAdapter.targets
--- a/src/Adapter/Build/Net6/MSTest.TestFramework.targets
+++ b/src/Adapter/Build/Net6/MSTest.TestFramework.targets
--- a/src/Adapter/PlatformServices.Shared/netstandard1.0/ns10RecursiveDirectoryPath.cs
+++ b/src/Adapter/PlatformServices.Shared/netstandard1.0/ns10RecursiveDirectoryPath.cs
@ -54,7 +54,7 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices
        /// The <see cref="object"/>.
        /// </returns>
        [SecurityCritical]
-#if NET5_0
+#if NET5_0_OR_GREATER
        [Obsolete]
 #endif
        public override object InitializeLifetimeService()
--- a/src/Adapter/PlatformServices.Shared/netstandard1.3/Services/ns13TestDeployment.cs
+++ b/src/Adapter/PlatformServices.Shared/netstandard1.3/Services/ns13TestDeployment.cs
@ -139,7 +139,7 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices
            }

            // Object model currently does not have support for SuspendCodeCoverage. We can remove this once support is added
-#if !NETSTANDARD2_0 && !NET5_0
+#if !NETSTANDARD2_0 && !NET5_0_OR_GREATER
            using (new SuspendCodeCoverage())
 #endif
            {
--- a/src/Adapter/PlatformServices.WinUI/PlatformServices.WinUI.csproj
+++ b/src/Adapter/PlatformServices.WinUI/PlatformServices.WinUI.csproj
@ -2,7 +2,7 @@
  <PropertyGroup>
    <RootNamespace>Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices</RootNamespace>
    <AssemblyName>Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices</AssemblyName>
-    <TargetFramework>net5.0-windows10.0.18362.0</TargetFramework>
+    <TargetFramework>net6.0-windows10.0.18362.0</TargetFramework>

    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
@ -85,4 +85,4 @@
      <CustomToolNamespace>Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices</CustomToolNamespace>
    </EmbeddedResource>
  </ItemGroup>
-</Project>
+</Project>
--- a/src/Adapter/PlatformServices.WinUI/Services/WinUITestSource.cs
+++ b/src/Adapter/PlatformServices.WinUI/Services/WinUITestSource.cs
@ -95,7 +95,7 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices
                            && !platformAssemblies.Contains(fileName.ToUpperInvariant())
                            && !systemAssemblies.Contains(fileName.ToUpperInvariant()))
                    {
-                        // WinUI Desktop uses .net 5, which builds both a .dll and an .exe.
+                        // WinUI Desktop uses .net 6, which builds both a .dll and an .exe.
                        // The manifest will provide the .exe, but the tests are inside the .dll, so we replace the name here.
                        newSources.Add(Path.Combine(appxSourceDirectory, Path.ChangeExtension(fileName, Constants.DllExtension)));
                    }
--- a/src/Package/MSTest.TestAdapter.nuspec
+++ b/src/Package/MSTest.TestAdapter.nuspec
@ -13,8 +13,8 @@
      Supported platforms:
      - .NET 4.6.2+
      - .NET Core 3.1+ (Universal Windows Apps 10+)
-      - .NET 5.0
-      - .NET 5.0 Windows.18362+
+      - .NET 6.0
+      - .NET 6.0 Windows.18362+
      - ASP.NET Core 1.0+
    </description>
    <projectUrl>https://github.com/microsoft/testfx</projectUrl>
@ -36,7 +36,7 @@

      <group targetFramework="uap10.0" />

-      <group targetFramework="net5.0" />
+      <group targetFramework="net6.0" />
    </dependencies>
  </metadata>
  <files>
@ -57,15 +57,15 @@
    <file src="MSTest.TestAdapter\netstandard2.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\uap10.0\" />
    <file src="MSTest.Core\netstandard2.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\uap10.0\" />

-    <!-- net5.0 -->
-    <file src="Build\Net5\MSTest.TestAdapter.props" target="build\net5.0\MSTest.TestAdapter.props" />
-    <file src="Build\Net5\MSTest.TestAdapter.targets" target="build\net5.0\MSTest.TestAdapter.targets" />
-    <file src="PlatformServices.NetCore\netstandard2.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net5.0\" />
-    <file src="PlatformServices.WinUI\net5.0-windows10.0.18362.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net5.0\winui\" />
-    <file src="Microsoft.TestPlatform.AdapterUtilities\netstandard2.0\" target="build\net5.0\" />
-    <file src="MSTest.TestAdapter\net5.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\net5.0\" />
-    <file src="PlatformServices.Interface\net5.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface.dll" target="build\net5.0\" />
-    <file src="MSTest.Core\net5.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\net5.0\" />
+    <!-- net6.0 -->
+    <file src="Build\Net6\MSTest.TestAdapter.props" target="build\net6.0\MSTest.TestAdapter.props" />
+    <file src="Build\Net6\MSTest.TestAdapter.targets" target="build\net6.0\MSTest.TestAdapter.targets" />
+    <file src="PlatformServices.NetCore\netstandard2.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net6.0\" />
+    <file src="PlatformServices.WinUI\net6.0-windows10.0.18362.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net6.0\winui\" />
+    <file src="Microsoft.TestPlatform.AdapterUtilities\netstandard2.0\" target="build\net6.0\" />
+    <file src="MSTest.TestAdapter\net6.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\net6.0\" />
+    <file src="PlatformServices.Interface\net6.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface.dll" target="build\net6.0\" />
+    <file src="MSTest.Core\net6.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\net6.0\" />

    <!-- net462 -->
    <file src="Build\Desktop\MSTest.TestAdapter.props" target="build\net462\" />
--- a/src/Package/MSTest.TestAdapter.symbols.nuspec
+++ b/src/Package/MSTest.TestAdapter.symbols.nuspec
@ -13,8 +13,8 @@
      Supported platforms:
      - .NET 4.6.2+
      - .NET Core 3.1+ (Universal Windows Apps 10+)
-      - .NET 5.0
-      - .NET 5.0 Windows.18362+
+      - .NET 6.0
+      - .NET 6.0 Windows.18362+
      - ASP.NET Core 1.0+
    </description>
    <projectUrl>https://github.com/microsoft/testfx</projectUrl>
@ -36,7 +36,7 @@

      <group targetFramework="uap10.0" />

-      <group targetFramework="net5.0" />
+      <group targetFramework="net6.0" />
    </dependencies>
  </metadata>
  <files>
@ -64,19 +64,19 @@
    <file src="PlatformServices.Universal\uap10.0.16299\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.pdb" target="build\uap10.0\" />
    <file src="PlatformServices.Universal\uap10.0.16299\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface.pdb" target="build\uap10.0\" />

-    <!-- net5.0 -->
-    <file src="Build\Net5\MSTest.TestAdapter.props" target="build\net5.0\MSTest.TestAdapter.props" />
-    <file src="Build\Net5\MSTest.TestAdapter.targets" target="build\net5.0\MSTest.TestAdapter.targets" />
-    <file src="PlatformServices.NetCore\netstandard2.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net5.0\" />
-    <file src="PlatformServices.WinUI\net5.0-windows10.0.18362.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net5.0\winui\" />
-    <file src="Microsoft.TestPlatform.AdapterUtilities\netstandard2.0\" target="build\net5.0\" />
-    <file src="MSTest.TestAdapter\net5.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\net5.0\" />
-    <file src="PlatformServices.Interface\net5.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface.dll" target="build\net5.0\" />
-    <file src="MSTest.Core\net5.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\net5.0\" />
+    <!-- net6.0 -->
+    <file src="Build\Net6\MSTest.TestAdapter.props" target="build\net6.0\MSTest.TestAdapter.props" />
+    <file src="Build\Net6\MSTest.TestAdapter.targets" target="build\net6.0\MSTest.TestAdapter.targets" />
+    <file src="PlatformServices.NetCore\netstandard2.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net6.0\" />
+    <file src="PlatformServices.WinUI\net6.0-windows10.0.18362.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net6.0\winui\" />
+    <file src="Microsoft.TestPlatform.AdapterUtilities\netstandard2.0\" target="build\net6.0\" />
+    <file src="MSTest.TestAdapter\net6.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\net6.0\" />
+    <file src="PlatformServices.Interface\net6.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface.dll" target="build\net6.0\" />
+    <file src="MSTest.Core\net6.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\net6.0\" />

    <!-- Symbols -->
-    <file src="PlatformServices.WinUI\net5.0-windows10.0.18362.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.pdb" target="build\net5.0\winui\" />
-    <file src="PlatformServices.NetCore\netstandard2.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.pdb" target="build\net5.0\" />
+    <file src="PlatformServices.WinUI\net6.0-windows10.0.18362.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.pdb" target="build\net6.0\winui\" />
+    <file src="PlatformServices.NetCore\netstandard2.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.pdb" target="build\net6.0\" />

    <!-- net462 -->
    <file src="Build\Desktop\MSTest.TestAdapter.props" target="build\net462\" />
--- a/src/Package/MSTest.TestFramework.nuspec
+++ b/src/Package/MSTest.TestFramework.nuspec
@ -14,8 +14,8 @@
      Supported platforms:
      - .NET 4.6.2+
      - .NET Core 3.1+ (Universal Windows Apps 10+)
-      - .NET 5.0
-      - .NET 5.0 Windows.18362+
+      - .NET 6.0
+      - .NET 6.0 Windows.18362+
      - ASP.NET Core 1.0+

      To discover and execute tests install MSTest.TestAdapter.
@ -39,7 +39,7 @@

      <group targetFramework="uap10.0" />

-      <group targetFramework="net5.0" />
+      <group targetFramework="net6.0" />
    </dependencies>
  </metadata>
  <files>
@ -61,15 +61,15 @@
    <file src="Extension.UWP\uap10.0.16299\**\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\uap10.0\" />
    <file src="Extension.UWP\uap10.0.16299\**\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\uap10.0\" />

-    <!-- net5.0 -->
-    <file src="Build\Net5\MSTest.TestFramework.targets" target="build\net5.0\" />
-    <file src="MSTest.Core\net5.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="lib\net5.0\" />
-    <file src="MSTest.Core\net5.0\**\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\net5.0\" />
+    <!-- net6.0 -->
+    <file src="Build\Net6\MSTest.TestFramework.targets" target="build\net6.0\" />
+    <file src="MSTest.Core\net6.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="lib\net6.0\" />
+    <file src="MSTest.Core\net6.0\**\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\net6.0\" />

-    <file src="Extension.WinUI\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="build\net5.0\winui\" />
-    <file src="Extension.WinUI\**\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="build\net5.0\winui\" />
-    <file src="Extension.Core\net5.0\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="build\net5.0\" />
-    <file src="Extension.Core\net5.0\**\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="build\net5.0\" />
+    <file src="Extension.WinUI\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="build\net6.0\winui\" />
+    <file src="Extension.WinUI\**\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="build\net6.0\winui\" />
+    <file src="Extension.Core\net6.0\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="build\net6.0\" />
+    <file src="Extension.Core\net6.0\**\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="build\net6.0\" />

    <!-- Icon -->
    <file src="Icon.png" target="" />
--- a/src/Package/MSTest.TestFramework.symbols.nuspec
+++ b/src/Package/MSTest.TestFramework.symbols.nuspec
@ -13,8 +13,8 @@
      Supported platforms:
      - .NET 4.6.2+
      - .NET Core 3.1+ (Universal Windows Apps 10+)
-      - .NET 5.0
-      - .NET 5.0 Windows.18362+
+      - .NET 6.0
+      - .NET 6.0 Windows.18362+
      - ASP.NET Core 1.0+

      To discover and execute tests install MSTest.TestAdapter.
@ -38,7 +38,7 @@

      <group targetFramework="uap10.0" />

-      <group targetFramework="net5.0" />
+      <group targetFramework="net6.0" />
    </dependencies>
  </metadata>
  <files>
@ -72,20 +72,20 @@
    <file src="Extension.UWP\uap10.0.16299\Microsoft.VisualStudio.TestPlatform.TestFramework.pdb" target="lib\uap10.0\" />
    <file src="Extension.UWP\uap10.0.16299\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.pdb" target="lib\uap10.0\" />

-    <!-- net5.0 -->
-    <file src="Build\Net5\MSTest.TestFramework.targets" target="build\net5.0\" />
-    <file src="MSTest.Core\net5.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="lib\net5.0\" />
-    <file src="MSTest.Core\net5.0\**\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\net5.0\" />
+    <!-- net6.0 -->
+    <file src="Build\Net6\MSTest.TestFramework.targets" target="build\net6.0\" />
+    <file src="MSTest.Core\net6.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="lib\net6.0\" />
+    <file src="MSTest.Core\net6.0\**\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\net6.0\" />

-    <file src="Extension.WinUI\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="build\net5.0\winui\" />
-    <file src="Extension.WinUI\**\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="build\net5.0\winui\" />
-    <file src="Extension.Core\net5.0\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="build\net5.0\" />
-    <file src="Extension.Core\net5.0\**\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="build\net5.0\" />
+    <file src="Extension.WinUI\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="build\net6.0\winui\" />
+    <file src="Extension.WinUI\**\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="build\net6.0\winui\" />
+    <file src="Extension.Core\net6.0\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="build\net6.0\" />
+    <file src="Extension.Core\net6.0\**\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="build\net6.0\" />

    <!-- Symbols -->
-    <file src="MSTest.Core\net5.0\Microsoft.VisualStudio.TestPlatform.TestFramework.pdb" target="lib\net5.0\" />
-    <file src="Extension.WinUI\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.pdb" target="build\net5.0\winui\" />
-    <file src="Extension.Core\net5.0\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.pdb" target="build\net5.0\" />
+    <file src="MSTest.Core\net6.0\Microsoft.VisualStudio.TestPlatform.TestFramework.pdb" target="lib\net6.0\" />
+    <file src="Extension.WinUI\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.pdb" target="build\net6.0\winui\" />
+    <file src="Extension.Core\net6.0\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.pdb" target="build\net6.0\" />

    <!-- Source code -->
    <file src="$srcroot$\**\*.cs" target="src" />
--- a/src/Package/MSTest.nuspec
+++ b/src/Package/MSTest.nuspec
@ -13,8 +13,8 @@
      Supported platforms:
      - .NET 4.6.2+
      - .NET Core 3.1+ (Universal Windows Apps 10+)
-      - .NET 5.0
-      - .NET 5.0 Windows.18362+
+      - .NET 6.0
+      - .NET 6.0 Windows.18362+
      - ASP.NET Core 1.0+
    </description>
    <projectUrl>https://github.com/microsoft/testfx</projectUrl>
@ -49,7 +49,7 @@
        <!-- <dependency id="Microsoft.NET.Test.Sdk" version="[$TestPlatformVersion$]" /> -->
      </group>

-      <group targetFramework="net5.0">
+      <group targetFramework="net6.0">
        <dependency id="MSTest.TestAdapter" version="[$version$]" />
        <dependency id="MSTest.TestFramework" version="[$version$]" />
        <dependency id="Microsoft.NET.Test.Sdk" version="[$TestPlatformVersion$]" />
--- a/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj
+++ b/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj
@ -7,7 +7,7 @@
    <AssemblyTitle>Extension.WinUI</AssemblyTitle>
    <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>

-    <TargetFramework>net5.0-windows10.0.18362.0</TargetFramework>
+    <TargetFramework>net6.0-windows10.0.18362.0</TargetFramework>
    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
    <SupportedOSPlatformVersion>10.0.17763.0</SupportedOSPlatformVersion>
--- a/test/E2ETests/Automation.CLI/CLITestBase.common.cs
+++ b/test/E2ETests/Automation.CLI/CLITestBase.common.cs
@ -17,7 +17,7 @@ namespace Microsoft.MSTestV2.CLIAutomation
        private const string PackagesFolder = "packages";

        // This value is automatically updated by "build.ps1" script.
-        private const string TestPlatformCLIPackage = @"Microsoft.TestPlatform\17.4.0-preview-20220828-01";
+        private const string TestPlatformCLIPackage = @"Microsoft.TestPlatform\17.4.0-preview-20220829-01";
        private const string VstestConsoleRelativePath = @"tools\net462\Common7\IDE\Extensions\TestPlatform\vstest.console.exe";

        /// <summary>