Skip to content

Commit d2088eb

Browse files
rolfbjarnerolfbjarne
authored
[VideoSubscriberAccount] Update to Xcode 26 beta 1-6. (#23710)
1 parent b0a5cf7 commit d2088eb

File tree

10 files changed

+80
-44
lines changed

10 files changed

+80
-44
lines changed

‎src/videosubscriberaccount.cs‎

Lines changed: 52 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@
1919
#endif
2020

2121
namespace VideoSubscriberAccount {
22+
[TV (26, 0), NoMacCatalyst, Mac (26, 0), iOS (26, 0)]
23+
[Native]
24+
public enum VSAutoSignInAuthorization : long {
25+
NotDetermined = 0,
26+
Granted,
27+
Denied,
28+
}
2229

2330
/// <summary>Encapsulates errors that may occur during attempts to verify credentials.</summary>
2431
[Native]
@@ -463,9 +470,9 @@ enum VSAccountProviderAuthenticationScheme {
463470
Api,
464471
}
465472

466-
[Deprecated (PlatformName.iOS, 18, 0, message: "Use the 'VSUserAccountType' enum instead.")]
467-
[Deprecated (PlatformName.TvOS, 18, 0, message: "Use the 'VSUserAccountType' enum instead.")]
468-
[Deprecated (PlatformName.MacOSX, 15, 0, message: "Use the 'VSUserAccount' type instead.")]
473+
[Deprecated (PlatformName.iOS, 18, 0, message: "Use the 'VSUserAccount' and 'VSUserAccountType' types instead.")]
474+
[Deprecated (PlatformName.TvOS, 18, 0, message: "Use the 'VSUserAccount' and 'VSUserAccountType' types instead.")]
475+
[Deprecated (PlatformName.MacOSX, 15, 0, message: "Use the 'VSUserAccount' and 'VSUserAccountType' types instead.")]
469476
[NoMacCatalyst]
470477
[Native]
471478
public enum VSSubscriptionAccessLevel : long {
@@ -565,8 +572,32 @@ interface VSUserAccountManager {
565572
[Async]
566573
[Export ("queryUserAccountsWithOptions:completion:")]
567574
void QueryUserAccounts (VSUserAccountQueryOptions options, Action<NSArray<VSUserAccount>, NSError> completion);
575+
576+
[Async]
577+
[TV (26, 0), NoMacCatalyst, Mac (26, 0), iOS (26, 0)]
578+
[Export ("queryAutoSignInTokenWithCompletionHandler:")]
579+
void QueryAutoSignInToken (VSUserAccountManagerQueryAutoSignInTokenCallback completion);
580+
581+
[Async]
582+
[TV (26, 0), NoMacCatalyst, NoMac, iOS (26, 0)]
583+
[Export ("requestAutoSignInAuthorizationWithCompletionHandler:")]
584+
void RequestAutoSignInAuthorization (VSUserAccountManagerRequestAutoSignInAuthorizationCallback completion);
585+
586+
[Async]
587+
[TV (26, 0), NoMacCatalyst, NoMac, iOS (26, 0)]
588+
[Export ("updateAutoSignInToken:updateContext:completionHandler:")]
589+
void UpdateAutoSignInToken (string autoSignInToken, VSAutoSignInTokenUpdateContext context, VSUserAccountManagerCallback completion);
590+
591+
[Async]
592+
[TV (26, 0), NoMacCatalyst, Mac (26, 0), iOS (26, 0)]
593+
[Export ("deleteAutoSignInTokenWithCompletionHandler:")]
594+
void DeleteAutoSignInToken (VSUserAccountManagerCallback completion);
568595
}
569596

597+
delegate void VSUserAccountManagerQueryAutoSignInTokenCallback ([NullAllowed] VSAutoSignInToken token, [NullAllowed] NSError error);
598+
delegate void VSUserAccountManagerRequestAutoSignInAuthorizationCallback ([NullAllowed] VSAutoSignInTokenUpdateContext updateContext, [NullAllowed] NSError error);
599+
delegate void VSUserAccountManagerCallback ([NullAllowed] NSError error);
600+
570601
[TV (16, 0), NoMacCatalyst, iOS (16, 0), Mac (13, 0)]
571602
[BaseType (typeof (NSObject))]
572603
[DisableDefaultCtor]
@@ -637,4 +668,22 @@ interface VSAppleSubscription {
637668
NativeHandle Constructor (string customerId, string [] productCodes);
638669
}
639670

671+
[TV (26, 0), NoMacCatalyst, Mac (26, 0), iOS (26, 0)]
672+
[BaseType (typeof (NSObject))]
673+
[DisableDefaultCtor]
674+
interface VSAutoSignInToken : NSSecureCoding {
675+
[Export ("authorization")]
676+
VSAutoSignInAuthorization Authorization { get; }
677+
678+
[NullAllowed, Export ("value")]
679+
string Value { get; }
680+
}
681+
682+
[TV (26, 0), NoMacCatalyst, NoMac, iOS (26, 0)]
683+
[BaseType (typeof (NSObject))]
684+
[DisableDefaultCtor]
685+
interface VSAutoSignInTokenUpdateContext {
686+
[Export ("authorization")]
687+
VSAutoSignInAuthorization Authorization { get; }
688+
}
640689
}

‎tests/cecil-tests/Documentation.KnownFailures.txt‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7398,6 +7398,9 @@ F:UserNotifications.UNNotificationInterruptionLevel.TimeSensitive2
73987398
F:UserNotifications.UNNotificationPresentationOptions.Banner
73997399
F:UserNotifications.UNNotificationPresentationOptions.List
74007400
F:VideoSubscriberAccount.VSAccountProviderAuthenticationScheme.Api
7401+
F:VideoSubscriberAccount.VSAutoSignInAuthorization.Denied
7402+
F:VideoSubscriberAccount.VSAutoSignInAuthorization.Granted
7403+
F:VideoSubscriberAccount.VSAutoSignInAuthorization.NotDetermined
74017404
F:VideoSubscriberAccount.VSErrorCode.Rejected
74027405
F:VideoSubscriberAccount.VSErrorCode.Unsupported
74037406
F:VideoSubscriberAccount.VSOriginatingDeviceCategory.Mobile
@@ -17979,8 +17982,16 @@ M:VideoSubscriberAccount.VSAccountApplicationProvider.#ctor(System.String,System
1797917982
M:VideoSubscriberAccount.VSAccountManager.Dispose(System.Boolean)
1798017983
M:VideoSubscriberAccount.VSAppleSubscription.#ctor(System.String,System.String[])
1798117984
M:VideoSubscriberAccount.VSUserAccount.#ctor(VideoSubscriberAccount.VSUserAccountType,Foundation.NSUrl)
17985+
M:VideoSubscriberAccount.VSUserAccountManager.DeleteAutoSignInToken(VideoSubscriberAccount.VSUserAccountManagerCallback)
17986+
M:VideoSubscriberAccount.VSUserAccountManager.DeleteAutoSignInTokenAsync
17987+
M:VideoSubscriberAccount.VSUserAccountManager.QueryAutoSignInToken(VideoSubscriberAccount.VSUserAccountManagerQueryAutoSignInTokenCallback)
17988+
M:VideoSubscriberAccount.VSUserAccountManager.QueryAutoSignInTokenAsync
1798217989
M:VideoSubscriberAccount.VSUserAccountManager.QueryUserAccounts(VideoSubscriberAccount.VSUserAccountQueryOptions,System.Action{Foundation.NSArray{VideoSubscriberAccount.VSUserAccount},Foundation.NSError})
1798317990
M:VideoSubscriberAccount.VSUserAccountManager.QueryUserAccountsAsync(VideoSubscriberAccount.VSUserAccountQueryOptions)
17991+
M:VideoSubscriberAccount.VSUserAccountManager.RequestAutoSignInAuthorization(VideoSubscriberAccount.VSUserAccountManagerRequestAutoSignInAuthorizationCallback)
17992+
M:VideoSubscriberAccount.VSUserAccountManager.RequestAutoSignInAuthorizationAsync
17993+
M:VideoSubscriberAccount.VSUserAccountManager.UpdateAutoSignInToken(System.String,VideoSubscriberAccount.VSAutoSignInTokenUpdateContext,VideoSubscriberAccount.VSUserAccountManagerCallback)
17994+
M:VideoSubscriberAccount.VSUserAccountManager.UpdateAutoSignInTokenAsync(System.String,VideoSubscriberAccount.VSAutoSignInTokenUpdateContext)
1798417995
M:VideoSubscriberAccount.VSUserAccountManager.UpdateUserAccount(VideoSubscriberAccount.VSUserAccount,System.Action{Foundation.NSError})
1798517996
M:VideoSubscriberAccount.VSUserAccountManager.UpdateUserAccountAsync(VideoSubscriberAccount.VSUserAccount)
1798617997
M:VideoToolbox.IVTFrameProcessorConfiguration.GetMaximumDimensions``1
@@ -25273,6 +25284,9 @@ P:VideoSubscriberAccount.VSAccountMetadataRequest.AccountProviderAuthenticationT
2527325284
P:VideoSubscriberAccount.VSAccountMetadataRequest.ApplicationAccountProviders
2527425285
P:VideoSubscriberAccount.VSAppleSubscription.CustomerId
2527525286
P:VideoSubscriberAccount.VSAppleSubscription.ProductCodes
25287+
P:VideoSubscriberAccount.VSAutoSignInToken.Authorization
25288+
P:VideoSubscriberAccount.VSAutoSignInToken.Value
25289+
P:VideoSubscriberAccount.VSAutoSignInTokenUpdateContext.Authorization
2527625290
P:VideoSubscriberAccount.VSUserAccount.AccountProviderIdentifier
2527725291
P:VideoSubscriberAccount.VSUserAccount.AccountType
2527825292
P:VideoSubscriberAccount.VSUserAccount.AppleSubscription
@@ -29538,6 +29552,9 @@ T:VideoSubscriberAccount.VSAccountApplicationProvider
2953829552
T:VideoSubscriberAccount.VSAccountProviderAuthenticationScheme
2953929553
T:VideoSubscriberAccount.VSAccountProviderResponse
2954029554
T:VideoSubscriberAccount.VSAppleSubscription
29555+
T:VideoSubscriberAccount.VSAutoSignInAuthorization
29556+
T:VideoSubscriberAccount.VSAutoSignInToken
29557+
T:VideoSubscriberAccount.VSAutoSignInTokenUpdateContext
2954129558
T:VideoSubscriberAccount.VSCheckAccessOptionKeys
2954229559
T:VideoSubscriberAccount.VSErrorInfo
2954329560
T:VideoSubscriberAccount.VSOriginatingDeviceCategory
@@ -29546,6 +29563,9 @@ T:VideoSubscriberAccount.VSSubscriptionAccessLevel
2954629563
T:VideoSubscriberAccount.VSSubscriptionRegistrationCenter
2954729564
T:VideoSubscriberAccount.VSUserAccount
2954829565
T:VideoSubscriberAccount.VSUserAccountManager
29566+
T:VideoSubscriberAccount.VSUserAccountManagerCallback
29567+
T:VideoSubscriberAccount.VSUserAccountManagerQueryAutoSignInTokenCallback
29568+
T:VideoSubscriberAccount.VSUserAccountManagerRequestAutoSignInAuthorizationCallback
2954929569
T:VideoSubscriberAccount.VSUserAccountQueryOptions
2955029570
T:VideoSubscriberAccount.VSUserAccountType
2955129571
T:VideoToolbox.HdrMetadataInsertionMode

‎tests/monotouch-test/AppKit/NSDraggingItem.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ public void NSDraggingItemConstructorTests ()
1919
#pragma warning restore 0219
2020
}
2121

22-
class MyPasteboard : NSObject, INSPasteboardWriting
23-
{
22+
class MyPasteboard : NSObject, INSPasteboardWriting {
2423
NSObject INSPasteboardWriting.GetPasteboardPropertyListForType (string type)
2524
{
2625
return new NSObject ();

‎tests/monotouch-test/AppKit/NSPasteboard.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -517,12 +517,10 @@ public void NSPasteboardTests_WriteObjectTests ()
517517
b.ReleaseGlobally ();
518518
}
519519

520-
class MyPasteboard2 : NSObject, INSPasteboardReading
521-
{
520+
class MyPasteboard2 : NSObject, INSPasteboardReading {
522521
}
523522

524-
class MyPasteboard : NSObject, INSPasteboardWriting
525-
{
523+
class MyPasteboard : NSObject, INSPasteboardWriting {
526524
NSObject INSPasteboardWriting.GetPasteboardPropertyListForType (string type)
527525
{
528526
return new NSObject ();

‎tests/monotouch-test/AppKit/NSTextFinder.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ public void NSTextFinderConstructor ()
2222
f.Client = client;
2323
}
2424

25-
class FinderClient : NSObject, INSTextFinderClient
26-
{
25+
class FinderClient : NSObject, INSTextFinderClient {
2726
public bool AllowsMultipleSelection { get { return true; } }
2827

2928
public bool Editable { get { return true; } }

‎tests/monotouch-test/AudioToolbox/AudioConverterTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ void Convert (string sourceFilePath, string destinationFilePath, AudioFormatType
273273
outputPacketDescriptions = new AudioStreamPacketDescription [theOutputBufSize / outputSizePerPacket];
274274
}
275275
int numOutputPackets = theOutputBufSize / outputSizePerPacket;
276-
AudioStreamPacketDependencyDescription[] packetDependencies = null;
276+
AudioStreamPacketDependencyDescription [] packetDependencies = null;
277277

278278
if (withPacketDependencies) {
279279
Assert.That (dstFormat.EmploysDependentPackets, Is.True, "EmploysDependentPackets");

‎tests/monotouch-test/ScriptingBridge/SBApplicationTest.cs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ public void TestGetApplicationFromBundleIdentifier ()
3737
using (var app1 = SBApplication.GetApplication (knownBundle))
3838
using (var app2 = SBApplication.GetApplication<MySBApp> (knownBundle))
3939
using (var app3 = SBApplication.GetApplication (unknownBundle))
40-
using (var app4 = SBApplication.GetApplication<MySBApp> (unknownBundle))
41-
{
40+
using (var app4 = SBApplication.GetApplication<MySBApp> (unknownBundle)) {
4241
Assert.IsNotNull (app1, "SBApplication from known bundle is null");
4342
Assert.IsNotNull (app2, "MySBApp from known bundle is null");
4443
Assert.IsNull (app3, "SBApplication from unknown bundle is non-null");
@@ -51,8 +50,7 @@ public void TestGetApplicationFromUrl ()
5150
{
5251
using (NSUrl knownUrl = new NSUrl ("http://www.xamarin.com"))
5352
using (var app1 = SBApplication.GetApplication (knownUrl))
54-
using (var app2 = SBApplication.GetApplication<MySBApp> (knownUrl))
55-
{
53+
using (var app2 = SBApplication.GetApplication<MySBApp> (knownUrl)) {
5654
Assert.IsNotNull (app1, "SBApplication from known URL is null");
5755
Assert.IsNotNull (app2, "MySBApp from known URL is null");
5856
}
@@ -66,8 +64,7 @@ public void TestGetApplicationFromPid ()
6664
using (var app1 = SBApplication.GetApplication (knownPid))
6765
using (var app2 = SBApplication.GetApplication<MySBApp> (knownPid))
6866
using (var app3 = SBApplication.GetApplication (unknownPid))
69-
using (var app4 = SBApplication.GetApplication<MySBApp> (unknownPid))
70-
{
67+
using (var app4 = SBApplication.GetApplication<MySBApp> (unknownPid)) {
7168
Assert.IsNotNull (app1, "SBApplication from known pid is null");
7269
Assert.IsNotNull (app2, "MySBApp from known pid is null");
7370
Assert.IsNotNull (app3, "SBApplication from unknown pid is null");

‎tests/xtro-sharpie/api-annotations-dotnet/iOS-VideoSubscriberAccount.todo‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎tests/xtro-sharpie/api-annotations-dotnet/macOS-VideoSubscriberAccount.todo‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎tests/xtro-sharpie/api-annotations-dotnet/tvOS-VideoSubscriberAccount.todo‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)