Merge pull request #13056 from rachelkang/xcode13.0-intentsui-b1-b4

[IntentsUI] Update bindings for Xcode13.0 betas 1, 4

src/frameworks.sources

@@ -1969,6 +1969,7 @@ MACOS_FRAMEWORKS =          \
 	ImageCaptureCore	\
 	ImageKit                \
 	Intents                 \
+	IntentsUI               \
 	IOSurface 		\
 	iTunesLibrary           \
 	JavaScriptCore          \
@@ -2256,6 +2257,7 @@ MACCATALYST_FRAMEWORKS = \
 	IdentityLookup \
 	ImageIO \
 	Intents \
+	IntentsUI \
 	IOSurface \
 	JavaScriptCore \
 	LinkPresentation \

src/intentsui.cs

@@ -12,10 +12,15 @@ using CoreGraphics;
 using Foundation;
 using Intents;
 using ObjCRuntime;
+#if MONOMAC
+using AppKit;
+#else
 using UIKit;
+#endif
 
 namespace IntentsUI {
 
+	[NoMac]
 	[iOS (10, 0)]
 	[MacCatalyst (13, 0)]
 	[Native]
@@ -24,6 +29,7 @@ namespace IntentsUI {
 		MapsCard
 	}
 
+	[NoMac]
 	[iOS (11,0)]
 	[MacCatalyst (13, 0)]
 	[Native]
@@ -34,7 +40,7 @@ namespace IntentsUI {
 		GenericAction,
 	}
 
-	[NoWatch, NoTV, NoMac, iOS (12,0)]
+	[NoWatch, NoTV, Mac (12,0), iOS (12,0)]
 	[Native]
 	public enum INUIAddVoiceShortcutButtonStyle : ulong {
 		White = 0,
@@ -47,15 +53,17 @@ namespace IntentsUI {
 		AutomaticOutLine,
 	}
 
+	[NoMac]
 	[iOS (11,0)]
 	delegate void INUIHostedViewControllingConfigureViewHandler (bool success, NSSet<INParameter> configuredParameters, CGSize desiredSize);
 
+	[NoMac]
 	[iOS (10, 0)]
 	[MacCatalyst (13, 0)]
 	[Protocol]
 	interface INUIHostedViewControlling {
 
-#if !XAMCORE_4_0 // Apple made this member optional in iOS 11
+#if !XAMCORE_4_0 && !__MACCATALYST__ // Apple made this member optional in iOS 11
 		[Abstract]
 #endif
 		[Export ("configureWithInteraction:context:completion:")]
@@ -66,6 +74,7 @@ namespace IntentsUI {
 		void ConfigureView (NSSet<INParameter> parameters, INInteraction interaction, INUIInteractiveBehavior interactiveBehavior, INUIHostedViewContext context, INUIHostedViewControllingConfigureViewHandler completionHandler);
 	}
 
+	[NoMac]
 	[iOS (10, 0)]
 	[MacCatalyst (13, 0)]
 	[Category]
@@ -83,6 +92,7 @@ namespace IntentsUI {
 		string GetInterfaceParametersDescription ();
 	}
 
+	[NoMac]
 	[iOS (10, 0)]
 	[MacCatalyst (13, 0)]
 	[Protocol]
@@ -98,8 +108,13 @@ namespace IntentsUI {
 		bool DisplaysPaymentTransaction { get; }
 	}
 
+	[Mac (12,0)]
 	[iOS (12,0)]
+#if MONOMAC
+	[BaseType (typeof (NSViewController))]
+#else
 	[BaseType (typeof (UIViewController))]
+#endif
 	[DisableDefaultCtor]
 	interface INUIAddVoiceShortcutViewController {
 
@@ -110,13 +125,14 @@ namespace IntentsUI {
 		[NullAllowed, Export ("delegate", ArgumentSemantic.Weak)]
 		NSObject WeakDelegate { get; set; }
 
-		[NoMacCatalyst]
+		[MacCatalyst (13,4)]
 		[Export ("initWithShortcut:")]
 		IntPtr Constructor (INShortcut shortcut);
 	}
 
 	interface IINUIAddVoiceShortcutViewControllerDelegate { }
 
+	[Mac (12,0)]
 	[iOS (12,0)]
 	[Protocol, Model (AutoGeneratedName = true)]
 	[BaseType (typeof (NSObject))]
@@ -131,8 +147,13 @@ namespace IntentsUI {
 		void DidCancel (INUIAddVoiceShortcutViewController controller);
 	}
 
+	[Mac (12,0)]
 	[iOS (12,0)]
+#if MONOMAC
+	[BaseType (typeof (NSViewController))]
+#else
 	[BaseType (typeof (UIViewController))]
+#endif
 	[DisableDefaultCtor]
 	interface INUIEditVoiceShortcutViewController {
 
@@ -143,13 +164,14 @@ namespace IntentsUI {
 		[NullAllowed, Export ("delegate", ArgumentSemantic.Weak)]
 		NSObject WeakDelegate { get; set; }
 
-		[NoMacCatalyst]
+		[MacCatalyst (13,4)]
 		[Export ("initWithVoiceShortcut:")]
 		IntPtr Constructor (INVoiceShortcut voiceShortcut);
 	}
 
 	interface IINUIEditVoiceShortcutViewControllerDelegate { }
 
+	[Mac (12,0)]
 	[iOS (12,0)]
 	[Protocol, Model (AutoGeneratedName = true)]
 	[BaseType (typeof (NSObject))]
@@ -168,8 +190,12 @@ namespace IntentsUI {
 		void DidCancel (INUIEditVoiceShortcutViewController controller);
 	}
 
-	[NoWatch, NoTV, NoMac, iOS (12,0)]
+	[NoWatch, NoTV, Mac (12,0), iOS (12,0)]
+#if MONOMAC
+	[BaseType (typeof (NSButton))]
+#else
 	[BaseType (typeof (UIButton))]
+#endif
 	[DisableDefaultCtor]
 	interface INUIAddVoiceShortcutButton {
 
@@ -202,7 +228,7 @@ namespace IntentsUI {
 
 	interface IINUIAddVoiceShortcutButtonDelegate {}
 
-	[NoWatch, NoTV, NoMac, iOS (12,0)]
+	[NoWatch, NoTV, Mac (12,0), iOS (12,0)]
 	[Protocol, Model (AutoGeneratedName = true)]
 	[BaseType (typeof(NSObject))]
 	interface INUIAddVoiceShortcutButtonDelegate {

tests/xtro-sharpie/MacCatalyst-IntentsUI.todo

@@ -1,31 +0,0 @@
-!missing-enum! INUIAddVoiceShortcutButtonStyle not bound
-!missing-enum! INUIHostedViewContext not bound
-!missing-enum! INUIInteractiveBehavior not bound
-!missing-field! IntentsUIVersionNumber not bound
-!missing-field! IntentsUIVersionString not bound
-!missing-protocol! INUIAddVoiceShortcutButtonDelegate not bound
-!missing-protocol! INUIAddVoiceShortcutViewControllerDelegate not bound
-!missing-protocol! INUIEditVoiceShortcutViewControllerDelegate not bound
-!missing-protocol! INUIHostedViewControlling not bound
-!missing-protocol! INUIHostedViewSiriProviding not bound
-!missing-selector! INUIAddVoiceShortcutButton::cornerRadius not bound
-!missing-selector! INUIAddVoiceShortcutButton::delegate not bound
-!missing-selector! INUIAddVoiceShortcutButton::initWithStyle: not bound
-!missing-selector! INUIAddVoiceShortcutButton::setCornerRadius: not bound
-!missing-selector! INUIAddVoiceShortcutButton::setDelegate: not bound
-!missing-selector! INUIAddVoiceShortcutButton::setShortcut: not bound
-!missing-selector! INUIAddVoiceShortcutButton::setStyle: not bound
-!missing-selector! INUIAddVoiceShortcutButton::shortcut not bound
-!missing-selector! INUIAddVoiceShortcutButton::style not bound
-!missing-selector! INUIAddVoiceShortcutViewController::delegate not bound
-!missing-selector! INUIAddVoiceShortcutViewController::initWithShortcut: not bound
-!missing-selector! INUIAddVoiceShortcutViewController::setDelegate: not bound
-!missing-selector! INUIEditVoiceShortcutViewController::delegate not bound
-!missing-selector! INUIEditVoiceShortcutViewController::initWithVoiceShortcut: not bound
-!missing-selector! INUIEditVoiceShortcutViewController::setDelegate: not bound
-!missing-selector! NSExtensionContext::hostedViewMaximumAllowedSize not bound
-!missing-selector! NSExtensionContext::hostedViewMinimumAllowedSize not bound
-!missing-selector! NSExtensionContext::interfaceParametersDescription not bound
-!missing-type! INUIAddVoiceShortcutButton not bound
-!missing-type! INUIAddVoiceShortcutViewController not bound
-!missing-type! INUIEditVoiceShortcutViewController not bound

tests/xtro-sharpie/common-IntentsUI.ignore

@@ -0,0 +1,3 @@
+## not exposed by our API (better use the OS version)
+!missing-field! IntentsUIVersionNumber not bound
+!missing-field! IntentsUIVersionString not bound

tests/xtro-sharpie/iOS-IntentsUI.ignore

@@ -1,6 +1,2 @@
 ## Apple made this protocol member optional in iOS 11 but it is a breaking change for us. Added to XAMCORE_4_0.
 !incorrect-protocol-member! INUIHostedViewControlling::configureWithInteraction:context:completion: is OPTIONAL and should NOT be abstract
-
-## not exposed by our API (better use the OS version)
-!missing-field! IntentsUIVersionNumber not bound
-!missing-field! IntentsUIVersionString not bound

tests/xtro-sharpie/macOS-IntentsUI.todo

@@ -1,24 +0,0 @@
-!missing-enum! INUIAddVoiceShortcutButtonStyle not bound
-!missing-field! IntentsUIVersionNumber not bound
-!missing-field! IntentsUIVersionString not bound
-!missing-protocol! INUIAddVoiceShortcutButtonDelegate not bound
-!missing-protocol! INUIAddVoiceShortcutViewControllerDelegate not bound
-!missing-protocol! INUIEditVoiceShortcutViewControllerDelegate not bound
-!missing-selector! INUIAddVoiceShortcutButton::cornerRadius not bound
-!missing-selector! INUIAddVoiceShortcutButton::delegate not bound
-!missing-selector! INUIAddVoiceShortcutButton::initWithStyle: not bound
-!missing-selector! INUIAddVoiceShortcutButton::setCornerRadius: not bound
-!missing-selector! INUIAddVoiceShortcutButton::setDelegate: not bound
-!missing-selector! INUIAddVoiceShortcutButton::setShortcut: not bound
-!missing-selector! INUIAddVoiceShortcutButton::setStyle: not bound
-!missing-selector! INUIAddVoiceShortcutButton::shortcut not bound
-!missing-selector! INUIAddVoiceShortcutButton::style not bound
-!missing-selector! INUIAddVoiceShortcutViewController::delegate not bound
-!missing-selector! INUIAddVoiceShortcutViewController::initWithShortcut: not bound
-!missing-selector! INUIAddVoiceShortcutViewController::setDelegate: not bound
-!missing-selector! INUIEditVoiceShortcutViewController::delegate not bound
-!missing-selector! INUIEditVoiceShortcutViewController::initWithVoiceShortcut: not bound
-!missing-selector! INUIEditVoiceShortcutViewController::setDelegate: not bound
-!missing-type! INUIAddVoiceShortcutButton not bound
-!missing-type! INUIAddVoiceShortcutViewController not bound
-!missing-type! INUIEditVoiceShortcutViewController not bound

tests/xtro-sharpie/tvOS-IntentsUI.ignore

@@ -1,7 +1,3 @@
-## not exposed by our API (better use the OS version)
-!missing-field! IntentsUIVersionNumber not bound
-!missing-field! IntentsUIVersionString not bound
-
 # fails on intro rdar: https://github.com/xamarin/maccore/issues/2286
 !missing-selector! +INImage::imageSizeForIntentResponse: not bound
 !missing-selector! +INImage::imageWithCGImage: not bound

tools/common/Frameworks.cs

@@ -208,6 +208,7 @@ public class Frameworks : Dictionary <string, Framework>
 					{ "ModelIO", 10, 11 },
 
 					{ "Intents", 10, 12 },
+					{ "IntentsUI", 12, 0 },
 					{ "IOSurface", "IOSurface", 10, 12 },
 					{ "Photos", "Photos", 10,12 },
 					{ "PhotosUI", "PhotosUI", 10,12 },