Move from net5 to net6 (#1238)

* Add net6 to nuspec

* remove net5

* leave shim on net5 for now

* iidoptimizer update

* publish net6 sdk version to maestro

* Update shim for net6

* more nuspec changes

* objlifetime tests against net6 in pipeline

* updates shim to 6

* authoring test

* update SetTargetFramework for host tests

* settfm

* host tests

Co-authored-by: Manodasan Wignarajah <mawign@microsoft.com>

build/AzurePipelineTemplates/CsWinRT-Build-Steps.yml

@@ -297,25 +297,36 @@ steps:
       WinRT.Runtime.pdb
     TargetFolder: $(Build.ArtifactStagingDirectory)\release_net5.0
 
+# Stage Net6.0
+- task: CopyFiles@2
+  displayName: Stage Net6.0
+  condition: and(succeeded(), eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'))
+  inputs:
+    SourceFolder: $(Build.SourcesDirectory)\src\WinRT.Runtime\bin\$(BuildConfiguration)\net6.0
+    Contents: |
+      WinRT.Runtime.dll
+      WinRT.Runtime.pdb
+    TargetFolder: $(Build.ArtifactStagingDirectory)\release_net6.0
+
 # Stage WinRT.Host.Shim
 - task: CopyFiles@2 
   displayName: Stage WinRT.Host.Shim
   condition: and(succeeded(), eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'))
   continueOnError: True
   inputs:
-    SourceFolder: $(Build.SourcesDirectory)\src\Authoring\WinRT.Host.Shim\bin\$(BuildConfiguration)\net5.0
+    SourceFolder: $(Build.SourcesDirectory)\src\Authoring\WinRT.Host.Shim\bin\$(BuildConfiguration)\net6.0
     Contents: |
       WinRT.Host.Shim.dll
       WinRT.Host.Shim.pdb
-    TargetFolder: $(Build.ArtifactStagingDirectory)\release_net5.0
+    TargetFolder: $(Build.ArtifactStagingDirectory)\release_net6.0
 
 # Stage IID Optimizer
 - task: CopyFiles@2
   displayName: Stage IID Optimizer
   condition: and(succeeded(), eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'))
   continueOnError: True
   inputs:
-    SourceFolder: $(Build.SourcesDirectory)\src\Perf\IIDOptimizer\bin\$(BuildConfiguration)\net5.0
+    SourceFolder: $(Build.SourcesDirectory)\src\Perf\IIDOptimizer\bin\$(BuildConfiguration)\net6.0
     Contents: |
       IIDOptimizer.exe 
       IIDOptimizer.dll
@@ -339,7 +350,7 @@ steps:
       tr/System.CommandLine.resources.dll
       zh-Hans/System.CommandLine.resources.dll
       zh-Hant/System.CommandLine.resources.dll 
-    TargetFolder: $(Build.ArtifactStagingDirectory)\release_net5.0\IIDOptimizer
+    TargetFolder: $(Build.ArtifactStagingDirectory)\release_net6.0\IIDOptimizer
 
 # Stage WinRT.Runtime ResX
 - task: CopyFiles@2
@@ -377,6 +388,14 @@ steps:
     PathtoPublish: $(Build.ArtifactStagingDirectory)\release_net5.0
     ArtifactName: net5.0
 
+# Publish Net6.0
+- task: PublishBuildArtifacts@1
+  displayName: Publish Net6.0
+  condition: and(succeeded(), eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'))
+  inputs:
+    PathtoPublish: $(Build.ArtifactStagingDirectory)\release_net6.0
+    ArtifactName: net6.0
+
 # Generate SBOM 
 - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
   displayName: 'SBOM Generator Task'

build/AzurePipelineTemplates/CsWinRT-BuildAndTest-Stage.yml

@@ -70,7 +70,7 @@ stages:
       displayName: Run Object Lifetime Tests
       condition: and(succeeded(), or(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildPlatform'], 'x64')))
       inputs:
-        testAssemblyVer2: Tests\ObjectLifetimeTests\bin\$(BuildPlatform)\$(BuildConfiguration)\net5.0-windows10.0.19041.0\win10-$(BuildPlatform)\ObjectLifetimeTests.Lifted.build.appxrecipe
+        testAssemblyVer2: Tests\ObjectLifetimeTests\bin\$(BuildPlatform)\$(BuildConfiguration)\net6.0-windows10.0.19041.0\win10-$(BuildPlatform)\ObjectLifetimeTests.Lifted.build.appxrecipe
         searchFolder: $(Build.SourcesDirectory)\src
 
 # Publish Test Log

build/AzurePipelineTemplates/CsWinRT-PublishToMaestro-Stage.yml

@@ -44,4 +44,4 @@ stages:
     - template: ..\..\eng\common\AzurePipelineTemplates\Maestro-PublishBuildToMaestro-Steps.yml 
       parameters:
         AssetNames: Microsoft.Windows.CsWinRT;CsWinRT.Dependency.DotNetCoreSdk;CsWinRT.Dependency.DotNetCoreRuntime;CsWinRT.Dependency.WindowsSdkVersionSuffix
-        AssetVersions: $(NugetVersion);$(Net5.Sdk.Version);$(_DotNetRuntimeVersion);$(_WindowsSdkVersionSuffix)
+        AssetVersions: $(NugetVersion);$(Net6.Sdk.Version);$(_DotNetRuntimeVersion);$(_WindowsSdkVersionSuffix)

build/AzurePipelineTemplates/CsWinRT-PublishToNuget-Stage.yml

@@ -66,6 +66,15 @@ stages:
         downloadPath: $(Build.SourcesDirectory)
         extractTars: false
 
+# Download Net6.0
+    - task: DownloadBuildArtifacts@0
+      displayName: 'Download Net6.0'
+      inputs:
+        artifactName: net6.0
+        itemPattern: ''
+        downloadPath: $(Build.SourcesDirectory)
+        extractTars: false
+
 # Stage Binaries
     - task: CmdLine@2
       displayName: Stage Binaries
@@ -88,15 +97,16 @@ stages:
           netstandard2.0\WinRT.Host.Shim.dll
           netstandard2.0\WinRT.SourceGenerator.dll
           net5.0\WinRT.Runtime.dll
-          net5.0\WinRT.Host.Shim.dll
+          net6.0\WinRT.Host.Shim.dll
+          net6.0\WinRT.Runtime.dll
           release_x64\WinRT.Host.dll
           release_x64\WinRT.Host.dll.mui
           release_x86\WinRT.Host.dll
           release_x86\WinRT.Host.dll.mui
           release_arm64\WinRT.Host.dll
           release_arm64\WinRT.Host.dll.mui
-          net5.0\IIDOptimizer\IIDOptimizer.exe
-          net5.0\IIDOptimizer\IIDOptimizer.dll
+          net6.0\IIDOptimizer\IIDOptimizer.exe
+          net6.0\IIDOptimizer\IIDOptimizer.dll
         UseMinimatch: true
         signConfigType: inlineSignParams
         inlineOperation: |
@@ -139,10 +149,10 @@ stages:
         ConnectedServiceName: 81cc6790-027c-4ef3-928d-65e8b96a691a
         FolderPath: $(Build.SourcesDirectory)
         Pattern: |
-          net5.0\IIDOptimizer\Mono.Cecil.dll
-          net5.0\IIDOptimizer\Mono.Cecil.Mdb.dll
-          net5.0\IIDOptimizer\Mono.Cecil.Pdb.dll
-          net5.0\IIDOptimizer\Mono.Cecil.Rocks.dll
+          net6.0\IIDOptimizer\Mono.Cecil.dll
+          net6.0\IIDOptimizer\Mono.Cecil.Mdb.dll
+          net6.0\IIDOptimizer\Mono.Cecil.Pdb.dll
+          net6.0\IIDOptimizer\Mono.Cecil.Rocks.dll
         UseMinimatch: true
         signConfigType: inlineSignParams
         inlineOperation: |
@@ -210,7 +220,7 @@ stages:
         command: pack
         searchPatternPack: nuget/Microsoft.Windows.CsWinRT.nuspec
         configurationToPack: Release
-        buildProperties: cswinrt_nuget_version=$(NugetVersion);cswinrt_exe=$(Build.SourcesDirectory)\cswinrt.exe;interop_winmd=$(Build.SourcesDirectory)\WinRT.Interop.winmd;netstandard2_runtime=$(Build.SourcesDirectory)\netstandard2.0\WinRT.Runtime.dll;net5_runtime=$(Build.SourcesDirectory)\net5.0\WinRT.Runtime.dll;source_generator=$(Build.SourcesDirectory)\netstandard2.0\WinRT.SourceGenerator.dll;winrt_shim=$(Build.SourcesDirectory)\net5.0\WinRT.Host.Shim.dll;winrt_host_x86=$(Build.SourcesDirectory)\release_x86\WinRT.Host.dll;winrt_host_x64=$(Build.SourcesDirectory)\release_x64\WinRT.Host.dll;winrt_host_arm64=$(Build.SourcesDirectory)\release_arm64\WinRT.Host.dll;winrt_host_resource_x86=$(Build.SourcesDirectory)\release_x86\WinRT.Host.dll.mui;winrt_host_resource_x64=$(Build.SourcesDirectory)\release_x64\WinRT.Host.dll.mui;winrt_host_resource_arm64=$(Build.SourcesDirectory)\release_arm64\WinRT.Host.dll.mui;guid_patch=$(Build.SourcesDirectory)\net5.0\IIDOptimizer\*.*
+        buildProperties: cswinrt_nuget_version=$(NugetVersion);cswinrt_exe=$(Build.SourcesDirectory)\cswinrt.exe;interop_winmd=$(Build.SourcesDirectory)\WinRT.Interop.winmd;netstandard2_runtime=$(Build.SourcesDirectory)\netstandard2.0\WinRT.Runtime.dll;net5_runtime=$(Build.SourcesDirectory)\net5.0\WinRT.Runtime.dll;net6_runtime=$(Build.SourcesDirectory)\net6.0\WinRT.Runtime.dll;source_generator=$(Build.SourcesDirectory)\netstandard2.0\WinRT.SourceGenerator.dll;winrt_shim=$(Build.SourcesDirectory)\net6.0\WinRT.Host.Shim.dll;winrt_host_x86=$(Build.SourcesDirectory)\release_x86\WinRT.Host.dll;winrt_host_x64=$(Build.SourcesDirectory)\release_x64\WinRT.Host.dll;winrt_host_arm64=$(Build.SourcesDirectory)\release_arm64\WinRT.Host.dll;winrt_host_resource_x86=$(Build.SourcesDirectory)\release_x86\WinRT.Host.dll.mui;winrt_host_resource_x64=$(Build.SourcesDirectory)\release_x64\WinRT.Host.dll.mui;winrt_host_resource_arm64=$(Build.SourcesDirectory)\release_arm64\WinRT.Host.dll.mui;guid_patch=$(Build.SourcesDirectory)\net6.0\IIDOptimizer\*.*
 
 # ESRP CodeSigning 
     - task: EsrpCodeSigning@1

docs/authoring.md

@@ -66,9 +66,9 @@ To make your component available as a NuGet package, it is important to include
             target="build\MyAuthoredComponent.targets" />
 
       <!-- Include the managed DLLs -->
-      <file src="C:\Path\To\CsWinRT\NugetDir\lib\net5.0\WinRT.Host.Shim.dll"                                  
+      <file src="C:\Path\To\CsWinRT\NugetDir\lib\net6.0\WinRT.Host.Shim.dll"                                  
             target="lib\$(TargetFramework)\WinRT.Host.Shim.dll" />  
-      <file src="C:\Path\To\CsWinRT\NugetDir\lib\net5.0\WinRT.Runtime.dll"                                  
+      <file src="C:\Path\To\CsWinRT\NugetDir\lib\net6.0\WinRT.Runtime.dll"                                  
             target="lib\$(TargetFramework)\WinRT.Runtime.dll" />
 
       <!-- Include the native DLLs -->

nuget/Microsoft.Windows.CsWinRT.Authoring.targets

@@ -58,7 +58,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
   <!-- For Project Reference consumers, copy the necessary WinRT DLLs to output directory --> 
   <ItemGroup> 
 
-    <None Condition="Exists('$(CsWinRTPath)lib\net5.0\WinRT.Host.Shim.dll')" Include="$(CsWinRTPath)lib\net5.0\WinRT.Host.Shim.dll">
+    <None Condition="Exists('$(CsWinRTPath)lib\net6.0\WinRT.Host.Shim.dll')" Include="$(CsWinRTPath)lib\net6.0\WinRT.Host.Shim.dll">
       <TargetPath>WinRT.Host.Shim.dll</TargetPath>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -253,7 +253,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
     <!-- When packing, include all necessary DLLs and the targets file for DLL copying on the native side -->
     <ItemGroup>
 
-      <Content Include="$(CsWinRTPath)lib\net5.0\WinRT.Host.Shim.dll">
+      <Content Include="$(CsWinRTPath)lib\net6.0\WinRT.Host.Shim.dll">
         <Pack>true</Pack>
         <PackagePath>lib\$(TargetFramework)</PackagePath>
       </Content>

nuget/Microsoft.Windows.CsWinRT.Embedded.targets

@@ -16,7 +16,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
 
   <ItemGroup>
     <CsWinRTEmbeddedSourcesAny Include="$(WinRTRuntimeSourcesDir)any\*.cs"/>
-    <CsWinRTEmbeddedSourcesNet5 Include="$(WinRTRuntimeSourcesDir)net5.0\*.cs"/>
+    <CsWinRTEmbeddedSourcesNet5 Include="$(WinRTRuntimeSourcesDir)net6.0\*.cs"/>
     <CsWinRTEmbeddedSourcesNet2 Include="$(WinRTRuntimeSourcesDir)netstandard2.0\*.cs"/>
   </ItemGroup>
 

nuget/Microsoft.Windows.CsWinRT.nuspec

@@ -7,14 +7,14 @@
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>C#/WinRT provides packaged WinRT projection support for the C# language. It is compatible with .NET 5 or later, and does not require any built-in knowledge of WinRT by the C# compiler.</description>
+    <description>C#/WinRT provides packaged WinRT projection support for the C# language. It is compatible with .NET 6 or later, and does not require any built-in knowledge of WinRT by the C# compiler.</description>
     <releaseNotes>Release notes are available at https://github.com/microsoft/CsWinRT/releases</releaseNotes>
     <tags>managed C# WinRT cswinrt WinMD xlang C#/WinRT</tags>
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <license type="file">LICENSE</license>
     <projectUrl>https://github.com/microsoft/cswinrt</projectUrl>
     <dependencies>
-      <group targetFramework=".NET5.0" />
+      <group targetFramework=".NET6.0" />
     </dependencies>
   </metadata>
   <files>
@@ -30,12 +30,12 @@
     <file src="Microsoft.Windows.CsWinRT.Authoring.Transitive.targets" target="build"/>
     <file src="$interop_winmd$" target="metadata"/>
     <file src="readme.txt"/>
-    <file src="$net5_runtime$" target="lib\net5.0\"/>
+    <file src="$net6_runtime$" target="lib\net6.0\"/>
     <file src="$source_generator$" target="analyzers\dotnet\cs\"/>
     <file src="$winrt_host_x64$" target ="hosting\x64\native"/>
     <file src="$winrt_host_x86$" target ="hosting\x86\native"/>
     <file src="$winrt_host_arm64$" target ="hosting\arm64\native"/>
-    <file src="$winrt_shim$" target ="lib\net5.0\"/>
+    <file src="$winrt_shim$" target ="lib\net6.0\"/>
 
     <!-- Localized resources for error strings 
          The paths here leads to a folder of folders, 
@@ -48,21 +48,21 @@
     <file src="$winrt_host_resource_x86$" target ="hosting\x86\native\en-US"/>
     <file src="$winrt_host_resource_arm64$" target ="hosting\arm64\native\en-US"/>
 
-    <file src="..\src\WinRT.Runtime\ResX\**" target ="lib\net5.0\"/>
+    <file src="..\src\WinRT.Runtime\ResX\**" target ="lib\net6.0\"/>
     <file src="..\src\Authoring\WinRT.SourceGenerator\ResX\**" target ="analyzers\dotnet\cs\"/>
 
     <!-- Add the WinRT.Runtime sources to the pkg for embedded scenarios -->
 
     <file src="..\src\WinRT.Runtime\*.cs" exclude="..\src\WinRT.Runtime\*.net*.cs" target="embedded\any\" />
-    <file src="..\src\WinRT.Runtime\*net5*.cs" target="embedded\net5.0\" />
+    <file src="..\src\WinRT.Runtime\*net5*.cs" target="embedded\net6.0\" />
     <file src="..\src\WinRT.Runtime\*netstandard2.0*.cs" target="embedded\netstandard2.0\" />
 
     <file src="..\src\WinRT.Runtime\Interop\*.cs" exclude="..\src\WinRT.Runtime\Interop\*.net*.cs"  target="embedded\any\" />
-    <file src="..\src\WinRT.Runtime\Interop\*net5*.cs" target="embedded\net5.0\" />
+    <file src="..\src\WinRT.Runtime\Interop\*net5*.cs" target="embedded\net6.0\" />
     <file src="..\src\WinRT.Runtime\Interop\*netstandard2.0*.cs" target="embedded\netstandard2.0\" />
 
     <file src="..\src\WinRT.Runtime\Projections\*.cs" exclude="..\src\WinRT.Runtime\Projections\*.net*.cs" target="embedded\any\" />
-    <file src="..\src\WinRT.Runtime\Projections\*net5*.cs" target="embedded\net5.0\" />
+    <file src="..\src\WinRT.Runtime\Projections\*net5*.cs" target="embedded\net6.0\" />
     <file src="..\src\WinRT.Runtime\Projections\*netstandard2.0*.cs" target="embedded\netstandard2.0\" />
 
     <file src="$guid_patch$" target ="build\tools\IIDOptimizer"/>

nuget/Microsoft.Windows.CsWinRT.targets

@@ -23,16 +23,16 @@ Copyright (C) Microsoft Corporation. All rights reserved.
   <!-- Remove WinRT.Host.dll and WinRT.Host.Shim.dll references -->
   <Target Name="CsWinRTRemoveHostingDllReferences" AfterTargets="ResolvePackageAssets" BeforeTargets="ResolveLockFileAnalyzers" Outputs="@(Reference)">
     <PropertyGroup>
-      <CsWinRTPkg-Net5Dir>$(CsWinRTPath)lib\net5.0</CsWinRTPkg-Net5Dir>
+      <CsWinRTPkg-Net6Dir>$(CsWinRTPath)lib\net6.0</CsWinRTPkg-Net6Dir>
       <CsWinRTPkg-NativeDir>$(CsWinRTPath)runtimes\**\native</CsWinRTPkg-NativeDir>
     </PropertyGroup>
     <ItemGroup>
      <ReferenceCopyLocalPaths        Remove="$(CsWinRTPkg-NativeDir)\WinRT.Host.dll"/>
      <RuntimeCopyLocalItems          Remove="$(CsWinRTPkg-NativeDir)\WinRT.Host.dll"/>
      <RuntimeTargetsCopyLocalItems   Remove="$(CsWinRTPkg-NativeDir)\WinRT.Host.dll"/>
-     <Reference                      Remove="$(CsWinRTPkg-Net5Dir)\WinRT.Host.Shim.dll"/>
-     <ResolvedCompileFileDefinitions Remove="$(CsWinRTPkg-Net5Dir)\WinRT.Host.Shim.dll"/>
-     <RuntimeCopyLocalItems          Remove="$(CsWinRTPkg-Net5Dir)\WinRT.Host.Shim.dll"/>
+     <Reference                      Remove="$(CsWinRTPkg-Net6Dir)\WinRT.Host.Shim.dll"/>
+     <ResolvedCompileFileDefinitions Remove="$(CsWinRTPkg-Net6Dir)\WinRT.Host.Shim.dll"/>
+     <RuntimeCopyLocalItems          Remove="$(CsWinRTPkg-Net6Dir)\WinRT.Host.Shim.dll"/>
     </ItemGroup>
   </Target>
 

src/Authoring/WinRT.Host.Shim/WinRT.Host.Shim.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>

src/Authoring/WinRT.Host/NetHostDir.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-     <TargetFramework>net5.0</TargetFramework> 
+     <TargetFramework>net6.0</TargetFramework> 
   </PropertyGroup>
 
   <Target Name="GetNetHostDir" Outputs="$(NetHostDir)">

src/Directory.Build.props

@@ -30,7 +30,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <CsWinRTIIDOptimizerPath>$(MSBuildThisFileDirectory)Perf\IIDOptimizer\bin\$(Configuration)\net5.0\</CsWinRTIIDOptimizerPath>
+    <CsWinRTIIDOptimizerPath>$(MSBuildThisFileDirectory)Perf\IIDOptimizer\bin\$(Configuration)\net6.0\</CsWinRTIIDOptimizerPath>
   </PropertyGroup>
 
   <PropertyGroup>

src/Perf/IIDOptimizer/IIDOptimizer.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RollForward>Major</RollForward>
   </PropertyGroup>

src/Samples/NetProjectionSample/SimpleMathProjection/SimpleMathProjection.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <!-- Note: target .NET 5 by setting the TargetFramework to net5.0-windows10.0.19041.0 -->
     <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <!-- Set Platform to AnyCPU to allow consumption of the projection assembly from any architecture. -->

src/Tests/AuthoringConsumptionTest/AuthoringConsumptionTest.vcxproj

@@ -69,31 +69,31 @@
   <ItemGroup>
     <ProjectReference Include="..\..\Projections\Windows\Windows.csproj">
       <Project>{ffa9a78b-f53f-43ee-af87-24a80f4c330a}</Project>
-      <SetTargetFramework>TargetFramework=net5.0</SetTargetFramework>
+      <SetTargetFramework>TargetFramework=net6.0</SetTargetFramework>
     </ProjectReference>
     <ProjectReference Include="..\..\Projections\WinUI\WinUI.csproj">
       <Project>{0a991d5f-bfee-4d2f-9aad-6ad06470a5df}</Project>
-      <SetTargetFramework>TargetFramework=net5.0</SetTargetFramework>
+      <SetTargetFramework>TargetFramework=net6.0</SetTargetFramework>
     </ProjectReference>
     <ProjectReference Include="..\..\Authoring\WinRT.Host.Shim\WinRT.Host.Shim.csproj">
       <Project>{0bb8f82d-874e-45aa-bca3-20ce0562164a}</Project>
-      <SetTargetFramework>TargetFramework=net5.0</SetTargetFramework>
+      <SetTargetFramework>TargetFramework=net6.0</SetTargetFramework>
     </ProjectReference>
     <ProjectReference Include="..\..\Authoring\WinRT.Host\WinRT.Host.vcxproj">
       <Project>{7e33bcb7-19c5-4061-981d-ba695322708a}</Project>
     </ProjectReference>
     <ProjectReference Include="..\..\WinRT.Runtime\WinRT.Runtime.csproj">
       <Project>{25244ced-966e-45f2-9711-1f51e951ff89}</Project>
-      <SetTargetFramework>TargetFramework=net5.0</SetTargetFramework>
+      <SetTargetFramework>TargetFramework=net6.0</SetTargetFramework>
     </ProjectReference>
     <ProjectReference Include="..\AuthoringTest\AuthoringTest.csproj">
       <Project>{41e2a272-150f-42f5-ad40-047aad9088a0}</Project>
-      <SetTargetFramework>TargetFramework=net5.0</SetTargetFramework>
+      <SetTargetFramework>TargetFramework=net6.0</SetTargetFramework>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="AuthoringTest">
-      <HintPath>..\AuthoringTest\bin\$(_WinMDPlatform)\$(Configuration)\net5.0\AuthoringTest.winmd</HintPath>
+      <HintPath>..\AuthoringTest\bin\$(_WinMDPlatform)\$(Configuration)\net6.0\AuthoringTest.winmd</HintPath>
       <IsWinMDFile>true</IsWinMDFile>
     </Reference>
   </ItemGroup>

src/Tests/AuthoringConsumptionTest/WinRT.Host.runtimeconfig.json

@@ -1,10 +1,10 @@
 {
   "runtimeOptions": {
-    "tfm": "net5.0",
+    "tfm": "net6.0",
     "rollForward": "LatestMinor",
     "framework": {
       "name": "Microsoft.NETCore.App",
-      "version": "5.0.0-preview"
+      "version": "6.0.0-preview"
     }
   }
 }

src/Tests/AuthoringTest/AuthoringTest.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Platforms>x64;x86</Platforms>
     <CsWinRTComponent>true</CsWinRTComponent>
     <!-- CsWinRTEnableLogging helps to diagnose generation issues -->

src/Tests/AuthoringWinUITest/AuthoringWinUITest (Package)/AuthoringWinUITest (Package).wapproj

@@ -67,7 +67,7 @@
       <Link>WinRT.Host.dll.mui</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\AuthoringTest\bin\$(_WinMDPlatform)\$(Configuration)\net5.0\AuthoringTest.dll">
+    <Content Include="..\..\AuthoringTest\bin\$(_WinMDPlatform)\$(Configuration)\net6.0\AuthoringTest.dll">
       <Link>AuthoringTest.dll</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>