Skip to content

[release/8.0] Move default build images to macos 15 (and xcode 16) (#120589) #122423

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

Open
agocke wants to merge 4 commits into
base: release/8.0-staging
Choose a base branch
from
Open

[release/8.0] Move default build images to macos 15 (and xcode 16) (#120589) #122423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1bde3ac
Move default build images to macos 15 (and xcode 16) (#120589)
agocke Nov 28, 2025
479faed
Replace the use of in some macros in Mono - it will expand to in C1…
steveisok Dec 11, 2025
37bd90f
One more
steveisok Dec 11, 2025
e2f969a
Fix warning on resolved in https://github.com/dotnet/runtime/pull/98018
steveisok Dec 11, 2025
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
5 changes: 4 additions & 1 deletion eng/pipelines/common/xplat-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,9 @@ jobs:
container: ${{ parameters.container }}

${{ if eq(parameters.jobParameters.pool, '') }}:
# N.B.: We should always be building on the latest available version of our build platform.
# Each of these queues should be the latest version or have a tracking issue if the latest version
# does not work for some reason.
pool:
# Public Linux Build Pool
${{ if and(or(in(parameters.osGroup, 'linux', 'freebsd', 'android', 'tizen'), eq(parameters.jobParameters.hostedOs, 'linux')), eq(variables['System.TeamProject'], 'public')) }}:
Expand All @@ -173,7 +176,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-13'
vmImage: 'macos-15'

# OSX Internal Pool
${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), ne(variables['System.TeamProject'], 'public')) }}:
Expand Down
8 changes: 4 additions & 4 deletions src/mono/mono/metadata/icall-signatures.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
// mono_icall_sig_void_int32
// mono_icall_sig_void_object
// mono_icall_sig_void_ptr
// mono_icall_sig_bool_ptr_ptrref
// mono_icall_sig_boolean_ptr_ptrref
// mono_icall_sig_double_double_double
// mono_icall_sig_float_float_float
// mono_icall_sig_int_obj_ptr
Expand Down Expand Up @@ -94,7 +94,7 @@
// mono_icall_sig_void_ptr_ptr
// mono_icall_sig_void_ptr_ptrref
// mono_icall_sig_void_uint32_ptrref
// mono_icall_sig_bool_ptr_int32_ptrref
// mono_icall_sig_boolean_ptr_int32_ptrref
// mono_icall_sig_int32_int32_ptr_ptrref
// mono_icall_sig_int32_ptr_int32_ptr
// mono_icall_sig_int32_ptr_int32_ptrref
Expand Down Expand Up @@ -182,7 +182,7 @@ ICALL_SIG (2, (void, int)) \
ICALL_SIG (2, (void, int32)) \
ICALL_SIG (2, (void, object)) \
ICALL_SIG (2, (void, ptr)) \
ICALL_SIG (3, (bool, ptr, ptrref)) \
ICALL_SIG (3, (boolean, ptr, ptrref)) \
ICALL_SIG (3, (double, double, double)) \
ICALL_SIG (3, (float, float, float)) \
ICALL_SIG (3, (int, obj, ptr)) \
Expand Down Expand Up @@ -222,7 +222,7 @@ ICALL_SIG (3, (void, ptr, object)) \
ICALL_SIG (3, (void, ptr, ptr)) \
ICALL_SIG (3, (void, ptr, ptrref)) \
ICALL_SIG (3, (void, uint32, ptrref)) \
ICALL_SIG (4, (bool, ptr, int32, ptrref)) \
ICALL_SIG (4, (boolean, ptr, int32, ptrref)) \
ICALL_SIG (4, (int32, int32, ptr, ptrref)) \
ICALL_SIG (4, (int32, ptr, int32, ptr)) \
ICALL_SIG (4, (int32, ptr, int32, ptrref)) \
Expand Down
3 changes: 1 addition & 2 deletions src/mono/mono/metadata/icall.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7185,8 +7185,7 @@ mono_lookup_icall_symbol (MonoMethod *m)
//
// mono_create_icall_signatures depends on this order. Handle with care.
typedef enum ICallSigType {
ICALL_SIG_TYPE_bool = 0x00,
ICALL_SIG_TYPE_boolean = ICALL_SIG_TYPE_bool,
ICALL_SIG_TYPE_boolean = 0x00,
ICALL_SIG_TYPE_double = 0x01,
ICALL_SIG_TYPE_float = 0x02,
ICALL_SIG_TYPE_int = 0x03,
Expand Down
4 changes: 2 additions & 2 deletions src/mono/mono/mini/aot-compiler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14625,8 +14625,8 @@ add_preinit_got_slots (MonoAotCompile *acfg)

#ifndef MONO_ARCH_HAVE_INTERP_ENTRY_TRAMPOLINE
static MonoMethodSignature * const * const interp_in_static_sigs [] = {
&mono_icall_sig_bool_ptr_int32_ptrref,
&mono_icall_sig_bool_ptr_ptrref,
&mono_icall_sig_boolean_ptr_int32_ptrref,
&mono_icall_sig_boolean_ptr_ptrref,
&mono_icall_sig_int32_int32_ptrref,
&mono_icall_sig_int32_int32_ptr_ptrref,
&mono_icall_sig_int32_ptr_int32_ptr,
Expand Down
2 changes: 1 addition & 1 deletion src/mono/mono/mini/decompose.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ decompose_long_opcode (MonoCompile *cfg, MonoInst *ins, MonoInst **repl_ins)
MONO_EMIT_NEW_COND_EXC (cfg, GT, "OverflowException");
/* The int cast is needed for the VS compiler. See Compiler Warning (level 2) C4146. */
#if SIZEOF_REGISTER == 8
MONO_EMIT_NEW_LCOMPARE_IMM (cfg, ins->sreg1, (-(int)2147483648));
MONO_EMIT_NEW_LCOMPARE_IMM (cfg, ins->sreg1, INT_MIN);
#else
g_assert (COMPILE_LLVM (cfg));
MONO_EMIT_NEW_LCOMPARE_IMM (cfg, ins->sreg1, -2147483648LL);
Expand Down
9 changes: 9 additions & 0 deletions src/tests/issues.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2630,6 +2630,15 @@
<ItemGroup Condition="'$(RuntimeFlavor)' == 'mono' and ('$(RuntimeVariant)' == 'llvmfullaot' or '$(RuntimeVariant)' == 'llvmaot' or '$(TargetOS)' == 'ios') and '$(TargetArchitecture)' == 'arm64'">
</ItemGroup>

<ItemGroup Condition="'$(RuntimeFlavor)' == 'mono' and '$(RuntimeVariant)' == 'minijit' and '$(TargetArchitecture)' == 'x64'">
<ExcludeList Include="$(XunitTestBinBase)/Interop/Swift/SwiftRetAbiStress/**">
<Issue>https://github.com/dotnet/runtime/issues/121983</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/Interop/Swift/SwiftCallbackAbiStress/**">
<Issue>https://github.com/dotnet/runtime/issues/121983</Issue>
</ExcludeList>
</ItemGroup>

<ItemGroup Condition="'$(RuntimeFlavor)' == 'mono' and '$(RuntimeVariant)' == 'minijit' and '$(TargetArchitecture)' == 'arm64'">
<ExcludeList Include="$(XunitTestBinBase)/Interop/SuppressGCTransition/SuppressGCTransitionTest/**">
<Issue>https://github.com/dotnet/runtime/issues/82859</Issue>
Expand Down
Loading