xamarin
/
xamarin-macios
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Xcode 16, here we come

This commit is contained in:
Rolf Bjarne Kvinge 2024-06-10 21:29:43 +02:00
Родитель 122ed73df5
Коммит 4b5e6c9b2d
10 изменённых файлов: 44 добавлений и 31 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
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)

14
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:

4
Versions-ios.plist.in
Просмотреть файл

@ -40,6 +40,7 @@
<string>16.4</string>
<string>17.0</string>
<string>17.2</string>
<string>18.0</string>
</array>
<key>tvOS</key>
<array>
@ -70,6 +71,7 @@
<string>16.4</string>
<string>17.0</string>
<string>17.2</string>
<string>18.0</string>
</array>
<key>watchOS</key>
<array>
@ -96,6 +98,7 @@
<string>9.4</string>
<string>10.0</string>
<string>10.2</string>
<string>11.0</string>
</array>
<key>MacCatalyst</key>
<array>
@ -116,6 +119,7 @@
<string>16.4</string>
<string>17.0</string>
<string>17.2</string>
<string>18.0</string>
</array>
</dict>
<key>MacCatalystVersionMap</key>

1
Versions-mac.plist.in
Просмотреть файл

@ -24,6 +24,7 @@
<string>13.3</string>
<string>14.0</string>
<string>14.2</string>
<string>15.0</string>
</array>
</dict>
<key>RecommendedXcodeVersion</key>

2
builds/Versions-MacCatalyst.plist.in
Просмотреть файл

@ -25,6 +25,7 @@
<string>16.4</string>
<string>17.0</string>
<string>17.2</string>
<string>18.0</string>
</array>
</dict>
<key>SupportedTargetPlatformVersions</key>
@ -51,6 +52,7 @@
<string>16.4</string>
<string>17.0</string>
<string>17.2</string>
<string>18.0</string>
</array>
</dict>
<key>MacCatalystVersionMap</key>

2
builds/Versions-iOS.plist.in
Просмотреть файл

@ -40,6 +40,7 @@
<string>16.4</string>
<string>17.0</string>
<string>17.2</string>
<string>18.0</string>
</array>
</dict>
<key>SupportedTargetPlatformVersions</key>
@ -85,6 +86,7 @@
<string>16.4</string>
<string>17.0</string>
<string>17.2</string>
<string>18.0</string>
</array>
</dict>
<key>RecommendedXcodeVersion</key>

2
builds/Versions-macOS.plist.in
Просмотреть файл

@ -24,6 +24,7 @@
<string>13.3</string>
<string>14.0</string>
<string>14.2</string>
<string>15.0</string>
</array>
</dict>
<key>SupportedTargetPlatformVersions</key>
@ -48,6 +49,7 @@
<string>13.3</string>
<string>14.0</string>
<string>14.2</string>
<string>15.0</string>
</array>
</dict>
<key>RecommendedXcodeVersion</key>

2
builds/Versions-tvOS.plist.in
Просмотреть файл

@ -35,6 +35,7 @@
<string>16.4</string>
<string>17.0</string>
<string>17.2</string>
<string>18.0</string>
</array>
</dict>
<key>SupportedTargetPlatformVersions</key>
@ -75,6 +76,7 @@
<string>16.4</string>
<string>17.0</string>
<string>17.2</string>
<string>18.0</string>
</array>
</dict>
<key>RecommendedXcodeVersion</key>

4
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

34
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); } }