diff --git a/Directory.Build.props b/Directory.Build.props index c70eaf929cf18f..23e0d7e5b93398 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -42,8 +42,8 @@ 21 13.0 13.0 - 12.0 - 15.2 + 14.0 + 17.0 diff --git a/eng/native/build-commons.sh b/eng/native/build-commons.sh index 5f4fd788374096..bf86924ac52607 100755 --- a/eng/native/build-commons.sh +++ b/eng/native/build-commons.sh @@ -93,7 +93,7 @@ build_native() # set default macCatalyst deployment target # keep in sync with SetOSTargetMinVersions in the root Directory.Build.props - cmakeArgs="-DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_OSX_SYSROOT=macosx -DCMAKE_SYSTEM_VARIANT=maccatalyst -DCMAKE_OSX_DEPLOYMENT_TARGET=15.2 $cmakeArgs" + cmakeArgs="-DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_OSX_SYSROOT=macosx -DCMAKE_SYSTEM_VARIANT=maccatalyst -DCMAKE_OSX_DEPLOYMENT_TARGET=17.0 $cmakeArgs" fi if [[ "$targetOS" == android || "$targetOS" == linux-bionic ]]; then diff --git a/eng/native/configurecompiler.cmake b/eng/native/configurecompiler.cmake index 504631762433bb..afaee85b6f58c5 100644 --- a/eng/native/configurecompiler.cmake +++ b/eng/native/configurecompiler.cmake @@ -705,10 +705,10 @@ if (CLR_CMAKE_HOST_UNIX OR CLR_CMAKE_HOST_WASI) endif() add_link_options(${DISABLE_OVERRIDING_MIN_VERSION_ERROR}) if(CLR_CMAKE_HOST_ARCH_ARM64) - set(CLR_CMAKE_MACCATALYST_COMPILER_TARGET "arm64-apple-ios15.2-macabi") + set(CLR_CMAKE_MACCATALYST_COMPILER_TARGET "arm64-apple-ios17.0-macabi") add_link_options(-target ${CLR_CMAKE_MACCATALYST_COMPILER_TARGET}) elseif(CLR_CMAKE_HOST_ARCH_AMD64) - set(CLR_CMAKE_MACCATALYST_COMPILER_TARGET "x86_64-apple-ios15.2-macabi") + set(CLR_CMAKE_MACCATALYST_COMPILER_TARGET "x86_64-apple-ios17.0-macabi") add_link_options(-target ${CLR_CMAKE_MACCATALYST_COMPILER_TARGET}) else() clr_unknown_arch() @@ -722,7 +722,7 @@ if (CLR_CMAKE_HOST_UNIX OR CLR_CMAKE_HOST_WASI) set(CMAKE_OBJC_FLAGS "${CMAKE_OBJC_FLAGS}-target ${CLR_CMAKE_MACCATALYST_COMPILER_TARGET} ${DISABLE_OVERRIDING_MIN_VERSION_ERROR}") set(CMAKE_OBJCXX_FLAGS "${CMAKE_OBJCXX_FLAGS} -target ${CLR_CMAKE_MACCATALYST_COMPILER_TARGET} ${DISABLE_OVERRIDING_MIN_VERSION_ERROR}") elseif(CLR_CMAKE_HOST_OSX) - set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0") + set(CMAKE_OSX_DEPLOYMENT_TARGET "14.0") if(CLR_CMAKE_HOST_ARCH_ARM64) add_compile_options(-arch arm64) elseif(CLR_CMAKE_HOST_ARCH_AMD64) diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets index a4fd6ffe5f4ee1..b5045834df2a88 100644 --- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets +++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets @@ -78,7 +78,7 @@ The .NET Foundation licenses this file to you under the MIT license. - 15.2 + 17.0 13.0 <_AppleSdkName Condition="'$(_targetOS)' == 'ios'">iphoneos @@ -98,7 +98,7 @@ The .NET Foundation licenses this file to you under the MIT license. - 12.0 + 14.0 x86_64-apple-macos$(AppleMinOSVersion) arm64-apple-macos$(AppleMinOSVersion) diff --git a/src/installer/pkg/sfx/bundle/shared-framework-distribution-template-arm64.xml b/src/installer/pkg/sfx/bundle/shared-framework-distribution-template-arm64.xml index 2d501b30731695..13576855563164 100644 --- a/src/installer/pkg/sfx/bundle/shared-framework-distribution-template-arm64.xml +++ b/src/installer/pkg/sfx/bundle/shared-framework-distribution-template-arm64.xml @@ -7,7 +7,7 @@ - + diff --git a/src/installer/pkg/sfx/bundle/shared-framework-distribution-template-x64.xml b/src/installer/pkg/sfx/bundle/shared-framework-distribution-template-x64.xml index 538f475d5d5836..6cd41f3f4a8148 100644 --- a/src/installer/pkg/sfx/bundle/shared-framework-distribution-template-x64.xml +++ b/src/installer/pkg/sfx/bundle/shared-framework-distribution-template-x64.xml @@ -7,7 +7,7 @@ - + diff --git a/src/mono/mono/utils/mono-codeman.c b/src/mono/mono/utils/mono-codeman.c index 26f8715c61dd0b..c655d04c8ccbea 100644 --- a/src/mono/mono/utils/mono-codeman.c +++ b/src/mono/mono/utils/mono-codeman.c @@ -735,12 +735,10 @@ mono_codeman_enable_write (void) if (codeman_no_exec) return; #ifdef HAVE_PTHREAD_JIT_WRITE_PROTECT_NP - if (__builtin_available (macOS 11, *)) { - int level = GPOINTER_TO_INT (mono_native_tls_get_value (write_level_tls_id)); - level ++; - mono_native_tls_set_value (write_level_tls_id, GINT_TO_POINTER (level)); - pthread_jit_write_protect_np (0); - } + int level = GPOINTER_TO_INT (mono_native_tls_get_value (write_level_tls_id)); + level ++; + mono_native_tls_set_value (write_level_tls_id, GINT_TO_POINTER (level)); + pthread_jit_write_protect_np (0); #elif defined(HOST_MACCAT) && defined(__aarch64__) /* JITing in Catalyst apps is not allowed on Apple Silicon, so assume if we're here we don't really have executable pages. */ #endif @@ -758,14 +756,12 @@ mono_codeman_disable_write (void) if (codeman_no_exec) return; #ifdef HAVE_PTHREAD_JIT_WRITE_PROTECT_NP - if (__builtin_available (macOS 11, *)) { - int level = GPOINTER_TO_INT (mono_native_tls_get_value (write_level_tls_id)); - g_assert (level); - level --; - mono_native_tls_set_value (write_level_tls_id, GINT_TO_POINTER (level)); - if (level == 0) - pthread_jit_write_protect_np (1); - } + int level = GPOINTER_TO_INT (mono_native_tls_get_value (write_level_tls_id)); + g_assert (level); + level --; + mono_native_tls_set_value (write_level_tls_id, GINT_TO_POINTER (level)); + if (level == 0) + pthread_jit_write_protect_np (1); #elif defined(HOST_MACCAT) && defined(__aarch64__) /* JITing in Catalyst apps is not allowed on Apple Silicon, so assume if we're here we don't really have executable pages */ #endif diff --git a/src/mono/mono/utils/mono-mmap.c b/src/mono/mono/utils/mono-mmap.c index 09af6f8994b942..fe7db3bbaf3b8a 100644 --- a/src/mono/mono/utils/mono-mmap.c +++ b/src/mono/mono/utils/mono-mmap.c @@ -285,9 +285,7 @@ mono_valloc (void *addr, size_t length, int flags, MonoMemAccountType type) mflags |= MAP_JIT; #if defined(HOST_ARM64) && !defined(HOST_MACCAT) /* Patching code on apple silicon seems to cause random crashes without this flag */ - /* No __builtin_available in old versions of Xcode that could be building Mono on x86 or amd64 */ - if (__builtin_available (macOS 11, *)) - mflags |= MAP_JIT; + mflags |= MAP_JIT; #endif } #endif diff --git a/src/mono/msbuild/apple/build/AppleBuild.targets b/src/mono/msbuild/apple/build/AppleBuild.targets index db7bb46a7f8051..37bb6c60a36d08 100644 --- a/src/mono/msbuild/apple/build/AppleBuild.targets +++ b/src/mono/msbuild/apple/build/AppleBuild.targets @@ -175,9 +175,9 @@ - + - + diff --git a/src/mono/msbuild/common/MonoAOTCompiler.props b/src/mono/msbuild/common/MonoAOTCompiler.props index 8b162a97060c29..b3f584a200ca8d 100644 --- a/src/mono/msbuild/common/MonoAOTCompiler.props +++ b/src/mono/msbuild/common/MonoAOTCompiler.props @@ -1,9 +1,9 @@ - + - + diff --git a/src/native/libs/System.Security.Cryptography.Native.Apple/pal_ecc.c b/src/native/libs/System.Security.Cryptography.Native.Apple/pal_ecc.c index dc5f195ab24226..88c4832ef30736 100644 --- a/src/native/libs/System.Security.Cryptography.Native.Apple/pal_ecc.c +++ b/src/native/libs/System.Security.Cryptography.Native.Apple/pal_ecc.c @@ -24,10 +24,7 @@ int32_t AppleCryptoNative_EccGenerateKey(int32_t keySizeBits, { CFDictionaryAddValue(attributes, kSecAttrKeyType, kSecAttrKeyTypeEC); CFDictionaryAddValue(attributes, kSecAttrKeySizeInBits, cfKeySizeValue); - if (__builtin_available(macOS 10.15, iOS 13, tvOS 13, *)) - { - CFDictionaryAddValue(attributes, kSecUseDataProtectionKeychain, kCFBooleanTrue); - } + CFDictionaryAddValue(attributes, kSecUseDataProtectionKeychain, kCFBooleanTrue); *pPrivateKey = SecKeyCreateRandomKey(attributes, pErrorOut); if (*pPrivateKey != NULL) diff --git a/src/native/libs/System.Security.Cryptography.Native.Apple/pal_networkframework.m b/src/native/libs/System.Security.Cryptography.Native.Apple/pal_networkframework.m index 159fa373f1d88e..47254f2f297b15 100644 --- a/src/native/libs/System.Security.Cryptography.Native.Apple/pal_networkframework.m +++ b/src/native/libs/System.Security.Cryptography.Native.Apple/pal_networkframework.m @@ -51,30 +51,24 @@ { void* ptr = NULL; - if (__builtin_available(macOS 12.3, iOS 15.4, tvOS 15.4, watchOS 8.4, *)) - { - nw_protocol_options_t framer_options = nw_framer_copy_options(framer); - assert(framer_options != NULL); + nw_protocol_options_t framer_options = nw_framer_copy_options(framer); + assert(framer_options != NULL); - NSNumber* num = nw_framer_options_copy_object_value(framer_options, MANAGED_CONTEXT_KEY); - assert(num != NULL); - [num getValue:&ptr]; - [num release]; + NSNumber* num = nw_framer_options_copy_object_value(framer_options, MANAGED_CONTEXT_KEY); + assert(num != NULL); + [num getValue:&ptr]; + [num release]; - nw_release(framer_options); - } + nw_release(framer_options); return ptr; } static void FramerOptionsSetManagedContext(nw_protocol_options_t framer_options, void* context) { - if (__builtin_available(macOS 12.3, iOS 15.4, tvOS 15.4.0, watchOS 8.4, *)) - { - NSNumber *ref = [NSNumber numberWithLong:(long)context]; - nw_framer_options_set_object_value(framer_options, MANAGED_CONTEXT_KEY, ref); - [ref release]; - } + NSNumber *ref = [NSNumber numberWithLong:(long)context]; + nw_framer_options_set_object_value(framer_options, MANAGED_CONTEXT_KEY, ref); + [ref release]; } static tls_protocol_version_t PalSslProtocolToTlsProtocolVersion(PAL_SslProtocol palProtocolId) @@ -313,23 +307,17 @@ PALEXPORT nw_connection_t AppleCryptoNative_NwConnectionCreate(int32_t isServer, // This writes encrypted TLS frames to the safe handle. It is executed on NW Thread pool static nw_framer_output_handler_t framer_output_handler = ^(nw_framer_t framer, nw_framer_message_t message, size_t message_length, bool is_complete) { - if (__builtin_available(macOS 12.3, iOS 15.4, tvOS 15.4, watchOS 2.0, *)) - { - void* context = FramerGetManagedContext(framer); - size_t size = message_length; + void* context = FramerGetManagedContext(framer); + size_t size = message_length; - nw_framer_parse_output(framer, 1, message_length, NULL, ^size_t(uint8_t *buffer, size_t buffer_length, bool is_complete2) - { - (_writeFunc)(context, buffer, buffer_length); - (void)is_complete2; - (void)message; - return buffer_length; - }); - } - else + nw_framer_parse_output(framer, 1, message_length, NULL, ^size_t(uint8_t *buffer, size_t buffer_length, bool is_complete2) { - assert(0); - } + (_writeFunc)(context, buffer, buffer_length); + (void)is_complete2; + (void)message; + return buffer_length; + }); + (void)is_complete; }; @@ -584,23 +572,18 @@ PALEXPORT int32_t AppleCryptoNative_Init(StatusUpdateCallback statusFunc, WriteC assert(statusFunc != NULL); assert(writeFunc != NULL); - if (__builtin_available(macOS 12.3, iOS 15.4, tvOS 15.4.0, watchOS 8.4, *)) - { - _writeFunc = writeFunc; - _statusFunc = statusFunc; - _challengeFunc = challengeFunc; - _framerDefinition = nw_framer_create_definition("com.dotnet.networkframework.tlsframer", - NW_FRAMER_CREATE_FLAGS_DEFAULT, framer_start); - _tlsDefinition = nw_protocol_copy_tls_definition(); - _tlsQueue = dispatch_queue_create("com.dotnet.networkframework.tlsqueue", NULL); - _inputQueue = _tlsQueue; - - // The endpoint values (127.0.0.1:42) are arbitrary - they just need to be - // syntactically and semantically valid since the connection is never established. - _endpoint = nw_endpoint_create_host("127.0.0.1", "42"); - - return 0; - } - - return 1; + _writeFunc = writeFunc; + _statusFunc = statusFunc; + _challengeFunc = challengeFunc; + _framerDefinition = nw_framer_create_definition("com.dotnet.networkframework.tlsframer", + NW_FRAMER_CREATE_FLAGS_DEFAULT, framer_start); + _tlsDefinition = nw_protocol_copy_tls_definition(); + _tlsQueue = dispatch_queue_create("com.dotnet.networkframework.tlsqueue", NULL); + _inputQueue = _tlsQueue; + + // The endpoint values (127.0.0.1:42) are arbitrary - they just need to be + // syntactically and semantically valid since the connection is never established. + _endpoint = nw_endpoint_create_host("127.0.0.1", "42"); + + return 0; } diff --git a/src/native/libs/System.Security.Cryptography.Native.Apple/pal_rsa.c b/src/native/libs/System.Security.Cryptography.Native.Apple/pal_rsa.c index 1746828d5b0d7d..fa76a4323225e5 100644 --- a/src/native/libs/System.Security.Cryptography.Native.Apple/pal_rsa.c +++ b/src/native/libs/System.Security.Cryptography.Native.Apple/pal_rsa.c @@ -26,10 +26,7 @@ int32_t AppleCryptoNative_RsaGenerateKey(int32_t keySizeBits, { CFDictionaryAddValue(attributes, kSecAttrKeyType, kSecAttrKeyTypeRSA); CFDictionaryAddValue(attributes, kSecAttrKeySizeInBits, cfKeySizeValue); - if (__builtin_available(macOS 10.15, iOS 13, tvOS 13, *)) - { - CFDictionaryAddValue(attributes, kSecUseDataProtectionKeychain, kCFBooleanTrue); - } + CFDictionaryAddValue(attributes, kSecUseDataProtectionKeychain, kCFBooleanTrue); *pPrivateKey = SecKeyCreateRandomKey(attributes, pErrorOut); if (*pPrivateKey != NULL) diff --git a/src/native/libs/System.Security.Cryptography.Native.Apple/pal_sec.c b/src/native/libs/System.Security.Cryptography.Native.Apple/pal_sec.c index 07cc20d1724f20..8e48ff2ea279a5 100644 --- a/src/native/libs/System.Security.Cryptography.Native.Apple/pal_sec.c +++ b/src/native/libs/System.Security.Cryptography.Native.Apple/pal_sec.c @@ -5,10 +5,5 @@ CFStringRef AppleCryptoNative_SecCopyErrorMessageString(OSStatus osStatus) { - if (__builtin_available(iOS 11.3, tvOS 11.3, *)) - { - return SecCopyErrorMessageString(osStatus, NULL); - } - - return CFStringCreateWithFormat(NULL, NULL, CFSTR("OSStatus %d"), (int)osStatus); + return SecCopyErrorMessageString(osStatus, NULL); } diff --git a/src/native/minipal/memorybarrierprocesswide.c b/src/native/minipal/memorybarrierprocesswide.c index 7582332f86c9e9..6a9704c9920a98 100644 --- a/src/native/minipal/memorybarrierprocesswide.c +++ b/src/native/minipal/memorybarrierprocesswide.c @@ -166,27 +166,9 @@ void minipal_memory_barrier_process_wide(void) // Iterate through each of the threads in the list. for (mach_msg_type_number_t i = 0; i < cThreads; i++) { - if (__builtin_available (macOS 10.14, iOS 12, tvOS 9, *)) - { - // Request the threads pointer values to force the thread to emit a memory barrier - size_t registers = 128; - machret = thread_get_register_pointer_values(pThreads[i], &sp, ®isters, registerValues); - } - else - { - // fallback implementation for older OS versions -#if defined(HOST_AMD64) - x86_thread_state64_t threadState; - mach_msg_type_number_t count = x86_THREAD_STATE64_COUNT; - machret = thread_get_state(pThreads[i], x86_THREAD_STATE64, (thread_state_t)&threadState, &count); -#elif defined(HOST_ARM64) - arm_thread_state64_t threadState; - mach_msg_type_number_t count = ARM_THREAD_STATE64_COUNT; - machret = thread_get_state(pThreads[i], ARM_THREAD_STATE64, (thread_state_t)&threadState, &count); -#else - #error Unexpected architecture -#endif - } + // Request the threads pointer values to force the thread to emit a memory barrier + size_t registers = 128; + machret = thread_get_register_pointer_values(pThreads[i], &sp, ®isters, registerValues); if (machret == KERN_INSUFFICIENT_BUFFER_SIZE) { diff --git a/src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets b/src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets index 83b3dacde69272..b75878a9dce3dd 100644 --- a/src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets +++ b/src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets @@ -556,8 +556,8 @@ Copyright (c) .NET Foundation. All rights reserved. - 12.0 - 15.2 + 14.0 + 17.0 13.0 <_AppleSdkName Condition="'$(_AppleTargetOS)' == 'ios'">iphoneos diff --git a/src/tests/Interop/Swift/SwiftAbiStress/CMakeLists.txt b/src/tests/Interop/Swift/SwiftAbiStress/CMakeLists.txt index 6ba90f2aa17942..4a7a3a90373d69 100644 --- a/src/tests/Interop/Swift/SwiftAbiStress/CMakeLists.txt +++ b/src/tests/Interop/Swift/SwiftAbiStress/CMakeLists.txt @@ -7,7 +7,7 @@ if (NOT SWIFT_COMPILER_TARGET AND CLR_CMAKE_TARGET_APPLE) set(SWIFT_PLATFORM "macosx") set(SWIFT_PLATFORM_SUFFIX "") if (NOT CMAKE_OSX_DEPLOYMENT_TARGET) - set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0") + set(CMAKE_OSX_DEPLOYMENT_TARGET "14.0") endif() set(SWIFT_DEPLOYMENT_TARGET ${CMAKE_OSX_DEPLOYMENT_TARGET}) set(SWIFT_COMPILER_TARGET "${CMAKE_OSX_ARCHITECTURES}-apple-${SWIFT_PLATFORM}${SWIFT_DEPLOYMENT_TARGET}${SWIFT_PLATFORM_SUFFIX}") diff --git a/src/tests/Interop/Swift/SwiftCallbackAbiStress/CMakeLists.txt b/src/tests/Interop/Swift/SwiftCallbackAbiStress/CMakeLists.txt index 4d9806201fb389..fe8c699b01dc4f 100644 --- a/src/tests/Interop/Swift/SwiftCallbackAbiStress/CMakeLists.txt +++ b/src/tests/Interop/Swift/SwiftCallbackAbiStress/CMakeLists.txt @@ -7,7 +7,7 @@ if (NOT SWIFT_COMPILER_TARGET AND CLR_CMAKE_TARGET_APPLE) set(SWIFT_PLATFORM "macosx") set(SWIFT_PLATFORM_SUFFIX "") if (NOT CMAKE_OSX_DEPLOYMENT_TARGET) - set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0") + set(CMAKE_OSX_DEPLOYMENT_TARGET "14.0") endif() set(SWIFT_DEPLOYMENT_TARGET ${CMAKE_OSX_DEPLOYMENT_TARGET}) set(SWIFT_COMPILER_TARGET "${CMAKE_OSX_ARCHITECTURES}-apple-${SWIFT_PLATFORM}${SWIFT_DEPLOYMENT_TARGET}${SWIFT_PLATFORM_SUFFIX}") diff --git a/src/tests/Interop/Swift/SwiftErrorHandling/CMakeLists.txt b/src/tests/Interop/Swift/SwiftErrorHandling/CMakeLists.txt index dc721fc13c54d4..d5f75e300f9043 100644 --- a/src/tests/Interop/Swift/SwiftErrorHandling/CMakeLists.txt +++ b/src/tests/Interop/Swift/SwiftErrorHandling/CMakeLists.txt @@ -7,7 +7,7 @@ if (NOT SWIFT_COMPILER_TARGET AND CLR_CMAKE_TARGET_APPLE) set(SWIFT_PLATFORM "macosx") set(SWIFT_PLATFORM_SUFFIX "") if (NOT CMAKE_OSX_DEPLOYMENT_TARGET) - set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0") + set(CMAKE_OSX_DEPLOYMENT_TARGET "14.0") endif() set(SWIFT_DEPLOYMENT_TARGET ${CMAKE_OSX_DEPLOYMENT_TARGET}) set(SWIFT_COMPILER_TARGET "${CMAKE_OSX_ARCHITECTURES}-apple-${SWIFT_PLATFORM}${SWIFT_DEPLOYMENT_TARGET}${SWIFT_PLATFORM_SUFFIX}") diff --git a/src/tests/Interop/Swift/SwiftIndirectResult/CMakeLists.txt b/src/tests/Interop/Swift/SwiftIndirectResult/CMakeLists.txt index d073b6fc147cd5..057972207720d6 100644 --- a/src/tests/Interop/Swift/SwiftIndirectResult/CMakeLists.txt +++ b/src/tests/Interop/Swift/SwiftIndirectResult/CMakeLists.txt @@ -7,7 +7,7 @@ if (NOT SWIFT_COMPILER_TARGET AND CLR_CMAKE_TARGET_APPLE) set(SWIFT_PLATFORM "macosx") set(SWIFT_PLATFORM_SUFFIX "") if (NOT CMAKE_OSX_DEPLOYMENT_TARGET) - set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0") + set(CMAKE_OSX_DEPLOYMENT_TARGET "14.0") endif() set(SWIFT_DEPLOYMENT_TARGET ${CMAKE_OSX_DEPLOYMENT_TARGET}) set(SWIFT_COMPILER_TARGET "${CMAKE_OSX_ARCHITECTURES}-apple-${SWIFT_PLATFORM}${SWIFT_DEPLOYMENT_TARGET}${SWIFT_PLATFORM_SUFFIX}") diff --git a/src/tests/Interop/Swift/SwiftInlineArray/CMakeLists.txt b/src/tests/Interop/Swift/SwiftInlineArray/CMakeLists.txt index c8ad8b4654981e..ece26cbc857249 100644 --- a/src/tests/Interop/Swift/SwiftInlineArray/CMakeLists.txt +++ b/src/tests/Interop/Swift/SwiftInlineArray/CMakeLists.txt @@ -7,7 +7,7 @@ if (NOT SWIFT_COMPILER_TARGET AND CLR_CMAKE_TARGET_APPLE) set(SWIFT_PLATFORM "macosx") set(SWIFT_PLATFORM_SUFFIX "") if (NOT CMAKE_OSX_DEPLOYMENT_TARGET) - set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0") + set(CMAKE_OSX_DEPLOYMENT_TARGET "14.0") endif() set(SWIFT_DEPLOYMENT_TARGET ${CMAKE_OSX_DEPLOYMENT_TARGET}) set(SWIFT_COMPILER_TARGET "${CMAKE_OSX_ARCHITECTURES}-apple-${SWIFT_PLATFORM}${SWIFT_DEPLOYMENT_TARGET}${SWIFT_PLATFORM_SUFFIX}") diff --git a/src/tests/Interop/Swift/SwiftInvalidCallConv/CMakeLists.txt b/src/tests/Interop/Swift/SwiftInvalidCallConv/CMakeLists.txt index dce97e33c0a6c7..c691423dcd60ec 100644 --- a/src/tests/Interop/Swift/SwiftInvalidCallConv/CMakeLists.txt +++ b/src/tests/Interop/Swift/SwiftInvalidCallConv/CMakeLists.txt @@ -7,7 +7,7 @@ if (NOT SWIFT_COMPILER_TARGET AND CLR_CMAKE_TARGET_APPLE) set(SWIFT_PLATFORM "macosx") set(SWIFT_PLATFORM_SUFFIX "") if (NOT CMAKE_OSX_DEPLOYMENT_TARGET) - set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0") + set(CMAKE_OSX_DEPLOYMENT_TARGET "14.0") endif() set(SWIFT_DEPLOYMENT_TARGET ${CMAKE_OSX_DEPLOYMENT_TARGET}) set(SWIFT_COMPILER_TARGET "${CMAKE_OSX_ARCHITECTURES}-apple-${SWIFT_PLATFORM}${SWIFT_DEPLOYMENT_TARGET}${SWIFT_PLATFORM_SUFFIX}") diff --git a/src/tests/Interop/Swift/SwiftRetAbiStress/CMakeLists.txt b/src/tests/Interop/Swift/SwiftRetAbiStress/CMakeLists.txt index ee3e93acd79b8e..08e930084ec30d 100644 --- a/src/tests/Interop/Swift/SwiftRetAbiStress/CMakeLists.txt +++ b/src/tests/Interop/Swift/SwiftRetAbiStress/CMakeLists.txt @@ -7,7 +7,7 @@ if (NOT SWIFT_COMPILER_TARGET AND CLR_CMAKE_TARGET_APPLE) set(SWIFT_PLATFORM "macosx") set(SWIFT_PLATFORM_SUFFIX "") if (NOT CMAKE_OSX_DEPLOYMENT_TARGET) - set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0") + set(CMAKE_OSX_DEPLOYMENT_TARGET "14.0") endif() set(SWIFT_DEPLOYMENT_TARGET ${CMAKE_OSX_DEPLOYMENT_TARGET}) set(SWIFT_COMPILER_TARGET "${CMAKE_OSX_ARCHITECTURES}-apple-${SWIFT_PLATFORM}${SWIFT_DEPLOYMENT_TARGET}${SWIFT_PLATFORM_SUFFIX}") diff --git a/src/tests/Interop/Swift/SwiftSelfContext/CMakeLists.txt b/src/tests/Interop/Swift/SwiftSelfContext/CMakeLists.txt index 61564d1e0a8350..d53a6c040ec031 100644 --- a/src/tests/Interop/Swift/SwiftSelfContext/CMakeLists.txt +++ b/src/tests/Interop/Swift/SwiftSelfContext/CMakeLists.txt @@ -7,7 +7,7 @@ if (NOT SWIFT_COMPILER_TARGET AND CLR_CMAKE_TARGET_APPLE) set(SWIFT_PLATFORM "macosx") set(SWIFT_PLATFORM_SUFFIX "") if (NOT CMAKE_OSX_DEPLOYMENT_TARGET) - set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0") + set(CMAKE_OSX_DEPLOYMENT_TARGET "14.0") endif() set(SWIFT_DEPLOYMENT_TARGET ${CMAKE_OSX_DEPLOYMENT_TARGET}) set(SWIFT_COMPILER_TARGET "${CMAKE_OSX_ARCHITECTURES}-apple-${SWIFT_PLATFORM}${SWIFT_DEPLOYMENT_TARGET}${SWIFT_PLATFORM_SUFFIX}")