Skip to content

Commit f1166c7

Browse files
committed
Use RuntimeIdentifiers on both heads and libraries, handle pre-net8 identifiers
1 parent 2f720d7 commit f1166c7

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

MultiTarget/WinUI.Extra.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
<PropertyGroup Condition="'$(IsWinAppSdk)' == 'true'">
1717
<!-- See https://github.com/microsoft/WindowsAppSDK/issues/3842 -->
1818
<UseRidGraph>true</UseRidGraph>
19+
20+
<RuntimeIdentifiers Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) >= 8">win-x86;win-x64;win-arm64</RuntimeIdentifiers>
21+
<RuntimeIdentifiers Condition="8 > $([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)'))">win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
22+
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
1923
</PropertyGroup>
2024

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

ProjectHeads/Head.WinAppSdk.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<OutputType>WinExe</OutputType>
44
<TargetFramework>$(WinAppSdkTargetFramework.Split(';')[0])</TargetFramework>
55
<Platforms>x86;x64;arm64</Platforms>
6-
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
76
<PublishProfile>win-$(Platform).pubxml</PublishProfile>
87
<UseWinUI>true</UseWinUI>
98
<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>

0 commit comments

Comments
 (0)