Skip to content

Commit 318ac14

Browse files
authored
[AccessorySetupKit] Update to Xcode 26 beta 1-5. (#23528)
1 parent 2e83697 commit 318ac14

File tree

3 files changed

+97
-24
lines changed

3 files changed

+97
-24
lines changed

src/accessorysetupkit.cs

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
using ObjCRuntime;
77
using UIKit;
88

9+
using ASAccessoryWiFiAwarePairedDeviceId = System.UInt64;
10+
911
namespace AccessorySetupKit {
1012
[Native]
1113
[iOS (18, 0)]
@@ -69,6 +71,10 @@ interface ASAccessory {
6971

7072
[Export ("bluetoothTransportBridgingIdentifier", ArgumentSemantic.Copy), NullAllowed]
7173
NSData BluetoothTransportBridgingIdentifier { get; }
74+
75+
[iOS (26, 0)]
76+
[Export ("wifiAwarePairedDeviceID")]
77+
ASAccessoryWiFiAwarePairedDeviceId WifiAwarePairedDeviceId { get; }
7278
}
7379

7480
[Native]
@@ -140,8 +146,20 @@ interface ASAccessorySession {
140146
[Async]
141147
[Export ("failAuthorization:completionHandler:")]
142148
void FailAuthorization (ASAccessory accessory, ASAccessorySessionCompletionHandler completionHandler);
149+
150+
[iOS (26, 0)]
151+
[Export ("pickerDisplaySettings", ArgumentSemantic.Copy)]
152+
[NullAllowed]
153+
ASPickerDisplaySettings PickerDisplaySettings { get; set; }
154+
155+
[Async]
156+
[iOS (26, 0)]
157+
[Export ("updateAuthorization:descriptor:completionHandler:")]
158+
void UpdateAuthorization (ASAccessory accessory, ASDiscoveryDescriptor descriptor, ASAccessorySessionUpdateAuthorizationHandler completionHandler);
143159
}
144160

161+
delegate void ASAccessorySessionUpdateAuthorizationHandler ([NullAllowed] NSError error);
162+
145163
[BaseType (typeof (NSObject))]
146164
[iOS (18, 0)]
147165
interface ASAccessorySettings {
@@ -194,6 +212,25 @@ interface ASDiscoveryDescriptor {
194212

195213
[Export ("SSIDPrefix", ArgumentSemantic.Copy), NullAllowed]
196214
string SsidPrefix { get; set; }
215+
216+
[iOS (26, 0)]
217+
[Export ("wifiAwareServiceName")]
218+
[NullAllowed]
219+
string WifiAwareServiceName { get; set; }
220+
221+
[iOS (26, 0)]
222+
[Export ("wifiAwareServiceRole", ArgumentSemantic.Assign)]
223+
ASDiscoveryDescriptorWiFiAwareServiceRole WifiAwareServiceRole { get; set; }
224+
225+
[iOS (26, 0)]
226+
[Export ("wifiAwareModelNameMatch", ArgumentSemantic.Copy)]
227+
[NullAllowed]
228+
ASPropertyCompareString WifiAwareModelNameMatch { get; set; }
229+
230+
[iOS (26, 0)]
231+
[Export ("wifiAwareVendorNameMatch", ArgumentSemantic.Copy)]
232+
[NullAllowed]
233+
ASPropertyCompareString WifiAwareVendorNameMatch { get; set; }
197234
}
198235

199236
[Native]
@@ -259,4 +296,52 @@ interface ASMigrationDisplayItem {
259296
[DesignatedInitializer]
260297
NativeHandle Constructor (string name, UIImage productImage, ASDiscoveryDescriptor descriptor);
261298
}
299+
300+
[iOS (26, 0)]
301+
[BaseType (typeof (NSObject))]
302+
[DisableDefaultCtor]
303+
interface ASPropertyCompareString {
304+
[Export ("string")]
305+
string String { get; }
306+
307+
[Export ("compareOptions", ArgumentSemantic.Assign)]
308+
NSStringCompareOptions CompareOptions { get; }
309+
310+
[Export ("initWithString:compareOptions:")]
311+
[DesignatedInitializer]
312+
NativeHandle Constructor (string @string, NSStringCompareOptions compareOptions);
313+
}
314+
315+
[iOS (26, 0)]
316+
[Native]
317+
public enum ASDiscoveryDescriptorWiFiAwareServiceRole : long {
318+
Subscriber = 10,
319+
Publisher = 20,
320+
}
321+
322+
[iOS (26, 0)]
323+
[BaseType (typeof (NSObject))]
324+
interface ASPickerDisplaySettings {
325+
[Static]
326+
[Export ("defaultSettings")]
327+
ASPickerDisplaySettings DefaultSettings { get; }
328+
329+
[Export ("discoveryTimeout")]
330+
double DiscoveryTimeout { get; set; }
331+
}
332+
333+
[Static]
334+
partial interface ASPickerDisplaySettingsDiscoveryTimeout {
335+
[iOS (26, 0)]
336+
[Field ("ASPickerDisplaySettingsDiscoveryTimeoutShort")]
337+
double Short { get; }
338+
339+
[iOS (26, 0)]
340+
[Field ("ASPickerDisplaySettingsDiscoveryTimeoutMedium")]
341+
double Medium { get; }
342+
343+
[iOS (26, 0)]
344+
[Field ("ASPickerDisplaySettingsDiscoveryTimeoutLong")]
345+
double Long { get; }
346+
}
262347
}

tests/introspection/ApiProtocolTest.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,10 @@ protected virtual bool Skip (Type type, string protocolName)
304304
case "SCWindow":
305305
case "SCStreamConfiguration":
306306
return true;
307+
// Xcode 26.0 Conformance not in headers
308+
case "ASPickerDisplaySettings":
309+
case "ASPropertyCompareString":
310+
return true;
307311
}
308312
break;
309313
case "NSMutableCopying":
@@ -530,6 +534,10 @@ protected virtual bool Skip (Type type, string protocolName)
530534
case "FSTask":
531535
case "FSTaskOptions":
532536
return true;
537+
// Xcode 26.0 Conformance not in headers
538+
case "ASPickerDisplaySettings":
539+
case "ASPropertyCompareString":
540+
return true;
533541
}
534542
break;
535543
case "NSSecureCoding":
@@ -759,6 +767,10 @@ protected virtual bool Skip (Type type, string protocolName)
759767
case "FSTask":
760768
case "FSTaskOptions":
761769
return true;
770+
// Xcode 26.0 Conformance not in headers
771+
case "ASPickerDisplaySettings":
772+
case "ASPropertyCompareString":
773+
return true;
762774
}
763775
break;
764776
// conformance added in Xcode 8 (iOS 10 / macOS 10.12)

tests/xtro-sharpie/api-annotations-dotnet/iOS-AccessorySetupKit.todo

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)