From 480a10c760777c69d1525b581d2b6ee2c76bd3f6 Mon Sep 17 00:00:00 2001
From: Manodasan Wignarajah <mawign@microsoft.com>
Date: Tue, 20 Aug 2024 18:08:21 -0700
Subject: [PATCH] Update to released CsWinRT versions (#373)

---
 .../CustomControls/WinUIComponentCs/WinUIComponentCs.csproj    | 2 +-
 Samples/Directory.Build.targets                                | 2 +-
 .../DrawingIsland/DrawingCppTestApp/DrawingCppTestApp.vcxproj  | 3 ---
 .../DrawingCppTestPackage/DrawingCppTestPackage.wapproj        | 2 +-
 .../DrawingIsland/DrawingCsTestApp/DrawingCsTestApp.csproj     | 2 +-
 .../DrawingCsTestPackage/DrawingCsTestPackage.wapproj          | 2 +-
 .../DrawingIslandCsProjection/DrawingIslandCsProjection.csproj | 2 +-
 .../CsUnpackagedAppNotifications.csproj                        | 2 +-
 8 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Samples/CustomControls/WinUIComponentCs/WinUIComponentCs.csproj b/Samples/CustomControls/WinUIComponentCs/WinUIComponentCs.csproj
index f853c50b..f5e1512a 100644
--- a/Samples/CustomControls/WinUIComponentCs/WinUIComponentCs.csproj
+++ b/Samples/CustomControls/WinUIComponentCs/WinUIComponentCs.csproj
@@ -10,7 +10,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.0-prerelease.240517.1" />
+		<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.1" />
 		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" />
 		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
 	</ItemGroup>
diff --git a/Samples/Directory.Build.targets b/Samples/Directory.Build.targets
index 92e66861..c4b0a522 100644
--- a/Samples/Directory.Build.targets
+++ b/Samples/Directory.Build.targets
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <WindowsSdkPackageVersion>$(TargetPlatformVersion.TrimEnd('0'))35-preview</WindowsSdkPackageVersion>
+    <WindowsSdkPackageVersion>$(TargetPlatformVersion.TrimEnd('0'))38</WindowsSdkPackageVersion>
   </PropertyGroup>
 
   <!-- Workaround issue affecting publishing with R2R on ARM64 for .NET 6 with the preview CsWinRT builds. -->
diff --git a/Samples/Islands/DrawingIsland/DrawingCppTestApp/DrawingCppTestApp.vcxproj b/Samples/Islands/DrawingIsland/DrawingCppTestApp/DrawingCppTestApp.vcxproj
index 25fa3bc4..b1c96961 100644
--- a/Samples/Islands/DrawingIsland/DrawingCppTestApp/DrawingCppTestApp.vcxproj
+++ b/Samples/Islands/DrawingIsland/DrawingCppTestApp/DrawingCppTestApp.vcxproj
@@ -148,7 +148,4 @@
     <Error Condition="!Exists('..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.1\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.1\build\Microsoft.Windows.SDK.BuildTools.props'))" />
     <Error Condition="!Exists('..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.1\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.1\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
   </Target>
-  <PropertyGroup>
-    <WindowsSdkPackageVersion>10.0.22621.35-preview</WindowsSdkPackageVersion>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Samples/Islands/DrawingIsland/DrawingCppTestPackage/DrawingCppTestPackage.wapproj b/Samples/Islands/DrawingIsland/DrawingCppTestPackage/DrawingCppTestPackage.wapproj
index 459ce308..a5f5e351 100644
--- a/Samples/Islands/DrawingIsland/DrawingCppTestPackage/DrawingCppTestPackage.wapproj
+++ b/Samples/Islands/DrawingIsland/DrawingCppTestPackage/DrawingCppTestPackage.wapproj
@@ -65,6 +65,6 @@
     <ProjectReference Include="..\DrawingCppTestApp\DrawingCppTestApp.vcxproj" />
   </ItemGroup>
   <PropertyGroup>
-    <WindowsSdkPackageVersion>10.0.22621.35-preview</WindowsSdkPackageVersion>
+    <WindowsSdkPackageVersion>10.0.22621.38</WindowsSdkPackageVersion>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Samples/Islands/DrawingIsland/DrawingCsTestApp/DrawingCsTestApp.csproj b/Samples/Islands/DrawingIsland/DrawingCsTestApp/DrawingCsTestApp.csproj
index 9c2030b4..e7757d66 100644
--- a/Samples/Islands/DrawingIsland/DrawingCsTestApp/DrawingCsTestApp.csproj
+++ b/Samples/Islands/DrawingIsland/DrawingCsTestApp/DrawingCsTestApp.csproj
@@ -34,7 +34,7 @@
     <!-- Added CsWinRT reference to avoid WinMD error as a result of WinMD leaking via project reference. -->
     <PackageReference Include="CommunityToolkit.WinAppSDK.LottieWinRT" Version="8.0.230819-rc-LottieIsland.7.g92a87e1883" />
     <PackageReference Include="CommunityToolkit.WinUI.Lottie" Version="8.0.230819-rc-LottieIsland.7.g92a87e1883" />
-    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.0-prerelease.240722.1" />
+    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.1" />
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240701003-experimental2" />
 
     <!-- Reference WASDK for types -->
diff --git a/Samples/Islands/DrawingIsland/DrawingCsTestPackage/DrawingCsTestPackage.wapproj b/Samples/Islands/DrawingIsland/DrawingCsTestPackage/DrawingCsTestPackage.wapproj
index a3b23e7c..4d6b84dd 100644
--- a/Samples/Islands/DrawingIsland/DrawingCsTestPackage/DrawingCsTestPackage.wapproj
+++ b/Samples/Islands/DrawingIsland/DrawingCsTestPackage/DrawingCsTestPackage.wapproj
@@ -64,6 +64,6 @@
     <ProjectReference Include="..\DrawingCsTestApp\DrawingCsTestApp.csproj" />
   </ItemGroup>
   <PropertyGroup>
-    <WindowsSdkPackageVersion>10.0.22621.35-preview</WindowsSdkPackageVersion>
+    <WindowsSdkPackageVersion>10.0.22621.38</WindowsSdkPackageVersion>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Samples/Islands/DrawingIsland/DrawingIslandCsProjection/DrawingIslandCsProjection.csproj b/Samples/Islands/DrawingIsland/DrawingIslandCsProjection/DrawingIslandCsProjection.csproj
index b9903fb1..b871eb2e 100644
--- a/Samples/Islands/DrawingIsland/DrawingIslandCsProjection/DrawingIslandCsProjection.csproj
+++ b/Samples/Islands/DrawingIsland/DrawingIslandCsProjection/DrawingIslandCsProjection.csproj
@@ -24,7 +24,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.0-prerelease.240722.1" />
+    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.1" />
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240701003-experimental2" />
   </ItemGroup>
 
diff --git a/Samples/Notifications/App/CsUnpackagedAppNotifications/CsUnpackagedAppNotifications/CsUnpackagedAppNotifications.csproj b/Samples/Notifications/App/CsUnpackagedAppNotifications/CsUnpackagedAppNotifications/CsUnpackagedAppNotifications.csproj
index dbe37363..ab7ddab9 100644
--- a/Samples/Notifications/App/CsUnpackagedAppNotifications/CsUnpackagedAppNotifications/CsUnpackagedAppNotifications.csproj
+++ b/Samples/Notifications/App/CsUnpackagedAppNotifications/CsUnpackagedAppNotifications/CsUnpackagedAppNotifications.csproj
@@ -19,7 +19,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.0-prerelease.240517.1" />
+    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.1" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" />
   </ItemGroup>