[d16-7] [xtro][bindings] Add xtro support for nullability and fix some bindings

src/addressbookui.cs

@@ -68,6 +68,7 @@ interface ABPeoplePickerNavigationController : UIAppearance {
 		[PostGet ("ViewControllers")] // that will PostGet TopViewController and VisibleViewController too
 		IntPtr Constructor (UIViewController rootViewController);
 
+		[NullAllowed]
 		[Export ("displayedProperties", ArgumentSemantic.Copy), Internal]
 		NSNumber[] _DisplayedProperties {get; set;}
 
@@ -148,6 +149,7 @@ interface ABPersonViewController : UIViewControllerRestoration {
 		[Export ("displayedPerson"), Internal]
 		IntPtr _DisplayedPerson {get; set;}
 
+		[NullAllowed]
 		[Export ("displayedProperties", ArgumentSemantic.Copy), Internal]
 		NSNumber[] _DisplayedProperties { get; set; }
 
@@ -311,19 +313,11 @@ interface ABUnknownPersonViewController {
 	[Protocol]
 	interface ABUnknownPersonViewControllerDelegate {
 		[Export ("unknownPersonViewController:didResolveToPerson:")]
-#if XAMCORE_2_0
 		[Abstract]
-		void DidResolveToPerson (ABUnknownPersonViewController unknownPersonView, ABPerson person);
-#else
-		void DidResolveToPerson (ABUnknownPersonViewController unknownPersonView, IntPtr person);
-#endif
+		void DidResolveToPerson (ABUnknownPersonViewController unknownPersonView, [NullAllowed] ABPerson person);
 
 		[Export ("unknownPersonViewController:shouldPerformDefaultActionForPerson:property:identifier:")]
-#if XAMCORE_2_0
 		bool ShouldPerformDefaultActionForPerson (ABUnknownPersonViewController personViewController, ABPerson person, int /* ABPropertyID = int32 */ propertyId, int /* ABMultiValueIdentifier = int32 */ identifier);
-#else
-		bool ShouldPerformDefaultActionForPerson (ABUnknownPersonViewController personViewController, IntPtr person, int /* ABPropertyID = int32 */ propertyId, int /* ABMultiValueIdentifier = int32 */ identifier);
-#endif
 	}
 }
 

src/arkit.cs

@@ -249,7 +249,7 @@ interface ARAnchorCopying : NSCopying {
 	[DisableDefaultCtor]
 	interface ARAnchor : ARAnchorCopying, NSSecureCoding {
 
-		[NullAllowed, Export ("identifier")]
+		[Export ("identifier")]
 		NSUuid Identifier { get; }
 
 		[iOS (12,0)]
@@ -930,7 +930,8 @@ interface ARWorldTrackingConfiguration {
 		ARWorldMap InitialWorldMap { get; set; }
 
 		[iOS (11,3)]
-		[NullAllowed, Export ("detectionImages", ArgumentSemantic.Copy)]
+		[NullAllowed] //null_resettable
+		[Export ("detectionImages", ArgumentSemantic.Copy)]
 		NSSet<ARReferenceImage> DetectionImages { get; set; }
 
 		[iOS (13,0)]

src/audiounit.cs

@@ -348,6 +348,7 @@ interface AUAudioUnit_AUAudioInputOutputUnit {
 		[Export ("setOutputEnabled:")]
 		bool SetOutputEnabled (bool enabled);
 
+		[return: NullAllowed]
 		[Export ("inputHandler", ArgumentSemantic.Copy)]
 		AUInputHandler GetInputHandler ();
 
@@ -360,6 +361,7 @@ interface AUAudioUnit_AUAudioInputOutputUnit {
 		[Export ("stopHardware")]
 		void StopHardware ();
 
+		[return: NullAllowed]
 		[Export ("outputProvider", ArgumentSemantic.Copy)]
 		AURenderPullInputBlock GetOutputProvider ();
 

src/avkit.cs

@@ -151,12 +151,13 @@ interface AVPlayerViewController {
 		[Export ("videoBounds")]
 		CGRect VideoBounds { get; }
 
+		[NullAllowed]
 		[Export ("contentOverlayView")]
 		UIView ContentOverlayView { get; }
 
 		[TV (11,0)]
 		[NoiOS]
-		[NullAllowed, Export ("unobscuredContentGuide")]
+		[Export ("unobscuredContentGuide")]
 		UILayoutGuide UnobscuredContentGuide { get; }
 
 		[NoTV]
@@ -205,6 +206,7 @@ interface AVPlayerViewController {
 		bool RequiresFullSubtitles { get; set; }
 #endregion
 #if !MONOMAC
+		[NullAllowed]
 		[NoiOS, TV (10, 0), NoWatch, NoMac]
 		[Export ("contentProposalViewController", ArgumentSemantic.Assign)]
 		AVContentProposalViewController ContentProposalViewController { get; set; }
@@ -231,6 +233,7 @@ interface AVPlayerViewController {
 		[Export ("playbackControlsIncludeInfoViews")]
 		bool PlaybackControlsIncludeInfoViews { get; set; }
 
+		[NullAllowed]
 		[NoiOS, TV (11, 0), NoWatch, NoMac]
 		[Export ("customInfoViewController", ArgumentSemantic.Assign)]
 		UIViewController CustomInfoViewController { get; set; }
@@ -289,17 +292,17 @@ interface AVPlayerViewControllerDelegate
 		[NoiOS][NoMac]
 		[TV (11,0)]
 		[Export ("playerViewControllerShouldDismiss:")]
-		bool ShouldDismiss ([NullAllowed] AVPlayerViewController playerViewController);
+		bool ShouldDismiss (AVPlayerViewController playerViewController);
 
 		[NoiOS][NoMac]
 		[TV (11,0)]
 		[Export ("playerViewControllerWillBeginDismissalTransition:")]
-		void WillBeginDismissalTransition ([NullAllowed] AVPlayerViewController playerViewController);
+		void WillBeginDismissalTransition (AVPlayerViewController playerViewController);
 
 		[NoiOS][NoMac]
 		[TV (11,0)]
 		[Export ("playerViewControllerDidEndDismissalTransition:")]
-		void DidEndDismissalTransition ([NullAllowed] AVPlayerViewController playerViewController);
+		void DidEndDismissalTransition (AVPlayerViewController playerViewController);
 
 		[NoiOS][NoMac]
 		[TV (9,0)]
@@ -347,7 +350,7 @@ interface AVPlayerViewControllerDelegate
 
 		[NoiOS, TV (11,0), NoWatch, NoMac]
 		[Export ("playerViewController:willTransitionToVisibilityOfTransportBar:withAnimationCoordinator:")]
-		void WillTransitionToVisibilityOfTransportBar ([NullAllowed] AVPlayerViewController playerViewController, bool visible, [NullAllowed] IAVPlayerViewControllerAnimationCoordinator coordinator);
+		void WillTransitionToVisibilityOfTransportBar (AVPlayerViewController playerViewController, bool visible, [NullAllowed] IAVPlayerViewControllerAnimationCoordinator coordinator);
 
 		[iOS (13,0), NoTV, NoWatch, NoMac]
 		[Export ("playerViewController:willBeginFullScreenPresentationWithAnimationCoordinator:"), EventArgs ("AVPlayerViewFullScreenPresentationWillBegin")]
@@ -402,6 +405,7 @@ interface AVPlayerView {
 		[Export ("initWithFrame:")]
 		IntPtr Constructor (CGRect frameRect);
 
+		[NullAllowed]
 		[Export ("player")]
 		AVPlayer Player { get; set; }
 
@@ -420,6 +424,7 @@ interface AVPlayerView {
 		[Export ("videoBounds")]
 		CGRect VideoBounds { get; }
 
+		[NullAllowed]
 		[Mac (10,10)]
 		[Export ("contentOverlayView")]
 		NSView ContentOverlayView { get; }
@@ -429,12 +434,13 @@ interface AVPlayerView {
 		bool UpdatesNowPlayingInfoCenter { get; set; }
 
 		[Mac (10,9)]
+		[NullAllowed]
 		[Export ("actionPopUpButtonMenu")]
 		NSMenu ActionPopUpButtonMenu { get; set; }
 
 		[Mac (10,9)] // No async
 		[Export ("beginTrimmingWithCompletionHandler:")]
-		void BeginTrimming (Action<AVPlayerViewTrimResult> handler);
+		void BeginTrimming ([NullAllowed] Action<AVPlayerViewTrimResult> handler);
 
 		[Mac (10,9)]
 		[Export ("canBeginTrimming")]

src/callkit.cs

@@ -226,12 +226,12 @@ interface CXCallController {
 		[iOS (11,0)]
 		[Async]
 		[Export ("requestTransactionWithActions:completion:")]
-		void RequestTransaction ([NullAllowed] CXAction[] actions, [NullAllowed] Action<NSError> completion);
+		void RequestTransaction (CXAction[] actions, Action<NSError> completion);
 
 		[iOS (11,0)]
 		[Async]
 		[Export ("requestTransactionWithAction:completion:")]
-		void RequestTransaction ([NullAllowed] CXAction action, [NullAllowed] Action<NSError> completion);
+		void RequestTransaction (CXAction action, Action<NSError> completion);
 	}
 
 	[iOS (10, 0)]

src/carplay.cs

@@ -241,6 +241,7 @@ interface CPInterfaceController {
 		void DismissTemplate (bool animated);
 
 		[Export ("presentedTemplate")]
+		[NullAllowed]
 		CPTemplate PresentedTemplate { get; }
 
 		[Export ("rootTemplate")]
@@ -731,9 +732,11 @@ interface CPRouteChoice : NSCopying, NSSecureCoding {
 		string [] SummaryVariants { get; }
 
 		[Export ("selectionSummaryVariants", ArgumentSemantic.Copy)]
+		[NullAllowed]
 		string [] SelectionSummaryVariants { get; }
 
 		[Export ("additionalInformationVariants", ArgumentSemantic.Copy)]
+		[NullAllowed]
 		string [] AdditionalInformationVariants { get; }
 
 		[NullAllowed, Export ("userInfo", ArgumentSemantic.Strong)]

src/classkit.cs

@@ -143,6 +143,7 @@ interface CLSActivity {
 		[Export ("duration")]
 		double Duration { get; }
 
+		[NullAllowed]
 		[Export ("primaryActivityItem", ArgumentSemantic.Strong)]
 		CLSActivityItem PrimaryActivityItem { get; set; }
 
@@ -281,6 +282,7 @@ interface CLSDataStoreDelegate {
 
 		[Abstract]
 		[Export ("createContextForIdentifier:parentContext:parentIdentifierPath:")]
+		[return: NullAllowed]
 		CLSContext CreateContext (string identifier, CLSContext parentContext, string [] parentIdentifierPath);
 	}
 

src/cloudkit.cs

@@ -456,20 +456,23 @@ interface CKDiscoveredUserInfo : NSCoding, NSCopying, NSSecureCoding {
 		[Export ("init")]
 		IntPtr Constructor ();
 
+		[NullAllowed]
 		[Export ("userRecordID", ArgumentSemantic.Copy)]
 		CKRecordID UserRecordId { get; }
 
 		[iOS (8, 0)]
 		[Mac (10, 10)]
 		[Deprecated (PlatformName.MacOSX, 10, 11, message : "Use 'DisplayContact.GivenName'.")]
 		[Deprecated (PlatformName.iOS, 9, 0, message : "Use 'DisplayContact.GivenName'.")]
+		[NullAllowed]
 		[Export ("firstName", ArgumentSemantic.Copy)]
 		string FirstName { get; }
 
 		[iOS (8, 0)]
 		[Mac (10, 10)]
 		[Deprecated (PlatformName.MacOSX, 10, 11, message : "Use 'DisplayContact.FamilyName'.")]
 		[Deprecated (PlatformName.iOS, 9, 0, message : "Use 'DisplayContact.FamilyName'.")]
+		[NullAllowed]
 		[Export ("lastName", ArgumentSemantic.Copy)]
 		string LastName { get; }
 
@@ -500,7 +503,7 @@ interface CKDiscoverUserInfosOperation {
 		IntPtr Constructor ();
 
 		[Export ("initWithEmailAddresses:userRecordIDs:")]
-		IntPtr Constructor (string [] emailAddresses, CKRecordID [] userRecordIDs);
+		IntPtr Constructor ([NullAllowed] string [] emailAddresses, [NullAllowed] CKRecordID [] userRecordIDs);
 
 		[NullAllowed] // by default this property is null
 		[Export ("emailAddresses", ArgumentSemantic.Copy)]
@@ -895,6 +898,7 @@ interface CKMarkNotificationsReadOperation {
 		[Export ("notificationIDs", ArgumentSemantic.Copy)]
 		CKNotificationID [] NotificationIds { get; set; }
 
+		[NullAllowed]
 		[Export ("markNotificationsReadCompletionBlock", ArgumentSemantic.Copy)]
 		CKMarkNotificationsReadHandler Completed {
 			get;
@@ -1067,6 +1071,7 @@ interface CKNotification : NSSecureCoding {
 		[Export ("notificationType", ArgumentSemantic.Assign)]
 		CKNotificationType NotificationType { get; }
 
+		[NullAllowed]
 		[Export ("notificationID", ArgumentSemantic.Copy)]
 		CKNotificationID NotificationId { get; }
 
@@ -1180,6 +1185,7 @@ interface CKQueryNotification : NSCoding, NSSecureCoding {
 	[BaseType (typeof (CKNotification))]
 	interface CKRecordZoneNotification : NSCoding, NSSecureCoding {
 
+		[NullAllowed]
 		[Export ("recordZoneID", ArgumentSemantic.Copy)]
 		CKRecordZoneID RecordZoneId { get; }
 
@@ -1289,6 +1295,7 @@ interface CKOperation {
 		Action LongLivedOperationWasPersistedCallback { get; set; }		
 
 		[Watch (4, 0), TV (11, 0), Mac (10, 13), iOS (11, 0)]
+		[NullAllowed]
 		[Export ("configuration", ArgumentSemantic.Copy)]
 		CKOperationConfiguration Configuration { get; set; }
 
@@ -1305,6 +1312,7 @@ interface CKOperationGroup : NSSecureCoding {
 		[Export ("operationGroupID")]
 		string OperationGroupId { get; }
 
+		[NullAllowed] // null_resettable
 		[Export ("defaultConfiguration", ArgumentSemantic.Copy)]
 		CKOperationConfiguration DefaultConfiguration { get; set; }
 
@@ -1457,6 +1465,7 @@ interface CKRecord : NSSecureCoding, NSCopying {
 		[NullAllowed, Export ("modificationDate", ArgumentSemantic.Copy)]
 		NSDate ModificationDate { get; }
 
+		[return: NullAllowed]
 		[Export ("objectForKey:")] [Internal]
 		NSObject _ObjectForKey (string key);
 
@@ -1683,12 +1692,14 @@ interface CKSubscription : NSSecureCoding, NSCopying {
 		[NoWatch]
 		[Deprecated (PlatformName.iOS, 10,0, message: "Use 'CKQuerySubscription'.")]
 		[Deprecated (PlatformName.MacOSX, 10,12, message: "Use 'CKQuerySubscription'.")]
+		[NullAllowed]
 		[Export ("recordType")]
 		string RecordType { get; }
 
 		[NoWatch]
 		[Deprecated (PlatformName.iOS, 10,0, message: "Use 'CKQuerySubscription'.")]
 		[Deprecated (PlatformName.MacOSX, 10,12, message: "Use 'CKQuerySubscription'.")]
+		[NullAllowed]
 		[Export ("predicate", ArgumentSemantic.Copy)]
 		NSPredicate Predicate { get; }
 
@@ -1699,12 +1710,14 @@ interface CKSubscription : NSSecureCoding, NSCopying {
 		CKSubscriptionOptions SubscriptionOptions { get; }
 
 		[TV (10,0), Watch (6,0)]
+		[NullAllowed]
 		[Export ("notificationInfo", ArgumentSemantic.Copy)]
 		CKNotificationInfo NotificationInfo { get; set; }
 
 		[NoWatch]
 		[Deprecated (PlatformName.iOS, 10,0, message: "Use 'CKRecordZoneSubscription'.")]
 		[Deprecated (PlatformName.MacOSX, 10,12, message: "Use 'CKRecordZoneSubscription'.")]
+		[NullAllowed]
 		[Export ("zoneID", ArgumentSemantic.Copy)]
 		CKRecordZoneID ZoneID { get; set; }
 	}

src/contacts.cs

@@ -328,10 +328,12 @@ interface CNContactFormatter : NSSecureCoding {
 		ICNKeyDescriptor GetDescriptorForRequiredKeys (CNContactFormatterStyle style);
 
 		[Static]
+		[return: NullAllowed]
 		[Export ("stringFromContact:style:")]
 		string GetStringFrom (CNContact contact, CNContactFormatterStyle style);
 
 		[Static]
+		[return: NullAllowed]
 		[Export ("attributedStringFromContact:style:defaultAttributes:")]
 		NSAttributedString GetAttributedStringFrom (CNContact contact, CNContactFormatterStyle style, [NullAllowed] NSDictionary attributes);
 
@@ -346,9 +348,11 @@ interface CNContactFormatter : NSSecureCoding {
 		[Export ("style")]
 		CNContactFormatterStyle Style { get; set; }
 
+		[return: NullAllowed]
 		[Export ("stringFromContact:")]
 		string GetString (CNContact contact);
 
+		[return: NullAllowed]
 		[Export ("attributedStringFromContact:defaultAttributes:")]
 		NSAttributedString GetAttributedString (CNContact contact, [NullAllowed] NSDictionary attributes);
 
@@ -1432,6 +1436,7 @@ interface CNChangeHistoryFetchRequest : NSSecureCoding {
 		[Export ("includeGroupChanges")]
 		bool IncludeGroupChanges { get; set; }
 
+		[NullAllowed]
 		[Export ("excludedTransactionAuthors", ArgumentSemantic.Copy)]
 		string[] ExcludedTransactionAuthors { get; set; }
 	}
@@ -1443,7 +1448,7 @@ interface CNFetchResult<T> {
 		[Export ("value", ArgumentSemantic.Strong)]
 		NSObject Value { get; }
 
-		[Export ("currentHistoryToken", ArgumentSemantic.Copy), NullAllowed]
+		[Export ("currentHistoryToken", ArgumentSemantic.Copy)]
 		NSData CurrentHistoryToken { get; }
 	}
 
@@ -1510,6 +1515,7 @@ interface CNContactStore {
 		bool ExecuteSaveRequest (CNSaveRequest saveRequest, [NullAllowed] out NSError error);
 #endif
 		[Watch (6, 0), Mac (10, 15), iOS (13, 0)]
+		[NullAllowed]
 		[Export ("currentHistoryToken", ArgumentSemantic.Copy)]
 		NSData CurrentHistoryToken { get; }
 
@@ -1547,10 +1553,12 @@ interface CNContactVCardSerialization {
 		ICNKeyDescriptor GetDescriptorFromRequiredKeys ();
 
 		[Static]
+		[return: NullAllowed]
 		[Export ("dataWithContacts:error:")]
 		NSData GetDataFromContacts (CNContact [] contacts, out NSError error);
 
 		[Static]
+		[return: NullAllowed]
 		[Export ("contactsWithData:error:")]
 		CNContact [] GetContactsFromData (NSData data, out NSError error);
 	}

src/coreaudiokit.cs

@@ -232,7 +232,7 @@ interface CAInterAppAudioTransportView {
 		UIColor RecordButtonColor { get; set; }
 
 		[Export ("setOutputAudioUnit:")]
-		void SetOutputAudioUnit ([NullAllowed] AudioUnit.AudioUnit audioUnit);
+		void SetOutputAudioUnit (AudioUnit.AudioUnit audioUnit);
 	}
 #endif
 }