Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/8.0.1xx][xcode15.1] Bump to Xcode 15.1 #19717

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Make.config
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ endif

## If this branch is a release branch, set NUGET_RELEASE_BRANCH to the exact branch name (so that any other branches won't become release branches just by branching off from a release branch).
## Example: release/6.0.3xx
NUGET_RELEASE_BRANCH=release/8.0.1xx
NUGET_RELEASE_BRANCH=release/8.0.1xx-xcode15.1

## If this is a pre-release (alpha, beta, rc, xcode, etc.) branch, set NUGET_HARDCODED_PRERELASE_BRANCH to the exact branch name. Also set NUGET_HARDCODED_PRELEASE_IDENTIFIER to the prerelease identifier to use.
## Example:
Expand Down Expand Up @@ -200,9 +200,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.0
XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_15.xip
XCODE_DEVELOPER_ROOT=/Applications/Xcode_15.0.0.app/Contents/Developer
XCODE_VERSION=15.1
XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_15.1.xip
XCODE_DEVELOPER_ROOT=/Applications/Xcode_15.1.0.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"
Expand Down
14 changes: 7 additions & 7 deletions Make.versions
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
# line changed in git).
#

IOS_PACKAGE_VERSION=17.0.0.$(IOS_COMMIT_DISTANCE)
MAC_PACKAGE_VERSION=9.0.0.$(MAC_COMMIT_DISTANCE)
IOS_PACKAGE_VERSION=17.2.0.$(IOS_COMMIT_DISTANCE)
MAC_PACKAGE_VERSION=9.2.0.$(MAC_COMMIT_DISTANCE)

#
# ** NuGet package version numbers **
Expand All @@ -65,11 +65,11 @@ MAC_PACKAGE_VERSION=9.0.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.0
TVOS_NUGET_OS_VERSION=17.0
WATCHOS_NUGET_OS_VERSION=10.0
MACOS_NUGET_OS_VERSION=14.0
MACCATALYST_NUGET_OS_VERSION=17.0
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


# Defines the default platform version if it's not specified in the TFM. The default should not change for a given .NET version:
Expand Down
8 changes: 8 additions & 0 deletions Versions-ios.plist.in
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
<string>16.2</string>
<string>16.4</string>
<string>17.0</string>
<string>17.2</string>
</array>
<key>tvOS</key>
<array>
Expand Down Expand Up @@ -68,6 +69,7 @@
<string>16.1</string>
<string>16.4</string>
<string>17.0</string>
<string>17.2</string>
</array>
<key>watchOS</key>
<array>
Expand All @@ -93,6 +95,7 @@
<string>9.0</string>
<string>9.4</string>
<string>10.0</string>
<string>10.2</string>
</array>
<key>MacCatalyst</key>
<array>
Expand All @@ -112,6 +115,7 @@
<string>16.2</string>
<string>16.4</string>
<string>17.0</string>
<string>17.2</string>
</array>
</dict>
<key>MacCatalystVersionMap</key>
Expand Down Expand Up @@ -146,6 +150,10 @@
<string>13.1</string>
<key>16.4</key>
<string>13.3</string>
<key>17.0</key>
<string>14.0</string>
<key>17.2</key>
<string>14.2</string>
</dict>
<key>RecommendedXcodeVersion</key>
<string>@XCODE_VERSION@</string>
Expand Down
1 change: 1 addition & 0 deletions Versions-mac.plist.in
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<string>13.1</string>
<string>13.3</string>
<string>14.0</string>
<string>14.2</string>
</array>
</dict>
<key>RecommendedXcodeVersion</key>
Expand Down
11 changes: 11 additions & 0 deletions src/AVFoundation/Enums.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1562,4 +1562,15 @@ public enum AVCapturePrimaryConstituentDeviceRestrictedSwitchingBehaviorConditio
ExposureModeChanged = 1uL << 2,
}

[TV (17, 2), NoWatch, NoMac, iOS (17, 2), NoMacCatalyst]
[Native]
public enum AVAudioSessionRenderingMode : long {
NotApplicable = 0,
MonoStereo = 1,
Surround = 2,
SpatialAudio = 3,
DolbyAudio = 4,
DolbyAtmos = 5,
}

}
3 changes: 2 additions & 1 deletion src/GameKit/GameKit.cs
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,8 @@ public enum GKError : long {
NotAuthorized = 32,
ConnectionTimeout = 33,
ApiObsolete = 34,

ICloudUnavailable = 35,
LockdownMode = 36,
FriendListDescriptionMissing = 100,
FriendListRestricted = 101,
FriendListDenied = 102,
Expand Down
19 changes: 19 additions & 0 deletions src/NetworkExtension/NECompat.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
#nullable enable

using System;
using System.ComponentModel;
using System.Threading.Tasks;
using Foundation;
using ObjCRuntime;

#if !NET
using NativeHandle = System.IntPtr;
#endif

namespace NetworkExtension {

Expand Down Expand Up @@ -49,4 +55,17 @@ public partial class NWTcpConnectionAuthenticationDelegate : NSObject {
}
}
#endif

[Obsolete (Constants.ApiRemovedGeneral)]
[Register ("NEFailureHandlerProvider", SkipRegistration = true)]
[EditorBrowsable (EditorBrowsableState.Never)]
public class NEFailureHandlerProvider : NEProvider {
public override NativeHandle ClassHandle => throw new PlatformNotSupportedException (Constants.ApiRemovedGeneral);

protected NEFailureHandlerProvider (NSObjectFlag t) : base (t) => throw new PlatformNotSupportedException (Constants.ApiRemovedGeneral);
protected internal NEFailureHandlerProvider (NativeHandle handle) : base (handle) => throw new PlatformNotSupportedException (Constants.ApiRemovedGeneral);

public unsafe virtual void HandleFailure (NSError error, Action completionHandler) => throw new PlatformNotSupportedException (Constants.ApiRemovedGeneral);
public unsafe virtual Task HandleFailureAsync (NSError error) => throw new PlatformNotSupportedException (Constants.ApiRemovedGeneral);
}
}
30 changes: 30 additions & 0 deletions src/Speech/SFCompat.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#nullable enable

using System;
using Foundation;
using ObjCRuntime;
using System.ComponentModel;

#if !NET
using NativeHandle = System.IntPtr;
#endif

namespace Speech {

[Obsolete (Constants.ApiRemovedGeneral)]
[EditorBrowsable (EditorBrowsableState.Never)]
public unsafe partial class SFAnalysisContextTag {

[Obsolete (Constants.ApiRemovedGeneral)]
[EditorBrowsable (EditorBrowsableState.Never)]
public static NSString LeftContext => throw new PlatformNotSupportedException (Constants.ApiRemovedGeneral);

[Obsolete (Constants.ApiRemovedGeneral)]
[EditorBrowsable (EditorBrowsableState.Never)]
public static NSString RightContext => throw new PlatformNotSupportedException (Constants.ApiRemovedGeneral);

[Obsolete (Constants.ApiRemovedGeneral)]
[EditorBrowsable (EditorBrowsableState.Never)]
public static NSString SelectedText => throw new PlatformNotSupportedException (Constants.ApiRemovedGeneral);
}
}
24 changes: 24 additions & 0 deletions src/avfoundation.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2324,6 +2324,10 @@ interface AVAudioSession {
[Export ("IOBufferDuration")]
double IOBufferDuration { get; }

[TV (17, 2), NoWatch, NoMac, iOS (17, 2), NoMacCatalyst]
[Export ("supportedOutputChannelLayouts")]
AVAudioChannelLayout [] SupportedOutputChannelLayouts { get; }

[NoWatch, NoMac]
[MacCatalyst (13, 1)]
[Export ("setInputGain:error:")]
Expand Down Expand Up @@ -2694,6 +2698,26 @@ interface AVAudioSession {
[Watch (8, 0), TV (15, 0), NoMac, iOS (15, 0), MacCatalyst (15, 0)]
[Field ("AVAudioSessionSpatialPlaybackCapabilitiesChangedNotification")]
NSString SpatialPlaybackCapabilitiesChangedNotification { get; }

[Notification (typeof (RenderingModeChangeNotificationEventArgs))]
[TV (17, 2), NoWatch, NoMac, iOS (17, 2), NoMacCatalyst]
[Field ("AVAudioSessionRenderingModeChangeNotification")]
NSString RenderingModeChangeNotification { get; }

[Notification]
[TV (17, 2), NoWatch, NoMac, iOS (17, 2), NoMacCatalyst]
[Field ("AVAudioSessionRenderingCapabilitiesChangeNotification")]
NSString RenderingCapabilitiesChangeNotification { get; }

[TV (17, 2), NoWatch, NoMac, iOS (17, 2), NoMacCatalyst]
[Export ("renderingMode")]
AVAudioSessionRenderingMode RenderingMode { get; }
}

[TV (17, 2), NoWatch, NoMac, iOS (17, 2), NoMacCatalyst]
interface RenderingModeChangeNotificationEventArgs {
[Export ("AVAudioSessionRenderingModeNewRenderingModeKey")]
AVAudioSessionRenderingMode NewRenderingMode { get; }
}

[NoMac]
Expand Down
20 changes: 18 additions & 2 deletions src/cloudkit.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2258,6 +2258,10 @@ interface CKSyncEngineFetchChangesScope : NSCopying {
[Internal]
[Export ("initWithExcludedZoneIDs:")]
NativeHandle _InitWithExcludedZoneIds (NSSet<CKRecordZoneID> zoneIds);

[Watch (10, 2), TV (17, 2), MacCatalyst (17, 2), Mac (14, 2), iOS (17, 2)]
[Export ("containsZoneID:")]
bool Contains (CKRecordZoneID zoneId);
}

[Watch (10, 0), TV (17, 0), Mac (14, 0), iOS (17, 0), MacCatalyst (17, 0)]
Expand Down Expand Up @@ -2491,7 +2495,13 @@ interface CKSyncEngineSentDatabaseChangesEvent {

[Watch (10, 0), TV (17, 0), Mac (14, 0), iOS (17, 0), MacCatalyst (17, 0)]
[BaseType (typeof (CKSyncEngineEvent))]
interface CKSyncEngineWillFetchChangesEvent { }
interface CKSyncEngineWillFetchChangesEvent {

[Watch (10, 2), TV (17, 2), MacCatalyst (17, 2), Mac (14, 2), iOS (17, 2)]
[Export ("context", ArgumentSemantic.Strong)]
CKSyncEngineFetchChangesContext Context { get; }

}

[Watch (10, 0), TV (17, 0), Mac (14, 0), iOS (17, 0), MacCatalyst (17, 0)]
[BaseType (typeof (CKSyncEngineEvent))]
Expand Down Expand Up @@ -2569,7 +2579,13 @@ interface CKSyncEngine {

[Watch (10, 0), TV (17, 0), Mac (14, 0), iOS (17, 0), MacCatalyst (17, 0)]
[BaseType (typeof (CKSyncEngineEvent))]
interface CKSyncEngineDidFetchChangesEvent { }
interface CKSyncEngineDidFetchChangesEvent {

[Watch (10, 2), TV (17, 2), MacCatalyst (17, 2), Mac (14, 2), iOS (17, 2)]
[Export ("context", ArgumentSemantic.Strong)]
CKSyncEngineFetchChangesContext Context { get; }

}

[Watch (10, 0), TV (17, 0), Mac (14, 0), iOS (17, 0), MacCatalyst (17, 0)]
[BaseType (typeof (CKSyncEngineEvent))]
Expand Down
2 changes: 2 additions & 0 deletions src/corelocation.cs
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ public enum CLMonitoringState : ulong {
Unknown,
Satisfied,
Unsatisfied,
[NoWatch, Mac (14, 2), iOS (17, 2), MacCatalyst (17, 2), NoTV]
Unmonitored,
}

[Watch (10, 0), Mac (14, 0), iOS (17, 0), MacCatalyst (17, 0), TV (17, 0)]
Expand Down
8 changes: 8 additions & 0 deletions src/corevideo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,14 @@ interface CVImageBuffer : CVBuffer {
[Watch (8, 0), TV (15, 0), Mac (12, 0), iOS (15, 0), MacCatalyst (15, 0)]
[Field ("kCVImageBufferAmbientViewingEnvironmentKey")]
NSString AmbientViewingEnvironmentKey { get; }

[Watch (10, 2), TV (17, 2), Mac (14, 2), iOS (17, 2), MacCatalyst (17, 2)]
[Field ("kCVImageBufferLogTransferFunctionKey")]
NSString LogTransferFunctionKey { get; }

[Watch (10, 2), TV (17, 2), Mac (14, 2), iOS (17, 2), MacCatalyst (17, 2)]
[Field ("kCVImageBufferLogTransferFunction_AppleLog")]
NSString LogTransferFunctionAppleLogKey { get; }
}

[MacCatalyst (13, 1)]
Expand Down
5 changes: 5 additions & 0 deletions src/frameworks.sources
Original file line number Diff line number Diff line change
Expand Up @@ -1630,6 +1630,11 @@ SOCIAL_SOURCES = \
Social/SLComposeViewController.cs \
Social/SLRequest.cs \

# Speech

SPEECH_SOURCES = \
Speech/SFCompat.cs \

# SpriteKit

SPRITEKIT_API_SOURCES = \
Expand Down
49 changes: 49 additions & 0 deletions src/gamekit.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1099,6 +1099,14 @@ interface GKMatch {
[Export ("expectedPlayerCount")]
nint ExpectedPlayerCount { get; }

[TV (17, 2), Mac (14, 2), iOS (17, 2), MacCatalyst (17, 2)]
[NullAllowed, Export ("properties")]
NSDictionary<NSString, NSObject> Properties { get; }

[TV (17, 2), Mac (14, 2), iOS (17, 2), MacCatalyst (17, 2)]
[NullAllowed, Export ("playerProperties")]
NSDictionary<GKPlayer, NSDictionary<NSString, NSObject>> PlayerProperties { get; }

[NoTV]
[Deprecated (PlatformName.iOS, 8, 0, message: "Use 'SendDataToAllPlayers (NSData, GKPlayer[] players, GKMatchSendDataMode mode, NSError error)' instead.")]
[Deprecated (PlatformName.MacOSX, 10, 10, message: "Use 'SendDataToAllPlayers (NSData, GKPlayer[] players, GKMatchSendDataMode mode, NSError error)' instead.")]
Expand Down Expand Up @@ -1334,6 +1342,18 @@ interface GKMatchRequest {
[Deprecated (PlatformName.MacCatalyst, 14, 0, message: "Use 'GKMatchmakerViewController.MatchmakingMode' instead.")]
[Export ("restrictToAutomatch")]
bool RestrictToAutomatch { get; set; }

[TV (17, 2), Mac (14, 2), iOS (17, 2), MacCatalyst (17, 2)]
[NullAllowed, Export ("queueName")]
string QueueName { get; set; }

[TV (17, 2), Mac (14, 2), iOS (17, 2), MacCatalyst (17, 2)]
[NullAllowed, Export ("properties", ArgumentSemantic.Copy)]
NSDictionary<NSString, NSObject> Properties { get; set; }

[TV (17, 2), Mac (14, 2), iOS (17, 2), MacCatalyst (17, 2)]
[NullAllowed, Export ("recipientProperties", ArgumentSemantic.Copy)]
NSDictionary<GKPlayer, NSDictionary<NSString, NSObject>> RecipientProperties { get; set; }
}

[NoWatch]
Expand Down Expand Up @@ -1409,6 +1429,11 @@ interface GKMatchmaker {
[Async]
void QueryActivity ([NullAllowed] GKQueryHandler completionHandler);

[TV (17, 2), Mac (14, 2), iOS (17, 2), MacCatalyst (17, 2)]
[Async]
[Export ("queryQueueActivity:withCompletionHandler:")]
void QueryQueueActivity (string queueName, [NullAllowed] Action<nint, NSError> completionHandler);

[NoWatch]
[MacCatalyst (13, 1)]
[Export ("matchForInvite:completionHandler:")]
Expand Down Expand Up @@ -1448,6 +1473,11 @@ interface GKMatchmaker {
[Async]
void FindPlayersForHostedRequest (GKMatchRequest request, [NullAllowed] Action<GKPlayer [], NSError> completionHandler);

[TV (17, 2), Mac (14, 2), iOS (17, 2), MacCatalyst (17, 2)]
[Async]
[Export ("findMatchedPlayers:withCompletionHandler:")]
void FindMatchedPlayers (GKMatchRequest request, [NullAllowed] Action<GKMatchedPlayers, NSError> completionHandler);

// Not truly an [Async] method since the handler can be called multiple times, for each player found
[MacCatalyst (13, 1)]
[Export ("startBrowsingForNearbyPlayersWithHandler:")]
Expand Down Expand Up @@ -1595,6 +1625,11 @@ interface GKMatchmakerViewControllerDelegate {
[MacCatalyst (13, 1)]
[Export ("matchmakerViewController:hostedPlayerDidAccept:"), EventArgs ("GKMatchmakingPlayer")]
void HostedPlayerDidAccept (GKMatchmakerViewController viewController, GKPlayer playerID);

[TV (17, 2), Mac (14, 2), iOS (17, 2), MacCatalyst (17, 2)]
[IgnoredInDelegate]
[Export ("matchmakerViewController:getMatchPropertiesForRecipient:withCompletionHandler:")]
void GetMatchProperties (GKMatchmakerViewController viewController, GKPlayer recipient, Action<NSDictionary<NSString, NSObject>> completionHandler);
}

[BaseType (typeof (NSObject))]
Expand Down Expand Up @@ -2987,4 +3022,18 @@ interface GKLeaderboardScore {
[Export ("leaderboardID", ArgumentSemantic.Strong)]
string LeaderboardId { get; set; }
}

[TV (17, 2), NoWatch, Mac (14, 2), iOS (17, 2), MacCatalyst (17, 2)]
[BaseType (typeof (NSObject))]
interface GKMatchedPlayers {

[NullAllowed, Export ("properties")]
NSDictionary<NSString, NSObject> Properties { get; }

[Export ("players")]
GKPlayer [] Players { get; }

[NullAllowed, Export ("playerProperties")]
NSDictionary<GKPlayer, NSDictionary<NSString, NSObject>> PlayerProperties { get; }
}
}
Loading