From de6aae068dba9a711ce349724059e1130f089e16 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 1 Nov 2024 10:10:42 -0700 Subject: [PATCH 1/5] Upgrade our macOS build machines to the latest non-beta x64 image. --- eng/pipelines/common/xplat-setup.yml | 2 +- eng/pipelines/coreclr/perf-non-wasm-jobs.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index 794a23bb218b5e..63b919d948fa20 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -173,7 +173,7 @@ jobs: # OSX Public Build Pool (we don't have on-prem OSX BuildPool). ${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), eq(variables['System.TeamProject'], 'public')) }}: - vmImage: 'macos-12' + vmImage: 'macos-latest-large' # The -large images are x64 macOS machines. # OSX Internal Pool ${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), ne(variables['System.TeamProject'], 'public')) }}: diff --git a/eng/pipelines/coreclr/perf-non-wasm-jobs.yml b/eng/pipelines/coreclr/perf-non-wasm-jobs.yml index 5e8e49304978e1..db39020624a250 100644 --- a/eng/pipelines/coreclr/perf-non-wasm-jobs.yml +++ b/eng/pipelines/coreclr/perf-non-wasm-jobs.yml @@ -434,7 +434,7 @@ jobs: nameSuffix: PerfBDNApp isOfficialBuild: false pool: - vmImage: 'macos-12' + vmImage: 'macos-latest-large' postBuildSteps: - template: /eng/pipelines/coreclr/templates/build-perf-bdn-app.yml parameters: From 8fd850120cb825f4bcb9271825c87dd6c219a0f0 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 1 Nov 2024 10:28:33 -0700 Subject: [PATCH 2/5] Only upgrade to 13, the -large variants don't exist on AzDO --- eng/pipelines/common/xplat-setup.yml | 2 +- eng/pipelines/coreclr/perf-non-wasm-jobs.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index 63b919d948fa20..0f11ccc22c91fb 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -173,7 +173,7 @@ jobs: # OSX Public Build Pool (we don't have on-prem OSX BuildPool). ${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), eq(variables['System.TeamProject'], 'public')) }}: - vmImage: 'macos-latest-large' # The -large images are x64 macOS machines. + vmImage: 'macos-13' # OSX Internal Pool ${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), ne(variables['System.TeamProject'], 'public')) }}: diff --git a/eng/pipelines/coreclr/perf-non-wasm-jobs.yml b/eng/pipelines/coreclr/perf-non-wasm-jobs.yml index db39020624a250..cf35d648c5b54d 100644 --- a/eng/pipelines/coreclr/perf-non-wasm-jobs.yml +++ b/eng/pipelines/coreclr/perf-non-wasm-jobs.yml @@ -434,7 +434,7 @@ jobs: nameSuffix: PerfBDNApp isOfficialBuild: false pool: - vmImage: 'macos-latest-large' + vmImage: 'macos-13' postBuildSteps: - template: /eng/pipelines/coreclr/templates/build-perf-bdn-app.yml parameters: From ecbd9a8efcd18bec51ffb23c4ccd0fd27540522e Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 1 Nov 2024 11:36:34 -0700 Subject: [PATCH 3/5] Fix function definition --- src/mono/mono/component/debugger-engine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/mono/component/debugger-engine.c b/src/mono/mono/component/debugger-engine.c index 9a3648b311b824..031404a2b8a822 100644 --- a/src/mono/mono/component/debugger-engine.c +++ b/src/mono/mono/component/debugger-engine.c @@ -1559,7 +1559,7 @@ mono_de_set_log_level (int level, FILE *file) } void -mono_de_set_using_icordbg () +mono_de_set_using_icordbg (void) { using_icordbg = TRUE; } From 2a5768077a91c7f8ad967ff4e1f576793178ea05 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 1 Nov 2024 13:27:40 -0700 Subject: [PATCH 4/5] Backport https://github.com/dotnet/runtime/pull/91314 to release/8.0-staging --- src/mono/mono/metadata/class-internals.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mono/mono/metadata/class-internals.h b/src/mono/mono/metadata/class-internals.h index 7a6a8ddc0080aa..4641ecec43799e 100644 --- a/src/mono/mono/metadata/class-internals.h +++ b/src/mono/mono/metadata/class-internals.h @@ -504,11 +504,11 @@ struct _MonoGenericContainer { int type_argc : 29; // Per the ECMA spec, this value is capped at 16 bits /* If true, we're a generic method, otherwise a generic type definition. */ /* Invariant: parent != NULL => is_method */ - gint is_method : 1; + guint is_method : 1; /* If true, this container has no associated class/method and only the image is known. This can happen: 1. For the special anonymous containers kept by MonoImage. 2. When user code creates a generic parameter via SRE, but has not yet set an owner. */ - gint is_anonymous : 1; + guint is_anonymous : 1; /* Our type parameters. If this is a special anonymous container (case 1, above), this field is not valid, use mono_metadata_create_anon_gparam () */ MonoGenericParamFull *type_params; }; From 9d712e85a469b97e7e25debba97905de9c94f9fd Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Mon, 4 Nov 2024 10:44:42 -0800 Subject: [PATCH 5/5] Move official build to macOS 13 as well --- eng/pipelines/common/xplat-setup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index 0f11ccc22c91fb..0cc2d37a836798 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -178,7 +178,7 @@ jobs: # OSX Internal Pool ${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), ne(variables['System.TeamProject'], 'public')) }}: name: "Azure Pipelines" - vmImage: 'macOS-12' + vmImage: 'macOS-13' os: macOS # Official Build Windows Pool