diff --git a/Make.config b/Make.config index 1aace67dec..6389c2a6e9 100644 --- a/Make.config +++ b/Make.config @@ -193,9 +193,9 @@ MACCATALYST_NUGET_VERSION_NO_METADATA=$(MACCATALYST_NUGET_VERSION)$(NUGET_PREREL MACCATALYST_NUGET_VERSION_FULL=$(MACCATALYST_NUGET_VERSION_NO_METADATA)+$(NUGET_BUILD_METADATA) # Xcode version should have both a major and a minor version (even if the minor version is 0) -XCODE_VERSION=13.3 -XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_13.3.xip -XCODE_DEVELOPER_ROOT=/Applications/Xcode_13.3.0.app/Contents/Developer +XCODE_VERSION=14.0 +XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_14_beta_2.xip +XCODE_DEVELOPER_ROOT=/Applications/Xcode_14.0.0-beta2.app/Contents/Developer XCODE_PRODUCT_BUILD_VERSION:=$(shell /usr/libexec/PlistBuddy -c 'Print :ProductBuildVersion' $(XCODE_DEVELOPER_ROOT)/../version.plist 2>/dev/null || echo " $(shell tput setaf 1 2>/dev/null)The required Xcode ($(XCODE_VERSION)) is not installed in $(basename $(basename $(XCODE_DEVELOPER_ROOT)))$(shell tput sgr0 2>/dev/null)" >&2) # Tell both Xcode and our build logic which Xcode we're using. @@ -220,9 +220,9 @@ MIN_CMAKE_URL=https://cmake.org/files/v3.6/cmake-3.6.2-Darwin-x86_64.dmg MIN_CMAKE_VERSION=2.8.8 # ObjectiveSharpie min/max versions -MIN_SHARPIE_VERSION=3.5.50 +MIN_SHARPIE_VERSION=3.5.56 MAX_SHARPIE_VERSION=3.5.99 -MIN_SHARPIE_URL=https://download.visualstudio.microsoft.com/download/pr/401d21b7-58c2-4f86-9009-76c15bf9a804/fd5dc34d033d9949a378ca4b3332c02c/objectivesharpie-3.5.50.pkg +MIN_SHARPIE_URL=https://download.visualstudio.microsoft.com/download/pr/f1881767-2fe0-49f7-b6d5-72f59b2dcb67/9fa486d176a532f9e2f9a1a61f2e7d7a/objectivesharpie-3.5.56.pkg # Minimum OSX versions for building XI/XM MIN_OSX_BUILD_VERSION=12.0 diff --git a/Make.versions b/Make.versions index 49275fb6d2..dd346175c0 100644 --- a/Make.versions +++ b/Make.versions @@ -48,8 +48,8 @@ # line changed in git). # -IOS_PACKAGE_VERSION=15.11.0.$(IOS_COMMIT_DISTANCE) -MAC_PACKAGE_VERSION=8.11.0.$(MAC_COMMIT_DISTANCE) +IOS_PACKAGE_VERSION=15.99.0.$(IOS_COMMIT_DISTANCE) +MAC_PACKAGE_VERSION=8.99.0.$(MAC_COMMIT_DISTANCE) # # ** NuGet package version numbers ** @@ -66,11 +66,11 @@ MAC_PACKAGE_VERSION=8.11.0.$(MAC_COMMIT_DISTANCE) # WARNING: Do **not** use versions higher than the available Xcode SDK or else we will have issues with mtouch (See https://github.com/xamarin/xamarin-macios/issues/7705) # When bumping the major macOS version in MACOS_NUGET_VERSION also update the macOS version where we execute on bots in jenkins/Jenkinsfile (in the 'node' element) -IOS_NUGET_OS_VERSION=15.4 -TVOS_NUGET_OS_VERSION=15.4 -WATCHOS_NUGET_OS_VERSION=8.5 -MACOS_NUGET_OS_VERSION=12.3 -MACCATALYST_NUGET_OS_VERSION=15.4 +IOS_NUGET_OS_VERSION=16.0 +TVOS_NUGET_OS_VERSION=16.0 +WATCHOS_NUGET_OS_VERSION=9.0 +MACOS_NUGET_OS_VERSION=13.0 +MACCATALYST_NUGET_OS_VERSION=16.0 # Defines the default platform version if it's not specified in the TFM. The default should not change for a given .NET version: @@ -80,8 +80,8 @@ MACCATALYST_NUGET_OS_VERSION=15.4 # Basically: this should be the last OS version of the platform in question when the current major .NET version is first released to stable. # Ref: https://github.com/dotnet/designs/blob/8e6394406d44f75f30ea2259a425cb9e38d75b69/accepted/2020/net5/net5.md#os-versions -DEFAULT_TARGET_PLATFORM_VERSION_IOS=15.4 -DEFAULT_TARGET_PLATFORM_VERSION_TVOS=15.4 -DEFAULT_TARGET_PLATFORM_VERSION_WATCHOS=8.5 -DEFAULT_TARGET_PLATFORM_VERSION_MACOS=12.3 -DEFAULT_TARGET_PLATFORM_VERSION_MACCATALYST=15.4 +DEFAULT_TARGET_PLATFORM_VERSION_IOS=16.0 +DEFAULT_TARGET_PLATFORM_VERSION_TVOS=16.0 +DEFAULT_TARGET_PLATFORM_VERSION_WATCHOS=9.0 +DEFAULT_TARGET_PLATFORM_VERSION_MACOS=13.0 +DEFAULT_TARGET_PLATFORM_VERSION_MACCATALYST=16.0 diff --git a/Versions-ios.plist.in b/Versions-ios.plist.in index f001297962..881800b723 100644 --- a/Versions-ios.plist.in +++ b/Versions-ios.plist.in @@ -49,6 +49,7 @@ 15.0 15.2 15.4 + 16.0 tvOS @@ -80,6 +81,7 @@ 15.0 15.2 15.4 + 16.0 watchOS @@ -108,6 +110,7 @@ 8.0 8.3 8.5 + 9.0 MacCatalyst @@ -123,6 +126,7 @@ 15.0 15.2 15.4 + 16.0 MacCatalystVersionMap diff --git a/Versions-mac.plist.in b/Versions-mac.plist.in index 41e39d0648..4c754a5d20 100644 --- a/Versions-mac.plist.in +++ b/Versions-mac.plist.in @@ -25,6 +25,7 @@ 12.0 12.1 12.3 + 13.0 RecommendedXcodeVersion diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets index fccd4d139c..2055d8c589 100644 --- a/dotnet/targets/Xamarin.Shared.Sdk.targets +++ b/dotnet/targets/Xamarin.Shared.Sdk.targets @@ -1125,8 +1125,8 @@ - - + + <_XamarinMainLibraries Include="$(_XamarinNativeLibraryDirectory)/$(_LibXamarinName)" /> <_XamarinMainLibraries Include="@(_MonoLibrary)" /> @@ -1147,6 +1147,11 @@ <_LinkNativeExecutableInputs Include="@(_XamarinMainLibraries)" /> <_LinkNativeExecutableInputs Include="@(_FileNativeReference)" /> + + + <_MainLinkerFlags Include="-Wl,-no_compact_unwind" /> + <_MainLinkerFlags Include="-Wl,-keep_dwarf_unwind" /> +