Bump for Xcode 10 beta 4

Make.config

@@ -44,7 +44,7 @@ endif
 
 # TODO: reset to 0 after major/minor version bump (SRO) and increment for service releases and previews
 # Note: if not reseted to 0 we can skip a version and start with .1 or .2
-PACKAGE_VERSION_REV=1
+PACKAGE_VERSION_REV=2
 IOS_PACKAGE_VERSION_REV=$(PACKAGE_VERSION_REV)
 
 IOS_PRODUCT=Xamarin.iOS
@@ -59,8 +59,8 @@ IOS_PACKAGE_UPDATE_ID=$(shell printf "2%02d%02d%02d%03d" $(IOS_PACKAGE_VERSION_M
 
 # Xcode version should have both a major and a minor version (even if the minor version is 0)
 XCODE_VERSION=10.0
-XCODE_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_10_Beta_3.xip
-XCODE_DEVELOPER_ROOT=/Applications/Xcode10-beta3.app/Contents/Developer
+XCODE_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_10_Beta_4.xip
+XCODE_DEVELOPER_ROOT=/Applications/Xcode10-beta4.app/Contents/Developer
 
 XCODE94_VERSION=9.4
 XCODE94_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_9.4.xip
@@ -97,7 +97,7 @@ WATCH_SDK_VERSION=5.0
 TVOS_SDK_VERSION=12.0
 
 MIN_IOS_SDK_VERSION=6.0
-MIN_OSX_SDK_VERSION=10.7
+MIN_OSX_SDK_VERSION=10.9
 MIN_WATCHOS_SDK_VERSION=2.0
 MIN_WATCH_OS_VERSION=1.0
 MIN_TVOS_SDK_VERSION=9.0

Versions-mac.plist.in

@@ -8,8 +8,6 @@
 	<dict>
 		<key>macOS</key>
 		<array>
-			<string>10.7</string>
-			<string>10.8</string>
 			<string>10.9</string>
 			<string>10.10</string>
 			<string>10.11</string>

builds/Makefile

@@ -1828,7 +1828,7 @@ LLVM_BASE_CONFIGURE_ENVIRONMENT=$(COMMON_ACVARS)
 	@echo "Configuring llvm"
 	@cd llvm && \
 	$(LLVM_BASE_CONFIGURE_ENVIRONMENT) \
-	$(abspath $(LLVM_PATH)/configure) --prefix=$$PWD/usr --build=i386-apple-darwin10.7  --enable-targets="arm" $(LLVM_BASE_CONFIGURE_FLAGS) --cache-file=../llvm.config.cache CC="$(CCACHE)clang" CXX="$(CCACHE)clang++" CXXFLAGS="$(LLVM_CXXFLAGS)" > $@.log 2>&1 || (echo "Configuring llvm failed:" && cat $@.log | sed "s/^/    /" && exit 1)
+	$(abspath $(LLVM_PATH)/configure) --prefix=$$PWD/usr --build=i386-apple-darwin10.9  --enable-targets="arm" $(LLVM_BASE_CONFIGURE_FLAGS) --cache-file=../llvm.config.cache CC="$(CCACHE)clang" CXX="$(CCACHE)clang++" CXXFLAGS="$(LLVM_CXXFLAGS)" > $@.log 2>&1 || (echo "Configuring llvm failed:" && cat $@.log | sed "s/^/    /" && exit 1)
 	$(Q) @touch $@
 	@echo Configured llvm
 

src/CoreMidi/MidiServices.cs

@@ -45,7 +45,6 @@
 using MidiObjectRef = System.Int32;
 using MidiClientRef = System.Int32;
 using MidiDeviceRef = System.Int32;
-using MidiDeviceListRef = System.Int32;
 using MidiPortRef = System.Int32;
 using MidiEndpointRef = System.Int32;
 using MidiEntityRef = System.Int32;
@@ -222,9 +221,6 @@ public class MidiObject
 		internal static IntPtr kMIDIPropertyTransmitsNotes;
 		internal static IntPtr kMIDIPropertyTransmitsProgramChanges;
 		internal static IntPtr kMIDIPropertyUniqueID;
-		internal static IntPtr kMIDIDriverPropertyUsesSerial;
-		internal static IntPtr kMIDIPropertyFactoryPatchNameFile;
-		internal static IntPtr kMIDIPropertyUserPatchNameFile;
 
 		static MidiObject ()
 		{
@@ -277,9 +273,6 @@ static MidiObject ()
 			kMIDIPropertyTransmitsNotes = Dlfcn.GetIntPtr (midiLibrary, "kMIDIPropertyTransmitsNotes");
 			kMIDIPropertyTransmitsProgramChanges = Dlfcn.GetIntPtr (midiLibrary, "kMIDIPropertyTransmitsProgramChanges");
 			kMIDIPropertyUniqueID = Dlfcn.GetIntPtr (midiLibrary, "kMIDIPropertyUniqueID");
-			kMIDIDriverPropertyUsesSerial = Dlfcn.GetIntPtr (midiLibrary, "kMIDIDriverPropertyUsesSerial");
-			kMIDIPropertyFactoryPatchNameFile = Dlfcn.GetIntPtr (midiLibrary, "kMIDIPropertyFactoryPatchNameFile");
-			kMIDIPropertyUserPatchNameFile = Dlfcn.GetIntPtr (midiLibrary, "kMIDIPropertyUserPatchNameFile");
 		}
 
 #if XAMCORE_2_0
@@ -1453,10 +1446,6 @@ public class MidiDevice : MidiObject {
 		[DllImport (Constants.CoreMidiLibrary)]
 		extern static MidiEntityRef MIDIDeviceGetEntity (MidiDeviceRef handle, nint item);
 
-		[NoiOS]
-		[DllImport (Constants.CoreMidiLibrary)]
-		extern static int MIDIDeviceAddEntity (MidiDeviceRef device, /* CFString */ IntPtr name, bool embedded, nuint numSourceEndpoints, nuint numDestinationEndpoints, MidiEntityRef newEntity);
-
 		public MidiEntity GetEntity (nint entityIndex)
 		{
 			if (handle == MidiObject.InvalidRef)
@@ -1467,16 +1456,6 @@ public MidiEntity GetEntity (nint entityIndex)
 			return new MidiEntity (h);
 		}
 
-		[NoiOS]
-		public int Add (string name, bool embedded, nuint numSourceEndpoints, nuint numDestinationEndpoints, MidiEntity newEntity)
-		{
-			if (handle == MidiObject.InvalidRef)
-				throw new ObjectDisposedException ("handle");
-			using (NSString nsName = new NSString (name)) {
-				return MIDIDeviceAddEntity (handle, nsName.Handle, embedded, numSourceEndpoints, numDestinationEndpoints, newEntity.Handle);
-			}
-		}
-
 		public nint EntityCount {
 			get {
 				return MIDIDeviceGetNumberOfEntities (handle);
@@ -1519,34 +1498,6 @@ public int UniqueID {
 			}
 		}
 
-		public bool UsesSerial {
-			get {
-				return GetInt (kMIDIDriverPropertyUsesSerial) != 0;
-			}
-			set {
-				SetInt (kMIDIDriverPropertyUsesSerial, value ? 1 : 0);
-			}
-		}
-
-		public string FactoryPatchNameFile {
-			get {
-				return GetString (kMIDIPropertyFactoryPatchNameFile);
-			}
-			set {
-				SetString (kMIDIPropertyFactoryPatchNameFile, value);
-			}
-		}
-
-		public string UserPatchNameFile {
-			get {
-				return GetString (kMIDIPropertyUserPatchNameFile);
-			}
-			set {
-				SetString (kMIDIPropertyUserPatchNameFile, value);
-			}
-		}
-
-
 		public int AdvanceScheduleTimeMuSec {
 			get {
 				return GetInt (kMIDIPropertyAdvanceScheduleTimeMuSec);
@@ -1887,65 +1838,6 @@ internal MidiDevice (MidiDeviceRef handle) : base (handle)
 		internal MidiDevice (MidiDeviceRef handle, bool owns) : base (handle, owns)
 		{
 		}
-#endif // !COREBUILD
-	}
-
-	public class MidiDeviceList : MidiObject {
-
-#if !COREBUILD && MONOMAC
-		[DllImport (Constants.CoreMidiLibrary)]
-		static extern nuint MIDIDeviceListGetNumberOfDevices (MidiDeviceListRef devList);
-
-		[DllImport (Constants.CoreMidiLibrary)]
-		static extern MidiDeviceRef MIDIDeviceListGetDevice (MidiDeviceListRef devList, nuint index);
-
-		[DllImport (Constants.CoreMidiLibrary)]
-		static extern int MIDIDeviceListAddDevice (MidiDeviceListRef devList, MidiDeviceRef dev);
-
-		[DllImport (Constants.CoreMidiLibrary)]
-		static extern int MIDIDeviceListDispose (MidiDeviceListRef devList);
-
-		internal MidiDeviceList (MidiDeviceListRef handle) : base (handle)
-		{
-		}
-
-		internal MidiDeviceList (MidiDeviceListRef handle, bool owns) : base (handle, owns)
-		{
-		}
-
-		public nuint GetNumberOfDevices () 
-		{
-			if (handle == MidiObject.InvalidRef)
-				throw new ObjectDisposedException ("handle");
-			return MIDIDeviceListGetNumberOfDevices (handle);
-		}
-
-		public MidiDevice Get (nuint index)
-		{
-			if (handle == MidiObject.InvalidRef)
-				throw new ObjectDisposedException ("handle");
-			var h = MIDIDeviceListGetDevice (handle, index);
-			if (h == MidiObject.InvalidRef)
-				return null;
-			return new MidiDevice (h);
-		}
-
-		public int Add (MidiDevice device)
-		{
-			if (handle == MidiObject.InvalidRef)
-				throw new ObjectDisposedException ("handle");
-			return MIDIDeviceListAddDevice (handle, device.Handle);
-		}
-
-		internal override void DisposeHandle ()
-		{
-			if (handle != MidiObject.InvalidRef){
-				if (owns)
-					MIDIDeviceListDispose (handle);
-				handle = MidiObject.InvalidRef;
-			}
-		}
-
 #endif // !COREBUILD
 	}
 

src/arkit.cs

@@ -701,11 +701,6 @@ interface ARWorldTrackingConfiguration {
 		[Export ("maximumNumberOfTrackedImages")]
 		nint MaximumNumberOfTrackedImages { get; set; }
 
-		[iOS (12,0)]
-		[Static]
-		[Export ("objectDetectionSupported")]
-		bool ObjectDetectionSupported { [Bind ("isObjectDetectionSupported")] get; }
-
 		[iOS (12,0)]
 		[Export ("detectionObjects", ArgumentSemantic.Copy)]
 		NSSet<ARReferenceObject> DetectionObjects { get; set; }

src/carplay.cs

@@ -263,11 +263,11 @@ interface CPApplicationDelegate : UIApplicationDelegate {
 
 		[Abstract]
 		[Export ("application:didConnectCarInterfaceController:toWindow:")]
-		void DidConnectCarInterfaceController (UIApplication application, CPInterfaceController interfaceController, CPMapContentWindow window);
+		void DidConnectCarInterfaceController (UIApplication application, CPInterfaceController interfaceController, CPWindow window);
 
 		[Abstract]
 		[Export ("application:didDisconnectCarInterfaceController:fromWindow:")]
-		void DidDisconnectCarInterfaceController (UIApplication application, CPInterfaceController interfaceController, CPMapContentWindow window);
+		void DidDisconnectCarInterfaceController (UIApplication application, CPInterfaceController interfaceController, CPWindow window);
 
 		[Export ("application:didSelectNavigationAlert:")]
 		void DidSelectNavigationAlert (UIApplication application, CPNavigationAlert navigationAlert);
@@ -335,8 +335,8 @@ interface CPListSection : NSSecureCoding {
 	[DisableDefaultCtor]
 	interface CPListTemplate : CPBarButtonProviding {
 
-		[Export ("initWithSections:")]
-		IntPtr Constructor (CPListSection [] sections);
+		[Export ("initWithTitle:sections:")]
+		IntPtr Constructor ([NullAllowed] string title, CPListSection[] sections);
 
 		[Wrap ("WeakDelegate")]
 		[NullAllowed]
@@ -349,7 +349,7 @@ interface CPListTemplate : CPBarButtonProviding {
 		CPListSection [] Sections { get; }
 
 		[NullAllowed, Export ("title")]
-		string Title { get; set; }
+		string Title { get; }
 
 		[Export ("updateSections:")]
 		void UpdateSections (CPListSection [] sections);
@@ -766,7 +766,7 @@ interface CPImageSet : NSSecureCoding {
 
 	[NoWatch, NoTV, NoMac, iOS (12,0)]
 	[BaseType (typeof (UIWindow))]
-	interface CPMapContentWindow {
+	interface CPWindow {
 
 		[Export ("initWithFrame:")]
 		IntPtr Constructor (CGRect frame);

src/coremidi.cs

@@ -144,83 +144,4 @@ interface MidiNetworkSession {
 		MidiEndpoint DestinationEndPoint { get; }
 	}
 #endif
-
-	[NoWatch, NoTV, Mac (10,14, onlyOn64: true), iOS (12,0)]
-	[BaseType (typeof(NSObject), Name="MIDICIProfile")]
-	[DisableDefaultCtor]
-	interface MidiCIProfile : NSSecureCoding
-	{
-		[Export ("name")]
-		string Name { get; }
-
-		[Export ("profileID")]
-		NSData ProfileId { get; }
-
-		[Export ("initWithData:name:")]
-		IntPtr Constructor (NSData data, string inName);
-	}
-
-	[NoWatch, NoTV, Mac (10,14, onlyOn64: true), iOS (12,0)]
-	[BaseType (typeof(NSObject), Name="MIDICIProfileState")]
-	[DisableDefaultCtor]
-	interface MidiCIProfileState : NSSecureCoding
-	{
-		[Export ("enabledProfiles")]
-		MidiCIProfile[] EnabledProfiles { get; }
-
-		[Export ("disabledProfiles")]
-		MidiCIProfile[] DisabledProfiles { get; }
-
-		[Export ("initWithEnabledProfiles:disabledProfiles:")]
-		IntPtr Constructor (MidiCIProfile[] enabled, MidiCIProfile[] disabled);
-	}
-
-	delegate void MidiCIProfileChangedHandler (MidiCISession session, byte channel, MidiCIProfile profile, bool enabled);
-	delegate void MidiCIPropertyResponseHandler (MidiCISession session, byte channel, NSData response, NSError error);
-	delegate void MidiCIPropertyChangedHandler (MidiCISession session, byte channel, NSData data);
-
-	[NoWatch, NoTV, Mac (10,14, onlyOn64: true), iOS (12,0)]
-	[BaseType (typeof(NSObject), Name="MIDICISession")]
-	[DisableDefaultCtor]
-	interface MidiCISession
-	{
-		[Export ("initWithMIDIEntity:dataReadyHandler:")]
-		IntPtr Constructor (uint entity, Action handler);
-
-		[Export ("entity")]
-		uint Entity { get; }
-
-		[Export ("supportsProfileCapability")]
-		bool SupportsProfileCapability { get; }
-
-		[Export ("supportsPropertyCapability")]
-		bool SupportsPropertyCapability { get; }
-
-		[Export ("deviceIdentification")]
-		MidiCIDeviceIdentification DeviceIdentification { get; }
-
-		[Export ("profileStateForChannel:")]
-		MidiCIProfileState GetProfileState (byte channel);
-
-		[Export ("enableProfile:onChannel:error:")]
-		bool EnableProfile (MidiCIProfile profile, byte channel, [NullAllowed] out NSError outError);
-
-		[Export ("disableProfile:onChannel:error:")]
-		bool DisableProfile (MidiCIProfile profile, byte channel, [NullAllowed] out NSError outError);
-
-		[NullAllowed, Export ("profileChangedCallback", ArgumentSemantic.Assign)]
-		MidiCIProfileChangedHandler ProfileChangedCallback { get; set; }
-
-		[Export ("hasProperty:onChannel:responseHandler:")]
-		void HasProperty (NSData inquiry, byte channel, MidiCIPropertyResponseHandler handler);
-
-		[Export ("getProperty:onChannel:responseHandler:")]
-		void GetProperty (NSData inquiry, byte channel, MidiCIPropertyResponseHandler handler);
-
-		[Export ("setProperty:onChannel:responseHandler:")]
-		void SetProperty (NSData inquiry, byte channel, MidiCIPropertyResponseHandler handler);
-
-		[NullAllowed, Export ("propertyChangedCallback", ArgumentSemantic.Assign)]
-		MidiCIPropertyChangedHandler PropertyChangedCallback { get; set; }
-	}
 }

src/frameworks.sources

@@ -512,7 +512,6 @@ COREMEDIA_SOURCES = \
 # CoreMidi
 
 COREMIDI_CORE_SOURCES = \
-	CoreMidi/MidiCIDeviceIdentification.cs \
 	CoreMidi/MidiServices.cs \
 	CoreMidi/MidiThruConnection.cs \
 	CoreMidi/MidiThruConnectionParams.cs \

src/metalperformanceshaders.cs

@@ -1253,7 +1253,7 @@ interface MPSCnnLogSoftMax {
 	[iOS (10,0)][TV (10,0)][Mac (10, 13, onlyOn64: true)]
 	[BaseType (typeof (NSObject))]
 	[DisableDefaultCtor]
-	interface MPSImageDescriptor {
+	interface MPSImageDescriptor : NSCopying {
 
 		[Export ("width")]
 		nuint Width { get; set; }
@@ -3240,7 +3240,7 @@ interface IMPSCnnConvolutionDataSource { }
 	[TV (11,0), Mac (10, 13, onlyOn64: true), iOS (11,0)]
 	[Protocol, Model]
 	[BaseType (typeof (NSObject), Name = "MPSCNNConvolutionDataSource")]
-	interface MPSCnnConvolutionDataSource {
+	interface MPSCnnConvolutionDataSource : NSCopying {
 		[Abstract]
 		[Export ("dataType")]
 		MPSDataType DataType { get; }