Skip to content

Revert dotnet-optimization dependency update from #129405 - #129706

Merged
AndyAyersMS merged 3 commits into
mainfrom
copilot/fix-build-failure-windows
Jun 23, 2026
Merged

Revert dotnet-optimization dependency update from #129405#129706
AndyAyersMS merged 3 commits into
mainfrom
copilot/fix-build-failure-windows

Conversation

CopilotAI commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

The windows-x86 release CoreCLR_Libraries build failed in the MergeMibcFiles target of src/coreclr/crossgen-corelib.proj with MSB3077. dotnet-pgo merge printed a non-fatal "Attempting to merge MIBCs collected on different RIDs: Windows-x86 != Windows-x64" message (restored optimization data mixes mibc files whose embedded RID metadata differs) and still exited 0, but MSBuild's Exec task scanned the output, treated that line as an error, and failed the build.

The regression was traced to the dotnet-optimization package update in #129405 (MIBC/PGO packages bumped from 1.0.0-prerelease.26276.2 to 1.0.0-prerelease.26317.1). Rather than masking the symptom, this PR reverts that dependency update so the underlying package change can be investigated separately.

Change

  • eng/Version.Details.props and eng/Version.Details.xml — reverted the dotnet-optimization MIBC/PGO dependencies from 1.0.0-prerelease.26317.1 back to 1.0.0-prerelease.26276.2 (and the corresponding SHA 4c45d9931b393b94ee8ae20e20ced71a02317e19 back to 66482c2bec0351f496e4cc18d98f0f55f78b0c78), undoing [main] Update dependencies from dnceng/internal/dotnet-optimization #129405.
  • src/coreclr/crossgen-corelib.proj — restored to its original <Exec Command="$(DotNetPgoCmd)" />, dropping the earlier IgnoreStandardErrorWarningFormat="true" workaround.

Notes

  • These are dependency-version metadata changes only, so no build/test run was required.

CopilotAI requested review from Copilot and removed request for CopilotJune 22, 2026 18:34
… fail build
Co-authored-by: EgorBo <523221+EgorBo@users.noreply.github.com>
CopilotAI requested review from Copilot and removed request for CopilotJune 22, 2026 18:48
CopilotAI changed the title [WIP] Fix build failure due to merging MIBCs on different RIDsFix build failure when merging MIBCs collected on different RIDsJun 22, 2026
CopilotAI requested a review from EgorBoJune 22, 2026 18:49
@github-actionsgithub-actionsBot added the area-Infrastructure-coreclr Only use for closed issues label Jun 22, 2026
@EgorBo

EgorBo commented Jun 22, 2026

Copy link
Copy Markdown
Member

Seems like it was regressed via #129405, the proposed fix in this PR just masks it out (although, generally it should be fine to use MIBC from any RID on any RID so the fix seems to be fine to me), but we probably need to figure out what happened to dotnet-optimization package.

@EgorBo

Copy link
Copy Markdown
Member

@copilot please revert #129405 instead

…3077
Co-authored-by: EgorBo <523221+EgorBo@users.noreply.github.com>
CopilotAI requested review from Copilot and removed request for CopilotJune 22, 2026 19:22

CopilotAI commented Jun 22, 2026

Copy link
Copy Markdown
ContributorAuthor

@copilot please revert #129405 instead

Done. Reverted the dotnet-optimization dependency bump from #129405 (1.0.0-prerelease.26317.11.0.0-prerelease.26276.2) in eng/Version.Details.props and eng/Version.Details.xml, and restored src/coreclr/crossgen-corelib.proj to its original Exec (dropping the IgnoreStandardErrorWarningFormat workaround).

Note

This response was generated by AI/Copilot.

CopilotAI changed the title Fix build failure when merging MIBCs collected on different RIDsRevert dotnet-optimization dependency update from #129405Jun 22, 2026
@EgorBo
EgorBo marked this pull request as ready for review June 22, 2026 19:22
CopilotAI review requested due to automatic review settings June 22, 2026 19:23
CopilotAI requested a review from EgorBoJune 22, 2026 19:23

CopilotAI 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 reverts a recent dotnet-optimization dependency bump by restoring the prior MIBC/PGO package versions and SHAs, aiming to return the repo to a previously working state while the underlying regression in the newer packages is investigated separately.

Changes:

  • Revert optimization.*.MIBC.Runtime and optimization.PGO.CoreCLR versions from 1.0.0-prerelease.26317.1 back to 1.0.0-prerelease.26276.2 (including the corresponding commit SHA rollback).
  • Restore src/coreclr/crossgen-corelib.proj’s MergeMibcFilesExec invocation to the original form (no IgnoreStandardErrorWarningFormat workaround).

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

FileDescription
eng/Version.Details.propsRolls back dotnet-optimization package version properties to the prior prerelease version.
eng/Version.Details.xmlRolls back the recorded dependency versions and SHAs for the dotnet-optimization inputs (MIBC + PGO).
src/coreclr/crossgen-corelib.projRestores the original dotnet-pgo mergeExec configuration in MergeMibcFiles.

@EgorBo

Copy link
Copy Markdown
Member

PTAL @dotnet/jit-contrib a revert to unblock CI, see #129705

@AndyAyersMS

Copy link
Copy Markdown
Member

/ba-g wasm tests timeout

@AndyAyersMS
AndyAyersMS merged commit b308edd into mainJun 23, 2026
168 of 171 checks passed
@AndyAyersMS
AndyAyersMS deleted the copilot/fix-build-failure-windows branch June 23, 2026 00:56
@dotnet-milestone-botdotnet-milestone-botBot added this to the 11.0-preview6 milestone Jun 23, 2026
eiriktsarpalis pushed a commit that referenced this pull request Jul 15, 2026
The `windows-x86 release CoreCLR_Libraries` build failed in the
`MergeMibcFiles` target of `src/coreclr/crossgen-corelib.proj` with
`MSB3077`. `dotnet-pgo merge` printed a non-fatal "Attempting to merge
MIBCs collected on different RIDs: Windows-x86 != Windows-x64" message
(restored optimization data mixes mibc files whose embedded RID metadata
differs) and still exited 0, but MSBuild's `Exec` task scanned the
output, treated that line as an error, and failed the build.
The regression was traced to the dotnet-optimization package update in
#129405 (MIBC/PGO packages bumped from `1.0.0-prerelease.26276.2` to
`1.0.0-prerelease.26317.1`). Rather than masking the symptom, this PR
reverts that dependency update so the underlying package change can be
investigated separately.
### Change
- **`eng/Version.Details.props`** and **`eng/Version.Details.xml`** —
reverted the dotnet-optimization MIBC/PGO dependencies from
`1.0.0-prerelease.26317.1` back to `1.0.0-prerelease.26276.2` (and the
corresponding SHA `4c45d9931b393b94ee8ae20e20ced71a02317e19` back to
`66482c2bec0351f496e4cc18d98f0f55f78b0c78`), undoing #129405.
- **`src/coreclr/crossgen-corelib.proj`** — restored to its original
`<Exec Command="$(DotNetPgoCmd)" />`, dropping the earlier
`IgnoreStandardErrorWarningFormat="true"` workaround.
### Notes
- These are dependency-version metadata changes only, so no build/test
run was required.
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: EgorBo <523221+EgorBo@users.noreply.github.com>
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jul 24, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-Infrastructure-coreclrOnly use for closed issues

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

4 participants

@EgorBo@AndyAyersMS