From ddf505b2bc136f0c4c79ed6f0e10a2d16548ad9e Mon Sep 17 00:00:00 2001
From: Arlo Godfrey <arlo.godfrey@outlook.com>
Date: Mon, 26 Aug 2024 12:24:27 -0500
Subject: [PATCH 1/3] Update WindowsAppSDK to preview2

---
 MultiTarget/PackageReferences/WinAppSdk.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MultiTarget/PackageReferences/WinAppSdk.props b/MultiTarget/PackageReferences/WinAppSdk.props
index a446d951..ac07438a 100644
--- a/MultiTarget/PackageReferences/WinAppSdk.props
+++ b/MultiTarget/PackageReferences/WinAppSdk.props
@@ -1,6 +1,6 @@
 <Project>
   <ItemGroup>
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240807006-preview1" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240821007-preview2" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
     <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2730-prerelease" />
   </ItemGroup>

From efa78ef1090d1036a8812293292036c885c82218 Mon Sep 17 00:00:00 2001
From: Arlo Godfrey <arlo.godfrey@outlook.com>
Date: Mon, 26 Aug 2024 12:25:42 -0500
Subject: [PATCH 2/3] Uupdate WindowsSdkPackageVersion for net6 and net8

---
 MultiTarget/WinUI.Extra.props | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/MultiTarget/WinUI.Extra.props b/MultiTarget/WinUI.Extra.props
index 51aa6adb..79b86611 100644
--- a/MultiTarget/WinUI.Extra.props
+++ b/MultiTarget/WinUI.Extra.props
@@ -33,7 +33,9 @@
     
     <RuntimeIdentifiers Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) >= 8">win-x86;win-x64;win-arm64</RuntimeIdentifiers> 
     <RuntimeIdentifiers Condition="8 > $([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)'))">win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
-    <WindowsSdkPackageVersion>10.0.22621.37-preview</WindowsSdkPackageVersion>
+
+    <WindowsSdkPackageVersion Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) >= 8">10.0.22621.41</WindowsSdkPackageVersion>
+    <WindowsSdkPackageVersion Condition="8 > $([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)'))">10.0.22621.38</WindowsSdkPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(IsUno)' == 'true'">

From df20cfdd305d224f768369d48ecfe9b53718f45d Mon Sep 17 00:00:00 2001
From: Arlo Godfrey <arlo.godfrey@outlook.com>
Date: Mon, 26 Aug 2024 12:26:06 -0500
Subject: [PATCH 3/3] Remove workaround for wasdk 1.6 < preview2

---
 MultiTarget/WinUI.Extra.props | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/MultiTarget/WinUI.Extra.props b/MultiTarget/WinUI.Extra.props
index 79b86611..d8ccc4a4 100644
--- a/MultiTarget/WinUI.Extra.props
+++ b/MultiTarget/WinUI.Extra.props
@@ -61,23 +61,4 @@
       <HintPath Condition="Exists('c:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\IDE\Extensions\Xamarin.VisualStudio')">c:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\IDE\Extensions\Xamarin.VisualStudio\Xamarin.Mac.dll</HintPath>
     </Reference>
   </ItemGroup>
-
-    <!--
-    Workaround for WindowsAppSdk 1.6
-    Track https://github.com/CommunityToolkit/Labs-Windows/pull/561#issuecomment-2274727870
-    -->
-  <Target Condition="'$(IsWinAppSdk)' == 'true'" Name="CsWinRTRemoveXamlDllReferences" AfterTargets="ResolveTargetingPackAssets;ResolveReferences" BeforeTargets="XamlPreCompile;CoreCompile" Outputs="@(Reference)">
-      <ItemGroup>
-          <Reference Remove="@(Reference)"
-              Condition="'%(Reference.Filename)%(Reference.Extension)' == 'Microsoft.Windows.UI.Xaml.dll'" />
-          <ReferencePathWithRefAssemblies Remove="@(ReferencePathWithRefAssemblies)"
-              Condition="'%(ReferencePathWithRefAssemblies.Filename)%(ReferencePathWithRefAssemblies.Extension)' == 'Microsoft.Windows.UI.Xaml.dll'" />
-          <ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)"
-              Condition="'%(ReferenceCopyLocalPaths.Filename)%(ReferenceCopyLocalPaths.Extension)' == 'Microsoft.Windows.UI.Xaml.dll'" />
-          <ReferencePath Remove="@(ReferencePath)"
-              Condition="'%(ReferencePath.Filename)%(ReferencePath.Extension)' == 'Microsoft.Windows.UI.Xaml.dll'" />
-          <RuntimePackAsset Remove="@(RuntimePackAsset)"
-Condition="'%(RuntimePackAsset.Filename)%(RuntimePackAsset.Extension)' == 'Microsoft.Windows.UI.Xaml.dll'" />
-      </ItemGroup>
-  </Target>
 </Project>