Clean up .NET 5 references and update to WinAppSDK projection for testing

CONTRIBUTING.md

@@ -11,6 +11,7 @@ C#/WinRT currently requires the following packages, or newer, to build:
 - [.NET Core 3.1 SDK](https://dotnet.microsoft.com/download/dotnet-core/3.1)
 - [nuget.exe 5.8.0-preview.3](https://www.nuget.org/downloads)
 - Microsoft.WinUI 3.0.0-preview4.210210.4
+- Microsoft.WindowsAppSDK 1.1.5
 
 The [`build.cmd`](src/build.cmd) script takes care of all related configuration steps and is the simplest way to get started building C#/WinRT. It installs prerequisites such as `nuget.exe` and the .NET 6 SDK, configures the environment to use .NET 6 (creating a `global.json` if necessary), builds the compiler, and builds and executes the unit tests. To build C#/WinRT, follow these steps: 
 

build/AzurePipelineTemplates/CsWinRT-Build-Steps.yml

@@ -244,7 +244,7 @@ steps:
   displayName: Stage Unit Test
   condition: and(succeeded(), or(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildPlatform'], 'x64')))
   inputs:
-    SourceFolder: $(Build.SourcesDirectory)\src\Tests\UnitTest\bin\$(BuildPlatform)\$(BuildConfiguration)\net5.0
+    SourceFolder: $(Build.SourcesDirectory)\src\Tests\UnitTest\bin\$(BuildPlatform)\$(BuildConfiguration)\net6.0
     Contents: |
       unittest.dll
       unittest.pdb
@@ -287,17 +287,6 @@ steps:
     PathtoPublish: $(Build.ArtifactStagingDirectory)\release_netstandard2.0
     ArtifactName: netstandard2.0
 
-# Stage Net5.0
-- task: CopyFiles@2
-  displayName: Stage Net5.0
-  condition: and(succeeded(), eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'))
-  inputs:
-    SourceFolder: $(Build.SourcesDirectory)\src\WinRT.Runtime\bin\$(BuildConfiguration)\net5.0
-    Contents: |
-      WinRT.Runtime.dll
-      WinRT.Runtime.pdb
-    TargetFolder: $(Build.ArtifactStagingDirectory)\release_net5.0
-
 # Stage Net6.0
 - task: CopyFiles@2
   displayName: Stage Net6.0
@@ -397,14 +386,6 @@ steps:
     PathtoPublish: $(Build.ArtifactStagingDirectory)\resx
     ArtifactName: ResX
 
-# Publish Net5.0
-- task: PublishBuildArtifacts@1
-  displayName: Publish Net5.0
-  condition: and(succeeded(), eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'))
-  inputs:
-    PathtoPublish: $(Build.ArtifactStagingDirectory)\release_net5.0
-    ArtifactName: net5.0
-
 # Publish Net6.0
 - task: PublishBuildArtifacts@1
   displayName: Publish Net6.0

build/AzurePipelineTemplates/CsWinRT-PublishToNuget-Stage.yml

@@ -56,15 +56,6 @@ stages:
         itemPattern: ''
         downloadPath: $(Build.SourcesDirectory)
         extractTars: false
-
-# Download Net5.0
-    - task: DownloadBuildArtifacts@0
-      displayName: 'Download Net5.0 '
-      inputs:
-        artifactName: net5.0
-        itemPattern: ''
-        downloadPath: $(Build.SourcesDirectory)
-        extractTars: false
 
 # Download Net6.0
     - task: DownloadBuildArtifacts@0
@@ -96,7 +87,6 @@ stages:
           netstandard2.0\WinRT.Runtime.dll
           netstandard2.0\WinRT.Host.Shim.dll
           netstandard2.0\WinRT.SourceGenerator.dll
-          net5.0\WinRT.Runtime.dll
           net6.0\WinRT.Host.Shim.dll
           net6.0\WinRT.Runtime.dll
           release_x64\WinRT.Host.dll
@@ -222,7 +212,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;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\*.*
+        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;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\*.*
 
     - task: NuGetCommand@2
       displayName: NuGet pack

src/Directory.Build.props

@@ -9,6 +9,7 @@
     <CsWinRTVerbosity>high</CsWinRTVerbosity>
     <!--Note: unlisted at https://www.nuget.org/packages/Microsoft.WinUI/-->
     <MicrosoftWinUIVersion>3.0.0-preview4.210210.4</MicrosoftWinUIVersion>
+    <MicrosoftWinAppSDKVersion>1.1.5</MicrosoftWinAppSDKVersion>
     <DebugType>full</DebugType>
     <DebugSymbols>true</DebugSymbols>
     <LangVersion>preview</LangVersion>
@@ -23,15 +24,16 @@
     <AssetTargetFallback>netcoreapp5.0</AssetTargetFallback>
     <IsTargetFrameworkNet5OrGreater>false</IsTargetFrameworkNet5OrGreater>
     <IsTargetFrameworkNet5OrGreater Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) >= 5">true</IsTargetFrameworkNet5OrGreater>
-    <AppBuildTFMs>netcoreapp3.1;net5.0;net6.0</AppBuildTFMs>
-    <AppBuildTFMs Condition="'$(CIBuildReason)' == 'CI'">netcoreapp3.1;net5.0;net6.0;net7.0</AppBuildTFMs>
-    <LibBuildTFMs>netstandard2.0;net5.0;net6.0</LibBuildTFMs>
-    <LibBuildTFMs Condition="'$(CIBuildReason)' == 'CI'">netstandard2.0;net5.0;net6.0;net7.0</LibBuildTFMs>
-    <TestsBuildTFMs>net5.0-windows10.0.19041.0;net6.0-windows10.0.19041.0;net7.0-windows10.0.19041.0</TestsBuildTFMs>
-    <TestsBuildTFMs Condition="'$(CIBuildReason)' == 'CI'">net5.0-windows10.0.19041.0;net6.0-windows10.0.19041.0;net7.0-windows10.0.19041.0</TestsBuildTFMs>
+    <AppBuildTFMs>netcoreapp3.1;net6.0</AppBuildTFMs>
+    <AppBuildTFMs Condition="'$(CIBuildReason)' == 'CI'">netcoreapp3.1;net6.0;net7.0</AppBuildTFMs>
+    <LibBuildTFMs>netstandard2.0;net6.0</LibBuildTFMs>
+    <LibBuildTFMs Condition="'$(CIBuildReason)' == 'CI'">netstandard2.0;net6.0;net7.0</LibBuildTFMs>
+    <TestsBuildTFMs>net6.0-windows10.0.19041.0;net7.0-windows10.0.19041.0</TestsBuildTFMs>
+    <TestsBuildTFMs Condition="'$(CIBuildReason)' == 'CI'">net6.0-windows10.0.19041.0;net7.0-windows10.0.19041.0</TestsBuildTFMs>
+    <WindowsAppSDKVerifyWinrtRuntimeVersion>false</WindowsAppSDKVerifyWinrtRuntimeVersion>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' != 'net5.0'">
+  <PropertyGroup Condition="!$(IsTargetFrameworkNet5OrGreater)">
     <DefineConstants>$(DefineConstants);MANUAL_IUNKNOWN</DefineConstants>
   </PropertyGroup>
 

src/Directory.Build.targets

@@ -34,5 +34,5 @@
   <Target Name="CleanIntermediateDirs" Condition="'$(CleanIntermediateDirs)'=='true'" AfterTargets="Build">
     <RemoveDir Directories="$(IntDir)" />
   </Target>
-
+	
 </Project>

src/Perf/ResultsComparer/ResultsComparer.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>$(PERFLAB_TARGET_FRAMEWORKS)</TargetFrameworks>
-    <TargetFramework Condition="'$(TargetFrameworks)' == ''">net5.0</TargetFramework>
+    <TargetFramework Condition="'$(TargetFrameworks)' == ''">net6.0</TargetFramework>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>

src/Projections/Test/Test.csproj

@@ -17,19 +17,19 @@
     <ProjectReference Include="..\..\WinRT.Runtime\WinRT.Runtime.csproj" />
     <ProjectReference Include="..\..\cswinrt\cswinrt.vcxproj" />
     <ProjectReference Include="..\Windows\Windows.csproj" />
-    <ProjectReference Include="..\WinUI\WinUI.csproj" />
+    <ProjectReference Include="..\WinAppSDK\WinAppSDK.csproj" />
     <InternalsVisibleTo Include="UnitTest" />
   </ItemGroup>
 
   <PropertyGroup>
     <CsWinRTExcludes>TestComponentCSharp.AnotherAssembly;</CsWinRTExcludes>
     <CsWinRTIncludes>TestComponent;TestComponentCSharp;test_component_base;test_component_derived;test_component_fast;</CsWinRTIncludes>
-    <!--PkgMicrosoft_WinUI is set in in obj\*.csproj.nuget.g.props with TargetFramework condition, doesn't support multi-targeting-->
-    <PkgMicrosoft_WinUI Condition="'$(PkgMicrosoft_WinUI)'==''">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'microsoft.winui', '$(MicrosoftWinUIVersion)'))</PkgMicrosoft_WinUI>
+    <!--PkgMicrosoft_WindowsAppSDK is set in in obj\*.csproj.nuget.g.props with TargetFramework condition, doesn't support multi-targeting-->
+    <PkgMicrosoft_WindowsAppSDK>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'microsoft.windowsappsdk', '$(MicrosoftWinAppSDKVersion)'))</PkgMicrosoft_WindowsAppSDK>
   </PropertyGroup>
   <ItemGroup>
-    <!--Explicitly reference WinUI winmds from TFM uap10.0-->
-    <CsWinRTInputs Include="$(PkgMicrosoft_WinUI)/**/*.winmd" />
+    <!--Explicitly reference WinAppSDK winmds from TFM uap10.0-->
+    <CsWinRTInputs Include="$(PkgMicrosoft_WindowsAppSDK)/**/*.winmd" />
   </ItemGroup>
 
 </Project>

src/Projections/TestHost.ProbeByClass/TestHost.ProbeByClass.csproj

@@ -12,18 +12,18 @@
     <ProjectReference Include="..\..\WinRT.Runtime\WinRT.Runtime.csproj" />
     <ProjectReference Include="..\..\cswinrt\cswinrt.vcxproj" />
     <ProjectReference Include="..\Windows\Windows.csproj" />
-    <ProjectReference Include="..\WinUI\WinUI.csproj" />
+    <ProjectReference Include="..\WinAppSDK\WinAppSDK.csproj" />
     <InternalsVisibleTo Include="UnitTest" />
   </ItemGroup>
 
   <PropertyGroup>
     <CsWinRTIncludes>TestComponent;TestComponentCSharp</CsWinRTIncludes>
-    <!--PkgMicrosoft_WinUI is set in in obj\*.csproj.nuget.g.props with TargetFramework condition, doesn't support multi-targeting-->
-    <PkgMicrosoft_WinUI Condition="'$(PkgMicrosoft_WinUI)'==''">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'microsoft.winui', '$(MicrosoftWinUIVersion)'))</PkgMicrosoft_WinUI>
+    <!--PkgMicrosoft_WindowsAppSDK is set in in obj\*.csproj.nuget.g.props with TargetFramework condition, doesn't support multi-targeting-->
+    <PkgMicrosoft_WindowsAppSDK>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'microsoft.windowsappsdk', '$(MicrosoftWinAppSDKVersion)'))</PkgMicrosoft_WindowsAppSDK>
   </PropertyGroup>
   <ItemGroup>
-    <!--Explicitly reference WinUI winmds from TFM uap10.0-->
-    <CsWinRTInputs Include="$(PkgMicrosoft_WinUI)/**/*.winmd" />
+    <!--Explicitly reference WinAppSDK winmds from TFM uap10.0-->
+    <CsWinRTInputs Include="$(PkgMicrosoft_WindowsAppSDK)/**/*.winmd" />
   </ItemGroup>
 
 </Project>

src/Projections/TestSubset/TestSubset.csproj

@@ -14,19 +14,19 @@
     <ProjectReference Include="..\..\WinRT.Runtime\WinRT.Runtime.csproj" />
     <ProjectReference Include="..\..\cswinrt\cswinrt.vcxproj" />
     <ProjectReference Include="..\Windows\Windows.csproj" />
-    <ProjectReference Include="..\WinUI\WinUI.csproj" />
+    <ProjectReference Include="..\WinAppSDK\WinAppSDK.csproj" />
     <ProjectReference Include="..\Test\Test.csproj" />
     <InternalsVisibleTo Include="UnitTest" />
   </ItemGroup>
 
   <PropertyGroup>
     <CsWinRTIncludes>TestComponentCSharp.AnotherAssembly;</CsWinRTIncludes>
-    <!--PkgMicrosoft_WinUI is set in in obj\*.csproj.nuget.g.props with TargetFramework condition, doesn't support multi-targeting-->
-    <PkgMicrosoft_WinUI Condition="'$(PkgMicrosoft_WinUI)'==''">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'microsoft.winui', '$(MicrosoftWinUIVersion)'))</PkgMicrosoft_WinUI>
+    <!--PkgMicrosoft_WindowsAppSDK is set in in obj\*.csproj.nuget.g.props with TargetFramework condition, doesn't support multi-targeting-->
+    <PkgMicrosoft_WindowsAppSDK>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'microsoft.windowsappsdk', '$(MicrosoftWinAppSDKVersion)'))</PkgMicrosoft_WindowsAppSDK>
   </PropertyGroup>
   <ItemGroup>
-    <!--Explicitly reference WinUI winmds from TFM uap10.0-->
-    <CsWinRTInputs Include="$(PkgMicrosoft_WinUI)/**/*.winmd" />
+    <!--Explicitly reference WinAppSDK winmds from TFM uap10.0-->
+    <CsWinRTInputs Include="$(PkgMicrosoft_WindowsAppSDK)/**/*.winmd" />
   </ItemGroup>
 
 </Project>

src/Projections/Reunion/Microsoft.UI.Dispatching.DispatcherQueueSynchronizationContext.cs → src/Projections/WinAppSDK/Microsoft.UI.Dispatching.DispatcherQueueSynchronizationContext.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Threading;
-using Microsoft.System;
+using Microsoft.UI.Dispatching;
 
-namespace Microsoft.System
+namespace Microsoft.UI.Dispatching
 {
     /// <summary>
     /// DispatcherQueueSyncContext allows developers to await calls and get back onto the

src/Projections/WinAppSDK/WinAppSDK.csproj

@@ -0,0 +1,49 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(LibBuildTFMs)</TargetFrameworks>
+    <Platforms>x64;x86</Platforms>
+    <AssemblyName>Microsoft.WinUI</AssemblyName>
+    <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
+    <IsTrimmable>true</IsTrimmable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
+    <ProjectReference Include="..\..\WinRT.Runtime\WinRT.Runtime.csproj" />
+    <ProjectReference Include="..\..\cswinrt\cswinrt.vcxproj" />
+    <ProjectReference Include="..\Windows\Windows.csproj" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="$(MicrosoftWinAppSDKVersion)" GeneratePathProperty="true">
+      <ExcludeAssets>build; buildtransitive; compile; runtime</ExcludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <PropertyGroup>
+    <CsWinRTFilters>
+      -exclude Windows
+      -include Microsoft
+      # The current WinUI nuget incorrectly references several Windows.* types that should be
+      # Microsoft.* types instead.  Temporarily include these to enable the build
+      -include Windows.UI.Xaml.Interop.Type
+      -include Windows.UI.Xaml.Interop.NotifyCollectionChangedAction
+      -include Windows.UI.Xaml.Markup.ContentPropertyAttribute
+      -include Windows.UI.Xaml.StyleTypedPropertyAttribute
+      -include Windows.UI.Xaml.TemplatePartAttribute
+      -include Windows.UI.Xaml.TemplateVisualStateAttribute
+      -include Windows.UI.Xaml.Data.BindableAttribute
+      -include Windows.UI.Xaml.Markup.ContentPropertyAttribute
+      -include Windows.UI.Xaml.Markup.FullXamlMetadataProviderAttribute
+      -include Windows.UI.Xaml.Markup.MarkupExtensionReturnTypeAttribute
+      -include Windows.UI.Xaml.Media.Animation.ConditionallyIndependentlyAnimatableAttribute
+      -include Windows.UI.Xaml.Media.Animation.IndependentlyAnimatableAttribute
+      -include Windows.UI.Xaml.Media.Animation.ConditionallyIndependentlyAnimatableAttribute
+    </CsWinRTFilters>
+    <!--PkgMicrosoft_WindowsAppSDK is set in in obj\*.csproj.nuget.g.props with TargetFramework condition, doesn't support multi-targeting-->
+    <PkgMicrosoft_WindowsAppSDK>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'microsoft.windowsappsdk', '$(MicrosoftWinAppSDKVersion)'))</PkgMicrosoft_WindowsAppSDK>
+  </PropertyGroup>
+  <ItemGroup>
+    <!--Explicitly reference WinAppSDK winmds from TFM uap10.0-->
+    <CsWinRTInputs Include="$(PkgMicrosoft_WindowsAppSDK)/**/*.winmd" />
+  </ItemGroup>
+
+</Project>

src/Projections/WinUI/WinUI.csproj

@@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <!-- 
+    Used to test generating the older WinUI projection, but not used as part of tests.
+    The WinAppSDK projection is used for tests instead.
+  -->
   <PropertyGroup>
     <TargetFrameworks>$(LibBuildTFMs)</TargetFrameworks>
     <Platforms>x64;x86</Platforms>

src/Samples/TestEmbedded/Net5App.Bootstrap/Net5App.Bootstrap.csproj → src/Samples/TestEmbedded/Net6App.Bootstrap/Net6App.Bootstrap.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <Platforms>x64;x86</Platforms>
   </PropertyGroup>
 

src/Samples/TestEmbedded/Net5App.Bootstrap/Program.cs → src/Samples/TestEmbedded/Net6App.Bootstrap/Program.cs

@@ -4,7 +4,7 @@
 using Gamma;
 using Windows.Media;
 
-namespace Net5App.Bootstrap
+namespace Net6App.Bootstrap
 {
     class Program
     {

src/Samples/TestEmbedded/Net5App/Net5App.csproj → src/Samples/TestEmbedded/Net6App/Net6App.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <Platforms>x64;x86</Platforms>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <SimulateCsWinRTNugetReference>true</SimulateCsWinRTNugetReference>
     <CsWinRTWindowsMetadata>sdk</CsWinRTWindowsMetadata>
   </PropertyGroup>

src/Samples/TestEmbedded/Net5App/Properties/launchSettings.json → src/Samples/TestEmbedded/Net6App/Properties/launchSettings.json

@@ -1,6 +1,6 @@
 {
   "profiles": {
-    "Net5App": {
+    "Net6App": {
       "commandName": "Project",
       "nativeDebugging": true
     }