[CoreData] Add support up to Xcode11 beta 7. (#6896)

2019-09-04 09:32:29 -04:00 · 2019-09-04 09:32:29 -04:00 · 1d9452a502
--- a/src/CoreData/Enums.cs
+++ b/src/CoreData/Enums.cs
@ -220,4 +220,21 @@ namespace CoreData {
 		ChangesOnly = 4,
 		TransactionsAndChanges = 5
 	}
+
+	[Watch (6,0), TV (13,0), Mac (10,15), iOS (13,0)]
+	[Native]
+	public enum NSBatchInsertRequestResultType : ulong {
+		StatusOnly = 0,
+		ObjectIds = 1,
+		Count = 2,
+	}
+
+	[Watch (6,0), TV (13,0), Mac (10,15), iOS (13,0)]
+	[Flags]
+	[Native]
+	public enum NSPersistentCloudKitContainerSchemaInitializationOptions : ulong {
+		None = 0x0,
+		DryRun = 1 << 1,
+		PrintSchema = 1 << 2,
+	}
 }
--- a/src/coredata.cs
+++ b/src/coredata.cs
@ -10,6 +10,7 @@
 using System;
 using Foundation;
 using ObjCRuntime;
+using CloudKit;
 #if MONOMAC
 using AppKit;
 #endif
@ -226,6 +227,10 @@ namespace CoreData

 		[Export ("allowsExternalBinaryDataStorage")]
 		bool AllowsExternalBinaryDataStorage { get; set; }
+
+		[Watch (6, 0), TV (13, 0), Mac (10, 15), iOS (13, 0)]
+		[Export ("preservesValueInHistoryOnDeletion")]
+		bool PreservesValueInHistoryOnDeletion { get; set; }
 	}

 	[BaseType (typeof (NSObject))]
@ -1482,6 +1487,22 @@ namespace CoreData

 		[NullAllowed, Export ("updatedProperties", ArgumentSemantic.Copy)]
 		NSSet<NSPropertyDescription> UpdatedProperties { get; }
+
+		[Watch (6, 0), TV (13, 0), Mac (10, 15), iOS (13, 0)]
+		[Static]
+		[NullAllowed, Export ("entityDescription")]
+		NSEntityDescription EntityDescription { get; }
+
+		[Watch (6, 0), TV (13, 0), Mac (10, 15), iOS (13, 0)]
+		[Static]
+		[NullAllowed, Export ("fetchRequest")]
+		NSFetchRequest FetchRequest { get; }
+
+		[Watch (6,0), TV (13,0), Mac (10,15), iOS (13,0)]
+		[Static]
+		[Export ("entityDescriptionWithContext:")]
+		[return: NullAllowed]
+		NSEntityDescription GetEntityDescription (NSManagedObjectContext context);
 	}

 	[Watch (4,0), TV (11,0), Mac (10,13), iOS (11,0)]
@ -1524,6 +1545,15 @@ namespace CoreData

 		[NullAllowed, Export ("token", ArgumentSemantic.Strong)]
 		NSPersistentHistoryToken Token { get; }
+
+		[Watch (6,0), TV (13,0), Mac (10,15), iOS (13,0)]
+		[Static]
+		[Export ("fetchHistoryWithFetchRequest:")]
+		NSPersistentHistoryChangeRequest FetchHistory (NSFetchRequest fetchRequest);
+
+		[Watch (6, 0), TV (13, 0), Mac (10, 15), iOS (13, 0)]
+		[NullAllowed, Export ("fetchRequest", ArgumentSemantic.Strong)]
+		NSFetchRequest FetchRequest { get; set; }
 	}

 	[Watch (4,0), TV (11,0), Mac (10,13), iOS (11,0)]
@ -1572,6 +1602,22 @@ namespace CoreData

 		[Export ("objectIDNotification")]
 		NSNotification ObjectIdNotification { get; }
+
+		[Watch (6,0), TV (13,0), Mac (10,15), iOS (13,0)]
+		[Static]
+		[Export ("entityDescriptionWithContext:")]
+		[return: NullAllowed]
+		NSEntityDescription GetEntityDescription (NSManagedObjectContext context);
+
+		[Watch (6, 0), TV (13, 0), Mac (10, 15), iOS (13, 0)]
+		[Static]
+		[NullAllowed, Export ("entityDescription")]
+		NSEntityDescription EntityDescription { get; }
+
+		[Watch (6, 0), TV (13, 0), Mac (10, 15), iOS (13, 0)]
+		[Static]
+		[NullAllowed, Export ("fetchRequest")]
+		NSFetchRequest FetchRequest { get; }
 	}

 #if !WATCH
@ -1683,8 +1729,28 @@ namespace CoreData
 		NSCoreDataCoreSpotlightDelegate CoreSpotlightExporter { get; }
 #endif

+		[Watch (6, 0), TV (13, 0), Mac (10, 15), iOS (13, 0)]
+		[Field ("NSPersistentStoreRemoteChangeNotificationPostOptionKey")]
+		NSString RemoteChangeNotificationPostOptionKey { get; }
+
+		[Notification (typeof (NSPersistentStoreRemoteChangeEventArgs))]
+		[Watch (6, 0), TV (13, 0), Mac (10, 15), iOS (13, 0)]
+		[Field ("NSPersistentStoreRemoteChangeNotification")]
+		NSString StoreRemoteChangeNotification { get; }
+
 	}
 	
+	interface NSPersistentStoreRemoteChangeEventArgs {
+		[Export ("NSStoreUUIDKey")]
+		NSUuid Uuid { get; }
+
+		[Export ("NSPersistentStoreURLKey")]
+		string Url { get; }
+
+		[Export ("NSPersistentHistoryTokenKey")]
+		NSPersistentHistoryToken PersistentHistoryTracking  {get; }
+	}
+
 	[Watch (3,0), TV (10,0), iOS (10,0), Mac (10,12)]
 	[BaseType (typeof(NSObject))]
 	[DisableDefaultCtor]
@ -1733,6 +1799,11 @@ namespace CoreData
 		[Export ("initWithURL:")]
 		[DesignatedInitializer]
 		IntPtr Constructor (NSUrl url);
+
+		// NSPersistentStoreDescription_NSPersistentCloudKitContainerAdditions category
+		[Watch (6, 0), TV (13, 0), Mac (10, 15), iOS (13, 0)]
+		[NullAllowed, Export ("cloudKitContainerOptions", ArgumentSemantic.Strong)]
+		NSPersistentCloudKitContainerOptions CloudKitContainerOptions { get; set; }
 	}
 	
 	[Watch (3,0), TV (10,0), iOS (10,0), Mac (10,12)]
@ -2087,6 +2158,12 @@ namespace CoreData
 		[iOS (9,0), Mac (10,11)]
 		[Export ("replacePersistentStoreAtURL:destinationOptions:withPersistentStoreFromURL:sourceOptions:storeType:error:")]
 		bool ReplacePersistentStore (NSUrl destinationUrl, [NullAllowed] NSDictionary destinationOptions, NSUrl sourceUrl, [NullAllowed] NSDictionary sourceOptions, string storeType, out NSError error);
+
+
+		[Watch (6,0), TV (13,0), Mac (10,15), iOS (13,0)]
+		[Export ("currentPersistentHistoryTokenFromStores:")]
+		[return: NullAllowed]
+		NSPersistentHistoryToken GetCurrentPersistentHistoryToken ([NullAllowed] NSObject[] stores);
 	}

 	interface NSPersistentStoreCoordinatorStoreChangeEventArgs {
@ -2413,4 +2490,88 @@ namespace CoreData
 #endif
 		NSDictionary[] ConflictingSnapshots { get; }
 	}
+
+	[Watch (6,0), TV (13,0), Mac (10,15), iOS (13,0)]
+	[BaseType (typeof(NSPersistentStoreRequest))]
+	[DesignatedDefaultCtor]
+	interface NSBatchInsertRequest {
+
+		[Export ("entityName")]
+		string EntityName { get; }
+
+		[NullAllowed, Export ("entity", ArgumentSemantic.Strong)]
+		NSEntityDescription Entity { get; }
+
+		[NullAllowed, Export ("objectsToInsert", ArgumentSemantic.Copy)]
+		NSDictionary<NSString, NSObject>[] ObjectsToInsert { get; set; }
+
+		[Export ("resultType", ArgumentSemantic.Assign)]
+		NSBatchInsertRequestResultType ResultType { get; set; }
+
+		[Static]
+		[Export ("batchInsertRequestWithEntityName:objects:")]
+		NSBatchInsertRequest BatchInsertRequest (string entityName, NSDictionary<NSString, NSObject>[] dictionaries);
+
+		[Export ("initWithEntityName:objects:")]
+		IntPtr Constructor (string entityName, NSDictionary<NSString, NSObject>[] dictionaries);
+
+		[Export ("initWithEntity:objects:")]
+		IntPtr Constructor (NSEntityDescription entity, NSDictionary<NSString, NSObject>[] dictionaries);
+	}
+
+	[Watch (6,0), TV (13,0), Mac (10,15), iOS (13,0)]
+	[BaseType (typeof(NSPersistentStoreResult))]
+	interface NSBatchInsertResult {
+		[NullAllowed, Export ("result", ArgumentSemantic.Strong)]
+		NSObject Result { get; }
+
+		[Export ("resultType")]
+		NSBatchInsertRequestResultType ResultType { get; }
+	}
+
+	[Watch (6,0), TV (13,0), Mac (10,15), iOS (13,0)]
+	[BaseType (typeof(NSAttributeDescription))]
+	interface NSDerivedAttributeDescription : NSSecureCoding {
+		[NullAllowed, Export ("derivationExpression", ArgumentSemantic.Strong)]
+		NSExpression DerivationExpression { get; set; }
+	}
+
+	[Watch (6,0), TV (13,0), Mac (10,15), iOS (13,0)]
+	[BaseType (typeof(NSPersistentContainer))]
+	[DisableDefaultCtor]
+	interface NSPersistentCloudKitContainer {
+
+		[Export ("initWithName:managedObjectModel:")]
+		[DesignatedInitializer]
+		IntPtr Constructor (string name, NSManagedObjectModel model);
+
+		[Export ("initializeCloudKitSchemaWithOptions:error:")]
+		bool Initialize (NSPersistentCloudKitContainerSchemaInitializationOptions options, [NullAllowed] out NSError error);
+
+		[Export ("recordForManagedObjectID:")]
+		[return: NullAllowed]
+		CKRecord GetRecord (NSManagedObjectID managedObjectId);
+
+		[Export ("recordsForManagedObjectIDs:")]
+		NSDictionary<NSManagedObjectID, CKRecord> GetRecords (NSManagedObjectID[] managedObjectIds);
+
+		[Export ("recordIDForManagedObjectID:")]
+		[return: NullAllowed]
+		CKRecordID GetRecordId (NSManagedObjectID managedObjectId);
+
+		[Export ("recordIDsForManagedObjectIDs:")]
+		NSDictionary<NSManagedObjectID, CKRecordID> GetRecordIds (NSManagedObjectID[] managedObjectIds);
+	}
+
+	[Watch (6,0), TV (13,0), Mac (10,15), iOS (13,0)]
+	[BaseType (typeof(NSObject))]
+	[DisableDefaultCtor]
+	interface NSPersistentCloudKitContainerOptions {
+		[Export ("containerIdentifier")]
+		string ContainerIdentifier { get; }
+
+		[Export ("initWithContainerIdentifier:")]
+		[DesignatedInitializer]
+		IntPtr Constructor (string containerIdentifier);
+	}
 }
--- a/src/frameworks.sources
+++ b/src/frameworks.sources
@ -1762,6 +1762,7 @@ COMMON_FRAMEWORKS =         \
 	AuthenticationServices	\
 	AVFoundation            \
 	CoreBluetooth           \
+	CoreData                \
 	CoreFoundation          \
 	CoreMedia               \
 	CoreML                  \
@ -1789,7 +1790,6 @@ MAC_FRAMEWORKS =            \
 	ContactsUI              \
 	CoreAnimation           \
 	CoreAudioKit            \
-	CoreData                \
 	CoreGraphics            \
 	CoreImage               \
 	CoreLocation            \
@ -1881,7 +1881,6 @@ IOS_FRAMEWORKS =         \
 	ContactsUI \
 	CoreAnimation \
 	CoreAudioKit \
-	CoreData \
 	CoreGraphics \
 	CoreImage \
 	CoreLocation \
@ -1962,7 +1961,6 @@ WATCHOS_FRAMEWORKS =        \
 	ClockKit                \
 	CloudKit                \
 	Contacts                \
-	CoreData                \
 	CoreGraphics            \
 	CoreLocation            \
 	CoreMotion              \
@ -1994,7 +1992,6 @@ TVOS_FRAMEWORKS =           \
 	CFNetwork               \
 	CloudKit                \
 	CoreAnimation           \
-	CoreData                \
 	CoreGraphics            \
 	CoreImage               \
 	CoreLocation            \
--- a/tests/xtro-sharpie/iOS-CoreData.ignore
+++ b/tests/xtro-sharpie/iOS-CoreData.ignore
@ -0,0 +1,3 @@
+# ignored due to missing types due to  https://github.com/xamarin/xamarin-macios/issues/6567
+!missing-protocol-member! NSFetchedResultsControllerDelegate::controller:didChangeContentWithDifference: not found
+!missing-protocol-member! NSFetchedResultsControllerDelegate::controller:didChangeContentWithSnapshot: not found
--- a/tests/xtro-sharpie/iOS-CoreData.todo
+++ b/tests/xtro-sharpie/iOS-CoreData.todo
@ -1,48 +0,0 @@
-!missing-enum! NSBatchInsertRequestResultType not bound
-!missing-enum! NSPersistentCloudKitContainerSchemaInitializationOptions not bound
-!missing-field! NSPersistentHistoryTokenKey not bound
-!missing-field! NSPersistentStoreRemoteChangeNotification not bound
-!missing-field! NSPersistentStoreRemoteChangeNotificationPostOptionKey not bound
-!missing-field! NSPersistentStoreURLKey not bound
-!missing-protocol-member! NSFetchedResultsControllerDelegate::controller:didChangeContentWithDifference: not found
-!missing-protocol-member! NSFetchedResultsControllerDelegate::controller:didChangeContentWithSnapshot: not found
-!missing-selector! +NSBatchInsertRequest::batchInsertRequestWithEntityName:objects: not bound
-!missing-selector! +NSPersistentHistoryChange::entityDescription not bound
-!missing-selector! +NSPersistentHistoryChange::entityDescriptionWithContext: not bound
-!missing-selector! +NSPersistentHistoryChange::fetchRequest not bound
-!missing-selector! +NSPersistentHistoryChangeRequest::fetchHistoryWithFetchRequest: not bound
-!missing-selector! +NSPersistentHistoryTransaction::entityDescription not bound
-!missing-selector! +NSPersistentHistoryTransaction::entityDescriptionWithContext: not bound
-!missing-selector! +NSPersistentHistoryTransaction::fetchRequest not bound
-!missing-selector! NSAttributeDescription::preservesValueInHistoryOnDeletion not bound
-!missing-selector! NSAttributeDescription::setPreservesValueInHistoryOnDeletion: not bound
-!missing-selector! NSBatchInsertRequest::entity not bound
-!missing-selector! NSBatchInsertRequest::entityName not bound
-!missing-selector! NSBatchInsertRequest::init not bound
-!missing-selector! NSBatchInsertRequest::initWithEntity:objects: not bound
-!missing-selector! NSBatchInsertRequest::initWithEntityName:objects: not bound
-!missing-selector! NSBatchInsertRequest::objectsToInsert not bound
-!missing-selector! NSBatchInsertRequest::resultType not bound
-!missing-selector! NSBatchInsertRequest::setObjectsToInsert: not bound
-!missing-selector! NSBatchInsertRequest::setResultType: not bound
-!missing-selector! NSBatchInsertResult::result not bound
-!missing-selector! NSBatchInsertResult::resultType not bound
-!missing-selector! NSDerivedAttributeDescription::derivationExpression not bound
-!missing-selector! NSDerivedAttributeDescription::setDerivationExpression: not bound
-!missing-selector! NSPersistentCloudKitContainer::initializeCloudKitSchemaWithOptions:error: not bound
-!missing-selector! NSPersistentCloudKitContainer::recordForManagedObjectID: not bound
-!missing-selector! NSPersistentCloudKitContainer::recordIDForManagedObjectID: not bound
-!missing-selector! NSPersistentCloudKitContainer::recordIDsForManagedObjectIDs: not bound
-!missing-selector! NSPersistentCloudKitContainer::recordsForManagedObjectIDs: not bound
-!missing-selector! NSPersistentCloudKitContainerOptions::containerIdentifier not bound
-!missing-selector! NSPersistentCloudKitContainerOptions::initWithContainerIdentifier: not bound
-!missing-selector! NSPersistentHistoryChangeRequest::fetchRequest not bound
-!missing-selector! NSPersistentHistoryChangeRequest::setFetchRequest: not bound
-!missing-selector! NSPersistentStoreCoordinator::currentPersistentHistoryTokenFromStores: not bound
-!missing-selector! NSPersistentStoreDescription::cloudKitContainerOptions not bound
-!missing-selector! NSPersistentStoreDescription::setCloudKitContainerOptions: not bound
-!missing-type! NSBatchInsertRequest not bound
-!missing-type! NSBatchInsertResult not bound
-!missing-type! NSDerivedAttributeDescription not bound
-!missing-type! NSPersistentCloudKitContainer not bound
-!missing-type! NSPersistentCloudKitContainerOptions not bound
--- a/tests/xtro-sharpie/macOS-CoreData.todo
+++ b/tests/xtro-sharpie/macOS-CoreData.todo
@ -1,46 +0,0 @@
-!missing-enum! NSBatchInsertRequestResultType not bound
-!missing-enum! NSPersistentCloudKitContainerSchemaInitializationOptions not bound
-!missing-field! NSPersistentHistoryTokenKey not bound
-!missing-field! NSPersistentStoreRemoteChangeNotification not bound
-!missing-field! NSPersistentStoreRemoteChangeNotificationPostOptionKey not bound
-!missing-field! NSPersistentStoreURLKey not bound
-!missing-selector! +NSBatchInsertRequest::batchInsertRequestWithEntityName:objects: not bound
-!missing-selector! +NSPersistentHistoryChange::entityDescription not bound
-!missing-selector! +NSPersistentHistoryChange::entityDescriptionWithContext: not bound
-!missing-selector! +NSPersistentHistoryChange::fetchRequest not bound
-!missing-selector! +NSPersistentHistoryChangeRequest::fetchHistoryWithFetchRequest: not bound
-!missing-selector! +NSPersistentHistoryTransaction::entityDescription not bound
-!missing-selector! +NSPersistentHistoryTransaction::entityDescriptionWithContext: not bound
-!missing-selector! +NSPersistentHistoryTransaction::fetchRequest not bound
-!missing-selector! NSAttributeDescription::preservesValueInHistoryOnDeletion not bound
-!missing-selector! NSAttributeDescription::setPreservesValueInHistoryOnDeletion: not bound
-!missing-selector! NSBatchInsertRequest::entity not bound
-!missing-selector! NSBatchInsertRequest::entityName not bound
-!missing-selector! NSBatchInsertRequest::init not bound
-!missing-selector! NSBatchInsertRequest::initWithEntity:objects: not bound
-!missing-selector! NSBatchInsertRequest::initWithEntityName:objects: not bound
-!missing-selector! NSBatchInsertRequest::objectsToInsert not bound
-!missing-selector! NSBatchInsertRequest::resultType not bound
-!missing-selector! NSBatchInsertRequest::setObjectsToInsert: not bound
-!missing-selector! NSBatchInsertRequest::setResultType: not bound
-!missing-selector! NSBatchInsertResult::result not bound
-!missing-selector! NSBatchInsertResult::resultType not bound
-!missing-selector! NSDerivedAttributeDescription::derivationExpression not bound
-!missing-selector! NSDerivedAttributeDescription::setDerivationExpression: not bound
-!missing-selector! NSPersistentCloudKitContainer::initializeCloudKitSchemaWithOptions:error: not bound
-!missing-selector! NSPersistentCloudKitContainer::recordForManagedObjectID: not bound
-!missing-selector! NSPersistentCloudKitContainer::recordIDForManagedObjectID: not bound
-!missing-selector! NSPersistentCloudKitContainer::recordIDsForManagedObjectIDs: not bound
-!missing-selector! NSPersistentCloudKitContainer::recordsForManagedObjectIDs: not bound
-!missing-selector! NSPersistentCloudKitContainerOptions::containerIdentifier not bound
-!missing-selector! NSPersistentCloudKitContainerOptions::initWithContainerIdentifier: not bound
-!missing-selector! NSPersistentHistoryChangeRequest::fetchRequest not bound
-!missing-selector! NSPersistentHistoryChangeRequest::setFetchRequest: not bound
-!missing-selector! NSPersistentStoreCoordinator::currentPersistentHistoryTokenFromStores: not bound
-!missing-selector! NSPersistentStoreDescription::cloudKitContainerOptions not bound
-!missing-selector! NSPersistentStoreDescription::setCloudKitContainerOptions: not bound
-!missing-type! NSBatchInsertRequest not bound
-!missing-type! NSBatchInsertResult not bound
-!missing-type! NSDerivedAttributeDescription not bound
-!missing-type! NSPersistentCloudKitContainer not bound
-!missing-type! NSPersistentCloudKitContainerOptions not bound
--- a/tests/xtro-sharpie/tvOS-CoreData.ignore
+++ b/tests/xtro-sharpie/tvOS-CoreData.ignore
@ -0,0 +1,3 @@
+# ignored due to missing types due to  https://github.com/xamarin/xamarin-macios/issues/6567
+!missing-protocol-member! NSFetchedResultsControllerDelegate::controller:didChangeContentWithDifference: not found
+!missing-protocol-member! NSFetchedResultsControllerDelegate::controller:didChangeContentWithSnapshot: not found
--- a/tests/xtro-sharpie/tvOS-CoreData.todo
+++ b/tests/xtro-sharpie/tvOS-CoreData.todo
@ -1,48 +0,0 @@
-!missing-enum! NSBatchInsertRequestResultType not bound
-!missing-enum! NSPersistentCloudKitContainerSchemaInitializationOptions not bound
-!missing-field! NSPersistentHistoryTokenKey not bound
-!missing-field! NSPersistentStoreRemoteChangeNotification not bound
-!missing-field! NSPersistentStoreRemoteChangeNotificationPostOptionKey not bound
-!missing-field! NSPersistentStoreURLKey not bound
-!missing-protocol-member! NSFetchedResultsControllerDelegate::controller:didChangeContentWithDifference: not found
-!missing-protocol-member! NSFetchedResultsControllerDelegate::controller:didChangeContentWithSnapshot: not found
-!missing-selector! +NSBatchInsertRequest::batchInsertRequestWithEntityName:objects: not bound
-!missing-selector! +NSPersistentHistoryChange::entityDescription not bound
-!missing-selector! +NSPersistentHistoryChange::entityDescriptionWithContext: not bound
-!missing-selector! +NSPersistentHistoryChange::fetchRequest not bound
-!missing-selector! +NSPersistentHistoryChangeRequest::fetchHistoryWithFetchRequest: not bound
-!missing-selector! +NSPersistentHistoryTransaction::entityDescription not bound
-!missing-selector! +NSPersistentHistoryTransaction::entityDescriptionWithContext: not bound
-!missing-selector! +NSPersistentHistoryTransaction::fetchRequest not bound
-!missing-selector! NSAttributeDescription::preservesValueInHistoryOnDeletion not bound
-!missing-selector! NSAttributeDescription::setPreservesValueInHistoryOnDeletion: not bound
-!missing-selector! NSBatchInsertRequest::entity not bound
-!missing-selector! NSBatchInsertRequest::entityName not bound
-!missing-selector! NSBatchInsertRequest::init not bound
-!missing-selector! NSBatchInsertRequest::initWithEntity:objects: not bound
-!missing-selector! NSBatchInsertRequest::initWithEntityName:objects: not bound
-!missing-selector! NSBatchInsertRequest::objectsToInsert not bound
-!missing-selector! NSBatchInsertRequest::resultType not bound
-!missing-selector! NSBatchInsertRequest::setObjectsToInsert: not bound
-!missing-selector! NSBatchInsertRequest::setResultType: not bound
-!missing-selector! NSBatchInsertResult::result not bound
-!missing-selector! NSBatchInsertResult::resultType not bound
-!missing-selector! NSDerivedAttributeDescription::derivationExpression not bound
-!missing-selector! NSDerivedAttributeDescription::setDerivationExpression: not bound
-!missing-selector! NSPersistentCloudKitContainer::initializeCloudKitSchemaWithOptions:error: not bound
-!missing-selector! NSPersistentCloudKitContainer::recordForManagedObjectID: not bound
-!missing-selector! NSPersistentCloudKitContainer::recordIDForManagedObjectID: not bound
-!missing-selector! NSPersistentCloudKitContainer::recordIDsForManagedObjectIDs: not bound
-!missing-selector! NSPersistentCloudKitContainer::recordsForManagedObjectIDs: not bound
-!missing-selector! NSPersistentCloudKitContainerOptions::containerIdentifier not bound
-!missing-selector! NSPersistentCloudKitContainerOptions::initWithContainerIdentifier: not bound
-!missing-selector! NSPersistentHistoryChangeRequest::fetchRequest not bound
-!missing-selector! NSPersistentHistoryChangeRequest::setFetchRequest: not bound
-!missing-selector! NSPersistentStoreCoordinator::currentPersistentHistoryTokenFromStores: not bound
-!missing-selector! NSPersistentStoreDescription::cloudKitContainerOptions not bound
-!missing-selector! NSPersistentStoreDescription::setCloudKitContainerOptions: not bound
-!missing-type! NSBatchInsertRequest not bound
-!missing-type! NSBatchInsertResult not bound
-!missing-type! NSDerivedAttributeDescription not bound
-!missing-type! NSPersistentCloudKitContainer not bound
-!missing-type! NSPersistentCloudKitContainerOptions not bound
--- a/tests/xtro-sharpie/watchOS-CoreData.ignore
+++ b/tests/xtro-sharpie/watchOS-CoreData.ignore
@ -0,0 +1,3 @@
+# ignored due to missing types due to  https://github.com/xamarin/xamarin-macios/issues/6567
+!missing-protocol-member! NSFetchedResultsControllerDelegate::controller:didChangeContentWithDifference: not found
+!missing-protocol-member! NSFetchedResultsControllerDelegate::controller:didChangeContentWithSnapshot: not found
--- a/tests/xtro-sharpie/watchOS-CoreData.todo
+++ b/tests/xtro-sharpie/watchOS-CoreData.todo
@ -1,48 +0,0 @@
-!missing-enum! NSBatchInsertRequestResultType not bound
-!missing-enum! NSPersistentCloudKitContainerSchemaInitializationOptions not bound
-!missing-field! NSPersistentHistoryTokenKey not bound
-!missing-field! NSPersistentStoreRemoteChangeNotification not bound
-!missing-field! NSPersistentStoreRemoteChangeNotificationPostOptionKey not bound
-!missing-field! NSPersistentStoreURLKey not bound
-!missing-protocol-member! NSFetchedResultsControllerDelegate::controller:didChangeContentWithDifference: not found
-!missing-protocol-member! NSFetchedResultsControllerDelegate::controller:didChangeContentWithSnapshot: not found
-!missing-selector! +NSBatchInsertRequest::batchInsertRequestWithEntityName:objects: not bound
-!missing-selector! +NSPersistentHistoryChange::entityDescription not bound
-!missing-selector! +NSPersistentHistoryChange::entityDescriptionWithContext: not bound
-!missing-selector! +NSPersistentHistoryChange::fetchRequest not bound
-!missing-selector! +NSPersistentHistoryChangeRequest::fetchHistoryWithFetchRequest: not bound
-!missing-selector! +NSPersistentHistoryTransaction::entityDescription not bound
-!missing-selector! +NSPersistentHistoryTransaction::entityDescriptionWithContext: not bound
-!missing-selector! +NSPersistentHistoryTransaction::fetchRequest not bound
-!missing-selector! NSAttributeDescription::preservesValueInHistoryOnDeletion not bound
-!missing-selector! NSAttributeDescription::setPreservesValueInHistoryOnDeletion: not bound
-!missing-selector! NSBatchInsertRequest::entity not bound
-!missing-selector! NSBatchInsertRequest::entityName not bound
-!missing-selector! NSBatchInsertRequest::init not bound
-!missing-selector! NSBatchInsertRequest::initWithEntity:objects: not bound
-!missing-selector! NSBatchInsertRequest::initWithEntityName:objects: not bound
-!missing-selector! NSBatchInsertRequest::objectsToInsert not bound
-!missing-selector! NSBatchInsertRequest::resultType not bound
-!missing-selector! NSBatchInsertRequest::setObjectsToInsert: not bound
-!missing-selector! NSBatchInsertRequest::setResultType: not bound
-!missing-selector! NSBatchInsertResult::result not bound
-!missing-selector! NSBatchInsertResult::resultType not bound
-!missing-selector! NSDerivedAttributeDescription::derivationExpression not bound
-!missing-selector! NSDerivedAttributeDescription::setDerivationExpression: not bound
-!missing-selector! NSPersistentCloudKitContainer::initializeCloudKitSchemaWithOptions:error: not bound
-!missing-selector! NSPersistentCloudKitContainer::recordForManagedObjectID: not bound
-!missing-selector! NSPersistentCloudKitContainer::recordIDForManagedObjectID: not bound
-!missing-selector! NSPersistentCloudKitContainer::recordIDsForManagedObjectIDs: not bound
-!missing-selector! NSPersistentCloudKitContainer::recordsForManagedObjectIDs: not bound
-!missing-selector! NSPersistentCloudKitContainerOptions::containerIdentifier not bound
-!missing-selector! NSPersistentCloudKitContainerOptions::initWithContainerIdentifier: not bound
-!missing-selector! NSPersistentHistoryChangeRequest::fetchRequest not bound
-!missing-selector! NSPersistentHistoryChangeRequest::setFetchRequest: not bound
-!missing-selector! NSPersistentStoreCoordinator::currentPersistentHistoryTokenFromStores: not bound
-!missing-selector! NSPersistentStoreDescription::cloudKitContainerOptions not bound
-!missing-selector! NSPersistentStoreDescription::setCloudKitContainerOptions: not bound
-!missing-type! NSBatchInsertRequest not bound
-!missing-type! NSBatchInsertResult not bound
-!missing-type! NSDerivedAttributeDescription not bound
-!missing-type! NSPersistentCloudKitContainer not bound
-!missing-type! NSPersistentCloudKitContainerOptions not bound