diff --git a/src/avfoundation.cs b/src/avfoundation.cs
index 722cd48369..29d6faa160 100644
--- a/src/avfoundation.cs
+++ b/src/avfoundation.cs
@@ -4802,7 +4802,8 @@ namespace AVFoundation {
 		void LoadSegment (CMTime trackTime, Action<AVAssetTrackSegment, NSError> completionHandler);
 	}
 
-	[Mac (10,10), NoiOS, NoTV, NoWatch, NoMacCatalyst]
+	[Mac (10,10), NoiOS, NoTV, NoWatch]
+	[NoMacCatalyst]
 	[DisableDefaultCtor]
 	[BaseType (typeof (NSObject))]
 	interface AVSampleCursor : NSCopying {
@@ -8905,6 +8906,7 @@ namespace AVFoundation {
 		NSString InterruptionReasonKey { get; }
 
 		[iOS (7,0)]
+		[MacCatalyst (14,0)]
 		[Export ("usesApplicationAudioSession")]
 		bool UsesApplicationAudioSession { get; set; }
 
diff --git a/src/callkit.cs b/src/callkit.cs
index d275c2816e..e208d0c461 100644
--- a/src/callkit.cs
+++ b/src/callkit.cs
@@ -296,8 +296,7 @@ namespace CallKit {
 		[Export ("getEnabledStatusForExtensionWithIdentifier:completionHandler:")]
 		void GetEnabledStatusForExtension (string identifier, Action<CXCallDirectoryEnabledStatus, NSError> completion);
 
-		[NoMacCatalyst]
-		[NoWatch, NoTV, NoMac, iOS (13,4)]
+		[NoWatch, NoTV, NoMac, iOS (13,4), MacCatalyst (14,0)]
 		[Async]
 		[Export ("openSettingsWithCompletionHandler:")]
 		void OpenSettings ([NullAllowed] Action<NSError> completion);
diff --git a/src/fileprovider.cs b/src/fileprovider.cs
index 6990c0d96c..ea263376fe 100644
--- a/src/fileprovider.cs
+++ b/src/fileprovider.cs
@@ -226,6 +226,7 @@ namespace FileProvider {
 
 	[iOS (11,0)]
 	[Mac (11,0)]
+	[NoMacCatalyst]
 	[Static]
 	interface NSFileProviderItemIdentifier {
 
@@ -269,6 +270,7 @@ namespace FileProvider {
 
 	[iOS (11,0)]
 	[Mac (11,0)]
+	[NoMacCatalyst]
 	[Static]
 	interface NSFileProviderPage {
 
@@ -345,6 +347,7 @@ namespace FileProvider {
 
 	[iOS (11,0)]
 	[Mac (10,15)]
+	[NoMacCatalyst]
 	[Protocol]
 	interface NSFileProviderEnumerationObserver {
 
@@ -370,6 +373,7 @@ namespace FileProvider {
 
 	[iOS (11,0)]
 	[Mac (10,15)]
+	[NoMacCatalyst]
 	[Protocol]
 	interface NSFileProviderChangeObserver {
 
@@ -399,6 +403,7 @@ namespace FileProvider {
 
 	[iOS (11,0)]
 	[Mac (10,15)]
+	[NoMacCatalyst]
 	[Protocol]
 	interface NSFileProviderEnumerator {
 
@@ -421,6 +426,7 @@ namespace FileProvider {
 
 	[iOS (11,0)]
 	[Mac (10,15)]
+	[NoMacCatalyst]
 	[Protocol]
 	interface NSFileProviderItem {
 
@@ -536,7 +542,7 @@ namespace FileProvider {
 		[Export ("userInfo")]
 		NSDictionary GetUserInfo ();
 
-		[NoiOS]
+		[NoiOS, NoMacCatalyst]
 		[Export ("fileSystemFlags")]
 		NSFileProviderFileSystemFlags FileSystemFlags { get; }
 
diff --git a/src/iTunesLibrary/Enums.cs b/src/iTunesLibrary/Enums.cs
index 64b293b936..56bf0b0201 100644
--- a/src/iTunesLibrary/Enums.cs
+++ b/src/iTunesLibrary/Enums.cs
@@ -317,6 +317,7 @@ namespace iTunesLibrary {
 		Kind,
 	}
 
+	[MacCatalyst (14,0)]
 	[Mac (10,14)]
 	public enum ITLibMediaEntityProperty {
 		[Field ("ITLibMediaEntityPropertyPersistentID")]
diff --git a/src/intentsui.cs b/src/intentsui.cs
index c5f4141e3b..b0bd8c1ffb 100644
--- a/src/intentsui.cs
+++ b/src/intentsui.cs
@@ -17,6 +17,7 @@ using UIKit;
 namespace IntentsUI {
 
 	[iOS (10, 0)]
+	[MacCatalyst (13, 0)]
 	[Native]
 	public enum INUIHostedViewContext : ulong {
 		SiriSnippet,
@@ -24,6 +25,7 @@ namespace IntentsUI {
 	}
 
 	[iOS (11,0)]
+	[MacCatalyst (13, 0)]
 	[Native]
 	public enum INUIInteractiveBehavior : ulong {
 		None,
@@ -49,6 +51,7 @@ namespace IntentsUI {
 	delegate void INUIHostedViewControllingConfigureViewHandler (bool success, NSSet<INParameter> configuredParameters, CGSize desiredSize);
 
 	[iOS (10, 0)]
+	[MacCatalyst (13, 0)]
 	[Protocol]
 	interface INUIHostedViewControlling {
 
@@ -64,6 +67,7 @@ namespace IntentsUI {
 	}
 
 	[iOS (10, 0)]
+	[MacCatalyst (13, 0)]
 	[Category]
 	[BaseType (typeof (NSExtensionContext))]
 	interface NSExtensionContext_INUIHostedViewControlling {
@@ -80,6 +84,7 @@ namespace IntentsUI {
 	}
 
 	[iOS (10, 0)]
+	[MacCatalyst (13, 0)]
 	[Protocol]
 	interface INUIHostedViewSiriProviding {
 
diff --git a/src/pencilkit.cs b/src/pencilkit.cs
index 1852307522..eed5c70367 100644
--- a/src/pencilkit.cs
+++ b/src/pencilkit.cs
@@ -102,25 +102,20 @@ namespace PencilKit {
 		[Export ("drawing", ArgumentSemantic.Copy)]
 		PKDrawing Drawing { get; set; }
 
-		[Unavailable (PlatformName.MacCatalyst), Advice ("This API is not available when using Catalyst on macOS.")]
 		[Export ("tool", ArgumentSemantic.Copy)]
 		PKTool Tool { get; set; }
 
-		[Unavailable (PlatformName.MacCatalyst), Advice ("This API is not available when using Catalyst on macOS.")]
 		[Export ("rulerActive")]
 		bool RulerActive { [Bind ("isRulerActive")] get; set; }
 
-		[Unavailable (PlatformName.MacCatalyst), Advice ("This API is not available when using Catalyst on macOS.")]
 		[Export ("drawingGestureRecognizer")]
 		UIGestureRecognizer DrawingGestureRecognizer { get; }
 
 		[Deprecated (PlatformName.iOS, 14, 0, message: "Use 'DrawingPolicy' property instead.")]
-		[Unavailable (PlatformName.MacCatalyst), Advice ("This API is not available when using Catalyst on macOS.")]
 		[Export ("allowsFingerDrawing")]
 		bool AllowsFingerDrawing { get; set; }
 
 		[iOS (14, 0)]
-		[Unavailable (PlatformName.MacCatalyst), Advice ("This API is not available when using Catalyst on macOS.")]
 		[Export ("drawingPolicy", ArgumentSemantic.Assign)]
 		PKCanvasViewDrawingPolicy DrawingPolicy { get; set; }
 	}
@@ -299,7 +294,6 @@ namespace PencilKit {
 		UIUserInterfaceStyle ColorUserInterfaceStyle { get; set; }
 
 		[Deprecated (PlatformName.iOS, 14, 0, message: "Create individual instances instead.")]
-		[Unavailable (PlatformName.MacCatalyst), Advice ("This API is not available when using Catalyst on macOS.")]
 		[Static]
 		[return: NullAllowed]
 		[Export ("sharedToolPickerForWindow:")]
diff --git a/src/pushkit.cs b/src/pushkit.cs
index d489205f0c..61ad41838d 100644
--- a/src/pushkit.cs
+++ b/src/pushkit.cs
@@ -101,6 +101,7 @@ namespace PushKit
 		void DidReceiveIncomingPush (PKPushRegistry registry, PKPushPayload payload, string type);
 
 		[iOS (11,0)]
+		[MacCatalyst (10,13)]
 		[Export ("pushRegistry:didReceiveIncomingPushWithPayload:forType:withCompletionHandler:")]
 		void DidReceiveIncomingPush (PKPushRegistry registry, PKPushPayload payload, string type, Action completion);
 
diff --git a/src/quicklookthumbnailing.cs b/src/quicklookthumbnailing.cs
index 2bcd2b038b..19595f76d5 100644
--- a/src/quicklookthumbnailing.cs
+++ b/src/quicklookthumbnailing.cs
@@ -101,7 +101,7 @@ namespace QuickLookThumbnailing {
 		UTType ContentType { get; set; }
 	}
 
-	[Mac (10,15), iOS (13,0)]
+	[Mac (10,15), iOS (13,0), MacCatalyst (13,0)]
 	[BaseType (typeof (NSObject))]
 	interface QLThumbnailRepresentation {
 
diff --git a/tests/xtro-sharpie/MacCatalyst-AVFoundation.ignore b/tests/xtro-sharpie/MacCatalyst-AVFoundation.ignore
index 07517a0748..1a9b77380d 100644
--- a/tests/xtro-sharpie/MacCatalyst-AVFoundation.ignore
+++ b/tests/xtro-sharpie/MacCatalyst-AVFoundation.ignore
@@ -15,7 +15,7 @@
 # ignored in mac os too
 !missing-protocol-conformance! AVSampleBufferDisplayLayer should conform to AVQueuedSampleBufferRendering (defined in 'AVSampleBufferDisplayLayerQueueManagement' category)
 
-# not present in catalyst
+# AVSampleCursor catagories lack API_AVAILABLE markings https://github.com/xamarin/maccore/issues/2518
 !missing-selector! AVSampleCursor::comparePositionInDecodeOrderWithPositionOfCursor: not bound
 !missing-selector! AVSampleCursor::copyCurrentSampleFormatDescription not bound
 !missing-selector! AVSampleCursor::currentChunkInfo not bound
diff --git a/tests/xtro-sharpie/MacCatalyst-CHIP.ignore b/tests/xtro-sharpie/MacCatalyst-CHIP.ignore
index 87cb23a583..c5ccc2fa72 100644
--- a/tests/xtro-sharpie/MacCatalyst-CHIP.ignore
+++ b/tests/xtro-sharpie/MacCatalyst-CHIP.ignore
@@ -1,4 +1,4 @@
-# framework is missing in Xcode13 beta 1
+# framework is in headers in Xcode13 beta 5 but symbols are not in binaries
 !missing-enum! CHIPErrorCode not bound
 !missing-enum! CHIPOnboardingPayloadType not bound
 !missing-enum! CHIPOptionalQRCodeInfoType not bound
@@ -398,3 +398,153 @@
 !missing-type! CHIPTemperatureMeasurement not bound
 !missing-type! CHIPTestCluster not bound
 !missing-type! CHIPThermostat not bound
+!missing-enum! CHIPCommissioningFlow not bound
+!missing-selector! CHIPAccountLogin::getSetupPIN:responseHandler: not bound
+!missing-selector! CHIPAccountLogin::login:setupPIN:responseHandler: not bound
+!missing-selector! CHIPAccountLogin::readAttributeClusterRevisionWithResponseHandler: not bound
+!missing-selector! CHIPApplicationLauncher::launchApp:catalogVendorId:applicationId:responseHandler: not bound
+!missing-selector! CHIPApplicationLauncher::readAttributeApplicationLauncherListWithResponseHandler: not bound
+!missing-selector! CHIPApplicationLauncher::readAttributeClusterRevisionWithResponseHandler: not bound
+!missing-selector! CHIPAudioOutput::readAttributeAudioOutputListWithResponseHandler: not bound
+!missing-selector! CHIPAudioOutput::readAttributeClusterRevisionWithResponseHandler: not bound
+!missing-selector! CHIPAudioOutput::renameOutput:name:responseHandler: not bound
+!missing-selector! CHIPAudioOutput::selectOutput:responseHandler: not bound
+!missing-selector! CHIPBinaryInputBasic::configureAttributePresentValueWithMinInterval:maxInterval:responseHandler: not bound
+!missing-selector! CHIPBinaryInputBasic::configureAttributeStatusFlagsWithMinInterval:maxInterval:responseHandler: not bound
+!missing-selector! CHIPBinaryInputBasic::readAttributeClusterRevisionWithResponseHandler: not bound
+!missing-selector! CHIPBinaryInputBasic::readAttributeOutOfServiceWithResponseHandler: not bound
+!missing-selector! CHIPBinaryInputBasic::readAttributePresentValueWithResponseHandler: not bound
+!missing-selector! CHIPBinaryInputBasic::readAttributeStatusFlagsWithResponseHandler: not bound
+!missing-selector! CHIPBinaryInputBasic::reportAttributePresentValueWithResponseHandler: not bound
+!missing-selector! CHIPBinaryInputBasic::reportAttributeStatusFlagsWithResponseHandler: not bound
+!missing-selector! CHIPBinaryInputBasic::writeAttributeOutOfServiceWithValue:responseHandler: not bound
+!missing-selector! CHIPBinaryInputBasic::writeAttributePresentValueWithValue:responseHandler: not bound
+!missing-selector! CHIPBridgedDeviceBasic::readAttributeClusterRevisionWithResponseHandler: not bound
+!missing-selector! CHIPBridgedDeviceBasic::readAttributeHardwareVersionStringWithResponseHandler: not bound
+!missing-selector! CHIPBridgedDeviceBasic::readAttributeHardwareVersionWithResponseHandler: not bound
+!missing-selector! CHIPBridgedDeviceBasic::readAttributeManufacturingDateWithResponseHandler: not bound
+!missing-selector! CHIPBridgedDeviceBasic::readAttributePartNumberWithResponseHandler: not bound
+!missing-selector! CHIPBridgedDeviceBasic::readAttributeProductLabelWithResponseHandler: not bound
+!missing-selector! CHIPBridgedDeviceBasic::readAttributeProductNameWithResponseHandler: not bound
+!missing-selector! CHIPBridgedDeviceBasic::readAttributeProductURLWithResponseHandler: not bound
+!missing-selector! CHIPBridgedDeviceBasic::readAttributeReachableWithResponseHandler: not bound
+!missing-selector! CHIPBridgedDeviceBasic::readAttributeSerialNumberWithResponseHandler: not bound
+!missing-selector! CHIPBridgedDeviceBasic::readAttributeSoftwareVersionStringWithResponseHandler: not bound
+!missing-selector! CHIPBridgedDeviceBasic::readAttributeSoftwareVersionWithResponseHandler: not bound
+!missing-selector! CHIPBridgedDeviceBasic::readAttributeUserLabelWithResponseHandler: not bound
+!missing-selector! CHIPBridgedDeviceBasic::readAttributeVendorIDWithResponseHandler: not bound
+!missing-selector! CHIPBridgedDeviceBasic::readAttributeVendorNameWithResponseHandler: not bound
+!missing-selector! CHIPBridgedDeviceBasic::writeAttributeUserLabelWithValue:responseHandler: not bound
+!missing-selector! CHIPContentLaunch::launchContent:data:responseHandler: not bound
+!missing-selector! CHIPContentLaunch::launchURL:displayString:responseHandler: not bound
+!missing-selector! CHIPContentLaunch::readAttributeAcceptsHeaderListWithResponseHandler: not bound
+!missing-selector! CHIPContentLaunch::readAttributeClusterRevisionWithResponseHandler: not bound
+!missing-selector! CHIPContentLaunch::readAttributeSupportedStreamingTypesWithResponseHandler: not bound
+!missing-selector! CHIPEthernetNetworkDiagnostics::readAttributeClusterRevisionWithResponseHandler: not bound
+!missing-selector! CHIPEthernetNetworkDiagnostics::readAttributeCollisionCountWithResponseHandler: not bound
+!missing-selector! CHIPEthernetNetworkDiagnostics::readAttributeOverrunCountWithResponseHandler: not bound
+!missing-selector! CHIPEthernetNetworkDiagnostics::readAttributePacketRxCountWithResponseHandler: not bound
+!missing-selector! CHIPEthernetNetworkDiagnostics::readAttributePacketTxCountWithResponseHandler: not bound
+!missing-selector! CHIPEthernetNetworkDiagnostics::readAttributeTxErrCountWithResponseHandler: not bound
+!missing-selector! CHIPEthernetNetworkDiagnostics::resetCounts: not bound
+!missing-selector! CHIPFixedLabel::readAttributeClusterRevisionWithResponseHandler: not bound
+!missing-selector! CHIPFixedLabel::readAttributeLabelListWithResponseHandler: not bound
+!missing-selector! CHIPGeneralDiagnostics::readAttributeClusterRevisionWithResponseHandler: not bound
+!missing-selector! CHIPGeneralDiagnostics::readAttributeNetworkInterfacesWithResponseHandler: not bound
+!missing-selector! CHIPGeneralDiagnostics::readAttributeRebootCountWithResponseHandler: not bound
+!missing-selector! CHIPKeypadInput::readAttributeClusterRevisionWithResponseHandler: not bound
+!missing-selector! CHIPKeypadInput::sendKey:responseHandler: not bound
+!missing-selector! CHIPMediaInput::hideInputStatus: not bound
+!missing-selector! CHIPMediaInput::readAttributeClusterRevisionWithResponseHandler: not bound
+!missing-selector! CHIPMediaInput::readAttributeMediaInputListWithResponseHandler: not bound
+!missing-selector! CHIPMediaInput::renameInput:name:responseHandler: not bound
+!missing-selector! CHIPMediaInput::selectInput:responseHandler: not bound
+!missing-selector! CHIPMediaInput::showInputStatus: not bound
+!missing-selector! CHIPMediaPlayback::mediaFastForward: not bound
+!missing-selector! CHIPMediaPlayback::mediaNext: not bound
+!missing-selector! CHIPMediaPlayback::mediaPause: not bound
+!missing-selector! CHIPMediaPlayback::mediaPlay: not bound
+!missing-selector! CHIPMediaPlayback::mediaPrevious: not bound
+!missing-selector! CHIPMediaPlayback::mediaRewind: not bound
+!missing-selector! CHIPMediaPlayback::mediaSkipBackward:responseHandler: not bound
+!missing-selector! CHIPMediaPlayback::mediaSkipForward:responseHandler: not bound
+!missing-selector! CHIPMediaPlayback::mediaSkipSeek:responseHandler: not bound
+!missing-selector! CHIPMediaPlayback::mediaStartOver: not bound
+!missing-selector! CHIPMediaPlayback::mediaStop: not bound
+!missing-selector! CHIPMediaPlayback::readAttributeClusterRevisionWithResponseHandler: not bound
+!missing-selector! CHIPOperationalCredentials::addOpCert:iCACertificate:iPKValue:caseAdminNode:adminVendorId:responseHandler: not bound
+!missing-selector! CHIPOperationalCredentials::opCSRRequest:responseHandler: not bound
+!missing-selector! CHIPRelativeHumidityMeasurement::configureAttributeMeasuredValueWithMinInterval:maxInterval:change:responseHandler: not bound
+!missing-selector! CHIPRelativeHumidityMeasurement::readAttributeClusterRevisionWithResponseHandler: not bound
+!missing-selector! CHIPRelativeHumidityMeasurement::readAttributeMaxMeasuredValueWithResponseHandler: not bound
+!missing-selector! CHIPRelativeHumidityMeasurement::readAttributeMeasuredValueWithResponseHandler: not bound
+!missing-selector! CHIPRelativeHumidityMeasurement::readAttributeMinMeasuredValueWithResponseHandler: not bound
+!missing-selector! CHIPRelativeHumidityMeasurement::reportAttributeMeasuredValueWithResponseHandler: not bound
+!missing-selector! CHIPSetupPayload::commissioningFlow not bound
+!missing-selector! CHIPSetupPayload::setCommissioningFlow: not bound
+!missing-selector! CHIPSoftwareDiagnostics::readAttributeClusterRevisionWithResponseHandler: not bound
+!missing-selector! CHIPSoftwareDiagnostics::readAttributeCurrentHeapHighWatermarkWithResponseHandler: not bound
+!missing-selector! CHIPSoftwareDiagnostics::resetWatermarks: not bound
+!missing-selector! CHIPTargetNavigator::navigateTarget:data:responseHandler: not bound
+!missing-selector! CHIPTargetNavigator::readAttributeClusterRevisionWithResponseHandler: not bound
+!missing-selector! CHIPTargetNavigator::readAttributeTargetNavigatorListWithResponseHandler: not bound
+!missing-selector! CHIPTestCluster::readAttributeListOctetStringWithResponseHandler: not bound
+!missing-selector! CHIPTestCluster::readAttributeListStructOctetStringWithResponseHandler: not bound
+!missing-selector! CHIPTestCluster::testUnknownCommand: not bound
+!missing-selector! CHIPTrustedRootCertificates::addTrustedRootCertificate:responseHandler: not bound
+!missing-selector! CHIPTrustedRootCertificates::readAttributeClusterRevisionWithResponseHandler: not bound
+!missing-selector! CHIPTrustedRootCertificates::removeTrustedRootCertificate:responseHandler: not bound
+!missing-selector! CHIPTvChannel::changeChannel:responseHandler: not bound
+!missing-selector! CHIPTvChannel::changeChannelByNumber:minorNumber:responseHandler: not bound
+!missing-selector! CHIPTvChannel::readAttributeClusterRevisionWithResponseHandler: not bound
+!missing-selector! CHIPTvChannel::readAttributeCurrentTvChannelWithResponseHandler: not bound
+!missing-selector! CHIPTvChannel::readAttributeTvChannelLineupWithResponseHandler: not bound
+!missing-selector! CHIPTvChannel::readAttributeTvChannelListWithResponseHandler: not bound
+!missing-selector! CHIPTvChannel::skipChannel:responseHandler: not bound
+!missing-selector! CHIPWakeOnLan::readAttributeClusterRevisionWithResponseHandler: not bound
+!missing-selector! CHIPWakeOnLan::readAttributeWakeOnLanMacAddressWithResponseHandler: not bound
+!missing-selector! CHIPWindowCovering::configureAttributeConfigStatusWithMinInterval:maxInterval:responseHandler: not bound
+!missing-selector! CHIPWindowCovering::configureAttributeCurrentPositionLiftWithMinInterval:maxInterval:change:responseHandler: not bound
+!missing-selector! CHIPWindowCovering::configureAttributeCurrentPositionTiltWithMinInterval:maxInterval:change:responseHandler: not bound
+!missing-selector! CHIPWindowCovering::configureAttributeWindowCoveringTypeWithMinInterval:maxInterval:responseHandler: not bound
+!missing-selector! CHIPWindowCovering::readAttributeClusterRevisionWithResponseHandler: not bound
+!missing-selector! CHIPWindowCovering::readAttributeConfigStatusWithResponseHandler: not bound
+!missing-selector! CHIPWindowCovering::readAttributeCurrentPositionLiftWithResponseHandler: not bound
+!missing-selector! CHIPWindowCovering::readAttributeCurrentPositionTiltWithResponseHandler: not bound
+!missing-selector! CHIPWindowCovering::readAttributeInstalledClosedLimitLiftWithResponseHandler: not bound
+!missing-selector! CHIPWindowCovering::readAttributeInstalledClosedLimitTiltWithResponseHandler: not bound
+!missing-selector! CHIPWindowCovering::readAttributeInstalledOpenLimitLiftWithResponseHandler: not bound
+!missing-selector! CHIPWindowCovering::readAttributeInstalledOpenLimitTiltWithResponseHandler: not bound
+!missing-selector! CHIPWindowCovering::readAttributeModeWithResponseHandler: not bound
+!missing-selector! CHIPWindowCovering::readAttributeWindowCoveringTypeWithResponseHandler: not bound
+!missing-selector! CHIPWindowCovering::reportAttributeConfigStatusWithResponseHandler: not bound
+!missing-selector! CHIPWindowCovering::reportAttributeCurrentPositionLiftWithResponseHandler: not bound
+!missing-selector! CHIPWindowCovering::reportAttributeCurrentPositionTiltWithResponseHandler: not bound
+!missing-selector! CHIPWindowCovering::reportAttributeWindowCoveringTypeWithResponseHandler: not bound
+!missing-selector! CHIPWindowCovering::windowCoveringDownClose: not bound
+!missing-selector! CHIPWindowCovering::windowCoveringGoToLiftPercentage:responseHandler: not bound
+!missing-selector! CHIPWindowCovering::windowCoveringGoToLiftValue:responseHandler: not bound
+!missing-selector! CHIPWindowCovering::windowCoveringGoToTiltPercentage:responseHandler: not bound
+!missing-selector! CHIPWindowCovering::windowCoveringGoToTiltValue:responseHandler: not bound
+!missing-selector! CHIPWindowCovering::windowCoveringStop: not bound
+!missing-selector! CHIPWindowCovering::windowCoveringUpOpen: not bound
+!missing-selector! CHIPWindowCovering::writeAttributeModeWithValue:responseHandler: not bound
+!missing-type! CHIPAccountLogin not bound
+!missing-type! CHIPApplicationLauncher not bound
+!missing-type! CHIPAudioOutput not bound
+!missing-type! CHIPBinaryInputBasic not bound
+!missing-type! CHIPBridgedDeviceBasic not bound
+!missing-type! CHIPContentLaunch not bound
+!missing-type! CHIPEthernetNetworkDiagnostics not bound
+!missing-type! CHIPFixedLabel not bound
+!missing-type! CHIPGeneralDiagnostics not bound
+!missing-type! CHIPKeypadInput not bound
+!missing-type! CHIPMediaInput not bound
+!missing-type! CHIPMediaPlayback not bound
+!missing-type! CHIPRelativeHumidityMeasurement not bound
+!missing-type! CHIPSoftwareDiagnostics not bound
+!missing-type! CHIPTargetNavigator not bound
+!missing-type! CHIPTrustedRootCertificates not bound
+!missing-type! CHIPTvChannel not bound
+!missing-type! CHIPWakeOnLan not bound
+!missing-type! CHIPWindowCovering not bound
diff --git a/tests/xtro-sharpie/MacCatalyst-CHIP.todo b/tests/xtro-sharpie/MacCatalyst-CHIP.todo
deleted file mode 100644
index 64bb77894b..0000000000
--- a/tests/xtro-sharpie/MacCatalyst-CHIP.todo
+++ /dev/null
@@ -1,150 +0,0 @@
-!missing-enum! CHIPCommissioningFlow not bound
-!missing-selector! CHIPAccountLogin::getSetupPIN:responseHandler: not bound
-!missing-selector! CHIPAccountLogin::login:setupPIN:responseHandler: not bound
-!missing-selector! CHIPAccountLogin::readAttributeClusterRevisionWithResponseHandler: not bound
-!missing-selector! CHIPApplicationLauncher::launchApp:catalogVendorId:applicationId:responseHandler: not bound
-!missing-selector! CHIPApplicationLauncher::readAttributeApplicationLauncherListWithResponseHandler: not bound
-!missing-selector! CHIPApplicationLauncher::readAttributeClusterRevisionWithResponseHandler: not bound
-!missing-selector! CHIPAudioOutput::readAttributeAudioOutputListWithResponseHandler: not bound
-!missing-selector! CHIPAudioOutput::readAttributeClusterRevisionWithResponseHandler: not bound
-!missing-selector! CHIPAudioOutput::renameOutput:name:responseHandler: not bound
-!missing-selector! CHIPAudioOutput::selectOutput:responseHandler: not bound
-!missing-selector! CHIPBinaryInputBasic::configureAttributePresentValueWithMinInterval:maxInterval:responseHandler: not bound
-!missing-selector! CHIPBinaryInputBasic::configureAttributeStatusFlagsWithMinInterval:maxInterval:responseHandler: not bound
-!missing-selector! CHIPBinaryInputBasic::readAttributeClusterRevisionWithResponseHandler: not bound
-!missing-selector! CHIPBinaryInputBasic::readAttributeOutOfServiceWithResponseHandler: not bound
-!missing-selector! CHIPBinaryInputBasic::readAttributePresentValueWithResponseHandler: not bound
-!missing-selector! CHIPBinaryInputBasic::readAttributeStatusFlagsWithResponseHandler: not bound
-!missing-selector! CHIPBinaryInputBasic::reportAttributePresentValueWithResponseHandler: not bound
-!missing-selector! CHIPBinaryInputBasic::reportAttributeStatusFlagsWithResponseHandler: not bound
-!missing-selector! CHIPBinaryInputBasic::writeAttributeOutOfServiceWithValue:responseHandler: not bound
-!missing-selector! CHIPBinaryInputBasic::writeAttributePresentValueWithValue:responseHandler: not bound
-!missing-selector! CHIPBridgedDeviceBasic::readAttributeClusterRevisionWithResponseHandler: not bound
-!missing-selector! CHIPBridgedDeviceBasic::readAttributeHardwareVersionStringWithResponseHandler: not bound
-!missing-selector! CHIPBridgedDeviceBasic::readAttributeHardwareVersionWithResponseHandler: not bound
-!missing-selector! CHIPBridgedDeviceBasic::readAttributeManufacturingDateWithResponseHandler: not bound
-!missing-selector! CHIPBridgedDeviceBasic::readAttributePartNumberWithResponseHandler: not bound
-!missing-selector! CHIPBridgedDeviceBasic::readAttributeProductLabelWithResponseHandler: not bound
-!missing-selector! CHIPBridgedDeviceBasic::readAttributeProductNameWithResponseHandler: not bound
-!missing-selector! CHIPBridgedDeviceBasic::readAttributeProductURLWithResponseHandler: not bound
-!missing-selector! CHIPBridgedDeviceBasic::readAttributeReachableWithResponseHandler: not bound
-!missing-selector! CHIPBridgedDeviceBasic::readAttributeSerialNumberWithResponseHandler: not bound
-!missing-selector! CHIPBridgedDeviceBasic::readAttributeSoftwareVersionStringWithResponseHandler: not bound
-!missing-selector! CHIPBridgedDeviceBasic::readAttributeSoftwareVersionWithResponseHandler: not bound
-!missing-selector! CHIPBridgedDeviceBasic::readAttributeUserLabelWithResponseHandler: not bound
-!missing-selector! CHIPBridgedDeviceBasic::readAttributeVendorIDWithResponseHandler: not bound
-!missing-selector! CHIPBridgedDeviceBasic::readAttributeVendorNameWithResponseHandler: not bound
-!missing-selector! CHIPBridgedDeviceBasic::writeAttributeUserLabelWithValue:responseHandler: not bound
-!missing-selector! CHIPContentLaunch::launchContent:data:responseHandler: not bound
-!missing-selector! CHIPContentLaunch::launchURL:displayString:responseHandler: not bound
-!missing-selector! CHIPContentLaunch::readAttributeAcceptsHeaderListWithResponseHandler: not bound
-!missing-selector! CHIPContentLaunch::readAttributeClusterRevisionWithResponseHandler: not bound
-!missing-selector! CHIPContentLaunch::readAttributeSupportedStreamingTypesWithResponseHandler: not bound
-!missing-selector! CHIPEthernetNetworkDiagnostics::readAttributeClusterRevisionWithResponseHandler: not bound
-!missing-selector! CHIPEthernetNetworkDiagnostics::readAttributeCollisionCountWithResponseHandler: not bound
-!missing-selector! CHIPEthernetNetworkDiagnostics::readAttributeOverrunCountWithResponseHandler: not bound
-!missing-selector! CHIPEthernetNetworkDiagnostics::readAttributePacketRxCountWithResponseHandler: not bound
-!missing-selector! CHIPEthernetNetworkDiagnostics::readAttributePacketTxCountWithResponseHandler: not bound
-!missing-selector! CHIPEthernetNetworkDiagnostics::readAttributeTxErrCountWithResponseHandler: not bound
-!missing-selector! CHIPEthernetNetworkDiagnostics::resetCounts: not bound
-!missing-selector! CHIPFixedLabel::readAttributeClusterRevisionWithResponseHandler: not bound
-!missing-selector! CHIPFixedLabel::readAttributeLabelListWithResponseHandler: not bound
-!missing-selector! CHIPGeneralDiagnostics::readAttributeClusterRevisionWithResponseHandler: not bound
-!missing-selector! CHIPGeneralDiagnostics::readAttributeNetworkInterfacesWithResponseHandler: not bound
-!missing-selector! CHIPGeneralDiagnostics::readAttributeRebootCountWithResponseHandler: not bound
-!missing-selector! CHIPKeypadInput::readAttributeClusterRevisionWithResponseHandler: not bound
-!missing-selector! CHIPKeypadInput::sendKey:responseHandler: not bound
-!missing-selector! CHIPMediaInput::hideInputStatus: not bound
-!missing-selector! CHIPMediaInput::readAttributeClusterRevisionWithResponseHandler: not bound
-!missing-selector! CHIPMediaInput::readAttributeMediaInputListWithResponseHandler: not bound
-!missing-selector! CHIPMediaInput::renameInput:name:responseHandler: not bound
-!missing-selector! CHIPMediaInput::selectInput:responseHandler: not bound
-!missing-selector! CHIPMediaInput::showInputStatus: not bound
-!missing-selector! CHIPMediaPlayback::mediaFastForward: not bound
-!missing-selector! CHIPMediaPlayback::mediaNext: not bound
-!missing-selector! CHIPMediaPlayback::mediaPause: not bound
-!missing-selector! CHIPMediaPlayback::mediaPlay: not bound
-!missing-selector! CHIPMediaPlayback::mediaPrevious: not bound
-!missing-selector! CHIPMediaPlayback::mediaRewind: not bound
-!missing-selector! CHIPMediaPlayback::mediaSkipBackward:responseHandler: not bound
-!missing-selector! CHIPMediaPlayback::mediaSkipForward:responseHandler: not bound
-!missing-selector! CHIPMediaPlayback::mediaSkipSeek:responseHandler: not bound
-!missing-selector! CHIPMediaPlayback::mediaStartOver: not bound
-!missing-selector! CHIPMediaPlayback::mediaStop: not bound
-!missing-selector! CHIPMediaPlayback::readAttributeClusterRevisionWithResponseHandler: not bound
-!missing-selector! CHIPOperationalCredentials::addOpCert:iCACertificate:iPKValue:caseAdminNode:adminVendorId:responseHandler: not bound
-!missing-selector! CHIPOperationalCredentials::opCSRRequest:responseHandler: not bound
-!missing-selector! CHIPRelativeHumidityMeasurement::configureAttributeMeasuredValueWithMinInterval:maxInterval:change:responseHandler: not bound
-!missing-selector! CHIPRelativeHumidityMeasurement::readAttributeClusterRevisionWithResponseHandler: not bound
-!missing-selector! CHIPRelativeHumidityMeasurement::readAttributeMaxMeasuredValueWithResponseHandler: not bound
-!missing-selector! CHIPRelativeHumidityMeasurement::readAttributeMeasuredValueWithResponseHandler: not bound
-!missing-selector! CHIPRelativeHumidityMeasurement::readAttributeMinMeasuredValueWithResponseHandler: not bound
-!missing-selector! CHIPRelativeHumidityMeasurement::reportAttributeMeasuredValueWithResponseHandler: not bound
-!missing-selector! CHIPSetupPayload::commissioningFlow not bound
-!missing-selector! CHIPSetupPayload::setCommissioningFlow: not bound
-!missing-selector! CHIPSoftwareDiagnostics::readAttributeClusterRevisionWithResponseHandler: not bound
-!missing-selector! CHIPSoftwareDiagnostics::readAttributeCurrentHeapHighWatermarkWithResponseHandler: not bound
-!missing-selector! CHIPSoftwareDiagnostics::resetWatermarks: not bound
-!missing-selector! CHIPTargetNavigator::navigateTarget:data:responseHandler: not bound
-!missing-selector! CHIPTargetNavigator::readAttributeClusterRevisionWithResponseHandler: not bound
-!missing-selector! CHIPTargetNavigator::readAttributeTargetNavigatorListWithResponseHandler: not bound
-!missing-selector! CHIPTestCluster::readAttributeListOctetStringWithResponseHandler: not bound
-!missing-selector! CHIPTestCluster::readAttributeListStructOctetStringWithResponseHandler: not bound
-!missing-selector! CHIPTestCluster::testUnknownCommand: not bound
-!missing-selector! CHIPTrustedRootCertificates::addTrustedRootCertificate:responseHandler: not bound
-!missing-selector! CHIPTrustedRootCertificates::readAttributeClusterRevisionWithResponseHandler: not bound
-!missing-selector! CHIPTrustedRootCertificates::removeTrustedRootCertificate:responseHandler: not bound
-!missing-selector! CHIPTvChannel::changeChannel:responseHandler: not bound
-!missing-selector! CHIPTvChannel::changeChannelByNumber:minorNumber:responseHandler: not bound
-!missing-selector! CHIPTvChannel::readAttributeClusterRevisionWithResponseHandler: not bound
-!missing-selector! CHIPTvChannel::readAttributeCurrentTvChannelWithResponseHandler: not bound
-!missing-selector! CHIPTvChannel::readAttributeTvChannelLineupWithResponseHandler: not bound
-!missing-selector! CHIPTvChannel::readAttributeTvChannelListWithResponseHandler: not bound
-!missing-selector! CHIPTvChannel::skipChannel:responseHandler: not bound
-!missing-selector! CHIPWakeOnLan::readAttributeClusterRevisionWithResponseHandler: not bound
-!missing-selector! CHIPWakeOnLan::readAttributeWakeOnLanMacAddressWithResponseHandler: not bound
-!missing-selector! CHIPWindowCovering::configureAttributeConfigStatusWithMinInterval:maxInterval:responseHandler: not bound
-!missing-selector! CHIPWindowCovering::configureAttributeCurrentPositionLiftWithMinInterval:maxInterval:change:responseHandler: not bound
-!missing-selector! CHIPWindowCovering::configureAttributeCurrentPositionTiltWithMinInterval:maxInterval:change:responseHandler: not bound
-!missing-selector! CHIPWindowCovering::configureAttributeWindowCoveringTypeWithMinInterval:maxInterval:responseHandler: not bound
-!missing-selector! CHIPWindowCovering::readAttributeClusterRevisionWithResponseHandler: not bound
-!missing-selector! CHIPWindowCovering::readAttributeConfigStatusWithResponseHandler: not bound
-!missing-selector! CHIPWindowCovering::readAttributeCurrentPositionLiftWithResponseHandler: not bound
-!missing-selector! CHIPWindowCovering::readAttributeCurrentPositionTiltWithResponseHandler: not bound
-!missing-selector! CHIPWindowCovering::readAttributeInstalledClosedLimitLiftWithResponseHandler: not bound
-!missing-selector! CHIPWindowCovering::readAttributeInstalledClosedLimitTiltWithResponseHandler: not bound
-!missing-selector! CHIPWindowCovering::readAttributeInstalledOpenLimitLiftWithResponseHandler: not bound
-!missing-selector! CHIPWindowCovering::readAttributeInstalledOpenLimitTiltWithResponseHandler: not bound
-!missing-selector! CHIPWindowCovering::readAttributeModeWithResponseHandler: not bound
-!missing-selector! CHIPWindowCovering::readAttributeWindowCoveringTypeWithResponseHandler: not bound
-!missing-selector! CHIPWindowCovering::reportAttributeConfigStatusWithResponseHandler: not bound
-!missing-selector! CHIPWindowCovering::reportAttributeCurrentPositionLiftWithResponseHandler: not bound
-!missing-selector! CHIPWindowCovering::reportAttributeCurrentPositionTiltWithResponseHandler: not bound
-!missing-selector! CHIPWindowCovering::reportAttributeWindowCoveringTypeWithResponseHandler: not bound
-!missing-selector! CHIPWindowCovering::windowCoveringDownClose: not bound
-!missing-selector! CHIPWindowCovering::windowCoveringGoToLiftPercentage:responseHandler: not bound
-!missing-selector! CHIPWindowCovering::windowCoveringGoToLiftValue:responseHandler: not bound
-!missing-selector! CHIPWindowCovering::windowCoveringGoToTiltPercentage:responseHandler: not bound
-!missing-selector! CHIPWindowCovering::windowCoveringGoToTiltValue:responseHandler: not bound
-!missing-selector! CHIPWindowCovering::windowCoveringStop: not bound
-!missing-selector! CHIPWindowCovering::windowCoveringUpOpen: not bound
-!missing-selector! CHIPWindowCovering::writeAttributeModeWithValue:responseHandler: not bound
-!missing-type! CHIPAccountLogin not bound
-!missing-type! CHIPApplicationLauncher not bound
-!missing-type! CHIPAudioOutput not bound
-!missing-type! CHIPBinaryInputBasic not bound
-!missing-type! CHIPBridgedDeviceBasic not bound
-!missing-type! CHIPContentLaunch not bound
-!missing-type! CHIPEthernetNetworkDiagnostics not bound
-!missing-type! CHIPFixedLabel not bound
-!missing-type! CHIPGeneralDiagnostics not bound
-!missing-type! CHIPKeypadInput not bound
-!missing-type! CHIPMediaInput not bound
-!missing-type! CHIPMediaPlayback not bound
-!missing-type! CHIPRelativeHumidityMeasurement not bound
-!missing-type! CHIPSoftwareDiagnostics not bound
-!missing-type! CHIPTargetNavigator not bound
-!missing-type! CHIPTrustedRootCertificates not bound
-!missing-type! CHIPTvChannel not bound
-!missing-type! CHIPWakeOnLan not bound
-!missing-type! CHIPWindowCovering not bound
diff --git a/tests/xtro-sharpie/MacCatalyst-CallKit.todo b/tests/xtro-sharpie/MacCatalyst-CallKit.todo
deleted file mode 100644
index 0ebffbe600..0000000000
--- a/tests/xtro-sharpie/MacCatalyst-CallKit.todo
+++ /dev/null
@@ -1 +0,0 @@
-!missing-selector! CXCallDirectoryManager::openSettingsWithCompletionHandler: not bound
diff --git a/tests/xtro-sharpie/MacCatalyst-CoreAudioKit.todo b/tests/xtro-sharpie/MacCatalyst-CoreAudioKit.ignore
similarity index 94%
rename from tests/xtro-sharpie/MacCatalyst-CoreAudioKit.todo
rename to tests/xtro-sharpie/MacCatalyst-CoreAudioKit.ignore
index 7331ace486..bc730c5bc7 100644
--- a/tests/xtro-sharpie/MacCatalyst-CoreAudioKit.todo
+++ b/tests/xtro-sharpie/MacCatalyst-CoreAudioKit.ignore
@@ -1,3 +1,4 @@
+# CAInterAppAudioSwitcherView and CAInterAppAudioTransportView are both deprecated on iOS and macOS
 !missing-selector! CAInterAppAudioSwitcherView::contentWidth not bound
 !missing-selector! CAInterAppAudioSwitcherView::isShowingAppNames not bound
 !missing-selector! CAInterAppAudioSwitcherView::setOutputAudioUnit: not bound
diff --git a/tests/xtro-sharpie/MacCatalyst-FileProvider.ignore b/tests/xtro-sharpie/MacCatalyst-FileProvider.ignore
new file mode 100644
index 0000000000..50003e4d2f
--- /dev/null
+++ b/tests/xtro-sharpie/MacCatalyst-FileProvider.ignore
@@ -0,0 +1,3 @@
+# Documentation as of Xcode 13 as macOS only
+!missing-enum! NSFileProviderFileSystemFlags not bound
+!missing-enum! NSFileProviderDomainTestingModes not bound
diff --git a/tests/xtro-sharpie/MacCatalyst-FileProvider.todo b/tests/xtro-sharpie/MacCatalyst-FileProvider.todo
index a3176daa57..85633ec4f0 100644
--- a/tests/xtro-sharpie/MacCatalyst-FileProvider.todo
+++ b/tests/xtro-sharpie/MacCatalyst-FileProvider.todo
@@ -1,14 +1,4 @@
-!missing-enum! NSFileProviderFileSystemFlags not bound
 !missing-enum-value! NSFileProviderItemCapabilities native value NSFileProviderItemCapabilitiesAllowsAll = 63 not bound
 
 # MacCatalyst 14.5 only, Maybe? They are unavailable in iOS
-!missing-enum! NSFileProviderDomainTestingModes not bound
 ## appended from unclassified file
-!unknown-field! NSFileProviderInitialPageSortedByDate bound
-!unknown-field! NSFileProviderInitialPageSortedByName bound
-!unknown-field! NSFileProviderRootContainerItemIdentifier bound
-!unknown-field! NSFileProviderWorkingSetContainerItemIdentifier bound
-!unknown-protocol! NSFileProviderChangeObserver bound
-!unknown-protocol! NSFileProviderEnumerationObserver bound
-!unknown-protocol! NSFileProviderEnumerator bound
-!unknown-protocol! NSFileProviderItem bound
diff --git a/tests/xtro-sharpie/MacCatalyst-IntentsUI.ignore b/tests/xtro-sharpie/MacCatalyst-IntentsUI.ignore
new file mode 100644
index 0000000000..a61ceea823
--- /dev/null
+++ b/tests/xtro-sharpie/MacCatalyst-IntentsUI.ignore
@@ -0,0 +1,5 @@
+# fails on intro rdar: https://github.com/xamarin/maccore/issues/2516
+!missing-selector! +INImage::imageSizeForIntentResponse: not bound
+!missing-selector! +INImage::imageWithCGImage: not bound
+!missing-selector! +INImage::imageWithUIImage: not bound
+!missing-selector! INImage::fetchUIImageWithCompletion: not bound
diff --git a/tests/xtro-sharpie/MacCatalyst-IntentsUI.todo b/tests/xtro-sharpie/MacCatalyst-IntentsUI.todo
index f862852bda..8bc21e8792 100644
--- a/tests/xtro-sharpie/MacCatalyst-IntentsUI.todo
+++ b/tests/xtro-sharpie/MacCatalyst-IntentsUI.todo
@@ -8,10 +8,6 @@
 !missing-protocol! INUIEditVoiceShortcutViewControllerDelegate not bound
 !missing-protocol! INUIHostedViewControlling not bound
 !missing-protocol! INUIHostedViewSiriProviding not bound
-!missing-selector! +INImage::imageSizeForIntentResponse: not bound
-!missing-selector! +INImage::imageWithCGImage: not bound
-!missing-selector! +INImage::imageWithUIImage: not bound
-!missing-selector! INImage::fetchUIImageWithCompletion: not bound
 !missing-selector! INUIAddVoiceShortcutButton::cornerRadius not bound
 !missing-selector! INUIAddVoiceShortcutButton::delegate not bound
 !missing-selector! INUIAddVoiceShortcutButton::initWithStyle: not bound
diff --git a/tests/xtro-sharpie/MacCatalyst-PencilKit.todo b/tests/xtro-sharpie/MacCatalyst-PencilKit.todo
index cf99ae1572..9f5ea19086 100644
--- a/tests/xtro-sharpie/MacCatalyst-PencilKit.todo
+++ b/tests/xtro-sharpie/MacCatalyst-PencilKit.todo
@@ -1,12 +1,2 @@
-!missing-selector! +PKToolPicker::sharedToolPickerForWindow: not bound
-!missing-selector! PKCanvasView::allowsFingerDrawing not bound
 !missing-selector! PKCanvasView::delegate not bound
-!missing-selector! PKCanvasView::drawingGestureRecognizer not bound
-!missing-selector! PKCanvasView::drawingPolicy not bound
-!missing-selector! PKCanvasView::isRulerActive not bound
-!missing-selector! PKCanvasView::setAllowsFingerDrawing: not bound
 !missing-selector! PKCanvasView::setDelegate: not bound
-!missing-selector! PKCanvasView::setDrawingPolicy: not bound
-!missing-selector! PKCanvasView::setRulerActive: not bound
-!missing-selector! PKCanvasView::setTool: not bound
-!missing-selector! PKCanvasView::tool not bound