Bump to mono:2018-08

.gitmodules

@@ -8,7 +8,7 @@
 [submodule "external/mono"]
     path = external/mono
     url = ../../mono/mono.git
-    branch = 2018-06
+    branch = 2018-08
 [submodule "external/opentk"]
     path = external/opentk
     url = ../../mono/opentk.git

Make.config

@@ -47,13 +47,13 @@ XCODE94_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_9.4.xip
 XCODE94_DEVELOPER_ROOT=/Applications/Xcode94.app/Contents/Developer
 
 # Minimum Mono version for building XI/XM
-MIN_MONO_VERSION=5.16.0.5
-MAX_MONO_VERSION=5.16.99
-MIN_MONO_URL=https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2018-06/7/7627a5f9eeba0fd846731ad0c498556f55be1a34/MonoFramework-MDK-5.16.0.5.macos10.xamarin.universal.pkg
+MIN_MONO_VERSION=5.18.0.185
+MAX_MONO_VERSION=5.18.99
+MIN_MONO_URL=https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2018-08/149/ea740d2bc8d58d9c0ee44ef0ba15ccddeafbe227/MonoFramework-MDK-5.18.0.185.macos10.xamarin.universal.pkg
 
 # Minimum Mono version for Xamarin.Mac apps using the system mono
-MIN_XM_MONO_VERSION=5.14.0.136
-MIN_XM_MONO_URL=https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2018-04/111/07c8f25fe536dbb7e244f965aa3f9a871f41e953/MonoFramework-MDK-5.14.0.136.macos10.xamarin.universal.pkg
+MIN_XM_MONO_VERSION=5.18.0.185
+MIN_XM_MONO_URL=https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2018-08/149/ea740d2bc8d58d9c0ee44ef0ba15ccddeafbe227/MonoFramework-MDK-5.18.0.185.macos10.xamarin.universal.pkg
 
 # Minimum Visual Studio version
 MIN_VISUAL_STUDIO_URL=https://bosstoragemirror.azureedge.net/vsmac/7a/7aff2dc1f28d711d11d63d79b2a4c49cda217189/VisualStudioForMac-Preview-7.7.0.1470.dmg
@@ -83,7 +83,7 @@ TVOS_SDK_VERSION=12.1
 
 # Minimum OS versions for running XI/XM apps.
 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>

runtime/exports.t4

@@ -311,6 +311,11 @@
 			"const void *", "method"
 		),
 
+		new Export (true, "void", "mono_dangerous_add_raw_internal_call",
+			"const char *", "name",
+			"const void *", "method"
+		),
+
 		new Export ("MonoMethodSignature *", "mono_method_signature",
 			"MonoMethod *", "method"
 		),

runtime/runtime.m

@@ -194,6 +194,25 @@
 	uint8_t flags;
 };
 
+static void
+xamarin_add_internal_call (const char *name, const void *method)
+{
+	/* COOP: With cooperative GC, icalls will run, like manageed methods,
+	 * in GC Unsafe mode, avoiding a thread state trandition.  In return
+	 * the icalls must guarantee that they won't block, or run indefinitely
+	 * without a safepoint, by manually performing a transition to GC Safe
+	 * mode.  With backward-compatible hybrid GC, icalls run in GC Safe
+	 * mode and the Mono API functions take care of thread state
+	 * transitions, so don't need to perform GC thread state transitions
+	 * themselves.
+	 *
+	 */
+	if (xamarin_is_gc_coop)
+		mono_dangerous_add_raw_internal_call (name, method);
+	else
+		mono_add_internal_call (name, method);
+}
+
 id
 xamarin_get_nsobject_handle (MonoObject *obj)
 {
@@ -881,7 +900,7 @@ -(void) xamarinSetGCHandle: (int) gc_handle;
 
 	mono_gc_toggleref_register_callback (gc_toggleref_callback);
 
-	mono_add_internal_call (xamarin_use_new_assemblies ? "Foundation.NSObject::RegisterToggleRef" : PRODUCT_COMPAT_NAMESPACE ".Foundation.NSObject::RegisterToggleRef", (const void *) gc_register_toggleref);
+	xamarin_add_internal_call (xamarin_use_new_assemblies ? "Foundation.NSObject::RegisterToggleRef" : PRODUCT_COMPAT_NAMESPACE ".Foundation.NSObject::RegisterToggleRef", (const void *) gc_register_toggleref);
 	mono_profiler_install ((MonoProfiler *) prof, NULL);
 	mono_profiler_install_gc (gc_event_callback, NULL);
 }
@@ -1359,8 +1378,8 @@ -(void) xamarinSetGCHandle: (int) gc_handle;
 	nsvalue_class = get_class_from_name (platform_image, foundation, "NSValue", true);
 	nsstring_class = get_class_from_name (platform_image, foundation, "NSString", true);
 
-	mono_add_internal_call (xamarin_use_new_assemblies ? "Foundation.NSObject::xamarin_release_managed_ref" : PRODUCT_COMPAT_NAMESPACE ".Foundation.NSObject::xamarin_release_managed_ref", (const void *) xamarin_release_managed_ref);
-	mono_add_internal_call (xamarin_use_new_assemblies ? "Foundation.NSObject::xamarin_create_managed_ref" : PRODUCT_COMPAT_NAMESPACE ".Foundation.NSObject::xamarin_create_managed_ref", (const void *) xamarin_create_managed_ref);
+	xamarin_add_internal_call (xamarin_use_new_assemblies ? "Foundation.NSObject::xamarin_release_managed_ref" : PRODUCT_COMPAT_NAMESPACE ".Foundation.NSObject::xamarin_release_managed_ref", (const void *) xamarin_release_managed_ref);
+	xamarin_add_internal_call (xamarin_use_new_assemblies ? "Foundation.NSObject::xamarin_create_managed_ref" : PRODUCT_COMPAT_NAMESPACE ".Foundation.NSObject::xamarin_create_managed_ref", (const void *) xamarin_create_managed_ref);
 
 	runtime_initialize = mono_class_get_method_from_name (runtime_class, "Initialize", 1);
 

src/AVFoundation/AVCaptureVideoPreviewLayer.cs

@@ -12,7 +12,7 @@ public partial class AVCaptureVideoPreviewLayer {
 
 		public enum InitMode {
 			WithConnection,
-			[iOS (8,0), Mac (10,7)]
+			[iOS (8,0)]
 			WithNoConnection,
 		}
 

src/AVFoundation/AVTypes.cs

@@ -259,7 +259,6 @@ public static class AVUtilities {
 		[DllImport (Constants.AVFoundationLibrary)]
 		static extern /* CGRect */ RectangleF AVMakeRectWithAspectRatioInsideRect (/* CGSize */ SizeF aspectRatio, /* CGRect */ RectangleF boundingRect);
 
-		[Mac (10,7)]
 		public static RectangleF WithAspectRatio (this RectangleF self, SizeF aspectRatio)
 		{
 			return AVMakeRectWithAspectRatioInsideRect (aspectRatio, self);

src/AVFoundation/Enums.cs

@@ -310,15 +310,13 @@ public enum AVAssetImageGeneratorResult : long {
 
 #if !XAMCORE_3_0 || MONOMAC
 	[NoTV]
-	[Mac (10,7)] // N/A in iOS
 	[Native]
 	// NSInteger - AVCaptureDevice.h
 	public enum AVCaptureDeviceTransportControlsPlaybackMode : long {
 		NotPlaying, Playing
 	}
 
 	[NoTV, NoWatch]
-	[Mac (10,7)] // N/A in iOS
 	[Native]
 	// NSInteger - AVCaptureSession.h
 	public enum AVVideoFieldMode : long {
@@ -694,7 +692,6 @@ public enum AVMovieWritingOptions : ulong
 	}
 
 	[NoiOS][NoTV][NoWatch]
-	[Mac (10,7)]
 	[Native]
 	public enum AVContentAuthorizationStatus : long {
 		Unknown,

src/AppKit/Enums.cs

@@ -1994,13 +1994,13 @@ public enum NSOpenGLContextParameter : ulong {
 		SurfaceOrder = 235,
 		SurfaceOpacity = 236,
 
-		[Mac (10, 7)] SurfaceBackingSize = 304,
-		[Mac (10, 7)] ReclaimResources = 308,
-		[Mac (10, 7)] CurrentRendererID = 309,
-		[Mac (10, 7)] GpuVertexProcessing = 310,
-		[Mac (10, 7)] GpuFragmentProcessing = 311,
-		[Mac (10, 7)] HasDrawable = 314,
-		[Mac (10, 7)] MpsSwapsInFlight = 315
+		SurfaceBackingSize = 304,
+		ReclaimResources = 308,
+		CurrentRendererID = 309,
+		GpuVertexProcessing = 310,
+		GpuFragmentProcessing = 311,
+		HasDrawable = 314,
+		MpsSwapsInFlight = 315
 	}
 
 	public enum NSSurfaceOrder {
@@ -2012,10 +2012,10 @@ public enum NSSurfaceOrder {
 	public enum NSOpenGLPixelFormatAttribute : uint { // uint32_t NSOpenGLPixelFormatAttribute
 		AllRenderers       =   1,
 		DoubleBuffer       =   5,
-		[Mac (10, 7)] TripleBuffer = 3,
+		TripleBuffer = 3,
 #if !XAMCORE_4_0
 		[Obsolete ("Use 'TripleBuffer' instead.")]
-		[Mac (10, 7)] TrippleBuffer = TripleBuffer,
+		TrippleBuffer = TripleBuffer,
 #endif
 		Stereo             =   6,
 		AuxBuffers         =   7,
@@ -2057,7 +2057,7 @@ public enum NSOpenGLPixelFormatAttribute : uint { // uint32_t NSOpenGLPixelForma
 		AcceleratedCompute =  97,
 
 		// Specify the profile
-		[Mac (10, 7)] OpenGLProfile = 99,
+		OpenGLProfile = 99,
 		VirtualScreenCount = 128,
 
 		[Deprecated (PlatformName.MacOSX, 10, 5)]
@@ -2096,7 +2096,7 @@ public enum NSOpenGLGlobalOption : uint {
 		FormatCacheSize = 501,
 		ClearFormatCache = 502,
 		RetainRenderers = 503,
-		[Mac (10, 7)] UseBuildCache = 506,
+		UseBuildCache = 506,
 		[Deprecated (PlatformName.MacOSX, 10, 4)]
 		ResetLibrary = 504
 	}
@@ -2405,7 +2405,6 @@ public enum NSWindowAnimationBehavior : long {
 		Default = 0, None = 2, DocumentWindow, UtilityWindow, AlertPanel
 	}
 
-	[Mac (10, 7)]
 	[Native]
 	public enum NSTextFinderAction : long {
 		ShowFindInterface = 1,

src/AppKit/NSAccessibility.cs

@@ -90,7 +90,6 @@ public static CGPoint GetPointInView (NSView parentView, CGPoint point)
 			return NSAccessibilityPointInView (parentView, point);
 		}
 
-		[Mac (10,7)]
 		[DllImport (Constants.AppKitLibrary)]
 		static extern void NSAccessibilityPostNotificationWithUserInfo (IntPtr element, IntPtr notification, IntPtr userInfo);
 

src/AppKit/NSColor.cs

@@ -247,7 +247,7 @@ public override string ToString ()
 			}
 		}
 
-		[Mac (10, 8)][Obsolete ("Use 'UnderPageBackgroundColor' instead.")]
+		[Obsolete ("Use 'UnderPageBackgroundColor' instead.")]
 		public static NSColor UnderPageBackground {
 			get {
 				return UnderPageBackgroundColor;

src/AppKit/NSStringAttributes.cs

@@ -362,13 +362,11 @@ public bool? MarkedClauseSegment {
 			set { Set (NSStringAttributeKey.MarkedClauseSegment, value); }
 		}
 
-		[Mac (10, 7)]
 		public NSTextLayoutOrientation? VerticalGlyphForm {
 			get { return (NSTextLayoutOrientation?)GetInt32Value (NSStringAttributeKey.VerticalGlyphForm); }
 			set { SetNumberValue (NSStringAttributeKey.VerticalGlyphForm, (int?)value); }
 		}
 
-		[Mac (10, 8)]
 		public NSTextAlternatives TextAlternatives {
 			get { return Get (NSStringAttributeKey.TextAlternatives, handle => new NSTextAlternatives (handle)); }
 			set { SetNativeValue (NSStringAttributeKey.TextAlternatives, value); }
@@ -520,13 +518,11 @@ public bool? MarkedClauseSegment {
 			set { Set (NSAttributedString.MarkedClauseSegmentAttributeName, value); }
 		}
 
-		[Mac (10, 7)]
 		public NSTextLayoutOrientation? VerticalGlyphForm {
 			get { return (NSTextLayoutOrientation?)GetInt32Value (NSAttributedString.VerticalGlyphFormAttributeName); }
 			set { SetNumberValue (NSAttributedString.VerticalGlyphFormAttributeName, (int?)value); }
 		}
 
-		[Mac (10, 8)]
 		public NSTextAlternatives TextAlternatives {
 			get { return Get (NSAttributedString.TextAlternativesAttributeName, handle => new NSTextAlternatives (handle)); }
 			set { SetNativeValue (NSAttributedString.TextAlternativesAttributeName, value); }

src/AppKit/XEnums.cs

@@ -11,15 +11,14 @@
 
 namespace AppKit {
 
-	[Mac (10, 7)]
 	[Native]
 	public enum NSTextLayoutOrientation : long {
 		Horizontal,
 		Vertical
 	}
 
 #if !XAMCORE_2_0
-	[Mac (10, 7), Flags]
+	[Flags]
 	[Native]
 	public enum NSTableViewAnimationOptions : ulong {
 		EffectFade = 0x1,
@@ -33,22 +32,19 @@ public enum NSTableViewAnimationOptions : ulong {
 	}
 #endif
 
-	[Mac (10, 7)]
 	[Native]
 	public enum NSPrintRenderingQuality : long {
 		Best,
 		Responsive
 	}
 
-	[Mac (10, 7)]
 	[Native]
 	public enum NSCorrectionIndicatorType : long {
 		Default = 0,
 		Reversion,
 		Guesses
 	}
 
-	[Mac (10, 7)]
 	[Native]
 	public enum NSCorrectionResponse : long {
 		None,
@@ -59,7 +55,6 @@ public enum NSCorrectionResponse : long {
 		Reverted
 	}
 
-	[Mac (10, 7)]
 	[Native]
 	public enum NSTextFinderMatchingType : long {
 		Contains = 0,

src/AudioToolbox/AudioQueue.cs

@@ -1296,11 +1296,9 @@ public AudioQueueStatus GetSourceAudio (uint numberOfFrames, ref AudioTimeStamp
 		                                                  out flags, out parentNumberOfFrames, (IntPtr) data);
 		}
 
-		[Mac (10,8)]
 		[DllImport (Constants.AudioToolboxLibrary)]
 		extern static AudioQueueStatus AudioQueueProcessingTapGetQueueTime (IntPtr inAQTap, out double outQueueSampleTime, out uint outQueueFrameCount);
 
-		[Mac (10,8)]
 		public AudioQueueStatus GetQueueTime (out double sampleTime, out uint frameCount)
 		{
 			return AudioQueueProcessingTapGetQueueTime (TapHandle, out sampleTime, out frameCount);

src/CoreFoundation/CFProxySupport.cs

@@ -254,7 +254,6 @@ public NSObject AutoConfigurationHTTPResponse {
 		}
 #endif
 
-		[Mac (10,7)]
 		public NSString AutoConfigurationJavaScript {
 			get {
 				if (AutoConfigurationJavaScriptKey == null)

src/CoreGraphics/CGPath.cs

@@ -73,7 +73,6 @@ public CGPath ()
 			handle = CGPathCreateMutable ();
 		}
 
-		[Mac(10,7)]
 		public CGPath (CGPath reference, CGAffineTransform transform)
 		{
 			if (reference == null)
@@ -571,25 +570,21 @@ extern unsafe static IntPtr CGPathCreateCopyByDashingPath (
 			/* CGFloat */ nfloat [] lengths,
 			/* size_t */ nint count);
 
-		[Mac(10,7)]
 		public CGPath CopyByDashingPath (CGAffineTransform transform, nfloat [] lengths)
 		{
 			return CopyByDashingPath (transform, lengths, 0);
 		}
 
-		[Mac(10,7)]
 		public unsafe CGPath CopyByDashingPath (CGAffineTransform transform, nfloat [] lengths, nfloat phase)
 		{
 			return MakeMutable (CGPathCreateCopyByDashingPath (handle, &transform, phase, lengths, lengths == null ? 0 : lengths.Length));
 		}
 
-		[Mac(10,7)]
 		public CGPath CopyByDashingPath (nfloat [] lengths)
 		{
 			return CopyByDashingPath (lengths, 0);
 		}
 
-		[Mac(10,7)]
 		public unsafe CGPath CopyByDashingPath (nfloat [] lengths, nfloat phase)
 		{
 			var path = CGPathCreateCopyByDashingPath (handle, null, phase, lengths, lengths == null ? 0 : lengths.Length);
@@ -604,13 +599,11 @@ public unsafe CGPath Copy ()
 		[DllImport (Constants.CoreGraphicsLibrary)]
 		unsafe extern static IntPtr CGPathCreateCopyByStrokingPath (/* CGPathRef */ IntPtr path, CGAffineTransform *transform, nfloat lineWidth, CGLineCap lineCap, CGLineJoin lineJoin, /* CGFloat */ nfloat miterLimit);
 
-		[Mac(10,7)]
 		public unsafe CGPath CopyByStrokingPath (CGAffineTransform transform, nfloat lineWidth, CGLineCap lineCap, CGLineJoin lineJoin, nfloat miterLimit)
 		{
 			return MakeMutable (CGPathCreateCopyByStrokingPath (handle, &transform, lineWidth, lineCap, lineJoin, miterLimit));
 		}
 
-		[Mac(10,7)]
 		public unsafe CGPath CopyByStrokingPath (nfloat lineWidth, CGLineCap lineCap, CGLineJoin lineJoin, nfloat miterLimit)
 		{
 			return MakeMutable (CGPathCreateCopyByStrokingPath (handle, null, lineWidth, lineCap, lineJoin, miterLimit));
@@ -630,13 +623,11 @@ public CGPath CopyByTransformingPath (CGAffineTransform transform)
 		[DllImport (Constants.CoreGraphicsLibrary)]
 		unsafe extern static IntPtr CGPathCreateWithEllipseInRect (CGRect boundingRect, CGAffineTransform *transform);
 
-		[Mac(10,7)]
 		static public unsafe CGPath EllipseFromRect (CGRect boundingRect, CGAffineTransform transform)
 		{
 			return MakeMutable (CGPathCreateWithEllipseInRect (boundingRect, &transform));
 		}
 
-		[Mac(10,7)]
 		static public unsafe CGPath EllipseFromRect (CGRect boundingRect)
 		{
 			return MakeMutable (CGPathCreateWithEllipseInRect (boundingRect, null));
@@ -645,13 +636,11 @@ static public unsafe CGPath EllipseFromRect (CGRect boundingRect)
 		[DllImport (Constants.CoreGraphicsLibrary)]
 		unsafe extern static IntPtr CGPathCreateWithRect (CGRect boundingRect, CGAffineTransform *transform);
 
-		[Mac(10,7)]
 		static public unsafe CGPath FromRect (CGRect rectangle, CGAffineTransform transform)
 		{
 			return MakeMutable (CGPathCreateWithRect (rectangle, &transform));
 		}
 
-		[Mac(10,7)]
 		static public unsafe CGPath FromRect (CGRect rectangle)
 		{
 			return MakeMutable (CGPathCreateWithRect (rectangle, null));