Merge branch 'main' into Xcode13-DeviceCheck-beta1

xamarin · Jul 7, 2021 · 48a3c23 · 48a3c23
2 parents 3b122e6 + 3b6f059
commit 48a3c23
Show file tree

Hide file tree

Showing 9 changed files with 88 additions and 83 deletions.
diff --git a/src/EventKit/EKEnums.cs b/src/EventKit/EKEnums.cs
@@ -80,6 +80,7 @@ public enum EKErrorCode : long {
 		SourceMismatch,
 		NotificationCollectionMismatch,
 		NotificationSavedWithoutCollection,
+		ReminderAlarmContainsEmailOrUrl,
 	}
 
 	// untyped enum -> EKTypes.h

diff --git a/src/eventkit.cs b/src/eventkit.cs
@@ -491,7 +491,7 @@ IntPtr Constructor (EKRecurrenceFrequency type, nint interval, [NullAllowed] EKR
 
 	[BaseType (typeof (NSObject))]
 	interface EKEventStore {
-		[NoiOS, Mac (10,11), NoWatch]
+		[NoiOS, Mac (10,11), NoWatch, NoMacCatalyst]
 		[Export ("initWithSources:")]
 		IntPtr Constructor (EKSource[] sources);
 
@@ -657,4 +657,71 @@ interface EKReminder {
 		[Static]
 		EKReminder Create (EKEventStore eventStore);	
 	}
+
+	[Mac (12,0), iOS (15,0), Watch (8,0), MacCatalyst (15,0), NoTV]
+	[BaseType (typeof (NSObject))]
+	[DisableDefaultCtor]
+	interface EKVirtualConferenceDescriptor
+	{
+		[Export ("initWithTitle:URLDescriptors:conferenceDetails:")]
+		[DesignatedInitializer]
+		IntPtr Constructor ([NullAllowed] string title, EKVirtualConferenceUrlDescriptor[] urlDescriptors, [NullAllowed] string conferenceDetails);
+
+		[NullAllowed, Export ("title")]
+		string Title { get; }
+
+		[Export ("URLDescriptors", ArgumentSemantic.Copy)]
+		EKVirtualConferenceUrlDescriptor[] UrlDescriptors { get; }
+
+		[NullAllowed, Export ("conferenceDetails")]
+		string ConferenceDetails { get; }
+	}
+
+	delegate void VirtualConferenceRoomTypeHandler (NSArray<EKVirtualConferenceRoomTypeDescriptor> virtualConferenceRoomTypeDescriptor, NSError error);
+	delegate void VirtualConferenceHandler (EKVirtualConferenceDescriptor virtualConferenceDescriptor, NSError error);
+
+	[Mac (12,0), iOS (15,0), Watch (8,0), MacCatalyst (15,0), NoTV]
+	[BaseType (typeof (NSObject))]
+	interface EKVirtualConferenceProvider : NSExtensionRequestHandling
+	{
+		[Async]
+		[Export ("fetchAvailableRoomTypesWithCompletionHandler:")]
+		void FetchAvailableRoomTypes (VirtualConferenceRoomTypeHandler handler);
+
+		[Async]
+		[Export ("fetchVirtualConferenceForIdentifier:completionHandler:")]
+		void FetchVirtualConference (string identifier, VirtualConferenceHandler handler);
+	}
+
+	[Mac (12,0), iOS (15,0), Watch (8,0), MacCatalyst (15,0), NoTV]
+	[BaseType (typeof (NSObject))]
+	[DisableDefaultCtor]
+	interface EKVirtualConferenceRoomTypeDescriptor
+	{
+		[Export ("initWithTitle:identifier:")]
+		[DesignatedInitializer]
+		IntPtr Constructor (string title, string identifier);
+
+		[Export ("title")]
+		string Title { get; }
+
+		[Export ("identifier")]
+		string Identifier { get; }
+	}
+
+	[Mac (12,0), iOS (15,0), Watch (8,0), MacCatalyst (15,0), NoTV]
+	[BaseType (typeof (NSObject), Name = "EKVirtualConferenceURLDescriptor")]
+	[DisableDefaultCtor]
+	interface EKVirtualConferenceUrlDescriptor
+	{
+		[Export ("initWithTitle:URL:")]
+		[DesignatedInitializer]
+		IntPtr Constructor ([NullAllowed] string title, NSUrl url);
+
+		[NullAllowed, Export ("title")]
+		string Title { get; }
+
+		[Export ("URL", ArgumentSemantic.Copy)]
+		NSUrl Url { get; }
+	}
 }
diff --git a/tests/xtro-sharpie/MacCatalyst-EventKit.ignore b/tests/xtro-sharpie/MacCatalyst-EventKit.ignore
@@ -1,2 +1,19 @@
 # It's in the documentation and headers, but throws a "+[EKCalendar calendarWithEventStore:]: unrecognized selector" exception at runtime
 !missing-selector! +EKCalendar::calendarWithEventStore: not bound
+
+# This is only used as an output in a manual binding so it doesn't need the availability
+!missing-enum! EKAlarmType not bound
+
+# These say the class supports MacCatalyst, but the selectors individually do not
+!missing-selector! EKEventStore::initWithSources: not bound
+!missing-selector! EKAlarm::emailAddress not bound
+!missing-selector! EKAlarm::setEmailAddress: not bound
+!missing-selector! EKAlarm::setSoundName: not bound
+!missing-selector! EKAlarm::setUrl: not bound
+!missing-selector! EKAlarm::soundName not bound
+!missing-selector! EKAlarm::type not bound
+!missing-selector! EKAlarm::url not bound
+
+# These two are deprecated
+!missing-selector! EKEvent::birthdayPersonUniqueID not bound
+!missing-selector! EKEventStore::initWithAccessToEntityTypes: not bound
diff --git a/tests/xtro-sharpie/MacCatalyst-EventKit.todo b/tests/xtro-sharpie/MacCatalyst-EventKit.todo
diff --git a/tests/xtro-sharpie/common-EventKit.ignore b/tests/xtro-sharpie/common-EventKit.ignore
@@ -1,4 +1,4 @@
 ## extra value so the enum is easier to create
 !extra-enum-value! Managed value 0 for EKWeekday.NotSet not found in native headers
 ## `Last` value can change overtime - which would be a breaking change for us
-!missing-enum-value! EKErrorCode native value EKErrorLast = 36 not bound
+!missing-enum-value! EKErrorCode native value EKErrorLast = 37 not bound
diff --git a/tests/xtro-sharpie/iOS-EventKit.todo b/tests/xtro-sharpie/iOS-EventKit.todo
diff --git a/tests/xtro-sharpie/macOS-EventKit.todo b/tests/xtro-sharpie/macOS-EventKit.todo
diff --git a/tests/xtro-sharpie/watchOS-EventKit.todo b/tests/xtro-sharpie/watchOS-EventKit.todo
diff --git a/tools/devops/automation/build-pipeline.yml b/tools/devops/automation/build-pipeline.yml
@@ -207,7 +207,7 @@ schedules:
 
 # the translations team wants a green build, we can do that on sundays even if 
 # the code did not change and without the device tests.
-- cron: "0 18 * * 1-5,0"
+- cron: "0 12 * * 0"
   displayName: Weekly Translations build (Sunday @ noon)
   branches:
     include: