[dotnet] Remove obsolete R2R output path workaround. Fixes #25721. - #26489
[dotnet] Remove obsolete R2R output path workaround. Fixes #25721.#26489rolfbjarne wants to merge 1 commit into
Conversation
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
There was a problem hiding this comment.
Pull request overview
This PR aims to remove an obsolete MSBuild workaround related to ReadyToRun (R2R) publishing by no longer rewriting _ReadyToRunFilesToPublish item paths to strip directory components, addressing #25721.
Changes:
- Removes the
_ReadyToRunFilesToPublish“path stripping” rewrite from the customMicrosoft.Sdk.R2R.targetstarget. - Leaves the remaining
_FixR2ROutputPathslogic in place for non-composite builds (settingOutputR2RImagemetadata).
💡 Add a code-review agent skill for context-aware, tailored reviews. Learn more in the docs.
| <!-- Workaround for https://github.com/dotnet/runtime/issues/79902 --> | ||
| <Target Name="_FixR2ROutputPaths" AfterTargets="_PrepareForReadyToRunCompilation"> | ||
| <ItemGroup> | ||
| <_ReadyToRunFilesToPublishFixed Include="@(_ReadyToRunFilesToPublish->'$(_ReadyToRunOutputPath)/%(Filename)%(Extension)')" /> | ||
| <_ReadyToRunFilesToPublish Remove="@(_ReadyToRunFilesToPublish)" /> | ||
| <_ReadyToRunFilesToPublish Include="@(_ReadyToRunFilesToPublishFixed)" /> | ||
| </ItemGroup> | ||
| <ItemGroup Condition="'$(PublishReadyToRunComposite)' != 'true'"> | ||
| <_ReadyToRunCompileListFixed Include="@(_ReadyToRunCompileList)" OutputR2RImage="$(_ReadyToRunOutputPath)/%(Filename)%(Extension)" /> |
| @@ -5,11 +5,6 @@ | |||
|
|
|||
| <!-- Workaround for https://github.com/dotnet/runtime/issues/79902 --> | |||
✅ API diff for current PR / commitNET (empty diffs)✅ API diff vs stableNET (empty diffs)ℹ️ Generator diffGenerator Diff: vsdrops (html) vsdrops (raw diff) gist (raw diff) - Please review changes) Pipeline on Agent |
🔥 [CI Build #fe60e0f] Test results 🔥Test results❌ Tests failed on VSTS: test results 0 tests crashed, 1 tests failed, 259 tests passed. Failures❌ dotnettests tests (macOS)1 tests failed, 0 tests passed.Failed tests
Html Report (VSDrops) Download Successes✅ assembly-processing: All 1 tests passed. Html Report (VSDrops) Download macOS tests✅ Tests on macOS Sonoma (14): All 5 tests passed. Html Report (VSDrops) Download Linux Build VerificationPipeline on Agent |
[dotnet] Remove obsolete R2R output path workaround. Fixes #25721.
Remove the workaround for dotnet/runtime#79902 that rewrote
_ReadyToRunFilesToPublishpaths to strip directory components.Fixes #25721.
🤖 Pull request created by Copilot