Skip to content

Fix non-portable CI builds. #114949

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
merged 4 commits into from
Apr 23, 2025
Merged

Fix non-portable CI builds. #114949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef50a6a
Fix non-portable CI builds.
tmds Apr 23, 2025
b0fe256
test with source-build validation jobs
ViktorHofer Apr 23, 2025
aa3e0be
Update runtime.yml
ViktorHofer Apr 23, 2025
9bd4d32
Update runtime.yml
ViktorHofer Apr 23, 2025
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
3 changes: 2 additions & 1 deletion eng/pipelines/runtime.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1786,11 +1786,12 @@ extends:
parameters:
platforms:
- name: CentOS9
baseOS: linux-x64
targetRID: centos.9-x64
portableBuild: false
container: SourceBuild_centos_x64
- name: NonexistentRID
baseOS: linux
baseOS: linux-x64
targetRID: banana.24-x64
portableBuild: false
container: SourceBuild_centos_x64
5 changes: 5 additions & 0 deletions ...raries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@
<RuntimeIdentifier>$(OutputRID)</RuntimeIdentifier>
<!-- Set the apphost RID so we download the apphost pack if needed. -->
<AppHostRuntimeIdentifier>$(OutputRID)</AppHostRuntimeIdentifier>
<!--
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 AppHostRuntimeIdentifier to the base RID so the SDK can find a runtime pack for publishing.
-->
<AppHostRuntimeIdentifier Condition="'$(OutputRID)' != '$(NETCoreSdkRuntimeIdentifier)' and '$(BaseOS)' != '' ">$(BaseOS)</AppHostRuntimeIdentifier>
<UseLocalAppHostPack>true</UseLocalAppHostPack>
<!-- Don't use the local apphost pack on Windows as matching linker configurations is difficult. -->
<UseLocalAppHostPack Condition="'$(TargetOS)' == 'windows'">false</UseLocalAppHostPack>
Expand Down
Loading