Enabled AoT for WinAppSdk 1.6-experimental1. Added RuntimeIdentifier …

…to head, removed redundant RuntimeIdentifiers definition on libraries.
CommunityToolkit · Jun 20, 2024 · 9349c6c · 9349c6c
1 parent 9e54bb0
commit 9349c6c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/MultiTarget/WinUI.Extra.props b/MultiTarget/WinUI.Extra.props
@@ -26,7 +26,7 @@
 
     <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>
-    <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+    <WindowsSdkPackageVersion>10.0.22621.35-preview</WindowsSdkPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(IsUno)' == 'true'">

diff --git a/ProjectHeads/Head.WinAppSdk.props b/ProjectHeads/Head.WinAppSdk.props
@@ -15,8 +15,9 @@
   <Import Project="$(MSBuildThisFileDirectory)\..\MultiTarget\WinUI.Extra.props" />
 
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
-      <!-- Set to true when WinAppSdk releases AoT support in 1.6+ -->
-      <PublishAot>false</PublishAot>
+      <PublishAot>true</PublishAot>
+      <RuntimeIdentifier Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) >= 8">win-$(Platform)</RuntimeIdentifier> 
+      <RuntimeIdentifier Condition="8 > $([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)'))">win10-$(Platform)</RuntimeIdentifier>
   </PropertyGroup>
 
   <ItemGroup>