Skip to content

Commit f696c4e

Browse files
authored
[xcode26.2] Merge xcode26.2 into main (#24445)
2 parents 803788a + fb72e49 commit f696c4e

32 files changed

+431
-22
lines changed

Make.config

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ NUGET_RELEASE_BRANCH=release/10.0.1xx
140140
##
141141
## Note that the prerelease identifier should be as short as possible, because otherwise
142142
## the resulting package name can become too long for MSIs.
143-
NUGET_HARDCODED_PRERELEASE_IDENTIFIER=xcode26.1
144-
NUGET_HARDCODED_PRERELEASE_BRANCH=xcode26.1
143+
NUGET_HARDCODED_PRERELEASE_IDENTIFIER=xcode26.2
144+
NUGET_HARDCODED_PRERELEASE_BRANCH=xcode26.2
145145

146146
# compute the alphanumeric version of branch names
147147
NUGET_RELEASE_BRANCH_ALPHANUMERIC:=$(shell export LANG=C; printf "%s" "$(NUGET_RELEASE_BRANCH)" | tr -c '[a-zA-Z0-9-]' '-')
@@ -201,9 +201,9 @@ MACCATALYST_NUGET_VERSION_NO_METADATA=$(MACCATALYST_NUGET_VERSION)$(NUGET_PREREL
201201
MACCATALYST_NUGET_VERSION_FULL=$(MACCATALYST_NUGET_VERSION_NO_METADATA)$(NUGET_BUILD_METADATA)
202202

203203
# Xcode version should have both a major and a minor version (even if the minor version is 0)
204-
XCODE_VERSION=26.1
205-
XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_26.1.1.xip
206-
XCODE_DEVELOPER_ROOT=/Applications/Xcode_26.1.1.app/Contents/Developer
204+
XCODE_VERSION=26.2
205+
XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_26.2.xip
206+
XCODE_DEVELOPER_ROOT=/Applications/Xcode_26.2.0.app/Contents/Developer
207207
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)
208208

209209
# We define stable Xcode as the Xcode app being named like "Xcode_#.#[.#].app"

Make.versions

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
# IMPORTANT: There must be *no* managed API differences unless the two first
2222
# numbers (major.minor) changes.
2323

24-
IOS_NUGET_OS_VERSION=26.1
25-
TVOS_NUGET_OS_VERSION=26.1
26-
MACOS_NUGET_OS_VERSION=26.1
27-
MACCATALYST_NUGET_OS_VERSION=26.1
24+
IOS_NUGET_OS_VERSION=26.2
25+
TVOS_NUGET_OS_VERSION=26.2
26+
MACOS_NUGET_OS_VERSION=26.2
27+
MACCATALYST_NUGET_OS_VERSION=26.2
2828

2929
# The following are the OS versions we first supported with the current .NET version.
3030
# These versions must *not* change with minor .NET updates, only major .NET releases.

builds/Versions-MacCatalyst.plist.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<string>18.5</string>
2727
<string>26.0</string>
2828
<string>26.1</string>
29+
<string>26.2</string>
2930
</array>
3031
</dict>
3132
<key>SupportedTargetPlatformVersions</key>
@@ -62,6 +63,7 @@
6263
<string>18.5</string>
6364
<string>26.0</string>
6465
<string>26.1</string>
66+
<string>26.2</string>
6567
</array>
6668
</dict>
6769
<key>MacCatalystVersionMap</key>
@@ -120,6 +122,8 @@
120122
<string>26.0</string>
121123
<key>26.1</key>
122124
<string>26.1</string>
125+
<key>26.2</key>
126+
<string>26.2</string>
123127
</dict>
124128
<key>RecommendedXcodeVersion</key>
125129
<string>@XCODE_VERSION@</string>

builds/Versions-iOS.plist.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<string>18.5</string>
4444
<string>26.0</string>
4545
<string>26.1</string>
46+
<string>26.2</string>
4647
</array>
4748
</dict>
4849
<key>SupportedTargetPlatformVersions</key>
@@ -98,6 +99,7 @@
9899
<string>18.5</string>
99100
<string>26.0</string>
100101
<string>26.1</string>
102+
<string>26.2</string>
101103
</array>
102104
</dict>
103105
<key>RecommendedXcodeVersion</key>

builds/Versions-macOS.plist.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<string>15.5</string>
2727
<string>26.0</string>
2828
<string>26.1</string>
29+
<string>26.2</string>
2930
</array>
3031
</dict>
3132
<key>SupportedTargetPlatformVersions</key>
@@ -60,6 +61,7 @@
6061
<string>15.5</string>
6162
<string>26.0</string>
6263
<string>26.1</string>
64+
<string>26.2</string>
6365
</array>
6466
</dict>
6567
<key>RecommendedXcodeVersion</key>

builds/Versions-tvOS.plist.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<string>18.5</string>
3939
<string>26.0</string>
4040
<string>26.1</string>
41+
<string>26.2</string>
4142
</array>
4243
</dict>
4344
<key>SupportedTargetPlatformVersions</key>
@@ -88,6 +89,7 @@
8889
<string>18.5</string>
8990
<string>26.0</string>
9091
<string>26.1</string>
92+
<string>26.2</string>
9193
</array>
9294
</dict>
9395
<key>RecommendedXcodeVersion</key>

src/AVFoundation/Enums.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -609,6 +609,8 @@ public enum AVAudioSessionCategoryOptions : ulong {
609609
OverrideMutedMicrophoneInterruption = 128,
610610
[iOS (26, 0), NoTV, NoMacCatalyst, NoMac]
611611
BluetoothHighQualityRecording = 1uL << 19,
612+
[iOS (26, 2), NoTV, MacCatalyst (26, 2), NoMac]
613+
FarFieldInput = 1uL << 18,
612614
}
613615

614616
/// <summary>An enumeration whose values specify the beginning and ending of an audio interruption.</summary>

src/SafariServices/SSEnums.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ public enum SFErrorCode : long {
5555
InternalError = 4,
5656
/// <summary>The app is missing an entitlement.</summary>
5757
MissingEntitlement = 5,
58+
/// <summary>The maximum number of allowed attempts to load the extension has been exceeded.</summary>
59+
MaximumAttemptsExceeded = 6,
5860
}
5961

6062
[NoMac]

src/Security/SecSharedCredential.cs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ namespace Security {
1010

1111
public static partial class SecSharedCredential {
1212

13+
[SupportedOSPlatform ("ios")]
14+
[SupportedOSPlatform ("maccatalyst")]
15+
[SupportedOSPlatform ("macos")]
16+
[UnsupportedOSPlatform ("tvos")]
17+
[ObsoletedOSPlatform ("ios26.2")]
18+
[ObsoletedOSPlatform ("maccatalyst26.2")]
19+
[ObsoletedOSPlatform ("macos26.2")]
1320
[DllImport (Constants.SecurityLibrary)]
1421
unsafe extern static void SecAddSharedWebCredential (IntPtr /* CFStringRef */ fqdn, IntPtr /* CFStringRef */ account, IntPtr /* CFStringRef */ password,
1522
BlockLiteral* /* void (^completionHandler)( CFErrorRef error) ) */ completionHandler);
@@ -34,6 +41,13 @@ internal static unsafe void Invoke (IntPtr block, IntPtr obj)
3441
/// <summary>To be added.</summary>
3542
/// <remarks>To be added.</remarks>
3643
[BindingImpl (BindingImplOptions.Optimizable)]
44+
[SupportedOSPlatform ("ios")]
45+
[SupportedOSPlatform ("maccatalyst")]
46+
[SupportedOSPlatform ("macos")]
47+
[UnsupportedOSPlatform ("tvos")]
48+
[ObsoletedOSPlatform ("ios26.2")]
49+
[ObsoletedOSPlatform ("maccatalyst26.2")]
50+
[ObsoletedOSPlatform ("macos26.2")]
3751
public static void AddSharedWebCredential (string domainName, string account, string password, Action<NSError> handler)
3852
{
3953
if (domainName is null)

src/authenticationservices.cs

Lines changed: 143 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ public enum ASCredentialServiceIdentifierType : long {
7575
Domain,
7676
/// <summary>The identifier specifies a URL.</summary>
7777
Url,
78+
/// <summary>The identifier specifies an app.</summary>
79+
[MacCatalyst (26, 2), iOS (26, 2), Mac (26, 2)]
80+
App,
7881
}
7982

8083
/// <summary>Enumerates errors associated with a <see cref="AuthenticationServices.ASWebAuthenticationSession" />.</summary>
@@ -364,6 +367,16 @@ interface ASCredentialProviderExtensionContext {
364367
[NoTV, NoMac, iOS (18, 0), NoMacCatalyst]
365368
[Export ("completeRequestWithTextToInsert:completionHandler:")]
366369
void CompleteRequest (string textToInsert, [NullAllowed] Action<bool> completionHandler);
370+
371+
[Async]
372+
[NoTV, NoMac, iOS (26, 2), MacCatalyst (26, 2)]
373+
[Export ("completeSavePasswordRequestWithCompletionHandler:")]
374+
void CompleteSavePasswordRequest ([NullAllowed] Action<bool> completionHandler);
375+
376+
[Async]
377+
[NoTV, NoMac, iOS (26, 2), MacCatalyst (26, 2)]
378+
[Export ("completeGeneratePasswordRequestWithResults:completionHandler:")]
379+
void CompleteGeneratePasswordRequest (ASGeneratedPassword [] results, [NullAllowed] Action<bool> completionHandler);
367380
}
368381

369382
/// <summary>Holds the identification for a credential service.</summary>
@@ -390,6 +403,24 @@ interface ASCredentialServiceIdentifier : NSCopying, NSSecureCoding {
390403
/// <remarks>To be added.</remarks>
391404
[Export ("type")]
392405
ASCredentialServiceIdentifierType Type { get; }
406+
407+
/// <summary>
408+
/// Constructs a new <see cref="AuthenticationServices.ASCredentialServiceIdentifier" /> with the specified <paramref name="identifier" />, of the specified <paramref name="type" />, and with the specified <paramref name="displayName" />.
409+
/// </summary>
410+
/// <param name="identifier">To be added.</param>
411+
/// <param name="type">To be added.</param>
412+
/// <param name="displayName">To be added.</param>
413+
/// <remarks>To be added.</remarks>
414+
[NoTV, Mac (26, 2), iOS (26, 2), MacCatalyst (26, 2)]
415+
[Export ("initWithIdentifier:type:displayName:")]
416+
NativeHandle Constructor (string identifier, ASCredentialServiceIdentifierType type, string displayName);
417+
418+
/// <summary>Gets the display name.</summary>
419+
/// <value>To be added.</value>
420+
/// <remarks>To be added.</remarks>
421+
[NoTV, Mac (26, 2), iOS (26, 2), MacCatalyst (26, 2)]
422+
[NullAllowed, Export ("displayName")]
423+
string DisplayName { get; }
393424
}
394425

395426
/// <summary>Associates a <see cref="AuthenticationServices.ASPasswordCredentialIdentity.User" /> string with a record in the developer's credential database.</summary>
@@ -525,6 +556,22 @@ interface ASCredentialProviderViewController {
525556
[iOS (26, 0), Mac (26, 0), MacCatalyst (26, 0), NoTV]
526557
[Export ("reportUnusedPasswordCredentialForDomain:userName:")]
527558
void ReportUnusedPasswordCredential (string domain, string userName);
559+
560+
[NoTV, NoMac, iOS (26, 2), MacCatalyst (26, 2)]
561+
[Export ("performSavePasswordRequestWithoutUserInteractionIfPossible:")]
562+
void PerformSavePasswordRequestWithoutUserInteractionIfPossible (ASSavePasswordRequest savePasswordRequest);
563+
564+
[NoTV, NoMac, iOS (26, 2), MacCatalyst (26, 2)]
565+
[Export ("prepareInterfaceForSavePasswordRequest:")]
566+
void PrepareInterfaceForSavePasswordRequest (ASSavePasswordRequest savePasswordRequest);
567+
568+
[NoTV, NoMac, iOS (26, 2), MacCatalyst (26, 2)]
569+
[Export ("performGeneratePasswordsRequestWithoutUserInteraction:")]
570+
void PerformGeneratePasswordsRequestWithoutUserInteraction (ASGeneratePasswordsRequest generatePasswordsRequest);
571+
572+
[NoTV, NoMac, iOS (26, 2), MacCatalyst (26, 2)]
573+
[Export ("prepareInterfaceForGeneratePasswordsRequest:")]
574+
void PrepareInterfaceForGeneratePasswordsRequest (ASGeneratePasswordsRequest generatePasswordsRequest);
528575
}
529576

530577
/// <summary>Associates a username and a password.</summary>
@@ -3026,4 +3073,100 @@ interface ASAuthorizationProviderExtensionSigningAlgorithm222 {
30263073
[Field ("ASAuthorizationProviderExtensionSigningAlgorithmEd25519")]
30273074
NSNumber Ed25519 { get; }
30283075
}
3076+
3077+
[NoTV, NoMac, iOS (26, 2), MacCatalyst (26, 2)]
3078+
[Native]
3079+
public enum ASSavePasswordRequestEvent : long {
3080+
UserInitiated,
3081+
FormDidDisappear,
3082+
GeneratedPasswordFilled
3083+
}
3084+
3085+
3086+
[NoTV, NoMac, iOS (26, 2), MacCatalyst (26, 2)]
3087+
enum ASGeneratedPasswordKind {
3088+
[Field ("ASGeneratedPasswordKindAlphanumeric")]
3089+
Alphanumeric,
3090+
[Field ("ASGeneratedPasswordKindPassphrase")]
3091+
Passphrase,
3092+
[Field ("ASGeneratedPasswordKindStrong")]
3093+
Strong,
3094+
}
3095+
3096+
[NoTV, NoMac, iOS (26, 2), MacCatalyst (26, 2)]
3097+
[BaseType (typeof (NSObject))]
3098+
[DisableDefaultCtor]
3099+
interface ASGeneratedPassword : NSCopying, NSSecureCoding {
3100+
3101+
[BindAs (typeof (ASGeneratedPasswordKind))]
3102+
[Export ("kind")]
3103+
NSString Kind { get; }
3104+
3105+
[Export ("localizedName")]
3106+
string LocalizedName { get; }
3107+
3108+
[Export ("value")]
3109+
string Value { get; }
3110+
3111+
[Export ("initWithKind:value:")]
3112+
NativeHandle Constructor ([BindAs (typeof (ASGeneratedPasswordKind))] NSString kind, string value);
3113+
}
3114+
3115+
[NoTV, NoMac, iOS (26, 2), MacCatalyst (26, 2)]
3116+
[BaseType (typeof (NSObject))]
3117+
[DisableDefaultCtor]
3118+
interface ASGeneratePasswordsRequest : NSCopying, NSSecureCoding {
3119+
3120+
[Export ("serviceIdentifier")]
3121+
ASCredentialServiceIdentifier ServiceIdentifier { get; }
3122+
3123+
[NullAllowed, Export ("passwordFieldPasswordRules")]
3124+
string PasswordFieldPasswordRules { get; }
3125+
3126+
[NullAllowed, Export ("confirmPasswordFieldPasswordRules")]
3127+
string ConfirmPasswordFieldPasswordRules { get; }
3128+
3129+
[NullAllowed, Export ("passwordRulesFromQuirks")]
3130+
string PasswordRulesFromQuirks { get; }
3131+
3132+
[Export ("initWithServiceIdentifier:passwordFieldPasswordRules:confirmPasswordFieldPasswordRules:passwordRulesFromQuirks:")]
3133+
NativeHandle Constructor (ASCredentialServiceIdentifier serviceIdentifier, [NullAllowed] string passwordFieldPasswordRules, [NullAllowed] string confirmPasswordFieldPasswordRules, [NullAllowed] string passwordRulesFromQuirks);
3134+
}
3135+
3136+
[NoTV, NoMac, iOS (26, 2), MacCatalyst (26, 2)]
3137+
[BaseType (typeof (NSObject))]
3138+
[DisableDefaultCtor]
3139+
interface ASSavePasswordRequest : NSCopying, NSSecureCoding {
3140+
3141+
[Export ("serviceIdentifier")]
3142+
ASCredentialServiceIdentifier ServiceIdentifier { get; }
3143+
3144+
[Export ("credential")]
3145+
ASPasswordCredential Credential { get; }
3146+
3147+
[NullAllowed, Export ("title")]
3148+
string Title { get; }
3149+
3150+
[Export ("sessionID")]
3151+
string SessionId { get; }
3152+
3153+
[Export ("event")]
3154+
ASSavePasswordRequestEvent Event { get; }
3155+
3156+
[BindAs (typeof (ASGeneratedPasswordKind))]
3157+
[NullAllowed, Export ("passwordKind")]
3158+
NSString PasswordKind { get; }
3159+
3160+
[Export ("initWithServiceIdentifier:credential:sessionID:event:")]
3161+
NativeHandle Constructor (ASCredentialServiceIdentifier serviceIdentifier, ASPasswordCredential credential, string sessionId, ASSavePasswordRequestEvent @event);
3162+
3163+
[Export ("initWithServiceIdentifier:credential:title:sessionID:event:")]
3164+
NativeHandle Constructor (ASCredentialServiceIdentifier serviceIdentifier, ASPasswordCredential credential, [NullAllowed] string title, string sessionId, ASSavePasswordRequestEvent @event);
3165+
3166+
[Export ("initWithServiceIdentifier:credential:sessionID:event:passwordKind:")]
3167+
NativeHandle Constructor (ASCredentialServiceIdentifier serviceIdentifier, ASPasswordCredential credential, string sessionId, ASSavePasswordRequestEvent @event, [NullAllowed][BindAs (typeof (ASGeneratedPasswordKind))] NSString passwordKind);
3168+
3169+
[Export ("initWithServiceIdentifier:credential:title:sessionID:event:passwordKind:")]
3170+
NativeHandle Constructor (ASCredentialServiceIdentifier serviceIdentifier, ASPasswordCredential credential, [NullAllowed] string title, string sessionId, ASSavePasswordRequestEvent @event, [NullAllowed][BindAs (typeof (ASGeneratedPasswordKind))] NSString passwordKind);
3171+
}
30293172
}

0 commit comments

Comments
 (0)