Skip to content

Don't use BaseOS as the RID for publishing NativeAOT'd assets when OutputRID is the SDK's RID #114755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkoritzinsky merged 1 commit into from
Apr 17, 2025
Merged

Don't use BaseOS as the RID for publishing NativeAOT'd assets when OutputRID is the SDK's RID #114755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/coreclr/tools/aot/ILCompiler/ILCompiler_publish.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
<PropertyGroup>
<_IsPublishing>true</_IsPublishing>
<RuntimeIdentifier>$(OutputRID)</RuntimeIdentifier>
<RuntimeIdentifier Condition="'$(BaseOS)' != ''">$(BaseOS)</RuntimeIdentifier>
<!--
If the output RID isn't the current SDK RID and we have a "base" RID, then the output RID isn't known to the SDK.
In that case, we need to set the RuntimeIdentifier to the base RID so the SDK can find a runtime pack for publishing.
-->
<RuntimeIdentifier Condition="'$(OutputRID)' != '$(NETCoreSdkRuntimeIdentifier)' and '$(BaseOS)' != '' ">$(BaseOS)</RuntimeIdentifier>
Comment thread
jkoritzinsky marked this conversation as resolved.
<PublishDir>$(RuntimeBinDir)ilc-published/</PublishDir>
<SelfContained>true</SelfContained>
<PublishTrimmed>true</PublishTrimmed>
Expand Down
6 changes: 5 additions & 1 deletion src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
<PropertyGroup>
<_IsPublishing>true</_IsPublishing>
<RuntimeIdentifier>$(OutputRID)</RuntimeIdentifier>
<RuntimeIdentifier Condition="'$(BaseOS)' != ''">$(BaseOS)</RuntimeIdentifier>
<!--
If the output RID isn't the current SDK RID and we have a "base" RID, then the output RID isn't known to the SDK.
In that case, we need to set the RuntimeIdentifier to the base RID so the SDK can find a runtime pack for publishing.
-->
<RuntimeIdentifier Condition="'$(OutputRID)' != '$(NETCoreSdkRuntimeIdentifier)' and '$(BaseOS)' != '' ">$(BaseOS)</RuntimeIdentifier>
Comment thread
jkoritzinsky marked this conversation as resolved.
<PublishDir>$(RuntimeBinDir)crossgen2-published/</PublishDir>
<SelfContained>true</SelfContained>
<PublishTrimmed>true</PublishTrimmed>
Expand Down
Loading