Skip to content

Revert "[manual] Merge release/9.0-staging into release/9.0" #124313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rbhanda merged 1 commit into from
Feb 12, 2026
Merged

Revert "[manual] Merge release/9.0-staging into release/9.0" #124313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "11.0.0-prerelease.26064.3",
"version": "9.0.0-prerelease.25615.2",
"commands": [
"xharness"
]
Expand Down
2 changes: 1 addition & 1 deletion eng/common/core-templates/job/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
demands: ImageOverride -equals build.ubuntu.2004.amd64
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
image: 1es-azurelinux-3
image: Azure-Linux-3-Amd64
os: linux
${{ else }}:
pool:
Expand Down
12 changes: 6 additions & 6 deletions eng/pipelines/coreclr/templates/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ jobs:

# iOS devices
- ${{ if in(parameters.platform, 'ios_arm64') }}:
- OSX.15.Amd64.Iphone.Open
- OSX.13.Amd64.Iphone.Open

# tvOS devices
- ${{ if in(parameters.platform, 'tvos_arm64') }}:
- OSX.15.Amd64.AppleTV.Open
- OSX.13.Amd64.AppleTV.Open
Copy link

Copilot AI Feb 12, 2026

Choose a reason for hiding this comment

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

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).

Suggested change
- OSX.13.Amd64.AppleTV.Open
- OSX.13.Amd64.AppleTV.Open

Copilot uses AI. Check for mistakes.

# Linux arm
- ${{ if eq(parameters.platform, 'linux_arm') }}:
Expand Down Expand Up @@ -105,16 +105,16 @@ jobs:
# OSX arm64
- ${{ if eq(parameters.platform, 'osx_arm64') }}:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- OSX.15.ARM64.Open
- OSX.13.ARM64.Open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- OSX.15.ARM64
- OSX.13.ARM64

# OSX x64
- ${{ if eq(parameters.platform, 'osx_x64') }}:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- OSX.15.Amd64.Open
- OSX.13.Amd64.Open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- OSX.15.Amd64
- OSX.13.Amd64

# windows x64
- ${{ if eq(parameters.platform, 'windows_x64') }}:
Expand Down
8 changes: 4 additions & 4 deletions eng/pipelines/libraries/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@ jobs:

# OSX arm64
- ${{ if eq(parameters.platform, 'osx_arm64') }}:
- OSX.15.ARM64.Open
- OSX.13.ARM64.Open

# OSX x64
- ${{ if eq(parameters.platform, 'osx_x64') }}:
- OSX.15.Amd64.Open
- OSX.13.Amd64.Open

# Android
- ${{ if in(parameters.platform, 'android_x86', 'android_x64', 'linux_bionic_x64') }}:
Expand All @@ -95,11 +95,11 @@ jobs:

# iOS devices
- ${{ if in(parameters.platform, 'ios_arm64') }}:
- OSX.15.Amd64.Iphone.Open
- OSX.13.Amd64.Iphone.Open

# tvOS devices
- ${{ if in(parameters.platform, 'tvos_arm64') }}:
- OSX.15.Amd64.AppleTV.Open
- OSX.13.Amd64.AppleTV.Open

# windows x64
- ${{ if eq(parameters.platform, 'windows_x64') }}:
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/scripts/superpmi_collect_setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ def main(main_args):
else:
helix_queue = "Ubuntu.2204.Amd64"
elif platform_name == "osx":
helix_queue = "OSX.15.ARM64" if arch == "arm64" else "OSX.15.Amd64"
helix_queue = "OSX.13.ARM64" if arch == "arm64" else "OSX.13.Amd64"

# Copy the superpmi scripts

Expand Down
2 changes: 1 addition & 1 deletion src/tests/Interop/COM/ComWrappers/API/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1121,7 +1121,7 @@ CustomQueryInterfaceResult ICustomQueryInterface.GetInterface(ref Guid iid, out
}
}

return CustomQueryInterfaceResult.NotHandled;
return CustomQueryInterfaceResult.Failed;
Copy link

Copilot AI Feb 12, 2026

Choose a reason for hiding this comment

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

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.

Suggested change
return CustomQueryInterfaceResult.Failed;
return CustomQueryInterfaceResult.NotHandled;

Copilot uses AI. Check for mistakes.
}
}
}
Expand Down
Loading