From 433ba57af339ed841724b309d17ab762a2d7483a Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Thu, 27 Nov 2025 00:37:28 +0100 Subject: [PATCH 1/3] Update minimum macOS and Mac Catalyst versions to 15.2 across project files --- Directory.Build.props | 2 +- eng/native/build-commons.sh | 2 +- eng/native/configurecompiler.cmake | 4 ++-- src/coreclr/crossgen-corelib.proj | 2 +- .../BuildIntegration/Microsoft.NETCore.Native.Unix.targets | 2 +- src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 84877200392e0c..92749172372151 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -42,7 +42,7 @@ 12.2 12.2 12.0 - 15.0 + 15.2 diff --git a/eng/native/build-commons.sh b/eng/native/build-commons.sh index 8c8baaaf34ac44..9d15dc39d4c907 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.0 $cmakeArgs" + cmakeArgs="-DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_OSX_SYSROOT=macosx -DCMAKE_SYSTEM_VARIANT=maccatalyst -DCMAKE_OSX_DEPLOYMENT_TARGET=15.2 $cmakeArgs" fi if [[ "$targetOS" == android || "$targetOS" == linux-bionic ]]; then diff --git a/eng/native/configurecompiler.cmake b/eng/native/configurecompiler.cmake index 9caf3a14828599..504631762433bb 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.0-macabi") + set(CLR_CMAKE_MACCATALYST_COMPILER_TARGET "arm64-apple-ios15.2-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.0-macabi") + set(CLR_CMAKE_MACCATALYST_COMPILER_TARGET "x86_64-apple-ios15.2-macabi") add_link_options(-target ${CLR_CMAKE_MACCATALYST_COMPILER_TARGET}) else() clr_unknown_arch() diff --git a/src/coreclr/crossgen-corelib.proj b/src/coreclr/crossgen-corelib.proj index 3479a945d1cfd7..375a82759544ab 100644 --- a/src/coreclr/crossgen-corelib.proj +++ b/src/coreclr/crossgen-corelib.proj @@ -197,7 +197,7 @@ 12.0 - 15.0 + 15.2 12.2 <_AppleSdkName Condition="'$(TargetOS)' == 'ios'">iphoneos diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets index ffc249157ed16a..9200b7da9bd7a7 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.0 + 15.2 12.2 <_AppleSdkName Condition="'$(_targetOS)' == 'ios'">iphoneos diff --git a/src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets b/src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets index 1f77bced6a354b..ce2bc815a923f2 100644 --- a/src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets +++ b/src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets @@ -557,7 +557,7 @@ Copyright (c) .NET Foundation. All rights reserved. 12.0 - 15.0 + 15.2 12.2 <_AppleSdkName Condition="'$(_AppleTargetOS)' == 'ios'">iphoneos From 2d77894c81cc9a612f2f04fb7ab685fa6ad960d5 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Thu, 27 Nov 2025 00:40:42 +0100 Subject: [PATCH 2/3] Revert changes --- eng/native/build-commons.sh | 2 +- .../BuildIntegration/Microsoft.NETCore.Native.Unix.targets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/native/build-commons.sh b/eng/native/build-commons.sh index 9d15dc39d4c907..8c8baaaf34ac44 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=15.0 $cmakeArgs" fi if [[ "$targetOS" == android || "$targetOS" == linux-bionic ]]; then diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets index 9200b7da9bd7a7..ffc249157ed16a 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 + 15.0 12.2 <_AppleSdkName Condition="'$(_targetOS)' == 'ios'">iphoneos From 4f3a8e7cc710b8ddc3348ae341bc4523de765dde Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Thu, 27 Nov 2025 00:44:42 +0100 Subject: [PATCH 3/3] Revert changes --- Directory.Build.props | 2 +- eng/native/configurecompiler.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 92749172372151..84877200392e0c 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -42,7 +42,7 @@ 12.2 12.2 12.0 - 15.2 + 15.0 diff --git a/eng/native/configurecompiler.cmake b/eng/native/configurecompiler.cmake index 504631762433bb..9caf3a14828599 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-ios15.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-ios15.0-macabi") add_link_options(-target ${CLR_CMAKE_MACCATALYST_COMPILER_TARGET}) else() clr_unknown_arch()