diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 8bfe2b1d047a4c..d3371222d3daf5 100644 --- a/.config/dotnet-tools.json +++ b/.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" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d8e72889f59ac..f2efa0478fa0f9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - cda39b50d316241f6c9dea44ed241a83aaccdfac + 32e742710dcc5086fa6aaef7061bb25911b05d28 https://github.com/dotnet/msquic @@ -54,14 +54,14 @@ 803d8598f98fb4efd94604b32627ee9407f246db - + https://github.com/dotnet/cecil - 1f9985e482df7a0dee94854226d0aecad102ac15 + 711eabb98b62ab3ddf6ab59c879713cd6e4f5982 - + https://github.com/dotnet/cecil - 1f9985e482df7a0dee94854226d0aecad102ac15 + 711eabb98b62ab3ddf6ab59c879713cd6e4f5982 @@ -79,9 +79,9 @@ - + https://github.com/dotnet/source-build-reference-packages - a9cadb09ddcc99b1e535efb0648047634f0c4f40 + 36e2d072b287fb211f288498b2d4553efdee7990 @@ -174,57 +174,57 @@ https://github.com/dotnet/arcade 9b9436a55a49bd58acb8ae95a57ad2185da26805 - + https://github.com/dotnet/runtime-assets - 70d5fa7d7d041da17e6f3827f55d7d9ceaffdb12 + 45c55b97e4006bac84d19a382ace44ef3dcb8d94 - + https://github.com/dotnet/runtime-assets - 70d5fa7d7d041da17e6f3827f55d7d9ceaffdb12 + 45c55b97e4006bac84d19a382ace44ef3dcb8d94 - + https://github.com/dotnet/runtime-assets - 70d5fa7d7d041da17e6f3827f55d7d9ceaffdb12 + 45c55b97e4006bac84d19a382ace44ef3dcb8d94 - + https://github.com/dotnet/runtime-assets - 70d5fa7d7d041da17e6f3827f55d7d9ceaffdb12 + 45c55b97e4006bac84d19a382ace44ef3dcb8d94 - + https://github.com/dotnet/runtime-assets - 70d5fa7d7d041da17e6f3827f55d7d9ceaffdb12 + 45c55b97e4006bac84d19a382ace44ef3dcb8d94 - + https://github.com/dotnet/runtime-assets - 70d5fa7d7d041da17e6f3827f55d7d9ceaffdb12 + 45c55b97e4006bac84d19a382ace44ef3dcb8d94 - + https://github.com/dotnet/runtime-assets - 70d5fa7d7d041da17e6f3827f55d7d9ceaffdb12 + 45c55b97e4006bac84d19a382ace44ef3dcb8d94 - + https://github.com/dotnet/runtime-assets - 70d5fa7d7d041da17e6f3827f55d7d9ceaffdb12 + 45c55b97e4006bac84d19a382ace44ef3dcb8d94 - + https://github.com/dotnet/runtime-assets - 70d5fa7d7d041da17e6f3827f55d7d9ceaffdb12 + 45c55b97e4006bac84d19a382ace44ef3dcb8d94 - + https://github.com/dotnet/runtime-assets - 70d5fa7d7d041da17e6f3827f55d7d9ceaffdb12 + 45c55b97e4006bac84d19a382ace44ef3dcb8d94 - + https://github.com/dotnet/runtime-assets - 70d5fa7d7d041da17e6f3827f55d7d9ceaffdb12 + 45c55b97e4006bac84d19a382ace44ef3dcb8d94 - + https://github.com/dotnet/runtime-assets - 70d5fa7d7d041da17e6f3827f55d7d9ceaffdb12 + 45c55b97e4006bac84d19a382ace44ef3dcb8d94 - + https://github.com/dotnet/runtime-assets - 70d5fa7d7d041da17e6f3827f55d7d9ceaffdb12 + 45c55b97e4006bac84d19a382ace44ef3dcb8d94 https://github.com/dotnet/llvm-project @@ -352,13 +352,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization 9d7532585ce71e30ab55f0364d3cecccaf0775d1 - + https://github.com/dotnet/hotreload-utils - 6eb504148b667c521f41d18dca072f1d2d8eae07 + 3f4893bee30a42b1041149c9b50b7a49224fcb68 - + https://github.com/dotnet/runtime-assets - 70d5fa7d7d041da17e6f3827f55d7d9ceaffdb12 + 45c55b97e4006bac84d19a382ace44ef3dcb8d94 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 045ad89db20dc9..d2c5c2ee96e0aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -146,20 +146,20 @@ 8.0.0 4.5.4 - 9.0.0-beta.25625.4 - 9.0.0-beta.25625.4 - 9.0.0-beta.25625.4 - 9.0.0-beta.25625.4 - 9.0.0-beta.25625.4 - 9.0.0-beta.25625.4 - 9.0.0-beta.25625.4 - 9.0.0-beta.25625.4 - 9.0.0-beta.25625.4 - 9.0.0-beta.25625.4 - 9.0.0-beta.25625.4 - 9.0.0-beta.25625.4 - 9.0.0-beta.25625.4 - 9.0.0-beta.25625.4 + 9.0.0-beta.26071.2 + 9.0.0-beta.26071.2 + 9.0.0-beta.26071.2 + 9.0.0-beta.26071.2 + 9.0.0-beta.26071.2 + 9.0.0-beta.26071.2 + 9.0.0-beta.26071.2 + 9.0.0-beta.26071.2 + 9.0.0-beta.26071.2 + 9.0.0-beta.26071.2 + 9.0.0-beta.26071.2 + 9.0.0-beta.26071.2 + 9.0.0-beta.26071.2 + 9.0.0-beta.26071.2 1.0.0-prerelease.24462.2 1.0.0-prerelease.24462.2 @@ -194,7 +194,7 @@ 9.0.0-prerelease.25615.2 9.0.0-prerelease.25615.2 - 9.0.0-alpha.0.25625.4 + 9.0.0-alpha.0.26104.3 3.12.0 4.5.0 6.0.0 @@ -222,14 +222,13 @@ 9.0.0-preview-20241010.1 - 0.11.5-alpha.25628.2 + 0.11.5-alpha.26075.3 9.0.0-rtm.24511.16 - 9.0.0-rtm.25627.1 - 9.0.0-rtm.24466.4 + 9.0.0-rtm.26119.1 - 2.4.8 + 2.4.16 19.1.0-alpha.1.26071.2 19.1.0-alpha.1.26071.2 diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index 0e5458e1f46cd5..1037ccedcb556c 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/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: diff --git a/eng/pipelines/coreclr/templates/helix-queues-setup.yml b/eng/pipelines/coreclr/templates/helix-queues-setup.yml index 402275a132e24f..d345553843d941 100644 --- a/eng/pipelines/coreclr/templates/helix-queues-setup.yml +++ b/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') }}: diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index 6bb27678d48dcc..64212601ae5bf8 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/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') }}: diff --git a/src/coreclr/scripts/superpmi_collect_setup.py b/src/coreclr/scripts/superpmi_collect_setup.py index d1eb398ecace9f..fa885e730e10db 100644 --- a/src/coreclr/scripts/superpmi_collect_setup.py +++ b/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 diff --git a/src/tests/Interop/COM/ComWrappers/API/Program.cs b/src/tests/Interop/COM/ComWrappers/API/Program.cs index 3ed01e8604ad3e..8204ce75f6a903 100644 --- a/src/tests/Interop/COM/ComWrappers/API/Program.cs +++ b/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; } } }