diff --git a/Make.config b/Make.config
index b7245eed87..35d0e21ad8 100644
--- a/Make.config
+++ b/Make.config
@@ -212,9 +212,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=15.2
-XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_15.2.xip
-XCODE_DEVELOPER_ROOT=/Applications/Xcode_15.2.0.app/Contents/Developer
+XCODE_VERSION=16.0
+XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_16-beta.xip
+XCODE_DEVELOPER_ROOT=/Applications/Xcode_16.0.0-beta.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)
# We define stable Xcode as the Xcode app being named like "Xcode_#.#[.#].app"
@@ -476,8 +476,8 @@ SIMULATORWATCH_OBJC_CFLAGS = $(SIMULATORWATCH_CFLAGS) $(COMMON_SIMULATOR_OBJC_
SIMULATORWATCH64_OBJC_CFLAGS = $(SIMULATORWATCH64_CFLAGS) $(COMMON_SIMULATOR_OBJC_CFLAGS)
DEVICEWATCH_SDK = $(XCODE_DEVELOPER_ROOT)/Platforms/WatchOS.platform/Developer/SDKs/WatchOS$(WATCH_SDK_VERSION).sdk
-DEVICEWATCH_CFLAGS = -arch armv7k -mwatchos-version-min=$(MIN_WATCHOS_SDK_VERSION) -isysroot $(DEVICEWATCH_SDK) $(CFLAGS) -fembed-bitcode $(IOS_COMMON_DEFINES)
-DEVICEWATCH64_32_CFLAGS = -arch arm64_32 -mwatchos-version-min=$(MIN_WATCHOS64_32_SDK_VERSION) -isysroot $(DEVICEWATCH_SDK) $(CFLAGS) -fembed-bitcode $(IOS_COMMON_DEFINES)
+DEVICEWATCH_CFLAGS = -arch armv7k -mwatchos-version-min=$(MIN_WATCHOS_SDK_VERSION) -isysroot $(DEVICEWATCH_SDK) $(CFLAGS) $(IOS_COMMON_DEFINES)
+DEVICEWATCH64_32_CFLAGS = -arch arm64_32 -mwatchos-version-min=$(MIN_WATCHOS64_32_SDK_VERSION) -isysroot $(DEVICEWATCH_SDK) $(CFLAGS) $(IOS_COMMON_DEFINES)
DEVICEWATCH_OBJC_CFLAGS = $(DEVICEWATCH_CFLAGS) $(DEVICE_OBJC_CFLAGS)
DEVICEWATCH64_32_OBJC_CFLAGS = $(DEVICEWATCH64_32_CFLAGS) $(DEVICE_OBJC_CFLAGS)
diff --git a/Make.versions b/Make.versions
index 9d52198a35..468e9964cc 100644
--- a/Make.versions
+++ b/Make.versions
@@ -48,8 +48,8 @@
# line changed in git).
#
-IOS_PACKAGE_VERSION=17.3.0.$(IOS_COMMIT_DISTANCE)
-MAC_PACKAGE_VERSION=9.3.0.$(MAC_COMMIT_DISTANCE)
+IOS_PACKAGE_VERSION=17.99.0.$(IOS_COMMIT_DISTANCE)
+MAC_PACKAGE_VERSION=9.99.0.$(MAC_COMMIT_DISTANCE)
#
# ** NuGet package version numbers **
@@ -65,11 +65,11 @@ MAC_PACKAGE_VERSION=9.3.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)
-IOS_NUGET_OS_VERSION=17.2
-TVOS_NUGET_OS_VERSION=17.2
-WATCHOS_NUGET_OS_VERSION=10.2
-MACOS_NUGET_OS_VERSION=14.2
-MACCATALYST_NUGET_OS_VERSION=17.2
+IOS_NUGET_OS_VERSION=18.0
+TVOS_NUGET_OS_VERSION=18.0
+WATCHOS_NUGET_OS_VERSION=11.0
+MACOS_NUGET_OS_VERSION=15.0
+MACCATALYST_NUGET_OS_VERSION=18.0
# In theory we should define the default platform version if it's not specified in the TFM. The default should not change for a given .NET version:
diff --git a/Versions-ios.plist.in b/Versions-ios.plist.in
index d246d5b947..793587a0c4 100644
--- a/Versions-ios.plist.in
+++ b/Versions-ios.plist.in
@@ -40,6 +40,7 @@
16.4
17.0
17.2
+ 18.0
tvOS
@@ -70,6 +71,7 @@
16.4
17.0
17.2
+ 18.0
watchOS
@@ -96,6 +98,7 @@
9.4
10.0
10.2
+ 11.0
MacCatalyst
@@ -116,6 +119,7 @@
16.4
17.0
17.2
+ 18.0
MacCatalystVersionMap
diff --git a/Versions-mac.plist.in b/Versions-mac.plist.in
index a611d04d70..15d1369dbf 100644
--- a/Versions-mac.plist.in
+++ b/Versions-mac.plist.in
@@ -24,6 +24,7 @@
13.3
14.0
14.2
+ 15.0
RecommendedXcodeVersion
diff --git a/builds/Versions-MacCatalyst.plist.in b/builds/Versions-MacCatalyst.plist.in
index dea4c6ade3..9db87d825f 100644
--- a/builds/Versions-MacCatalyst.plist.in
+++ b/builds/Versions-MacCatalyst.plist.in
@@ -25,6 +25,7 @@
16.4
17.0
17.2
+ 18.0
SupportedTargetPlatformVersions
@@ -51,6 +52,7 @@
16.4
17.0
17.2
+ 18.0
MacCatalystVersionMap
diff --git a/builds/Versions-iOS.plist.in b/builds/Versions-iOS.plist.in
index 8b0d432616..cd25753ea3 100644
--- a/builds/Versions-iOS.plist.in
+++ b/builds/Versions-iOS.plist.in
@@ -40,6 +40,7 @@
16.4
17.0
17.2
+ 18.0
SupportedTargetPlatformVersions
@@ -85,6 +86,7 @@
16.4
17.0
17.2
+ 18.0
RecommendedXcodeVersion
diff --git a/builds/Versions-macOS.plist.in b/builds/Versions-macOS.plist.in
index 02a7939c5c..728d0e0e46 100644
--- a/builds/Versions-macOS.plist.in
+++ b/builds/Versions-macOS.plist.in
@@ -24,6 +24,7 @@
13.3
14.0
14.2
+ 15.0
SupportedTargetPlatformVersions
@@ -48,6 +49,7 @@
13.3
14.0
14.2
+ 15.0
RecommendedXcodeVersion
diff --git a/builds/Versions-tvOS.plist.in b/builds/Versions-tvOS.plist.in
index 4c6af96265..94ca3d4892 100644
--- a/builds/Versions-tvOS.plist.in
+++ b/builds/Versions-tvOS.plist.in
@@ -35,6 +35,7 @@
16.4
17.0
17.2
+ 18.0
SupportedTargetPlatformVersions
@@ -75,6 +76,7 @@
16.4
17.0
17.2
+ 18.0
RecommendedXcodeVersion
diff --git a/tests/test-libraries/Makefile b/tests/test-libraries/Makefile
index 77566bd562..61725d4db3 100644
--- a/tests/test-libraries/Makefile
+++ b/tests/test-libraries/Makefile
@@ -242,9 +242,9 @@ else
$(eval $(call Template,watchsimulator,WATCHSIMULATOR,x86_64,WatchSimulator,-mwatchos-simulator-version-min=$(MIN_WATCH_OS_VERSION) -isysroot $(SIMULATORWATCH_SDK)))
endif
ifdef WATCHOS_SUPPORTS_32BIT_DEVICE_ARCHITECTURES
-$(eval $(call Template,watchos,WATCHOS,armv7k arm64_32,WatchOS,-mwatchos-version-min=$(MIN_WATCHOS_SDK_VERSION) -fembed-bitcode -isysroot $(DEVICEWATCH_SDK)))
+$(eval $(call Template,watchos,WATCHOS,armv7k arm64_32,WatchOS,-mwatchos-version-min=$(MIN_WATCHOS_SDK_VERSION) -isysroot $(DEVICEWATCH_SDK)))
else
-$(eval $(call Template,watchos,WATCHOS,arm64_32,WatchOS,-mwatchos-version-min=$(MIN_WATCHOS_SDK_VERSION) -fembed-bitcode -isysroot $(DEVICEWATCH_SDK)))
+$(eval $(call Template,watchos,WATCHOS,arm64_32,WatchOS,-mwatchos-version-min=$(MIN_WATCHOS_SDK_VERSION) -isysroot $(DEVICEWATCH_SDK)))
endif
endif
ifdef INCLUDE_MAC
diff --git a/tools/common/SdkVersions.cs b/tools/common/SdkVersions.cs
index 27461b303a..0a14ca4810 100644
--- a/tools/common/SdkVersions.cs
+++ b/tools/common/SdkVersions.cs
@@ -14,12 +14,12 @@ using MonoTouch;
namespace Xamarin {
static class SdkVersions {
- public const string Xcode = "15.2";
- public const string OSX = "14.2";
- public const string iOS = "17.2";
- public const string WatchOS = "10.2";
- public const string TVOS = "17.2";
- public const string MacCatalyst = "17.2";
+ public const string Xcode = "16.0";
+ public const string OSX = "15.0";
+ public const string iOS = "18.0";
+ public const string WatchOS = "11.0";
+ public const string TVOS = "18.0";
+ public const string MacCatalyst = "18.0";
#if NET
public const string MinOSX = "10.15";
@@ -48,19 +48,19 @@ namespace Xamarin {
public const string MinWatchOSCompanionSimulator = "14.5";
public const string MinTVOSSimulator = "14.0";
- public const string MaxiOSSimulator = "17.2";
- public const string MaxWatchOSSimulator = "10.2";
- public const string MaxWatchOSCompanionSimulator = "17.2";
- public const string MaxTVOSSimulator = "17.2";
+ public const string MaxiOSSimulator = "18.0";
+ public const string MaxWatchOSSimulator = "11.0";
+ public const string MaxWatchOSCompanionSimulator = "18.0";
+ public const string MaxTVOSSimulator = "18.0";
- public const string MaxiOSDeploymentTarget = "17.2";
- public const string MaxWatchDeploymentTarget = "10.2";
- public const string MaxTVOSDeploymentTarget = "17.2";
+ public const string MaxiOSDeploymentTarget = "18.0";
+ public const string MaxWatchDeploymentTarget = "11.0";
+ public const string MaxTVOSDeploymentTarget = "18.0";
- public const string TargetPlatformVersioniOS = "17.2";
- public const string TargetPlatformVersiontvOS = "17.2";
- public const string TargetPlatformVersionmacOS = "14.2";
- public const string TargetPlatformVersionMacCatalyst = "17.2";
+ public const string TargetPlatformVersioniOS = "18.0";
+ public const string TargetPlatformVersiontvOS = "18.0";
+ public const string TargetPlatformVersionmacOS = "15.0";
+ public const string TargetPlatformVersionMacCatalyst = "18.0";
public static Version OSXVersion { get { return new Version (OSX); } }
public static Version iOSVersion { get { return new Version (iOS); } }