[DeviceDiscoveryExtension] Implement Xcode 16 beta 6 changes. (#21175)

This is just adding the framework to macOS and Mac Catalyst.

Author: rolfbjarne

src/DeviceDiscoveryExtension/Enums.cs

@@ -15,14 +15,14 @@
 
 namespace DeviceDiscoveryExtension {
 
-	[NoMac, iOS (16, 0), NoMacCatalyst, NoWatch, NoTV]
+	[Mac (15, 0), iOS (16, 0), MacCatalyst (18, 0), NoWatch, NoTV]
 	[Native]
 	public enum DDDeviceProtocol : long {
 		Invalid = 0,
 		Dial = 1,
 	}
 
-	[NoMac, iOS (16, 0), NoMacCatalyst, NoWatch, NoTV]
+	[Mac (15, 0), iOS (16, 0), MacCatalyst (18, 0), NoWatch, NoTV]
 	[Native]
 	public enum DDDeviceCategory : long {
 		HiFiSpeaker = 0,
@@ -35,7 +35,7 @@ public enum DDDeviceCategory : long {
 		AccessorySetup = 6,
 	}
 
-	[NoMac, iOS (16, 0), NoMacCatalyst, NoWatch, NoTV]
+	[Mac (15, 0), iOS (16, 0), MacCatalyst (18, 0), NoWatch, NoTV]
 	[Native]
 	public enum DDDeviceState : long {
 		Invalid = 0,
@@ -45,15 +45,15 @@ public enum DDDeviceState : long {
 		Invalidating = 30,
 	}
 
-	[NoMac, iOS (16, 0), NoMacCatalyst, NoWatch, NoTV]
+	[Mac (15, 0), iOS (16, 0), MacCatalyst (18, 0), NoWatch, NoTV]
 	[Native]
 	public enum DDDeviceMediaPlaybackState : long {
 		NoContent = 0,
 		Paused = 1,
 		Playing = 2,
 	}
 
-	[NoMac, iOS (16, 0), NoMacCatalyst, NoWatch, NoTV]
+	[Mac (15, 0), iOS (16, 0), MacCatalyst (18, 0), NoWatch, NoTV]
 	[ErrorDomain ("DDErrorDomain")]
 	[Native]
 	public enum DDErrorCode : long {
@@ -68,7 +68,7 @@ public enum DDErrorCode : long {
 		// Next, // don't bind 'Next', it's not static and we'd have to break compat if it were ever to change
 	}
 
-	[NoMac, iOS (16, 0), NoMacCatalyst, NoWatch, NoTV]
+	[Mac (15, 0), iOS (16, 0), MacCatalyst (18, 0), NoWatch, NoTV]
 	[Native]
 	public enum DDEventType : long {
 		Unknown = 0,
@@ -77,7 +77,7 @@ public enum DDEventType : long {
 		DeviceChanged = 42,
 	}
 
-	[NoMac, iOS (18, 0), NoMacCatalyst, NoWatch, NoTV]
+	[Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0), NoWatch, NoTV]
 	[Native]
 	[Flags]
 	public enum DDDeviceSupports : ulong {

src/Foundation/NSObject.mac.cs

@@ -112,6 +112,7 @@ public partial class NSObject {
 		static IntPtr sm = Dlfcn.dlopen (Constants.ServiceManagementLibrary, 1);
 		static IntPtr sa = Dlfcn.dlopen (Constants.SafetyKitLibrary, 1);
 		static IntPtr cr = Dlfcn.dlopen (Constants.CryptoTokenKitLibrary, 1);
+		static IntPtr dd = Dlfcn.dlopen (Constants.DeviceDiscoveryExtensionLibrary, 1);
 		static IntPtr fk = Dlfcn.dlopen (Constants.FSKitLibrary, 1);
 
 #if !NET

src/build/generator-frameworks.g.cs

@@ -195,6 +195,7 @@ partial class Frameworks {
 		"CryptoTokenKit",
 		"Darwin",
 		"DeviceCheck",
+		"DeviceDiscoveryExtension",
 		"EventKit",
 		"ExecutionPolicy",
 		"ExtensionKit",
@@ -482,6 +483,7 @@ partial class Frameworks {
 		"CoreWlan",
 		"CryptoTokenKit",
 		"DeviceCheck",
+		"DeviceDiscoveryExtension",
 		"EventKit",
 		"EventKitUI",
 		"ExecutionPolicy",

src/devicediscoveryextension.cs

@@ -22,7 +22,7 @@
 namespace DeviceDiscoveryExtension {
 
 	[Static]
-	[NoMac, iOS (16, 0), NoMacCatalyst, NoWatch, NoTV]
+	[Mac (15, 0), iOS (16, 0), MacCatalyst (18, 0), NoWatch, NoTV]
 	interface DDDeviceProtocolStrings {
 		[Field ("DDDeviceProtocolStringInvalid")]
 		NSString Invalid { get; }
@@ -31,7 +31,7 @@ interface DDDeviceProtocolStrings {
 		NSString Dial { get; }
 	}
 
-	[NoMac, iOS (16, 0), NoMacCatalyst, NoWatch, NoTV]
+	[Mac (15, 0), iOS (16, 0), MacCatalyst (18, 0), NoWatch, NoTV]
 	[BaseType (typeof (NSObject))]
 	[DisableDefaultCtor]
 	interface DDDevice {
@@ -98,7 +98,7 @@ interface DDDevice {
 		string Ssid { get; set; }
 	}
 
-	[NoMac, iOS (16, 0), NoMacCatalyst, NoWatch, NoTV]
+	[Mac (15, 0), iOS (16, 0), MacCatalyst (18, 0), NoWatch, NoTV]
 	[BaseType (typeof (NSObject))]
 	[DisableDefaultCtor]
 	interface DDDeviceEvent {
@@ -112,7 +112,7 @@ interface DDDeviceEvent {
 		DDEventType EventType { get; }
 	}
 
-	[NoMac, iOS (16, 0), NoMacCatalyst, NoWatch, NoTV]
+	[Mac (15, 0), iOS (16, 0), MacCatalyst (18, 0), NoWatch, NoTV]
 	[BaseType (typeof (NSObject))]
 	interface DDDiscoverySession {
 		[Export ("reportEvent:")]

src/frameworks.sources

@@ -2127,6 +2127,7 @@ MACOS_FRAMEWORKS =          \
 	CoreText                \
 	CoreWlan                \
 	Darwin                  \
+	DeviceDiscoveryExtension \
 	EventKit                \
 	ExecutionPolicy		\
 	ExtensionKit		\
@@ -2453,6 +2454,7 @@ MACCATALYST_FRAMEWORKS = \
 	CoreTelephony \
 	CoreText \
 	CoreWlan \
+	DeviceDiscoveryExtension \
 	EventKit \
 	EventKitUI \
 	ExecutionPolicy \

src/rsp/dotnet/maccatalyst-defines-dotnet.rsp

@@ -46,6 +46,7 @@
 -d:HAS_COREWLAN
 -d:HAS_CRYPTOTOKENKIT
 -d:HAS_DEVICECHECK
+-d:HAS_DEVICEDISCOVERYEXTENSION
 -d:HAS_EVENTKIT
 -d:HAS_EVENTKITUI
 -d:HAS_EXECUTIONPOLICY

src/rsp/dotnet/macos-defines-dotnet.rsp

@@ -42,6 +42,7 @@
 -d:HAS_CRYPTOTOKENKIT
 -d:HAS_DARWIN
 -d:HAS_DEVICECHECK
+-d:HAS_DEVICEDISCOVERYEXTENSION
 -d:HAS_EVENTKIT
 -d:HAS_EXECUTIONPOLICY
 -d:HAS_EXTENSIONKIT

src/rsp/macos-defines.rsp

@@ -43,6 +43,7 @@
 -d:HAS_CRYPTOTOKENKIT
 -d:HAS_DARWIN
 -d:HAS_DEVICECHECK
+-d:HAS_DEVICEDISCOVERYEXTENSION
 -d:HAS_EVENTKIT
 -d:HAS_EXECUTIONPOLICY
 -d:HAS_EXTENSIONKIT

tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-DeviceDiscoveryExtension.ignore

@@ -0,0 +1,10 @@
+## These C methods are helpers to cast an enum value to string, but the string value is not used anywhere. Ignored them for now.
+!missing-pinvoke! DDDeviceCategoryToString is not bound
+!missing-pinvoke! DDDeviceMediaPlaybackStateToString is not bound
+!missing-pinvoke! DDDeviceProtocolToString is not bound
+!missing-pinvoke! DDDeviceStateToString is not bound
+!missing-pinvoke! DDEventTypeToString is not bound
+
+## This is a non-constant enum value, so we're not binding it so that we don't have to break compat in the future
+!missing-enum-value! DDErrorCode native value DDErrorCodeNext = 350007 not bound
+