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

[xcode15.4] Update bindings to Xcode 15.4 #20865

Merged
merged 2 commits into from
Jul 11, 2024
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
6 changes: 3 additions & 3 deletions Make.config
Original file line number Diff line number Diff line change
Expand Up @@ -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.3
XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_15.3.xip
XCODE_DEVELOPER_ROOT=/Applications/Xcode_15.3.0.app/Contents/Developer
XCODE_VERSION=15.4
XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_15.4.xip
XCODE_DEVELOPER_ROOT=/Applications/Xcode_15.4.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.4.0.$(IOS_COMMIT_DISTANCE)
MAC_PACKAGE_VERSION=9.4.0.$(MAC_COMMIT_DISTANCE)
IOS_PACKAGE_VERSION=17.5.0.$(IOS_COMMIT_DISTANCE)
MAC_PACKAGE_VERSION=9.5.0.$(MAC_COMMIT_DISTANCE)

#
# ** NuGet package version numbers **
Expand All @@ -65,11 +65,11 @@ MAC_PACKAGE_VERSION=9.4.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.4
TVOS_NUGET_OS_VERSION=17.4
WATCHOS_NUGET_OS_VERSION=10.4
MACOS_NUGET_OS_VERSION=14.4
MACCATALYST_NUGET_OS_VERSION=17.4
IOS_NUGET_OS_VERSION=17.5
TVOS_NUGET_OS_VERSION=17.5
WATCHOS_NUGET_OS_VERSION=10.5
MACOS_NUGET_OS_VERSION=14.5
MACCATALYST_NUGET_OS_VERSION=17.5


# 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:
Expand Down
6 changes: 6 additions & 0 deletions Versions-ios.plist.in
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
<string>17.0</string>
<string>17.2</string>
<string>17.4</string>
<string>17.5</string>
</array>
<key>tvOS</key>
<array>
Expand Down Expand Up @@ -72,6 +73,7 @@
<string>17.0</string>
<string>17.2</string>
<string>17.4</string>
<string>17.5</string>
</array>
<key>watchOS</key>
<array>
Expand Down Expand Up @@ -99,6 +101,7 @@
<string>10.0</string>
<string>10.2</string>
<string>10.4</string>
<string>10.5</string>
</array>
<key>MacCatalyst</key>
<array>
Expand All @@ -120,6 +123,7 @@
<string>17.0</string>
<string>17.2</string>
<string>17.4</string>
<string>17.5</string>
</array>
</dict>
<key>MacCatalystVersionMap</key>
Expand Down Expand Up @@ -160,6 +164,8 @@
<string>14.2</string>
<key>17.4</key>
<string>14.4</string>
<key>17.5</key>
<string>14.5</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 @@ -25,6 +25,7 @@
<string>14.0</string>
<string>14.2</string>
<string>14.4</string>
<string>14.5</string>
</array>
</dict>
<key>RecommendedXcodeVersion</key>
Expand Down
4 changes: 4 additions & 0 deletions builds/Versions-MacCatalyst.plist.in
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<string>17.0</string>
<string>17.2</string>
<string>17.4</string>
<string>17.5</string>
</array>
</dict>
<key>SupportedTargetPlatformVersions</key>
Expand Down Expand Up @@ -53,6 +54,7 @@
<string>17.0</string>
<string>17.2</string>
<string>17.4</string>
<string>17.5</string>
</array>
</dict>
<key>MacCatalystVersionMap</key>
Expand Down Expand Up @@ -93,6 +95,8 @@
<string>14.2</string>
<key>17.4</key>
<string>14.4</string>
<key>17.5</key>
<string>14.5</string>
</dict>
<key>RecommendedXcodeVersion</key>
<string>@XCODE_VERSION@</string>
Expand Down
2 changes: 2 additions & 0 deletions builds/Versions-iOS.plist.in
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
<string>17.0</string>
<string>17.2</string>
<string>17.4</string>
<string>17.5</string>
</array>
</dict>
<key>SupportedTargetPlatformVersions</key>
Expand Down Expand Up @@ -87,6 +88,7 @@
<string>17.0</string>
<string>17.2</string>
<string>17.4</string>
<string>17.5</string>
</array>
</dict>
<key>RecommendedXcodeVersion</key>
Expand Down
2 changes: 2 additions & 0 deletions builds/Versions-macOS.plist.in
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<string>14.0</string>
<string>14.2</string>
<string>14.4</string>
<string>14.5</string>
</array>
</dict>
<key>SupportedTargetPlatformVersions</key>
Expand All @@ -50,6 +51,7 @@
<string>14.0</string>
<string>14.2</string>
<string>14.4</string>
<string>14.5</string>
</array>
</dict>
<key>RecommendedXcodeVersion</key>
Expand Down
2 changes: 2 additions & 0 deletions builds/Versions-tvOS.plist.in
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
<string>17.0</string>
<string>17.2</string>
<string>17.4</string>
<string>17.5</string>
</array>
</dict>
<key>SupportedTargetPlatformVersions</key>
Expand Down Expand Up @@ -77,6 +78,7 @@
<string>17.0</string>
<string>17.2</string>
<string>17.4</string>
<string>17.5</string>
</array>
</dict>
<key>RecommendedXcodeVersion</key>
Expand Down
2 changes: 2 additions & 0 deletions src/UIKit/UIEnums.cs
Original file line number Diff line number Diff line change
Expand Up @@ -727,6 +727,8 @@ public enum UITouchProperties : long {
Azimuth = (1 << 1),
Altitude = (1 << 2),
Location = (1 << 3),
[iOS (17, 5), MacCatalyst (17, 5), NoTV]
Roll = (1L << 4),
}

//
Expand Down
13 changes: 13 additions & 0 deletions src/authenticationservices.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1438,6 +1438,10 @@ interface ASAuthorizationSecurityKeyPublicKeyCredentialAssertionRequest : ASAuth
[Sealed]
[Export ("allowedCredentials", ArgumentSemantic.Copy)]
ASAuthorizationSecurityKeyPublicKeyCredentialDescriptor [] SecurityAllowedCredentials { get; set; }

[Mac (14, 5), iOS (17, 5), MacCatalyst (17, 5)]
[NullAllowed, Export ("appID")]
string AppId { get; set; }
}

interface IASAuthorizationPublicKeyCredentialAssertionRequest { }
Expand Down Expand Up @@ -1674,12 +1678,21 @@ interface ASAuthorizationPlatformPublicKeyCredentialRegistrationRequest : ASAuth
[NoWatch, NoTV, Mac (12, 0), iOS (15, 0), MacCatalyst (15, 0)]
[BaseType (typeof (NSObject))]
interface ASAuthorizationSecurityKeyPublicKeyCredentialAssertion : ASAuthorizationPublicKeyCredentialAssertion {

[Mac (14, 5), iOS (17, 5), MacCatalyst (17, 5)]
[Export ("appID")]
bool AppId { get; }
}

[NoWatch, NoTV, Mac (12, 0), iOS (15, 0), MacCatalyst (15, 0)]
[BaseType (typeof (NSObject))]
[DisableDefaultCtor]
interface ASAuthorizationSecurityKeyPublicKeyCredentialRegistration : ASAuthorizationPublicKeyCredentialRegistration {

[Mac (14, 5), iOS (17, 5), MacCatalyst (17, 5)]
[Export ("transports", ArgumentSemantic.Assign)]
[BindAs (typeof (ASAuthorizationSecurityKeyPublicKeyCredentialDescriptorTransport []))]
NSString [] Transports { get; }
}

[NoWatch, TV (16, 0), Mac (12, 0), iOS (15, 0), MacCatalyst (15, 0)]
Expand Down
30 changes: 21 additions & 9 deletions src/automaticassessmentconfiguration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ namespace AutomaticAssessmentConfiguration {
public enum AEAssessmentErrorCode : long {
Unknown = 1,
UnsupportedPlatform = 2,
MultipleParticipantsNotSupported = 3,
ConfigurationUpdatesNotSupported = 4,
}

[iOS (14, 0)]
Expand Down Expand Up @@ -86,19 +88,19 @@ interface AEAssessmentConfiguration : NSCopying {
[Export ("allowsContinuousPathKeyboard")]
bool AllowsContinuousPathKeyboard { get; set; }

[NoiOS, Mac (12, 0), MacCatalyst (15, 0)]
[iOS (17, 5), Mac (12, 0), MacCatalyst (15, 0)]
[Export ("configurationsByApplication", ArgumentSemantic.Copy)]
NSDictionary<AEAssessmentApplication, AEAssessmentParticipantConfiguration> ConfigurationsByApplication { get; }

[NoiOS, Mac (12, 0), MacCatalyst (15, 0)]
[iOS (17, 5), Mac (12, 0), MacCatalyst (15, 0)]
[Export ("mainParticipantConfiguration", ArgumentSemantic.Strong)]
AEAssessmentParticipantConfiguration MainParticipantConfiguration { get; }

[NoiOS, Mac (12, 0), MacCatalyst (15, 0)]
[iOS (17, 5), Mac (12, 0), MacCatalyst (15, 0)]
[Export ("removeApplication:")]
void Remove (AEAssessmentApplication application);

[NoiOS, Mac (12, 0), MacCatalyst (15, 0)]
[iOS (17, 5), Mac (12, 0), MacCatalyst (15, 0)]
[Export ("setConfiguration:forApplication:")]
void SetConfiguration (AEAssessmentParticipantConfiguration configuration, AEAssessmentApplication application);
}
Expand All @@ -109,6 +111,16 @@ interface AEAssessmentConfiguration : NSCopying {
[DisableDefaultCtor]
interface AEAssessmentSession {

[MacCatalyst (17, 5), Mac (14, 5), iOS (17, 5)]
[Static]
[Export ("supportsMultipleParticipants")]
bool SupportsMultipleParticipants { get; }

[MacCatalyst (17, 5), Mac (14, 5), iOS (17, 5)]
[Static]
[Export ("supportsConfigurationUpdates")]
bool SupportsConfigurationUpdates { get; }

[Wrap ("WeakDelegate")]
[NullAllowed]
IAEAssessmentSessionDelegate Delegate { get; set; }
Expand All @@ -126,7 +138,7 @@ interface AEAssessmentSession {
[Export ("configuration", ArgumentSemantic.Copy)]
AEAssessmentConfiguration Configuration { get; }

[Mac (12, 0), iOS (15, 0), MacCatalyst (15, 0)]
[Mac (12, 0), iOS (17, 5), MacCatalyst (15, 0)]
[Export ("updateToConfiguration:")]
void Update (AEAssessmentConfiguration configuration);

Expand Down Expand Up @@ -161,11 +173,11 @@ interface AEAssessmentSessionDelegate {
[Export ("assessmentSessionDidEnd:")]
void DidEnd (AEAssessmentSession session);

[NoiOS, Mac (12, 0), MacCatalyst (15, 0)]
[iOS (17, 5), Mac (12, 0), MacCatalyst (15, 0)]
[Export ("assessmentSessionDidUpdate:")]
void DidUpdate (AEAssessmentSession session);

[NoiOS, Mac (12, 0), MacCatalyst (15, 0)]
[iOS (17, 5), Mac (12, 0), MacCatalyst (15, 0)]
[Export ("assessmentSession:failedToUpdateToConfiguration:error:")]
void FailedToUpdate (AEAssessmentSession session, AEAssessmentConfiguration configuration, NSError error);
}
Expand All @@ -176,7 +188,7 @@ interface AEAssessmentSessionDelegate {
[DisableDefaultCtor]
#endif
interface AEAssessmentApplication : NSCopying {
[NoiOS]
[iOS (17, 5)]
[MacCatalyst (15, 0)]
[Export ("initWithBundleIdentifier:")]
NativeHandle Constructor (string bundleIdentifier);
Expand All @@ -196,7 +208,7 @@ interface AEAssessmentApplication : NSCopying {
bool RequiresSignatureValidation { get; set; }
}

[Mac (12, 0), iOS (15, 0), MacCatalyst (15, 0)]
[Mac (12, 0), iOS (17, 5), MacCatalyst (15, 0)]
[BaseType (typeof (NSObject))]
interface AEAssessmentParticipantConfiguration : NSCopying {
[Export ("allowsNetworkAccess")]
Expand Down
4 changes: 4 additions & 0 deletions src/avfoundation.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14055,6 +14055,10 @@ interface AVPlayerItemErrorLogEvent : NSCopying {

[Export ("errorComment"), NullAllowed]
string ErrorComment { get; }

[Watch (10, 5), TV (17, 5), Mac (14, 5), iOS (17, 5), MacCatalyst (17, 5)]
[NullAllowed, Export ("allHTTPResponseHeaderFields")]
NSDictionary<NSString, NSString> AllHttpResponseHeaderFields { get; }
}

interface IAVPlayerItemMetadataCollectorPushDelegate { }
Expand Down
8 changes: 8 additions & 0 deletions src/passkit.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1259,6 +1259,14 @@ interface PKPaymentNetwork {
[Watch (10, 4), Mac (14, 4), iOS (17, 4), NoTV, MacCatalyst (17, 4)]
[Field ("PKPaymentNetworkMeeza")]
NSString Meeza { get; }

[Watch (10, 5), Mac (14, 5), iOS (17, 5), NoTV, MacCatalyst (17, 5)]
[Field ("PKPaymentNetworkBankAxept")]
NSString BankAxept { get; }

[Watch (10, 5), Mac (14, 5), iOS (17, 5), NoTV, MacCatalyst (17, 5)]
[Field ("PKPaymentNetworkNAPAS")]
NSString Napas { get; }
}

#if !WATCH
Expand Down
Loading