Skip to content

Commit

Permalink
[VideoSubscriberAccount] Updates for Xcode13 Beta 1 (#11977)
Browse files Browse the repository at this point in the history
* initial changes

* removing maccatalyst from the sources

* adding issue link

* getting closer, I think

* adding ignore

Co-authored-by: tj_devel709 <antlambe@microsoft.com>
  • Loading branch information
tj-devel709 and tj_devel709 committed Jun 23, 2021
1 parent 1f84aaa commit c4d5433
Show file tree
Hide file tree
Showing 5 changed files with 88 additions and 64 deletions.
1 change: 0 additions & 1 deletion src/frameworks.sources
Expand Up @@ -2266,7 +2266,6 @@ MACCATALYST_FRAMEWORKS = \
UserNotifications \
UserNotificationsUI \
VideoToolbox \
VideoSubscriberAccount \
Vision \
WKWebKit \

Expand Down
12 changes: 12 additions & 0 deletions src/videosubscriberaccount.cs
Expand Up @@ -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);

Expand Down Expand Up @@ -294,6 +304,7 @@ enum VSAccountProviderAuthenticationScheme {

[TV (11,0)][iOS (11,0)]
[Mac (10,14)]
[NoMacCatalyst]
[Native]
public enum VSSubscriptionAccessLevel : long {
Unknown,
Expand All @@ -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
Expand Down
75 changes: 75 additions & 0 deletions 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
63 changes: 0 additions & 63 deletions 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
@@ -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

8 comments on commit c4d5433

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ [CI Build] Tests passed on Build. ✅

Tests passed on Build.

API diff

✅ API Diff from stable

View API diff

API & Generator diff

ℹ️ API Diff (from PR only) (please review changes)
ℹ️ Generator Diff (please review changes)

Packages generated

View packages

🎉 All 221 tests passed 🎉

Pipeline on Agent XAMBOT-1036.BigSur'
[VideoSubscriberAccount] Updates for Xcode13 Beta 1 (#11977)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔥 Tests failed catastrophically on VSTS: device tests tvOS 🔥

Not enough free space in the host.

Pipeline on Agent
[VideoSubscriberAccount] Updates for Xcode13 Beta 1 (#11977)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Tests were not ran (VSTS: device tests iOS). ⚠️

Results were skipped for this run due to provisioning problems Azure Devops. Please contact the bot administrator.

Pipeline on Agent
[VideoSubscriberAccount] Updates for Xcode13 Beta 1 (#11977)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Tests were not ran (VSTS: device tests tvOS). ⚠️

Results were skipped for this run due to provisioning problems Azure Devops. Please contact the bot administrator.

Pipeline on Agent
[VideoSubscriberAccount] Updates for Xcode13 Beta 1 (#11977)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ Tests passed on macOS Mac Catalina (10.15) ✅

Tests passed

All tests on macOS X Mac Catalina (10.15) passed.

Pipeline on Agent
[VideoSubscriberAccount] Updates for Xcode13 Beta 1 (#11977)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ Tests passed on macOS Mac Mojave (10.14) ✅

Tests passed

All tests on macOS X Mac Mojave (10.14) passed.

Pipeline on Agent
[VideoSubscriberAccount] Updates for Xcode13 Beta 1 (#11977)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ Tests passed on macOS Mac High Sierra (10.13) ✅

Tests passed

All tests on macOS X Mac High Sierra (10.13) passed.

Pipeline on Agent
[VideoSubscriberAccount] Updates for Xcode13 Beta 1 (#11977)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Tests were not ran (VSTS: device tests iOS32b). ⚠️

Results were skipped for this run due to provisioning problems Azure Devops. Please contact the bot administrator.

Pipeline on Agent
[VideoSubscriberAccount] Updates for Xcode13 Beta 1 (#11977)

Please sign in to comment.