Skip to content
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.

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

[release/8.0-staging] Upgrade our macOS build machines to the latest non-beta x64 image #109456

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions eng/pipelines/common/xplat-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,12 +173,12 @@ 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-13'

# 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
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/coreclr/perf-non-wasm-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ jobs:
nameSuffix: PerfBDNApp
isOfficialBuild: false
pool:
vmImage: 'macos-12'
vmImage: 'macos-13'
postBuildSteps:
- template: /eng/pipelines/coreclr/templates/build-perf-bdn-app.yml
parameters:
Expand Down
2 changes: 1 addition & 1 deletion src/mono/mono/component/debugger-engine.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions src/mono/mono/metadata/class-internals.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down
Loading