Skip to content

Commit 0308abf

Browse files
CopilotEgorBo
authored and
eiriktsarpalis
committed
Revert dotnet-optimization dependency update from #129405 (#129706)
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>
1 parent 0a1f4fc commit 0308abf

2 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎eng/Version.Details.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,12 @@ This file should be imported by eng/Versions.props
9090
<runtimewinarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>11.0.0-alpha.1.26303.1</runtimewinarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
9191
<runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>11.0.0-alpha.1.26303.1</runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
9292
<!-- dotnet-optimization dependencies -->
93-
<optimizationlinuxarm64MIBCRuntimePackageVersion>1.0.0-prerelease.26317.1</optimizationlinuxarm64MIBCRuntimePackageVersion>
94-
<optimizationlinuxx64MIBCRuntimePackageVersion>1.0.0-prerelease.26317.1</optimizationlinuxx64MIBCRuntimePackageVersion>
95-
<optimizationPGOCoreCLRPackageVersion>1.0.0-prerelease.26317.1</optimizationPGOCoreCLRPackageVersion>
96-
<optimizationwindows_ntarm64MIBCRuntimePackageVersion>1.0.0-prerelease.26317.1</optimizationwindows_ntarm64MIBCRuntimePackageVersion>
97-
<optimizationwindows_ntx64MIBCRuntimePackageVersion>1.0.0-prerelease.26317.1</optimizationwindows_ntx64MIBCRuntimePackageVersion>
98-
<optimizationwindows_ntx86MIBCRuntimePackageVersion>1.0.0-prerelease.26317.1</optimizationwindows_ntx86MIBCRuntimePackageVersion>
93+
<optimizationlinuxarm64MIBCRuntimePackageVersion>1.0.0-prerelease.26276.2</optimizationlinuxarm64MIBCRuntimePackageVersion>
94+
<optimizationlinuxx64MIBCRuntimePackageVersion>1.0.0-prerelease.26276.2</optimizationlinuxx64MIBCRuntimePackageVersion>
95+
<optimizationPGOCoreCLRPackageVersion>1.0.0-prerelease.26276.2</optimizationPGOCoreCLRPackageVersion>
96+
<optimizationwindows_ntarm64MIBCRuntimePackageVersion>1.0.0-prerelease.26276.2</optimizationwindows_ntarm64MIBCRuntimePackageVersion>
97+
<optimizationwindows_ntx64MIBCRuntimePackageVersion>1.0.0-prerelease.26276.2</optimizationwindows_ntx64MIBCRuntimePackageVersion>
98+
<optimizationwindows_ntx86MIBCRuntimePackageVersion>1.0.0-prerelease.26276.2</optimizationwindows_ntx86MIBCRuntimePackageVersion>
9999
<!-- dotnet-runtime-assets dependencies -->
100100
<MicrosoftDotNetCilStripSourcesPackageVersion>11.0.0-beta.26309.3</MicrosoftDotNetCilStripSourcesPackageVersion>
101101
<MicrosoftDotnetFuzzingTestDataPackageVersion>11.0.0-beta.26309.3</MicrosoftDotnetFuzzingTestDataPackageVersion>

‎eng/Version.Details.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -303,21 +303,21 @@
303303
<Uri>https://github.com/dotnet/dotnet</Uri>
304304
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
305305
</Dependency>
306-
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.26317.1">
306+
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.26276.2">
307307
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
308-
<Sha>4c45d9931b393b94ee8ae20e20ced71a02317e19</Sha>
308+
<Sha>66482c2bec0351f496e4cc18d98f0f55f78b0c78</Sha>
309309
</Dependency>
310-
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.26317.1">
310+
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.26276.2">
311311
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
312-
<Sha>4c45d9931b393b94ee8ae20e20ced71a02317e19</Sha>
312+
<Sha>66482c2bec0351f496e4cc18d98f0f55f78b0c78</Sha>
313313
</Dependency>
314-
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.26317.1">
314+
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.26276.2">
315315
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
316-
<Sha>4c45d9931b393b94ee8ae20e20ced71a02317e19</Sha>
316+
<Sha>66482c2bec0351f496e4cc18d98f0f55f78b0c78</Sha>
317317
</Dependency>
318-
<Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.26317.1">
318+
<Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.26276.2">
319319
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
320-
<Sha>4c45d9931b393b94ee8ae20e20ced71a02317e19</Sha>
320+
<Sha>66482c2bec0351f496e4cc18d98f0f55f78b0c78</Sha>
321321
</Dependency>
322322
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="11.0.0-alpha.0.26180.1">
323323
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
@@ -355,13 +355,13 @@
355355
<Uri>https://github.com/dotnet/dotnet</Uri>
356356
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
357357
</Dependency>
358-
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.26317.1">
358+
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.26276.2">
359359
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
360-
<Sha>4c45d9931b393b94ee8ae20e20ced71a02317e19</Sha>
360+
<Sha>66482c2bec0351f496e4cc18d98f0f55f78b0c78</Sha>
361361
</Dependency>
362-
<Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.26317.1">
362+
<Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.26276.2">
363363
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
364-
<Sha>4c45d9931b393b94ee8ae20e20ced71a02317e19</Sha>
364+
<Sha>66482c2bec0351f496e4cc18d98f0f55f78b0c78</Sha>
365365
</Dependency>
366366
<!-- Necessary for source-build. This allows the package to be retrieved from previously-source-built artifacts
367367
and flow in as dependencies of the packages produced by runtime. -->

0 commit comments

Comments
 (0)