From c857bb11661358146d8c9acb128989ae181e0920 Mon Sep 17 00:00:00 2001
From: Arlo <arlo.godfrey@outlook.com>
Date: Wed, 18 Dec 2024 16:17:25 -0600
Subject: [PATCH] Use stable Microsoft.UI.Xaml on UWP, prerelease on modern
 .NET

---
 MultiTarget/PackageReferences/Uwp/Microsoft.UI.Xaml.props | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/MultiTarget/PackageReferences/Uwp/Microsoft.UI.Xaml.props b/MultiTarget/PackageReferences/Uwp/Microsoft.UI.Xaml.props
index b44b7f4..ec70bbc 100644
--- a/MultiTarget/PackageReferences/Uwp/Microsoft.UI.Xaml.props
+++ b/MultiTarget/PackageReferences/Uwp/Microsoft.UI.Xaml.props
@@ -1,8 +1,14 @@
 <Project>
 	<!-- Condition must be on a <When> statement in its own file for this to work in Visual Studio. https://stackoverflow.com/a/16557059 -->
 	<Choose>
-		<When Condition="'$(HasWinUI)' == 'true'" >
+		<When Condition="'$(HasWinUI)' == 'true' AND '$(MultiTargetPlatformIdentifier)' == 'uap'" >
 			<ItemGroup>
+				<PackageReference Include="Microsoft.UI.Xaml" Version="2.8.6" />
+			</ItemGroup>
+		</When>
+		<When Condition="'$(HasWinUI)' == 'true' AND '$(MultiTargetPlatformIdentifier)' == 'windows'" >
+			<ItemGroup>
+				<!-- This preview version breaks uap builds by referencing Microsoft.VCLibs.Desktop when it shouldn't -->
 				<PackageReference Include="Microsoft.UI.Xaml" Version="2.8.7-prerelease.241119001" />
 			</ItemGroup>
 		</When>