diff --git a/src/CoreBluetooth/Enums.cs b/src/CoreBluetooth/Enums.cs index 5fc9b9c74f..f1bca38173 100644 --- a/src/CoreBluetooth/Enums.cs +++ b/src/CoreBluetooth/Enums.cs @@ -63,7 +63,7 @@ namespace XamCore.CoreBluetooth { Disconnecting } -#if !MONOMAC || !XAMCORE_4_0 +#if !XAMCORE_4_0 // NSInteger -> CBPeripheralManager.h [Native] public enum CBPeripheralManagerAuthorizationStatus : nint { diff --git a/src/corebluetooth.cs b/src/corebluetooth.cs index 06b5786d79..87edad0dea 100644 --- a/src/corebluetooth.cs +++ b/src/corebluetooth.cs @@ -488,11 +488,11 @@ namespace XamCore.CoreBluetooth { [Since (7,0), Mavericks] [Export ("identifier")] NSUuid Identifier { get; } -#else - [iOS (9,0)] +#endif + + [iOS (9,0)][Mac (10,12)] [Export ("maximumWriteValueLengthForType:")] nuint GetMaximumWriteValueLength (CBCharacteristicWriteType type); -#endif #if !XAMCORE_2_0 [Availability (Deprecated = Platform.iOS_7_0, Obsoleted = Platform.iOS_9_0)] @@ -731,11 +731,9 @@ namespace XamCore.CoreBluetooth { NSString ServiceChangedString { get; } #endif // !XAMCORE_3_0 -#if !MONOMAC - [Since (7,1)] + [Since (7,1)][Mac (10,10)] [Export ("UUIDString")] string Uuid { get; } -#endif } [Since (6,0), Mac(10,9)] diff --git a/tests/xtro-sharpie/osx.ignore b/tests/xtro-sharpie/osx.ignore index d2681f0c60..ff1e7a7ebd 100644 --- a/tests/xtro-sharpie/osx.ignore +++ b/tests/xtro-sharpie/osx.ignore @@ -392,7 +392,7 @@ # Only one type currently, which default returns. Currently unneeded unless they extend. !missing-selector! +NSDistributedNotificationCenter::notificationCenterForType: not bound -# iOS Only, not available for macOS - NS_CLASS_AVAILABLE(NA, 10_0) +# iOS Only, not available for macOS - NS_CLASS_AVAILABLE(NA, XXX) !missing-protocol! MTLFence not bound !missing-protocol! MTLHeap not bound !missing-protocol-member! MTLBlitCommandEncoder::updateFence: not found @@ -413,6 +413,9 @@ !missing-selector! MTLHeapDescriptor::setStorageMode: not bound !missing-selector! MTLHeapDescriptor::size not bound !missing-selector! MTLHeapDescriptor::storageMode not bound +!missing-field! CBCentralManagerOptionRestoreIdentifierKey not bound +!missing-field! CBConnectPeripheralOptionNotifyOnConnectionKey not bound +!missing-field! CBConnectPeripheralOptionNotifyOnNotificationKey not bound # iOS Only - NS_AVAILABLE_IOS !missing-protocol-member! MTLRenderCommandEncoder::updateFence:afterStages: not found @@ -421,4 +424,8 @@ !missing-selector! MTLRenderPassDepthAttachmentDescriptor::depthResolveFilter not bound !missing-selector! MTLRenderPassDepthAttachmentDescriptor::setDepthResolveFilter: not bound !missing-selector! MTLSamplerDescriptor::lodAverage not bound -!missing-selector! MTLSamplerDescriptor::setLodAverage: not bound \ No newline at end of file +!missing-selector! MTLSamplerDescriptor::setLodAverage: not bound + +# Deprecated in the same version of OS X that CBCentral becomes available. The alternative (Identifier property) is bound and available. +!missing-selector! CBCentral::UUID not bound +!missing-selector! CBPeripheral::UUID not bound \ No newline at end of file