Revert "[manual] Merge release/9.0-staging into release/9.0" #124313
Conversation
This reverts commit cbb9e77.
github-actions
bot
added
the
needs-area-label
There was a problem hiding this comment.
Pull request overview
This PR reverts changes introduced by #124305 (a manual merge from release/9.0-staging into release/9.0), restoring prior test behavior and build/pipeline configuration for the release branch.
Changes:
- Reverts COM interop test behavior in
ComWrappersAPI tests. - Reverts Helix macOS queue selection (OSX 15 → OSX 13) across CoreCLR scripts and pipeline templates.
- Reverts source-build agent image and the pinned
xharnessdotnet tool version.
Reviewed changes
Copilot reviewed 5 out of 6 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| src/tests/Interop/COM/ComWrappers/API/Program.cs | Adjusts ICustomQueryInterface.GetInterface result handling in a COM apartment deadlock regression test. |
| src/coreclr/scripts/superpmi_collect_setup.py | Reverts macOS Helix queue selection for SuperPMI collection to OSX 13. |
| eng/pipelines/libraries/helix-queues-setup.yml | Reverts macOS Helix queue names for libraries jobs to OSX 13. |
| eng/pipelines/coreclr/templates/helix-queues-setup.yml | Reverts macOS Helix queue names for CoreCLR jobs to OSX 13. |
| eng/common/core-templates/job/source-build.yml | Reverts internal 1ES pool image selection to Azure-Linux-3-Amd64. |
| .config/dotnet-tools.json | Reverts microsoft.dotnet.xharness.cli version pin to a 9.0 prerelease. |
| } | ||
|
|
||
| return CustomQueryInterfaceResult.NotHandled; | ||
| return CustomQueryInterfaceResult.Failed; |
There was a problem hiding this comment.
ICustomQueryInterface.GetInterface now always returns CustomQueryInterfaceResult.Failed, which forces QueryInterface to fail rather than letting the runtime handle the request (e.g., for IID_IUnknown). In this test that can cause COM APIs like RoGetAgileReference/marshalling to fail unexpectedly. Consider returning NotHandled (or returning Failed only for specific iids you intend to reject) so default COM interface handling can proceed.
| return CustomQueryInterfaceResult.Failed; | |
| return CustomQueryInterfaceResult.NotHandled; |
| # tvOS devices | ||
| - ${{ if in(parameters.platform, 'tvos_arm64') }}: | ||
| - OSX.15.Amd64.AppleTV.Open | ||
| - OSX.13.Amd64.AppleTV.Open |
There was a problem hiding this comment.
The tvos_arm64 helix queue entry is indented differently than the surrounding helixQueues items, which makes the YAML harder to read and increases the risk of future indentation-related mistakes. Align the indentation of the - OSX.13.Amd64.AppleTV.Open line with the other queue entries under similar conditional blocks (e.g., the ios_arm64 block).
| - OSX.13.Amd64.AppleTV.Open | |
| - OSX.13.Amd64.AppleTV.Open |
2 participants
Reverts #124305