Merge xcode8.2 into cycle8-xi

Make.config

@@ -29,7 +29,7 @@ PACKAGE_HEAD_REV=$(shell git rev-parse HEAD)
 # on wrench, because wrench technically builds hashes, not branches)
 #
 # 
-PACKAGE_HEAD_BRANCH=xcode8.1
+PACKAGE_HEAD_BRANCH=cycle8-xi
 ifeq ($(BUILD_REVISION),)
 CURRENT_BRANCH:=$(shell git rev-parse --abbrev-ref HEAD)
 else
@@ -40,21 +40,21 @@ IOS_PRODUCT=Xamarin.iOS
 IOS_PACKAGE_NAME=Xamarin.iOS
 IOS_PACKAGE_NAME_LOWER=$(shell echo $(IOS_PACKAGE_NAME) | tr "[:upper:]" "[:lower:]")
 # NEVER customize IOS_PACKAGE_VERSION itself, other parts (mtouch, web updater) are using the IOS_PACKAGE_VERSION_* variables
-IOS_PACKAGE_VERSION=10.2.1.$(IOS_COMMIT_DISTANCE)
+IOS_PACKAGE_VERSION=10.3.1.$(IOS_COMMIT_DISTANCE)
 IOS_PACKAGE_VERSION_MAJOR=$(word 1, $(subst ., ,$(IOS_PACKAGE_VERSION)))
 IOS_PACKAGE_VERSION_MINOR=$(word 2, $(subst ., ,$(IOS_PACKAGE_VERSION)))
 IOS_PACKAGE_VERSION_REV=$(word 3, $(subst ., ,$(IOS_PACKAGE_VERSION)))
 IOS_PACKAGE_VERSION_BUILD=$(IOS_COMMIT_DISTANCE)
 IOS_PACKAGE_UPDATE_ID=$(shell printf "2%02d%02d%02d%03d" $(IOS_PACKAGE_VERSION_MAJOR) $(IOS_PACKAGE_VERSION_MINOR) $(IOS_PACKAGE_VERSION_REV) $(IOS_PACKAGE_VERSION_BUILD))
 
-# Xcode 8.1
-XCODE_VERSION=8.1
-XCODE_URL=http://xamarin-storage/bot-provisioning/Xcode_8.1.xip
-XCODE_DEVELOPER_ROOT=/Applications/Xcode81.app/Contents/Developer
+# Xcode 8.2
+XCODE_VERSION=8.2
+XCODE_URL=http://xamarin-storage/bot-provisioning/Xcode_8.2.xip
+XCODE_DEVELOPER_ROOT=/Applications/Xcode82.app/Contents/Developer
 
 # Minimum Mono version
 MIN_MONO_VERSION=4.6.1.5
-MAX_MONO_VERSION=4.6.99
+MAX_MONO_VERSION=4.8.0.269
 MIN_MONO_URL=http://download.xamarin.com/MonoFrameworkMDK/Macx86/MonoFramework-MDK-4.6.1.5.macos10.xamarin.universal.pkg
 
 # Minimum Xamarin Studio version
@@ -67,10 +67,10 @@ MIN_OSX_BUILD_VERSION=10.11
 MIN_OSX_VERSION_FOR_IOS=10.10
 MIN_OSX_VERSION_FOR_MAC=10.10
 
-IOS_SDK_VERSION=10.1
+IOS_SDK_VERSION=10.2
 OSX_SDK_VERSION=10.12
 WATCH_SDK_VERSION=3.1
-TVOS_SDK_VERSION=10.0
+TVOS_SDK_VERSION=10.1
 
 MIN_IOS_SDK_VERSION=6.0
 MIN_OSX_SDK_VERSION=10.7

runtime/bindings-generator.cs

@@ -512,6 +512,44 @@ static IEnumerable<FunctionData> GetFunctionData ()
 				}
 			);
 
+			data.Add (
+				new FunctionData {
+					Comment = " // IntPtr func (float, Vector2, nuint, nuint, nuint, int, bool, IntPtr)",
+					Prefix = "simd__",
+					Variants = Variants.NonStret,
+					ReturnType = Types.IntPtr,
+					Parameters = new ParameterData[] {
+						new ParameterData { TypeData = Types.Float },
+						new ParameterData { TypeData = Types.Vector2 },
+						new ParameterData { TypeData = Types.NUInt },
+						new ParameterData { TypeData = Types.NUInt },
+						new ParameterData { TypeData = Types.NUInt },
+						new ParameterData { TypeData = Types.Int32 },
+						new ParameterData { TypeData = Types.Bool },
+						new ParameterData { TypeData = Types.IntPtr },
+					},
+				}
+			);
+
+			data.Add (
+				new FunctionData {
+					Comment = " // IntPtr func (float, Vector2, nuint, nuint, nuint, Int64, bool, IntPtr)",
+					Prefix = "simd__",
+					Variants = Variants.NonStret,
+					ReturnType = Types.IntPtr,
+					Parameters = new ParameterData[] {
+						new ParameterData { TypeData = Types.Float },
+						new ParameterData { TypeData = Types.Vector2 },
+						new ParameterData { TypeData = Types.NUInt },
+						new ParameterData { TypeData = Types.NUInt },
+						new ParameterData { TypeData = Types.NUInt },
+						new ParameterData { TypeData = Types.Int64 },
+						new ParameterData { TypeData = Types.Bool },
+						new ParameterData { TypeData = Types.IntPtr },
+					},
+				}
+			);
+
 			data.Add (
 				new FunctionData {
 					Comment = " // bool func (Vector2i, IntPtr, IntPtr, IntPtr, IntPtr)",

src/AVKit/Enums.cs

@@ -1,4 +1,5 @@
 using XamCore.ObjCRuntime;
+using XamCore.Foundation;
 
 namespace XamCore.AVKit {
 
@@ -24,4 +25,5 @@ public enum AVKitError : nint {
 		PictureInPictureStartFailed = -1001
 	}
 #endif
+
 }	

src/Constants.mac.cs.in

@@ -123,5 +123,6 @@ namespace MonoMac {
 		// macOS 10.12
 		public const string PhotosLibrary = "/System/Library/Frameworks/Photos.framework/Photos";
 		public const string IntentsLibrary = "/System/Library/Frameworks/Intents.framework/Intents";
+		public const string MediaPlayerLibrary = "/System/Library/Frameworks/MediaPlayer.framework/MediaPlayer";
 	}
 }

src/HomeKit/HMCharacteristic.cs

@@ -8,185 +8,6 @@ namespace XamCore.HomeKit {
 	[TV (10,0)]
 	partial class HMCharacteristic 
 	{
-		public HMCharacteristicType CharacteristicType {
-			get {
-				var s = _CharacteristicType;
-				// safety in case the field does not exists / cannot be loaded / new in future iOS versions...
-				if (s == null)
-					return HMCharacteristicType.None;
-				if (s == HMCharacteristicTypeInternal.PowerState)
-					return HMCharacteristicType.PowerState;				
-				if (s == HMCharacteristicTypeInternal.Hue)
-					return HMCharacteristicType.Hue;						
-				if (s == HMCharacteristicTypeInternal.Saturation)
-					return HMCharacteristicType.Saturation;
-				if (s == HMCharacteristicTypeInternal.Brightness)
-					return HMCharacteristicType.Brightness;
-				if (s == HMCharacteristicTypeInternal.TemperatureUnits)
-					return HMCharacteristicType.TemperatureUnits;
-				if (s == HMCharacteristicTypeInternal.CurrentTemperature)
-					return HMCharacteristicType.CurrentTemperature;
-				if (s == HMCharacteristicTypeInternal.TargetTemperature)
-					return HMCharacteristicType.TargetTemperature;
-				if (s == HMCharacteristicTypeInternal.CurrentHeatingCooling)
-					return HMCharacteristicType.CurrentHeatingCooling;
-				if (s == HMCharacteristicTypeInternal.TargetHeatingCooling)
-					return HMCharacteristicType.TargetHeatingCooling;
-				if (s == HMCharacteristicTypeInternal.CoolingThreshold)
-					return HMCharacteristicType.CoolingThreshold;
-				if (s == HMCharacteristicTypeInternal.HeatingThreshold)
-					return HMCharacteristicType.HeatingThreshold;
-				if (s == HMCharacteristicTypeInternal.CurrentRelativeHumidity)
-					return HMCharacteristicType.CurrentRelativeHumidity;
-				if (s == HMCharacteristicTypeInternal.TargetRelativeHumidity)
-					return HMCharacteristicType.TargetRelativeHumidity;
-				if (s == HMCharacteristicTypeInternal.CurrentDoorState)
-					return HMCharacteristicType.CurrentDoorState;
-				if (s == HMCharacteristicTypeInternal.TargetDoorState)
-					return HMCharacteristicType.TargetDoorState;
-				if (s == HMCharacteristicTypeInternal.ObstructionDetected)
-					return HMCharacteristicType.ObstructionDetected;
-				if (s == HMCharacteristicTypeInternal.Name)
-					return HMCharacteristicType.Name;
-				if (s == HMCharacteristicTypeInternal.Manufacturer)
-					return HMCharacteristicType.Manufacturer;
-				if (s == HMCharacteristicTypeInternal.Model)
-					return HMCharacteristicType.Model;
-				if (s == HMCharacteristicTypeInternal.SerialNumber)
-					return HMCharacteristicType.SerialNumber;
-				if (s == HMCharacteristicTypeInternal.Identify)
-					return HMCharacteristicType.Identify;
-				if (s == HMCharacteristicTypeInternal.RotationDirection)
-					return HMCharacteristicType.RotationDirection;
-				if (s == HMCharacteristicTypeInternal.RotationSpeed)
-					return HMCharacteristicType.RotationSpeed;
-				if (s == HMCharacteristicTypeInternal.OutletInUse)
-					return HMCharacteristicType.OutletInUse;
-				if (s == HMCharacteristicTypeInternal.Version)
-					return HMCharacteristicType.Version;
-				if (s == HMCharacteristicTypeInternal.Logs)
-					return HMCharacteristicType.Logs;
-				if (s == HMCharacteristicTypeInternal.AudioFeedback)
-					return HMCharacteristicType.AudioFeedback;
-				if (s == HMCharacteristicTypeInternal.AdminOnlyAccess)
-					return HMCharacteristicType.AdminOnlyAccess;
-				if (s == HMCharacteristicTypeInternal.MotionDetected)
-					return HMCharacteristicType.MotionDetected;
-				if (s == HMCharacteristicTypeInternal.CurrentLockMechanismState)
-					return HMCharacteristicType.CurrentLockMechanismState;
-				if (s == HMCharacteristicTypeInternal.TargetLockMechanismState)
-					return HMCharacteristicType.TargetLockMechanismState;
-				if (s == HMCharacteristicTypeInternal.LockMechanismLastKnownAction)
-					return HMCharacteristicType.LockMechanismLastKnownAction;
-				if (s == HMCharacteristicTypeInternal.LockManagementControlPoint)
-					return HMCharacteristicType.LockManagementControlPoint;
-				if (s == HMCharacteristicTypeInternal.LockManagementAutoSecureTimeout)
-					return HMCharacteristicType.LockManagementAutoSecureTimeout;
-				// iOS 9
-				if (s == HMCharacteristicTypeInternal.AirParticulateDensity)
-					return HMCharacteristicType.AirParticulateDensity;
-				if (s == HMCharacteristicTypeInternal.AirParticulateSize)
-					return HMCharacteristicType.AirParticulateSize;
-				if (s == HMCharacteristicTypeInternal.AirQuality)
-					return HMCharacteristicType.AirQuality;
-				if (s == HMCharacteristicTypeInternal.BatteryLevel)
-					return HMCharacteristicType.BatteryLevel;
-				if (s == HMCharacteristicTypeInternal.CarbonDioxideDetected)
-					return HMCharacteristicType.CarbonDioxideDetected;
-				if (s == HMCharacteristicTypeInternal.CarbonDioxideLevel)
-					return HMCharacteristicType.CarbonDioxideLevel;
-				if (s == HMCharacteristicTypeInternal.CarbonDioxidePeakLevel)
-					return HMCharacteristicType.CarbonDioxidePeakLevel;
-				if (s == HMCharacteristicTypeInternal.CarbonMonoxideDetected)
-					return HMCharacteristicType.CarbonMonoxideDetected;
-				if (s == HMCharacteristicTypeInternal.CarbonMonoxideLevel)
-					return HMCharacteristicType.CarbonMonoxideLevel;
-				if (s == HMCharacteristicTypeInternal.CarbonMonoxidePeakLevel)
-					return HMCharacteristicType.CarbonMonoxidePeakLevel;
-				if (s == HMCharacteristicTypeInternal.ChargingState)
-					return HMCharacteristicType.ChargingState;
-				if (s == HMCharacteristicTypeInternal.ContactState)
-					return HMCharacteristicType.ContactState;
-				if (s == HMCharacteristicTypeInternal.CurrentSecuritySystemState)
-					return HMCharacteristicType.CurrentSecuritySystemState;
-				if (s == HMCharacteristicTypeInternal.CurrentHorizontalTilt)
-					return HMCharacteristicType.CurrentHorizontalTilt;
-				if (s == HMCharacteristicTypeInternal.CurrentLightLevel)
-					return HMCharacteristicType.CurrentLightLevel;
-				if (s == HMCharacteristicTypeInternal.CurrentPosition)
-					return HMCharacteristicType.CurrentPosition;
-				if (s == HMCharacteristicTypeInternal.CurrentVerticalTilt)
-					return HMCharacteristicType.CurrentVerticalTilt;
-				if (s == HMCharacteristicTypeInternal.FirmwareVersion)
-					return HMCharacteristicType.FirmwareVersion;
-				if (s == HMCharacteristicTypeInternal.HardwareVersion)
-					return HMCharacteristicType.HardwareVersion;
-				if (s == HMCharacteristicTypeInternal.HoldPosition)
-					return HMCharacteristicType.HoldPosition;
-				if (s == HMCharacteristicTypeInternal.InputEvent)
-					return HMCharacteristicType.InputEvent;
-				if (s == HMCharacteristicTypeInternal.LeakDetected)
-					return HMCharacteristicType.LeakDetected;
-				if (s == HMCharacteristicTypeInternal.OccupancyDetected)
-					return HMCharacteristicType.OccupancyDetected;
-				if (s == HMCharacteristicTypeInternal.OutputState)
-					return HMCharacteristicType.OutputState;
-				if (s == HMCharacteristicTypeInternal.PositionState)
-					return HMCharacteristicType.PositionState;
-				if (s == HMCharacteristicTypeInternal.SmokeDetected)
-					return HMCharacteristicType.SmokeDetected;
-				if (s == HMCharacteristicTypeInternal.SoftwareVersion)
-					return HMCharacteristicType.SoftwareVersion;
-				if (s == HMCharacteristicTypeInternal.StatusActive)
-					return HMCharacteristicType.StatusActive;
-				if (s == HMCharacteristicTypeInternal.StatusFault)
-					return HMCharacteristicType.StatusFault;
-				if (s == HMCharacteristicTypeInternal.StatusJammed)
-					return HMCharacteristicType.StatusJammed;
-				if (s == HMCharacteristicTypeInternal.StatusLowBattery)
-					return HMCharacteristicType.StatusLowBattery;
-				if (s == HMCharacteristicTypeInternal.StatusTampered)
-					return HMCharacteristicType.StatusTampered;
-				if (s == HMCharacteristicTypeInternal.TargetSecuritySystemState)
-					return HMCharacteristicType.TargetSecuritySystemState;
-				if (s == HMCharacteristicTypeInternal.TargetHorizontalTilt)
-					return HMCharacteristicType.TargetHorizontalTilt;
-				if (s == HMCharacteristicTypeInternal.TargetPosition)
-					return HMCharacteristicType.TargetPosition;
-				if (s == HMCharacteristicTypeInternal.TargetVerticalTilt)
-					return HMCharacteristicType.TargetVerticalTilt;
-				// iOS 10.0
-				if (s == HMCharacteristicTypeInternal.StreamingStatus)
-					return HMCharacteristicType.StreamingStatus;
-				if (s == HMCharacteristicTypeInternal.SetupStreamEndpoint)
-					return HMCharacteristicType.SetupStreamEndpoint;
-				if (s == HMCharacteristicTypeInternal.SupportedVideoStreamConfiguration)
-					return HMCharacteristicType.SupportedVideoStreamConfiguration;
-				if (s == HMCharacteristicTypeInternal.SupportedAudioStreamConfiguration)
-					return HMCharacteristicType.SupportedAudioStreamConfiguration;
-				if (s == HMCharacteristicTypeInternal.SupportedRtpConfiguration)
-					return HMCharacteristicType.SupportedRtpConfiguration;
-				if (s == HMCharacteristicTypeInternal.SelectedStreamConfiguration)
-					return HMCharacteristicType.SelectedStreamConfiguration;
-				if (s == HMCharacteristicTypeInternal.Volume)
-					return HMCharacteristicType.Volume;
-				if (s == HMCharacteristicTypeInternal.Mute)
-					return HMCharacteristicType.Mute;
-				if (s == HMCharacteristicTypeInternal.NightVision)
-					return HMCharacteristicType.NightVision;
-				if (s == HMCharacteristicTypeInternal.OpticalZoom)
-					return HMCharacteristicType.OpticalZoom;
-				if (s == HMCharacteristicTypeInternal.DigitalZoom)
-					return HMCharacteristicType.DigitalZoom;
-				if (s == HMCharacteristicTypeInternal.ImageRotation)
-					return HMCharacteristicType.ImageRotation;
-				if (s == HMCharacteristicTypeInternal.ImageMirroring)
-					return HMCharacteristicType.ImageMirroring;
-
-				return HMCharacteristicType.None;
-			}
-		}
-
 		public bool SupportsEventNotification {
 			get {
 				foreach (var p in Properties){