Merge commit 'c2c9c8ba9a6bcf174b6d5ae156ef182f127227d7'

Author: Mirroring

.config/dotnet-tools.json

@@ -15,7 +15,7 @@
       ]
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "9.0.0-prerelease.25615.2",
+      "version": "11.0.0-prerelease.26064.3",
       "commands": [
         "xharness"
       ]

eng/common/core-templates/job/source-build.yml

@@ -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: Azure-Linux-3-Amd64
+          image: 1es-azurelinux-3
           os: linux
     ${{ else }}:
       pool:

eng/pipelines/coreclr/templates/helix-queues-setup.yml

@@ -54,11 +54,11 @@ jobs:
 
     # iOS devices
     - ${{ if in(parameters.platform, 'ios_arm64') }}:
-      - OSX.13.Amd64.Iphone.Open
+      - OSX.15.Amd64.Iphone.Open
 
     # tvOS devices
     - ${{ if in(parameters.platform, 'tvos_arm64') }}:
-        - OSX.13.Amd64.AppleTV.Open
+        - OSX.15.Amd64.AppleTV.Open
 
     # Linux arm
     - ${{ if eq(parameters.platform, 'linux_arm') }}:
@@ -105,16 +105,16 @@ jobs:
     # OSX arm64
     - ${{ if eq(parameters.platform, 'osx_arm64') }}:
       - ${{ if eq(variables['System.TeamProject'], 'public') }}:
-        - OSX.13.ARM64.Open
+        - OSX.15.ARM64.Open
       - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-        - OSX.13.ARM64
+        - OSX.15.ARM64
 
     # OSX x64
     - ${{ if eq(parameters.platform, 'osx_x64') }}:
       - ${{ if eq(variables['System.TeamProject'], 'public') }}:
-        - OSX.13.Amd64.Open
+        - OSX.15.Amd64.Open
       - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-        - OSX.13.Amd64
+        - OSX.15.Amd64
 
     # windows x64
     - ${{ if eq(parameters.platform, 'windows_x64') }}:

eng/pipelines/libraries/helix-queues-setup.yml

@@ -73,11 +73,11 @@ jobs:
 
     # OSX arm64
     - ${{ if eq(parameters.platform, 'osx_arm64') }}:
-      - OSX.13.ARM64.Open
+      - OSX.15.ARM64.Open
 
     # OSX x64
     - ${{ if eq(parameters.platform, 'osx_x64') }}:
-      - OSX.13.Amd64.Open
+      - OSX.15.Amd64.Open
 
     # Android
     - ${{ if in(parameters.platform, 'android_x86', 'android_x64', 'linux_bionic_x64') }}:
@@ -95,11 +95,11 @@ jobs:
 
     # iOS devices
     - ${{ if in(parameters.platform, 'ios_arm64') }}:
-      - OSX.13.Amd64.Iphone.Open
+      - OSX.15.Amd64.Iphone.Open
 
     # tvOS devices
     - ${{ if in(parameters.platform, 'tvos_arm64') }}:
-      - OSX.13.Amd64.AppleTV.Open
+      - OSX.15.Amd64.AppleTV.Open
 
     # windows x64
     - ${{ if eq(parameters.platform, 'windows_x64') }}:

src/coreclr/scripts/superpmi_collect_setup.py

@@ -465,7 +465,7 @@ def main(main_args):
         else:
             helix_queue = "Ubuntu.2204.Amd64"
     elif platform_name == "osx":
-        helix_queue = "OSX.13.ARM64" if arch == "arm64" else "OSX.13.Amd64"
+        helix_queue = "OSX.15.ARM64" if arch == "arm64" else "OSX.15.Amd64"
 
     # Copy the superpmi scripts
 

src/tests/Interop/COM/ComWrappers/API/Program.cs

@@ -1121,7 +1121,7 @@ CustomQueryInterfaceResult ICustomQueryInterface.GetInterface(ref Guid iid, out
                     }
                 }
 
-                return CustomQueryInterfaceResult.Failed;
+                return CustomQueryInterfaceResult.NotHandled;
             }
         }
     }