Skip to content

Adjust non-portable RID handling for tool packs to handle cross builds between non-portable RIDs#2140

Merged
jkoritzinsky merged 3 commits intodotnet:release/10.0.1xxfrom
jkoritzinsky:sb-cross-non-portable-rid
Aug 28, 2025
Merged

Adjust non-portable RID handling for tool packs to handle cross builds between non-portable RIDs#2140
jkoritzinsky merged 3 commits intodotnet:release/10.0.1xxfrom
jkoritzinsky:sb-cross-non-portable-rid

Conversation

@jkoritzinsky
Copy link
Copy Markdown
Member

@jkoritzinsky jkoritzinsky commented Aug 26, 2025 •
edited
Loading

Try using the non-portable cg2/ilc when targeting any non-portable RID, not just the non-portable RID matching the SDK RID.

Fixes dotnet/source-build#5225

@jkoritzinsky
Try using the non-portable cg2/ilc when targeting any non-portable RI…
210a434 
…D, not just the non-portable RID matching the SDK RID.
@jkoritzinsky jkoritzinsky marked this pull request as ready for review August 26, 2025 23:44
@jkoritzinsky
Copy link
Copy Markdown
Member Author

jkoritzinsky commented Aug 26, 2025

Validated the new experience:

  1. Building a SB SDK for the same RID as the bootstrapping SB SDK will use the "live" crossgen2 as it does today.
  2. Building a SB SDK for a different RID as the bootstrapping SB SDK will try to use the portable crossgen2 when CG2 is not bundled with the bootstrapping SDK (and as such won't work offline only).
  3. When CG2 is bundled in the bootstrapping SB SDK, it will be used when building the new SB SDK for the new non-portable RID (matching the rules in the linked issue).

@jkoritzinsky jkoritzinsky requested a review from a team August 26, 2025 23:48
@jkoritzinsky
Copy link
Copy Markdown
Member Author

jkoritzinsky commented Aug 26, 2025

cc: @tmds please review and validate

@jkoritzinsky
Copy link
Copy Markdown
Member Author

jkoritzinsky commented Aug 28, 2025

/backport to main

@jkoritzinsky jkoritzinsky merged commit a565415 into dotnet:release/10.0.1xx Aug 28, 2025
10 checks passed
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Aug 28, 2025

Started backporting to main: https://github.com/dotnet/dotnet/actions/runs/17305105348

@jkoritzinsky jkoritzinsky deleted the sb-cross-non-portable-rid branch August 28, 2025 18:50
@jkoritzinsky jkoritzinsky restored the sb-cross-non-portable-rid branch August 28, 2025 18:50
@github-actions github-actions bot mentioned this pull request Aug 28, 2025
Merged
@tmds tmds mentioned this pull request Sep 10, 2025
Closed
@nagilson nagilson mentioned this pull request Sep 30, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mthalman mthalman mthalman approved these changes

+1 more reviewer

@tmds tmds tmds left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

.NET Unified Build
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jkoritzinsky @tmds @mthalman @nagilson