From 5a5cdca11a7ce93c10738efbcb24862935191535 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= <jlaban@gmail.com>
Date: Wed, 20 Nov 2024 17:25:42 -0500
Subject: [PATCH 1/3] fix(webview2): Adjust target platform selection for
 windows builds

---
 src/Uno.Sdk/targets/Uno.Common.WinAppSdk.targets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Uno.Sdk/targets/Uno.Common.WinAppSdk.targets b/src/Uno.Sdk/targets/Uno.Common.WinAppSdk.targets
index ab1279f6ab31..9a0614d1b9bb 100644
--- a/src/Uno.Sdk/targets/Uno.Common.WinAppSdk.targets
+++ b/src/Uno.Sdk/targets/Uno.Common.WinAppSdk.targets
@@ -44,6 +44,11 @@
 		<Platform Condition="$(Platform) == 'AnyCPU'">$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)</Platform>
 		<PublishProfile Condition=" $(PublishProfile) == '' ">win-$(Platform).pubxml</PublishProfile>
 		<UseWinUI Condition=" $(UseWinUI) == '' ">true</UseWinUI>
+
+		<!-- Explicitly set the PlatformTarget in order for packages like WebView2 to select the appropriate binaries -->
+		<PlatformTarget Condition=" '$(PlatformTarget)' == '' AND '$(NETCoreSdkRuntimeIdentifier)' == 'win-x86'">x86</EffectivePlatform>
+		<PlatformTarget Condition=" '$(PlatformTarget)' == '' AND '$(NETCoreSdkRuntimeIdentifier)' == 'win-x64'">x64</EffectivePlatform>
+		<PlatformTarget Condition=" '$(PlatformTarget)' == '' AND '$(NETCoreSdkRuntimeIdentifier)' == 'win-arm64'">arm64</EffectivePlatform>
 	</PropertyGroup>
 
 	<!-- Legacy Project Support -->

From 7ea1eadbd38800966a87a10590315ef54a508a68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= <jlaban@gmail.com>
Date: Wed, 20 Nov 2024 17:30:12 -0500
Subject: [PATCH 2/3] chore: Restrict to Any CPU

---
 src/Uno.Sdk/targets/Uno.Common.WinAppSdk.targets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Uno.Sdk/targets/Uno.Common.WinAppSdk.targets b/src/Uno.Sdk/targets/Uno.Common.WinAppSdk.targets
index 9a0614d1b9bb..85904e0ad996 100644
--- a/src/Uno.Sdk/targets/Uno.Common.WinAppSdk.targets
+++ b/src/Uno.Sdk/targets/Uno.Common.WinAppSdk.targets
@@ -46,9 +46,9 @@
 		<UseWinUI Condition=" $(UseWinUI) == '' ">true</UseWinUI>
 
 		<!-- Explicitly set the PlatformTarget in order for packages like WebView2 to select the appropriate binaries -->
-		<PlatformTarget Condition=" '$(PlatformTarget)' == '' AND '$(NETCoreSdkRuntimeIdentifier)' == 'win-x86'">x86</EffectivePlatform>
-		<PlatformTarget Condition=" '$(PlatformTarget)' == '' AND '$(NETCoreSdkRuntimeIdentifier)' == 'win-x64'">x64</EffectivePlatform>
-		<PlatformTarget Condition=" '$(PlatformTarget)' == '' AND '$(NETCoreSdkRuntimeIdentifier)' == 'win-arm64'">arm64</EffectivePlatform>
+		<PlatformTarget Condition=" '$(PlatformTarget)' == '' AND $(Platform) == 'AnyCPU' AND '$(NETCoreSdkRuntimeIdentifier)' == 'win-x86'">x86</EffectivePlatform>
+		<PlatformTarget Condition=" '$(PlatformTarget)' == '' AND $(Platform) == 'AnyCPU' AND '$(NETCoreSdkRuntimeIdentifier)' == 'win-x64'">x64</EffectivePlatform>
+		<PlatformTarget Condition=" '$(PlatformTarget)' == '' AND $(Platform) == 'AnyCPU' AND '$(NETCoreSdkRuntimeIdentifier)' == 'win-arm64'">arm64</EffectivePlatform>
 	</PropertyGroup>
 
 	<!-- Legacy Project Support -->

From 153b8cabbd630f566d9bfa48605afcd3246f6905 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= <jlaban@gmail.com>
Date: Wed, 20 Nov 2024 17:33:12 -0500
Subject: [PATCH 3/3] chore: Adjust endings

---
 src/Uno.Sdk/targets/Uno.Common.WinAppSdk.targets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Uno.Sdk/targets/Uno.Common.WinAppSdk.targets b/src/Uno.Sdk/targets/Uno.Common.WinAppSdk.targets
index 85904e0ad996..2873a19e7a34 100644
--- a/src/Uno.Sdk/targets/Uno.Common.WinAppSdk.targets
+++ b/src/Uno.Sdk/targets/Uno.Common.WinAppSdk.targets
@@ -46,9 +46,9 @@
 		<UseWinUI Condition=" $(UseWinUI) == '' ">true</UseWinUI>
 
 		<!-- Explicitly set the PlatformTarget in order for packages like WebView2 to select the appropriate binaries -->
-		<PlatformTarget Condition=" '$(PlatformTarget)' == '' AND $(Platform) == 'AnyCPU' AND '$(NETCoreSdkRuntimeIdentifier)' == 'win-x86'">x86</EffectivePlatform>
-		<PlatformTarget Condition=" '$(PlatformTarget)' == '' AND $(Platform) == 'AnyCPU' AND '$(NETCoreSdkRuntimeIdentifier)' == 'win-x64'">x64</EffectivePlatform>
-		<PlatformTarget Condition=" '$(PlatformTarget)' == '' AND $(Platform) == 'AnyCPU' AND '$(NETCoreSdkRuntimeIdentifier)' == 'win-arm64'">arm64</EffectivePlatform>
+		<PlatformTarget Condition=" '$(PlatformTarget)' == '' AND $(Platform) == 'AnyCPU' AND '$(NETCoreSdkRuntimeIdentifier)' == 'win-x86'">x86</PlatformTarget>
+		<PlatformTarget Condition=" '$(PlatformTarget)' == '' AND $(Platform) == 'AnyCPU' AND '$(NETCoreSdkRuntimeIdentifier)' == 'win-x64'">x64</PlatformTarget>
+		<PlatformTarget Condition=" '$(PlatformTarget)' == '' AND $(Platform) == 'AnyCPU' AND '$(NETCoreSdkRuntimeIdentifier)' == 'win-arm64'">arm64</PlatformTarget>
 	</PropertyGroup>
 
 	<!-- Legacy Project Support -->