From 67872c12def74796eb171b198302ea700aa19034 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 15 Sep 2024 12:37:59 +0200
Subject: [PATCH] Update SDK package checks for .NET 9 SDK

---
 .../CommunityToolkit.Mvvm.WindowsSdk.targets      | 15 +++++++++++++--
 .../CommunityToolkit.Mvvm.csproj                  |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.WindowsSdk.targets b/src/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.WindowsSdk.targets
index ee9b5c2c8..1655776c5 100644
--- a/src/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.WindowsSdk.targets
+++ b/src/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.WindowsSdk.targets
@@ -45,10 +45,21 @@
         <Recommended>10.0.$([System.Version]::Parse("$(WindowsSdkPackageVersion.Split('-')[0])").Build).$(_MvvmToolkitWindowsSdkPackageRecommendedBuild)</Recommended>
       </_MvvmToolkitWindowsSdkPackage>
         
-      <!-- Otherwise, validate against the framework reference package -->
+      <!--
+        Otherwise, validate against the framework reference package. We need to check for two different item specs:
+          - "Microsoft.Windows.SDK.NET.Ref": this is the default name for the framework reference for the Windows
+            SDK projections, used on .NET 8 and lower. It includes all Windows APIs, except for XAML.
+          - "Microsoft.Windows.SDK.NET.Ref.Windows": this is the same as bove, except it's the framework reference
+            name that is added by the .NET 9 SDK for projects targeting .NET 8 and above. This specifically includes
+            the "Windows" profile, which only references non-XAML APIs. This change was done for the UWP support for
+            .NET 9, which requires the .NET SDK to also be able to reference XAML types. Those will use a different
+            item spec (ie. "Microsoft.Windows.SDK.NET.Ref.Xaml"). We only need to check the base "Windows" reference.
+      -->
       <_MvvmToolkitWindowsSdkPackage
         Include="@(ResolvedFrameworkReference)"
-        Condition="'$(WindowsSdkPackageVersion)' == '' AND '@(ResolvedFrameworkReference)' != '' AND '%(Identity)' == 'Microsoft.Windows.SDK.NET.Ref'">
+        Condition="'$(WindowsSdkPackageVersion)' == '' AND
+                   '@(ResolvedFrameworkReference)' != '' AND
+                   ('%(Identity)' == 'Microsoft.Windows.SDK.NET.Ref' OR '%(Identity)' == 'Microsoft.Windows.SDK.NET.Ref.Windows')">
         <Referenced>%(ResolvedFrameworkReference.TargetingPackVersion)</Referenced>
         <Required>10.0.$([System.Version]::Parse("%(ResolvedFrameworkReference.TargetingPackVersion)").Build).$(_MvvmToolkitWindowsSdkPackageMinBuild)</Required>
         <Recommended>10.0.$([System.Version]::Parse("%(ResolvedFrameworkReference.TargetingPackVersion)").Build).$(_MvvmToolkitWindowsSdkPackageRecommendedBuild)</Recommended>
diff --git a/src/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.csproj b/src/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.csproj
index 94c2f8bf0..d3f647efd 100644
--- a/src/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.csproj
+++ b/src/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.csproj
@@ -61,7 +61,7 @@
 
   <!-- Reference CsWinRT when targeting Windows, to get the latest source generators -->
   <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0-windows10.0.17763.0'))">
-    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.3" PrivateAssets="all" />
   </ItemGroup>
 
   <!-- Reference the various multi-targeted versions of the source generator project (one per Roslyn version), and the code fixer -->