[corebluetooth] Update up to beta 6 and enable it on watchOS (#2540)

macOS 10.13 has finally catch up with iOS and this simplifies the
bindings a bit.

Author: spouliot

src/Constants.watch.cs.in

@@ -44,6 +44,7 @@ namespace ObjCRuntime {
 		public const string IntentsLibrary = "/System/Library/Frameworks/Intents.framework/Intents";
 
 		// WatchOS 4.0
+		public const string CoreBluetoothLibrary = "/System/Library/Frameworks/CoreBluetooth.framework/CoreBluetooth";
 		public const string CoreMLLibrary = "/System/Library/Frameworks/CoreML.framework/CoreML";	
 	}
 }

src/CoreBluetooth/AdvertisementDataOptions.cs

@@ -37,6 +37,7 @@ namespace XamCore.CoreBluetooth {
 	// It's intentionally not called AdvertisementDataOptions because different options
 	// are valid in different contexts
 	//
+	[Watch (4,0)]
 	[iOS (6,0)]
 	public class StartAdvertisingOptions : DictionaryContainer
 	{

src/CoreBluetooth/CBUUID.cs

@@ -205,5 +205,15 @@ public unsafe string ToString (bool fullUuid)
 
 			return sb.ToString ();
 		}
+
+#if MONOMAC
+		// workaround for 27160443 – Trello: https://trello.com/c/oqB27JA6
+		// try new constant (10.13+) and fallback to the old/misnamed one
+		public static NSString CharacteristicValidRangeString {
+			get {
+				return CBUUIDCharacteristicValidRangeString ?? CBUUIDValidRangeString;
+			}
+		}
+#endif
 	}
 }

src/CoreBluetooth/CoreBluetooth.cs

@@ -113,10 +113,10 @@ public CBPeer ()
 		}
 	}
 #endif
-#if !MONOMAC && !XAMCORE_4_0
+#if !WATCH && !XAMCORE_4_0
 	public partial class CBCentralManager {
 
-		public virtual CBCentralManagerState State {
+		public new virtual CBCentralManagerState State {
 			get {
 				return (CBCentralManagerState)base.State;
 			}

src/CoreBluetooth/Enums.cs

@@ -13,13 +13,11 @@
 
 namespace XamCore.CoreBluetooth {
 
-#if !MONOMAC
+	[Mac (10,13)]
+	[Watch (4,0)]
 	[iOS (10,0)]
 	[Native]
 	public enum CBManagerState : nint {
-#else
-	internal enum CBManagerState {
-#endif
 		Unknown = 0,
 		Resetting,
 		Unsupported,
@@ -31,6 +29,7 @@ internal enum CBManagerState {
 	// NSInteger -> CBCentralManager.h
 	[Introduced (PlatformName.iOS, 5, 0)]
 	[Deprecated (PlatformName.iOS, 10, 0, message: "Use 'CBManagerState' instead.")]
+	[NoWatch]
 	[Native]
 	public enum CBCentralManagerState : nint {
 		Unknown = CBManagerState.Unknown,
@@ -44,6 +43,7 @@ public enum CBCentralManagerState : nint {
 	// NSInteger -> CBPeripheralManager.h
 	[Introduced (PlatformName.iOS, 6, 0)]
 	[Deprecated (PlatformName.iOS, 10, 0, message: "Use 'CBManagerState' instead.")]
+	[NoWatch]
 	[Native]
 	public enum CBPeripheralManagerState : nint {
 		Unknown = CBManagerState.Unknown,
@@ -55,16 +55,19 @@ public enum CBPeripheralManagerState : nint {
 	}
 
 	// NSInteger -> CBPeripheralManager.h
+	[Watch (4,0)]
 	[Native]
 	public enum CBPeripheralState : nint {
 		Disconnected,
 		Connecting,
 		Connected,
-		Disconnecting
+		[iOS (9,0)][Mac (10,13)]
+		Disconnecting,
 	}
 
 #if !XAMCORE_4_0
 	// NSInteger -> CBPeripheralManager.h
+	[Watch (4,0)]
 	[Native]
 	public enum CBPeripheralManagerAuthorizationStatus : nint {
 		NotDetermined,
@@ -75,6 +78,7 @@ public enum CBPeripheralManagerAuthorizationStatus : nint {
 #endif
 
 	// NSUInteger -> CBCharacteristic.h
+	[Watch (4,0)]
 	[Flags]
 	[Native]
 	public enum CBCharacteristicProperties : nuint_compat_int {
@@ -86,10 +90,13 @@ public enum CBCharacteristicProperties : nuint_compat_int {
 		Indicate = 32,
 		AuthenticatedSignedWrites = 64,
 		ExtendedProperties = 128,
+		[Mac (10,9)]
 		NotifyEncryptionRequired = 0x100,
+		[Mac (10,9)]
 		IndicateEncryptionRequired = 0x200
 	}
 
+	[Watch (4,0)]
 	[ErrorDomain ("CBErrorDomain")]
 	[Native] // NSInteger -> CBError.h
 	public enum CBError : nint {
@@ -104,12 +111,15 @@ public enum CBError : nint {
 		PeripheralDisconnected,
 		UUIDNotAllowed,
 		AlreadyAdvertising,
-		// iOS7.1
+		[iOS (7,1)][Mac (10,13)]
 		ConnectionFailed,
-		// iOS 9
-		ConnectionLimitReached
+		[iOS (9,0)][Mac (10,13)]
+		ConnectionLimitReached,
+		[iOS (11,0)][TV (11,0)][Mac (10,13)]
+		UnknownDevice,
 	}
 
+	[Watch (4,0)]
 	[ErrorDomain ("CBATTErrorDomain")]
 	[Native] // NSInteger -> CBError.h
 	public enum CBATTError : nint {
@@ -134,13 +144,16 @@ public enum CBATTError : nint {
 	}
 
 	// NSInteger -> CBPeripheral.h
+	[Watch (4,0)]
 	[Native]
 	public enum CBCharacteristicWriteType : nint {
 		WithResponse,
 		WithoutResponse
 	}
 
 	// NSUInteger -> CBCharacteristic.h
+	[Mac (10,9)]
+	[Watch (4,0)]
 	[Flags]
 	[Native]
 	public enum CBAttributePermissions : nuint_compat_int {
@@ -151,6 +164,7 @@ public enum CBAttributePermissions : nuint_compat_int {
 	}
 
 	// NSInteger -> CBPeripheralManager.h
+	[Watch (4,0)]
 	[Native]
 	public enum CBPeripheralManagerConnectionLatency : nint {
 		Low = 0,

src/CoreBluetooth/GuidWrapper.cs

@@ -58,7 +58,7 @@ public void ConnectPeripheral (CBPeripheral peripheral, PeripheralConnectionOpti
 			ConnectPeripheral (peripheral, options == null ? null : options.Dictionary);
 		}
 
-#if !TVOS
+#if !TVOS && !WATCH
 		[Availability (Introduced = Platform.iOS_5_0, Deprecated = Platform.iOS_7_0, Obsoleted = Platform.iOS_9_0, Message = "Use 'RetrievePeripheralsWithIdentifiers' instead.")]
 		public void RetrievePeripherals (CBUUID [] peripheralUuids)
 		{

src/CoreBluetooth/PeripheralConnectionOptions.cs

@@ -33,6 +33,7 @@
 
 namespace XamCore.CoreBluetooth {
 
+	[Watch (4,0)]
 	public class PeripheralConnectionOptions : DictionaryContainer
 	{
 #if !COREBUILD