From c4d5433a636fbd6a82414ff25ab57e482a98556e Mon Sep 17 00:00:00 2001 From: TJ Lambert <50846373+tj-devel709@users.noreply.github.com> Date: Wed, 23 Jun 2021 12:55:08 -0500 Subject: [PATCH] [VideoSubscriberAccount] Updates for Xcode13 Beta 1 (#11977) * initial changes * removing maccatalyst from the sources * adding issue link * getting closer, I think * adding ignore Co-authored-by: tj_devel709 --- src/frameworks.sources | 1 - src/videosubscriberaccount.cs | 12 +++ .../MacCatalyst-VideoSubscriberAccount.ignore | 75 +++++++++++++++++++ .../MacCatalyst-VideoSubscriberAccount.todo | 63 ---------------- ...do => macOS-VideoSubscriberAccount.ignore} | 1 + 5 files changed, 88 insertions(+), 64 deletions(-) create mode 100644 tests/xtro-sharpie/MacCatalyst-VideoSubscriberAccount.ignore rename tests/xtro-sharpie/{macOS-VideoSubscriberAccount.todo => macOS-VideoSubscriberAccount.ignore} (85%) diff --git a/src/frameworks.sources b/src/frameworks.sources index e2968fb00cce..19e13215945a 100644 --- a/src/frameworks.sources +++ b/src/frameworks.sources @@ -2266,7 +2266,6 @@ MACCATALYST_FRAMEWORKS = \ UserNotifications \ UserNotificationsUI \ VideoToolbox \ - VideoSubscriberAccount \ Vision \ WKWebKit \ diff --git a/src/videosubscriberaccount.cs b/src/videosubscriberaccount.cs index 7d6d3b4c049d..2567b1949872 100644 --- a/src/videosubscriberaccount.cs +++ b/src/videosubscriberaccount.cs @@ -103,10 +103,20 @@ interface IVSAccountManagerDelegate { } interface VSAccountManagerDelegate { [Abstract] +#if XAMCORE_4_0 + [NoMac] +#elif MONOMAC + [Obsoleted (PlatformName.MacOSX, 12,0, message: "Unavailable on macOS, will be removed in the future.")] +#endif [Export ("accountManager:presentViewController:")] void PresentViewController (VSAccountManager accountManager, UIViewController viewController); [Abstract] +#if XAMCORE_4_0 + [NoMac] +#elif MONOMAC + [Obsoleted (PlatformName.MacOSX, 12,0, message: "Unavailable on macOS, will be removed in the future.")] +#endif [Export ("accountManager:dismissViewController:")] void DismissViewController (VSAccountManager accountManager, UIViewController viewController); @@ -294,6 +304,7 @@ enum VSAccountProviderAuthenticationScheme { [TV (11,0)][iOS (11,0)] [Mac (10,14)] + [NoMacCatalyst] [Native] public enum VSSubscriptionAccessLevel : long { Unknown, @@ -303,6 +314,7 @@ public enum VSSubscriptionAccessLevel : long { [TV (11,0)][iOS (11,0)] [Mac (10,14)] + [NoMacCatalyst] [BaseType (typeof (NSObject))] interface VSSubscription { [NullAllowed] // null_resettable diff --git a/tests/xtro-sharpie/MacCatalyst-VideoSubscriberAccount.ignore b/tests/xtro-sharpie/MacCatalyst-VideoSubscriberAccount.ignore new file mode 100644 index 000000000000..4694135f858a --- /dev/null +++ b/tests/xtro-sharpie/MacCatalyst-VideoSubscriberAccount.ignore @@ -0,0 +1,75 @@ +## These selectors should not be failing in xtro +## https://github.com/xamarin/maccore/issues/2462 +!missing-enum! VSAccountAccessStatus not bound +!missing-enum! VSErrorCode not bound +!missing-field! VSAccountProviderAuthenticationSchemeAPI not bound +!missing-field! VSAccountProviderAuthenticationSchemeSAML not bound +!missing-field! VSCheckAccessOptionPrompt not bound +!missing-field! VSErrorDomain not bound +!missing-field! VSErrorInfoKeyAccountProviderResponse not bound +!missing-field! VSErrorInfoKeySAMLResponse not bound +!missing-field! VSErrorInfoKeySAMLResponseStatus not bound +!missing-field! VSErrorInfoKeyUnsupportedProviderIdentifier not bound +!missing-field! VSOpenTVProviderSettingsURLString not bound +!missing-protocol! VSAccountManagerDelegate not bound +!missing-selector! +VSSubscriptionRegistrationCenter::defaultSubscriptionRegistrationCenter not bound +!missing-selector! VSAccountManager::checkAccessStatusWithOptions:completionHandler: not bound +!missing-selector! VSAccountManager::delegate not bound +!missing-selector! VSAccountManager::enqueueAccountMetadataRequest:completionHandler: not bound +!missing-selector! VSAccountManager::setDelegate: not bound +!missing-selector! VSAccountManagerResult::cancel not bound +!missing-selector! VSAccountMetadata::accountProviderIdentifier not bound +!missing-selector! VSAccountMetadata::accountProviderResponse not bound +!missing-selector! VSAccountMetadata::authenticationExpirationDate not bound +!missing-selector! VSAccountMetadata::SAMLAttributeQueryResponse not bound +!missing-selector! VSAccountMetadata::verificationData not bound +!missing-selector! VSAccountMetadataRequest::accountProviderAuthenticationToken not bound +!missing-selector! VSAccountMetadataRequest::applicationAccountProviders not bound +!missing-selector! VSAccountMetadataRequest::attributeNames not bound +!missing-selector! VSAccountMetadataRequest::channelIdentifier not bound +!missing-selector! VSAccountMetadataRequest::featuredAccountProviderIdentifiers not bound +!missing-selector! VSAccountMetadataRequest::forceAuthentication not bound +!missing-selector! VSAccountMetadataRequest::includeAccountProviderIdentifier not bound +!missing-selector! VSAccountMetadataRequest::includeAuthenticationExpirationDate not bound +!missing-selector! VSAccountMetadataRequest::isInterruptionAllowed not bound +!missing-selector! VSAccountMetadataRequest::localizedVideoTitle not bound +!missing-selector! VSAccountMetadataRequest::setAccountProviderAuthenticationToken: not bound +!missing-selector! VSAccountMetadataRequest::setApplicationAccountProviders: not bound +!missing-selector! VSAccountMetadataRequest::setAttributeNames: not bound +!missing-selector! VSAccountMetadataRequest::setChannelIdentifier: not bound +!missing-selector! VSAccountMetadataRequest::setFeaturedAccountProviderIdentifiers: not bound +!missing-selector! VSAccountMetadataRequest::setForceAuthentication: not bound +!missing-selector! VSAccountMetadataRequest::setIncludeAccountProviderIdentifier: not bound +!missing-selector! VSAccountMetadataRequest::setIncludeAuthenticationExpirationDate: not bound +!missing-selector! VSAccountMetadataRequest::setInterruptionAllowed: not bound +!missing-selector! VSAccountMetadataRequest::setLocalizedVideoTitle: not bound +!missing-selector! VSAccountMetadataRequest::setSupportedAccountProviderIdentifiers: not bound +!missing-selector! VSAccountMetadataRequest::setSupportedAuthenticationSchemes: not bound +!missing-selector! VSAccountMetadataRequest::setVerificationToken: not bound +!missing-selector! VSAccountMetadataRequest::supportedAccountProviderIdentifiers not bound +!missing-selector! VSAccountMetadataRequest::supportedAuthenticationSchemes not bound +!missing-selector! VSAccountMetadataRequest::verificationToken not bound +!missing-selector! VSAccountProviderResponse::authenticationScheme not bound +!missing-selector! VSAccountProviderResponse::body not bound +!missing-selector! VSAccountProviderResponse::status not bound +!missing-selector! VSSubscriptionRegistrationCenter::setCurrentSubscription: not bound +!missing-type! VSAccountManager not bound +!missing-type! VSAccountManagerResult not bound +!missing-type! VSAccountMetadata not bound +!missing-type! VSAccountMetadataRequest not bound +!missing-type! VSAccountProviderResponse not bound +!missing-type! VSSubscriptionRegistrationCenter not bound +!missing-selector! VSAccountApplicationProvider::identifier not bound +!missing-selector! VSAccountApplicationProvider::initWithLocalizedDisplayName:identifier: not bound +!missing-selector! VSAccountApplicationProvider::localizedDisplayName not bound +!missing-type! VSAccountApplicationProvider not bound +!missing-enum! VSSubscriptionAccessLevel not bound +!missing-selector! VSSubscription::accessLevel not bound +!missing-selector! VSSubscription::billingIdentifier not bound +!missing-selector! VSSubscription::expirationDate not bound +!missing-selector! VSSubscription::setAccessLevel: not bound +!missing-selector! VSSubscription::setBillingIdentifier: not bound +!missing-selector! VSSubscription::setExpirationDate: not bound +!missing-selector! VSSubscription::setTierIdentifiers: not bound +!missing-selector! VSSubscription::tierIdentifiers not bound +!missing-type! VSSubscription not bound diff --git a/tests/xtro-sharpie/MacCatalyst-VideoSubscriberAccount.todo b/tests/xtro-sharpie/MacCatalyst-VideoSubscriberAccount.todo index e192616655be..e69de29bb2d1 100644 --- a/tests/xtro-sharpie/MacCatalyst-VideoSubscriberAccount.todo +++ b/tests/xtro-sharpie/MacCatalyst-VideoSubscriberAccount.todo @@ -1,63 +0,0 @@ -!missing-enum! VSAccountAccessStatus not bound -!missing-enum! VSErrorCode not bound -!missing-field! VSAccountProviderAuthenticationSchemeAPI not bound -!missing-field! VSAccountProviderAuthenticationSchemeSAML not bound -!missing-field! VSCheckAccessOptionPrompt not bound -!missing-field! VSErrorDomain not bound -!missing-field! VSErrorInfoKeyAccountProviderResponse not bound -!missing-field! VSErrorInfoKeySAMLResponse not bound -!missing-field! VSErrorInfoKeySAMLResponseStatus not bound -!missing-field! VSErrorInfoKeyUnsupportedProviderIdentifier not bound -!missing-field! VSOpenTVProviderSettingsURLString not bound -!missing-protocol! VSAccountManagerDelegate not bound -!missing-selector! +VSSubscriptionRegistrationCenter::defaultSubscriptionRegistrationCenter not bound -!missing-selector! VSAccountManager::checkAccessStatusWithOptions:completionHandler: not bound -!missing-selector! VSAccountManager::delegate not bound -!missing-selector! VSAccountManager::enqueueAccountMetadataRequest:completionHandler: not bound -!missing-selector! VSAccountManager::setDelegate: not bound -!missing-selector! VSAccountManagerResult::cancel not bound -!missing-selector! VSAccountMetadata::accountProviderIdentifier not bound -!missing-selector! VSAccountMetadata::accountProviderResponse not bound -!missing-selector! VSAccountMetadata::authenticationExpirationDate not bound -!missing-selector! VSAccountMetadata::SAMLAttributeQueryResponse not bound -!missing-selector! VSAccountMetadata::verificationData not bound -!missing-selector! VSAccountMetadataRequest::accountProviderAuthenticationToken not bound -!missing-selector! VSAccountMetadataRequest::applicationAccountProviders not bound -!missing-selector! VSAccountMetadataRequest::attributeNames not bound -!missing-selector! VSAccountMetadataRequest::channelIdentifier not bound -!missing-selector! VSAccountMetadataRequest::featuredAccountProviderIdentifiers not bound -!missing-selector! VSAccountMetadataRequest::forceAuthentication not bound -!missing-selector! VSAccountMetadataRequest::includeAccountProviderIdentifier not bound -!missing-selector! VSAccountMetadataRequest::includeAuthenticationExpirationDate not bound -!missing-selector! VSAccountMetadataRequest::isInterruptionAllowed not bound -!missing-selector! VSAccountMetadataRequest::localizedVideoTitle not bound -!missing-selector! VSAccountMetadataRequest::setAccountProviderAuthenticationToken: not bound -!missing-selector! VSAccountMetadataRequest::setApplicationAccountProviders: not bound -!missing-selector! VSAccountMetadataRequest::setAttributeNames: not bound -!missing-selector! VSAccountMetadataRequest::setChannelIdentifier: not bound -!missing-selector! VSAccountMetadataRequest::setFeaturedAccountProviderIdentifiers: not bound -!missing-selector! VSAccountMetadataRequest::setForceAuthentication: not bound -!missing-selector! VSAccountMetadataRequest::setIncludeAccountProviderIdentifier: not bound -!missing-selector! VSAccountMetadataRequest::setIncludeAuthenticationExpirationDate: not bound -!missing-selector! VSAccountMetadataRequest::setInterruptionAllowed: not bound -!missing-selector! VSAccountMetadataRequest::setLocalizedVideoTitle: not bound -!missing-selector! VSAccountMetadataRequest::setSupportedAccountProviderIdentifiers: not bound -!missing-selector! VSAccountMetadataRequest::setSupportedAuthenticationSchemes: not bound -!missing-selector! VSAccountMetadataRequest::setVerificationToken: not bound -!missing-selector! VSAccountMetadataRequest::supportedAccountProviderIdentifiers not bound -!missing-selector! VSAccountMetadataRequest::supportedAuthenticationSchemes not bound -!missing-selector! VSAccountMetadataRequest::verificationToken not bound -!missing-selector! VSAccountProviderResponse::authenticationScheme not bound -!missing-selector! VSAccountProviderResponse::body not bound -!missing-selector! VSAccountProviderResponse::status not bound -!missing-selector! VSSubscriptionRegistrationCenter::setCurrentSubscription: not bound -!missing-type! VSAccountManager not bound -!missing-type! VSAccountManagerResult not bound -!missing-type! VSAccountMetadata not bound -!missing-type! VSAccountMetadataRequest not bound -!missing-type! VSAccountProviderResponse not bound -!missing-type! VSSubscriptionRegistrationCenter not bound -!missing-selector! VSAccountApplicationProvider::identifier not bound -!missing-selector! VSAccountApplicationProvider::initWithLocalizedDisplayName:identifier: not bound -!missing-selector! VSAccountApplicationProvider::localizedDisplayName not bound -!missing-type! VSAccountApplicationProvider not bound diff --git a/tests/xtro-sharpie/macOS-VideoSubscriberAccount.todo b/tests/xtro-sharpie/macOS-VideoSubscriberAccount.ignore similarity index 85% rename from tests/xtro-sharpie/macOS-VideoSubscriberAccount.todo rename to tests/xtro-sharpie/macOS-VideoSubscriberAccount.ignore index 4c6a429f20ee..b9af6e17333a 100644 --- a/tests/xtro-sharpie/macOS-VideoSubscriberAccount.todo +++ b/tests/xtro-sharpie/macOS-VideoSubscriberAccount.ignore @@ -1,2 +1,3 @@ +## These are no longer supported on Mac !extra-protocol-member! unexpected selector VSAccountManagerDelegate::accountManager:dismissViewController: found !extra-protocol-member! unexpected selector VSAccountManagerDelegate::accountManager:presentViewController: found