From 06ef8f406975551423ff150d89b6299ff40c0149 Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Fri, 5 Apr 2024 11:59:12 -0600
Subject: [PATCH] chore: update WindowsAppSdk references

---
 samples/MauiEmbedding/Directory.Packages.props                | 4 ++--
 samples/Playground/Directory.Packages.props                   | 4 ++--
 src/Directory.Build.targets                                   | 4 ++--
 src/Uno.Extensions.Maui.UI/Uno.Extensions.Maui.WinUI.csproj   | 1 +
 .../Uno.Extensions.Maui.WinUI.Markup.csproj                   | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/samples/MauiEmbedding/Directory.Packages.props b/samples/MauiEmbedding/Directory.Packages.props
index 9aead5468..7c2df978e 100644
--- a/samples/MauiEmbedding/Directory.Packages.props
+++ b/samples/MauiEmbedding/Directory.Packages.props
@@ -2,8 +2,8 @@
 	<ItemGroup>
 		<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.0" />
 		<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
-		<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
-		<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.4.231219000" />
+		<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
+		<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.5.240311000" />
 		<PackageVersion Include="SkiaSharp" Version="2.88.7" />
 		<PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.7" />
 		<PackageVersion Include="SkiaSharp.NativeAssets.iOS" Version="2.88.7" />
diff --git a/samples/Playground/Directory.Packages.props b/samples/Playground/Directory.Packages.props
index 4f23f29b2..e1340313b 100644
--- a/samples/Playground/Directory.Packages.props
+++ b/samples/Playground/Directory.Packages.props
@@ -13,8 +13,8 @@
 		<PackageVersion Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.13" />
 		<PackageVersion Include="Microsoft.UI.Xaml" Version="2.7.1" />
 		<PackageVersion Include="Microsoft.Windows.Compatibility" Version="7.0.3" />
-		<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
-		<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.4.231219000" />
+		<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
+		<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.5.240311000" />
 		<PackageVersion Include="Refit" Version="6.3.2" />
 		<PackageVersion Include="Refit.HttpClientFactory" Version="6.3.2" />
 		<PackageVersion Include="SkiaSharp.Views" Version="2.88.6" />
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 38b03c745..380ca432d 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -47,7 +47,7 @@
 
 	<Choose>
 		<When Condition="$(_IsWinUI)">
-			<ItemGroup>
+			<ItemGroup Condition="$(ExcludeWinAppSdkReference) != 'true'">
 				<PackageReference Include="Microsoft.WindowsAppSDK" Condition="$(WinAppSdkVersion)==''"/>
 				<PackageReference Include="Microsoft.WindowsAppSDK" Condition="$(WinAppSdkVersion)!=''" VersionOverride="$(WinAppSdkVersion)"/>
 				<PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
@@ -95,5 +95,5 @@
 			 <!--Prevent projects from duplicating assemblies in every output folder-->
 			<Private Condition="'$(OutputType)' == 'library' and '$(NugetOverrideVersion)'==''">false</Private>
 		</ProjectReference>
-	</ItemDefinitionGroup> 
+	</ItemDefinitionGroup>
 </Project>
diff --git a/src/Uno.Extensions.Maui.UI/Uno.Extensions.Maui.WinUI.csproj b/src/Uno.Extensions.Maui.UI/Uno.Extensions.Maui.WinUI.csproj
index e105a86d3..a7745b6e2 100644
--- a/src/Uno.Extensions.Maui.UI/Uno.Extensions.Maui.WinUI.csproj
+++ b/src/Uno.Extensions.Maui.UI/Uno.Extensions.Maui.WinUI.csproj
@@ -12,6 +12,7 @@
 		<IsMauiEmbedding>false</IsMauiEmbedding>
 		<IsMauiEmbedding Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android' OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst' OR $(TargetFramework.Contains('windows10'))">true</IsMauiEmbedding>
 		<DefineConstants Condition="$(IsMauiEmbedding)">$(DefineConstants);MAUI_EMBEDDING</DefineConstants>
+		<ExcludeWinAppSdkReference>true</ExcludeWinAppSdkReference>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/src/Uno.Extensions.Maui.WinUI.Markup/Uno.Extensions.Maui.WinUI.Markup.csproj b/src/Uno.Extensions.Maui.WinUI.Markup/Uno.Extensions.Maui.WinUI.Markup.csproj
index fbe245019..6b85d3c45 100644
--- a/src/Uno.Extensions.Maui.WinUI.Markup/Uno.Extensions.Maui.WinUI.Markup.csproj
+++ b/src/Uno.Extensions.Maui.WinUI.Markup/Uno.Extensions.Maui.WinUI.Markup.csproj
@@ -11,7 +11,7 @@
 		<IsMauiEmbedding>false</IsMauiEmbedding>
 		<IsMauiEmbedding Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android' OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst' OR $(TargetFramework.Contains('windows10'))">true</IsMauiEmbedding>
 		<DefineConstants Condition="$(IsMauiEmbedding)">$(DefineConstants);MAUI_EMBEDDING</DefineConstants>
-		<WinAppSdkVersion>1.4.231219000</WinAppSdkVersion>
+		<ExcludeWinAppSdkReference>true</ExcludeWinAppSdkReference>
 	</PropertyGroup>
 
 	<ItemGroup>