Merge branch 'master' into platform-runtime-helper

unoplatform · Nov 21, 2024 · 4767456 · 4767456
2 parents 6475085 + 4332529
commit 4767456
Showing 1 changed file with 5 additions and 0 deletions.
diff --git 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 $(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 -->