Skip to content

Commit f3d1684

Browse files
committed
Enabled AoT for WinAppSdk 1.6-experimental1. Added RuntimeIdentifier to head, removed redundant RuntimeIdentifiers definition on libraries.
1 parent bffc095 commit f3d1684

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

MultiTarget/WinUI.Extra.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
<RuntimeIdentifiers Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) >= 8">win-x86;win-x64;win-arm64</RuntimeIdentifiers>
3535
<RuntimeIdentifiers Condition="8 > $([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)'))">win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
36-
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
36+
<WindowsSdkPackageVersion>10.0.22621.35-preview</WindowsSdkPackageVersion>
3737
</PropertyGroup>
3838

3939
<PropertyGroup Condition="'$(IsUno)' == 'true'">

ProjectHeads/Head.WinAppSdk.props

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
<Import Project="$(MSBuildThisFileDirectory)\..\MultiTarget\WinUI.Extra.props" />
1616

1717
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
18-
<!-- Set to true when WinAppSdk releases AoT support in 1.6+ -->
19-
<PublishAot>false</PublishAot>
18+
<PublishAot>true</PublishAot>
19+
<RuntimeIdentifier Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) >= 8">win-$(Platform)</RuntimeIdentifier>
20+
<RuntimeIdentifier Condition="8 > $([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)'))">win10-$(Platform)</RuntimeIdentifier>
2021
</PropertyGroup>
2122

2223
<ItemGroup>

0 commit comments

Comments
 (0)