Skip to content

[net11.0] R2R-compile only System.Private.CoreLib for Debug CoreCLR arm64 builds#25787

Merged
rolfbjarne merged 1 commit into
net11.0from
dev/rolf/r2r-only-corelib-arm64
Jun 24, 2026
Merged

[net11.0] R2R-compile only System.Private.CoreLib for Debug CoreCLR arm64 builds#25787
rolfbjarne merged 1 commit into
net11.0from
dev/rolf/r2r-only-corelib-arm64

Conversation

@rolfbjarne

@rolfbjarne rolfbjarne commented Jun 23, 2026

Copy link
Copy Markdown
Member

Re-applies the changes from #25583 (which was reverted because it broke x64 builds), but scoped to arm64 RuntimeIdentifiers only.

The PublishReadyToRunCompositeRoots item is now only added when $(RuntimeIdentifier) ends with -arm64, leaving x64 builds unaffected.

🤖 Pull request created by Copilot

@rolfbjarne
[dotnet] R2R-compile only System.Private.CoreLib for Debug CoreCLR ar…
8b56ee1 
…m64 builds

Only apply the PublishReadyToRunCompositeRoots optimization for arm64
RuntimeIdentifiers, since it broke x64 builds.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@rolfbjarne rolfbjarne requested a review from kotlarmilos June 23, 2026 15:36
@rolfbjarne rolfbjarne marked this pull request as ready for review June 23, 2026 15:36
Copilot AI review requested due to automatic review settings June 23, 2026 15:36
Copilot AI reviewed Jun 23, 2026
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR adjusts the custom ReadyToRun (R2R) MSBuild targets in dotnet/macios to re-introduce the “R2R only CoreLib” optimization, but scoped to -arm64 runtime identifiers to avoid re-breaking x64 builds (as happened in #25583).

Changes:

  • Add PublishReadyToRunCompositeRoots for System.Private.CoreLib.dll only when $(RuntimeIdentifier) ends with -arm64.
  • Add a _DedupUnrootedReadyToRunPublish target to remove _ReadyToRunCompositeUnrootedBuildInput items from ResolvedFileToPublish when composite roots are present.

Comment thread dotnet/targets/Microsoft.Sdk.R2R.targets
Comment thread dotnet/targets/Microsoft.Sdk.R2R.targets
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

vs-mobiletools-engineering-service2 commented Jun 23, 2026

Copy link
Copy Markdown
Collaborator

✅ [PR Build #8b56ee1] Build passed (Detect API changes) ✅

Pipeline on Agent
Hash: 8b56ee1f6cea4fbf33dc86ecc6d864f2614584b9 [PR build]

@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

vs-mobiletools-engineering-service2 commented Jun 23, 2026

Copy link
Copy Markdown
Collaborator

✅ [PR Build #8b56ee1] Build passed (Build packages) ✅

Pipeline on Agent
Hash: 8b56ee1f6cea4fbf33dc86ecc6d864f2614584b9 [PR build]

@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

vs-mobiletools-engineering-service2 commented Jun 23, 2026

Copy link
Copy Markdown
Collaborator

✅ API diff for current PR / commit

NET (empty diffs)

✅ API diff vs stable

NET (empty diffs)

ℹ️ Generator diff

Generator Diff: vsdrops (html) vsdrops (raw diff) gist (raw diff) - Please review changes)

Pipeline on Agent
Hash: 8b56ee1f6cea4fbf33dc86ecc6d864f2614584b9 [PR build]

@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

vs-mobiletools-engineering-service2 commented Jun 23, 2026

Copy link
Copy Markdown
Collaborator

✅ [PR Build #8b56ee1] Build passed (Build macOS tests) ✅

Pipeline on Agent
Hash: 8b56ee1f6cea4fbf33dc86ecc6d864f2614584b9 [PR build]

@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@rolfbjarne rolfbjarne enabled auto-merge (squash) June 24, 2026 10:28
@BrzVlad

BrzVlad commented Jun 24, 2026

Copy link
Copy Markdown
Member

@PureWeen This seems to fix the failure from dotnet/maui#35364 (comment)

@vs-mobiletools-engineering-service2

vs-mobiletools-engineering-service2 commented Jun 24, 2026

Copy link
Copy Markdown
Collaborator

🚀 [CI Build #8b56ee1] Test results 🚀

Test results

✅ All tests passed on VSTS: test results.

🎉 All 280 tests passed 🎉

Tests counts

✅ assembly-processing: All 1 tests passed. Html Report (VSDrops) Download
✅ cecil: All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (iOS): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (MacCatalyst): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (macOS): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (Multiple platforms): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (tvOS): All 1 tests passed. Html Report (VSDrops) Download
✅ framework: All 2 tests passed. Html Report (VSDrops) Download
✅ fsharp: All 4 tests passed. Html Report (VSDrops) Download
✅ generator: All 5 tests passed. Html Report (VSDrops) Download
✅ interdependent-binding-projects: All 4 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ introspection: All 9 tests passed. Html Report (VSDrops) Download
✅ linker (iOS): All 31 tests passed. Html Report (VSDrops) Download
✅ linker (MacCatalyst): All 31 tests passed. Html Report (VSDrops) Download
✅ linker (macOS): All 21 tests passed. Html Report (VSDrops) Download
✅ linker (tvOS): All 31 tests passed. Html Report (VSDrops) Download
✅ monotouch (iOS): All 27 tests passed. Html Report (VSDrops) Download
✅ monotouch (MacCatalyst): All 31 tests passed. Html Report (VSDrops) Download
✅ monotouch (macOS): All 24 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ monotouch (tvOS): All 27 tests passed. Html Report (VSDrops) Download
✅ msbuild: All 2 tests passed. Html Report (VSDrops) Download
✅ sharpie: All 1 tests passed. Html Report (VSDrops) Download
✅ windows: All 3 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ xcframework: All 4 tests passed. Html Report (VSDrops) Download
✅ xtro: All 1 tests passed. Html Report (VSDrops) Download

macOS tests

✅ Tests on macOS Sonoma (14): All 5 tests passed. Html Report (VSDrops) Download
✅ Tests on macOS Sequoia (15): All 5 tests passed. Html Report (VSDrops) Download
✅ Tests on macOS Tahoe (26): All 5 tests passed. [attempt 2] Html Report (VSDrops) Download

Linux Build Verification

✅ Linux build succeeded

Pipeline on Agent
Hash: 8b56ee1f6cea4fbf33dc86ecc6d864f2614584b9 [PR build]

@rolfbjarne rolfbjarne merged commit be77eb7 into net11.0 Jun 24, 2026
55 checks passed
@rolfbjarne rolfbjarne deleted the dev/rolf/r2r-only-corelib-arm64 branch June 24, 2026 11:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

@dalexsoto dalexsoto dalexsoto approved these changes

@kotlarmilos kotlarmilos Awaiting requested review from kotlarmilos

+1 more reviewer

@davidnguyen-tech davidnguyen-tech davidnguyen-tech approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

copilot

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@rolfbjarne @vs-mobiletools-engineering-service2 @BrzVlad @dalexsoto @davidnguyen-tech