From cc3a04b173e02c4c34d2570718aa1f3030d4e9a3 Mon Sep 17 00:00:00 2001 From: Manuel de la Pena Date: Tue, 14 Jul 2020 15:09:10 -0400 Subject: [PATCH] [Contacts] Add support for Xcode 12 beta 1. (#9080) --- src/contacts.cs | 18 ++++++++++++++++++ tests/xtro-sharpie/iOS-Contacts.todo | 4 ---- tests/xtro-sharpie/macOS-Contacts.todo | 4 ---- tests/xtro-sharpie/watchOS-Contacts.todo | 4 ---- 4 files changed, 18 insertions(+), 12 deletions(-) delete mode 100644 tests/xtro-sharpie/iOS-Contacts.todo delete mode 100644 tests/xtro-sharpie/macOS-Contacts.todo delete mode 100644 tests/xtro-sharpie/watchOS-Contacts.todo diff --git a/src/contacts.cs b/src/contacts.cs index 9381b6116b..660917c654 100644 --- a/src/contacts.cs +++ b/src/contacts.cs @@ -356,6 +356,16 @@ namespace Contacts { [Field ("CNContactPropertyAttribute")] NSString ContactPropertyAttribute { get; } + + [Static] + [iOS (14, 0), Mac (10, 16), Watch (7, 0)] + [Export ("descriptorForRequiredKeysForDelimiter")] + ICNKeyDescriptor RequiredKeysForDelimiter { get; } + + [Static] + [iOS (14, 0), Mac (10, 16), Watch (7, 0)] + [Export ("descriptorForRequiredKeysForNameOrder")] + ICNKeyDescriptor RequiredKeysForNameOrder { get; } } [iOS (9,0), Mac (10,11)] @@ -1248,6 +1258,14 @@ namespace Contacts { [Field ("CNLabelContactRelationSonInLawOrBrotherInLaw")] NSString SonInLawOrBrotherInLaw { get; } + [iOS (14, 0), Mac (10, 16), Watch (7, 0)] + [Field ("CNLabelContactRelationGranddaughterOrNiece")] + NSString GranddaughterOrNiece { get; } + + [iOS (14, 0), Mac (10, 16), Watch (7, 0)] + [Field ("CNLabelContactRelationGrandsonOrNephew")] + NSString GrandsonOrNephew { get; } + } delegate void CNContactStoreRequestAccessHandler (bool granted, NSError error); diff --git a/tests/xtro-sharpie/iOS-Contacts.todo b/tests/xtro-sharpie/iOS-Contacts.todo deleted file mode 100644 index ae1987f4b4..0000000000 --- a/tests/xtro-sharpie/iOS-Contacts.todo +++ /dev/null @@ -1,4 +0,0 @@ -!missing-field! CNLabelContactRelationGranddaughterOrNiece not bound -!missing-field! CNLabelContactRelationGrandsonOrNephew not bound -!missing-selector! +CNContactFormatter::descriptorForRequiredKeysForDelimiter not bound -!missing-selector! +CNContactFormatter::descriptorForRequiredKeysForNameOrder not bound diff --git a/tests/xtro-sharpie/macOS-Contacts.todo b/tests/xtro-sharpie/macOS-Contacts.todo deleted file mode 100644 index ae1987f4b4..0000000000 --- a/tests/xtro-sharpie/macOS-Contacts.todo +++ /dev/null @@ -1,4 +0,0 @@ -!missing-field! CNLabelContactRelationGranddaughterOrNiece not bound -!missing-field! CNLabelContactRelationGrandsonOrNephew not bound -!missing-selector! +CNContactFormatter::descriptorForRequiredKeysForDelimiter not bound -!missing-selector! +CNContactFormatter::descriptorForRequiredKeysForNameOrder not bound diff --git a/tests/xtro-sharpie/watchOS-Contacts.todo b/tests/xtro-sharpie/watchOS-Contacts.todo deleted file mode 100644 index ae1987f4b4..0000000000 --- a/tests/xtro-sharpie/watchOS-Contacts.todo +++ /dev/null @@ -1,4 +0,0 @@ -!missing-field! CNLabelContactRelationGranddaughterOrNiece not bound -!missing-field! CNLabelContactRelationGrandsonOrNephew not bound -!missing-selector! +CNContactFormatter::descriptorForRequiredKeysForDelimiter not bound -!missing-selector! +CNContactFormatter::descriptorForRequiredKeysForNameOrder not bound