Bump to mono/2018-04

.gitmodules

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

Make.config

@@ -62,9 +62,9 @@ XCODE_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_9.4.xip
 XCODE_DEVELOPER_ROOT=/Applications/Xcode94.app/Contents/Developer
 
 # Minimum Mono version
-MIN_MONO_VERSION=5.12.0.226
-MAX_MONO_VERSION=5.12.99
-MIN_MONO_URL=https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2018-02/192/9824e260f56eb08b163e2c79d3338cd946aad7d6/MonoFramework-MDK-5.12.0.226.macos10.xamarin.universal.pkg
+MIN_MONO_VERSION=5.14.0.136
+MAX_MONO_VERSION=5.14.99
+MIN_MONO_URL=https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2018-04/111/07c8f25fe536dbb7e244f965aa3f9a871f41e953/MonoFramework-MDK-5.14.0.136.macos10.xamarin.universal.pkg
 
 # Minimum Visual Studio version
 MIN_VISUAL_STUDIO_URL=https://download.visualstudio.microsoft.com/download/pr/11550896/783d2219a348f93b6988fb415951788a/VisualStudioForMac-Preview-7.4.0.985.dmg

src/Compression/Compression.cs

@@ -202,8 +202,7 @@ public override int Read (byte[] array, int offset, int count)
 			return ReadCore (new Span<byte> (array, offset, count));
 		}
 
-		// FIXME needs Span
-		internal override int Read (Span<byte> destination)
+		public override int Read (Span<byte> destination)
 		{
 			if (GetType () != typeof (CompressionStream)) {
 				// CompressStream is not sealed, and a derived type may have overridden Read(byte[], int, int) prior
@@ -313,8 +312,7 @@ public override Task<int> ReadAsync (byte[] array, int offset, int count, Cancel
 			return ReadAsyncMemory (new Memory<byte>(array, offset, count), cancellationToken).AsTask ();
 		}
 
-		// FIXME needs Span
-		internal override ValueTask<int> ReadAsync (Memory<byte> destination, CancellationToken cancellationToken = default(CancellationToken))
+		public override ValueTask<int> ReadAsync (Memory<byte> destination, CancellationToken cancellationToken = default(CancellationToken))
 		{
 			if (GetType () != typeof (CompressionStream)) {
 				// Ensure that existing streams derived from DeflateStream and that override ReadAsync(byte[],...)
@@ -407,8 +405,7 @@ public override void Write (byte[] array, int offset, int count)
 			WriteCore (new ReadOnlySpan<byte> (array, offset, count));
 		}
 
-		// FIXME needs Span
-		internal override void Write (ReadOnlySpan<byte> source)
+		public override void Write (ReadOnlySpan<byte> source)
 		{
 			if (GetType () != typeof (CompressionStream)) {
 				// DeflateStream is not sealed, and a derived type may have overridden Write(byte[], int, int) prior
@@ -561,8 +558,7 @@ public override Task WriteAsync (byte[] array, int offset, int count, Cancellati
 			return WriteAsyncMemory (new ReadOnlyMemory<byte> (array, offset, count), cancellationToken);
 		}
 
-		// FIXME needs Span
-		internal override Task WriteAsync (ReadOnlyMemory<byte> source, CancellationToken cancellationToken)
+		public override Task WriteAsync (ReadOnlyMemory<byte> source, CancellationToken cancellationToken)
 		{
 			if (GetType () != typeof (CompressionStream)) {
 				// Ensure that existing streams derived from DeflateStream and that override WriteAsync(byte[],...)

tests/linker/ios/link all/AttributeTest.cs

@@ -125,6 +125,9 @@ static public bool Check ()
 	[Preserve (AllMembers = true)]
 	public class AttributeTest {
 
+		// Good enough to fool linker to abort the tracking
+		static string mscorlib = "mscorlib";
+
 		[Test]
 		public void DebugAssemblyAttributes ()
 		{
@@ -187,7 +190,7 @@ public void DebuggerTypeProxy_24203 ()
 		{
 			var d = new Dictionary<string,int> () { { "key", 0 } };
 			Assert.NotNull (d); // just to be 100% sure it won't be linked away (with the attribute we'll be looking for)
-			var proxy = Type.GetType ("System.Collections.Generic.Mscorlib_DictionaryDebugView`2, mscorlib");
+			var proxy = Type.GetType ("System.Collections.Generic.IDictionaryDebugView`2, " + mscorlib);
 #if DEBUG
 			Assert.NotNull (proxy, "proxy");
 			// having the type is nice, but it must not be empty to be useful
@@ -226,8 +229,8 @@ public void SecurityDeclaration ()
 			// we ensure that we can create the type / call the code
 			Assert.True (SecurityDeclarationDecoratedUserCode.Check (), "call");
 			// we ensure that both the permission and the flag are NOT part of the final/linked binary (link all removes security declarations)
-			Assert.Null (Type.GetType ("System.Security.Permissions.FileIOPermissionAttribute, mscorlib"), "FileIOPermissionAttribute");
-			Assert.Null (Type.GetType ("System.Security.Permissions.FileIOPermissionAccess, mscorlib"), "FileIOPermissionAccess");
+			Assert.Null (Type.GetType ("System.Security.Permissions.FileIOPermissionAttribute, " + mscorlib), "FileIOPermissionAttribute");
+			Assert.Null (Type.GetType ("System.Security.Permissions.FileIOPermissionAccess, " + mscorlib), "FileIOPermissionAccess");
 		}
 	}
 }

tests/linker/ios/link all/LinkAllTest.cs

@@ -192,10 +192,10 @@ public void DetectPlatform ()
 		{
 #if !__WATCHOS__
 			// for (future) nunit[lite] platform detection - if this test fails then platform detection won't work
-			Assert.NotNull (Type.GetType (NamespacePrefix + "UIKit.UIApplicationDelegate, " + AssemblyName), "UIApplicationDelegate");
+			Assert.NotNull (Helper.GetType (NamespacePrefix + "UIKit.UIApplicationDelegate, " + AssemblyName), "UIApplicationDelegate");
 #endif
 			// and you can trust the old trick with the linker
-			Assert.NotNull (Type.GetType ("Mono.Runtime"), "Mono.Runtime");
+			Assert.NotNull (Helper.GetType ("Mono.Runtime"), "Mono.Runtime");
 		}
 
 		[Test]
@@ -220,16 +220,16 @@ public void RemovedAttributes ()
 
 			// since we're linking the attributes will NOT be available - even if they are used
 #if !XAMCORE_3_0
-			Assert.Null (Type.GetType (prefix + "ObjCRuntime.AvailabilityAttribute, " + suffix), "AvailabilityAttribute");
-			Assert.Null (Type.GetType (prefix + "ObjCRuntime.iOSAttribute, " + suffix), "AvailabilityAttribute");
-			Assert.Null (Type.GetType (prefix + "ObjCRuntime.AvailabilityAttribute, " + suffix), "AvailabilityAttribute");
-			Assert.Null (Type.GetType (prefix + "ObjCRuntime.SinceAttribute, " + suffix), "SinceAttribute");
+			Assert.Null (Helper.GetType (prefix + "ObjCRuntime.AvailabilityAttribute, " + suffix), "AvailabilityAttribute");
+			Assert.Null (Helper.GetType (prefix + "ObjCRuntime.iOSAttribute, " + suffix), "AvailabilityAttribute");
+			Assert.Null (Helper.GetType (prefix + "ObjCRuntime.AvailabilityAttribute, " + suffix), "AvailabilityAttribute");
+			Assert.Null (Helper.GetType (prefix + "ObjCRuntime.SinceAttribute, " + suffix), "SinceAttribute");
 #endif
-			Assert.Null (Type.GetType (prefix + "ObjCRuntime.IntroducedAttribute, " + suffix), "IntroducedAttribute");
-			Assert.Null (Type.GetType (prefix + "ObjCRuntime.DeprecatedAttribute, " + suffix), "DeprecatedAttribute");
-			Assert.Null (Type.GetType (prefix + "ObjCRuntime.ObsoletedAttribute, " + suffix), "ObsoletedAttribute");
-			Assert.Null (Type.GetType (prefix + "ObjCRuntime.UnavailableAttribute, " + suffix), "UnavailableAttribute");
-			Assert.Null (Type.GetType (prefix + "ObjCRuntime.ThreadSafeAttribute, " + suffix), "ThreadSafeAttribute");
+			Assert.Null (Helper.GetType (prefix + "ObjCRuntime.IntroducedAttribute, " + suffix), "IntroducedAttribute");
+			Assert.Null (Helper.GetType (prefix + "ObjCRuntime.DeprecatedAttribute, " + suffix), "DeprecatedAttribute");
+			Assert.Null (Helper.GetType (prefix + "ObjCRuntime.ObsoletedAttribute, " + suffix), "ObsoletedAttribute");
+			Assert.Null (Helper.GetType (prefix + "ObjCRuntime.UnavailableAttribute, " + suffix), "UnavailableAttribute");
+			Assert.Null (Helper.GetType (prefix + "ObjCRuntime.ThreadSafeAttribute, " + suffix), "ThreadSafeAttribute");
 		}
 
 		[Test]
@@ -419,14 +419,14 @@ public void OpenTk10_Preserved ()
 			// Compiler optimization (roslyn release) can remove the variable, which removes OpenTK-1.dll from the app and fail the test
 			Assert.That (state, Is.EqualTo (OpenTK.WindowState.Normal), "normal");
 
-			var gl = Type.GetType ("OpenTK.Graphics.ES11.GL, OpenTK-1.0", false);
+			var gl = Helper.GetType ("OpenTK.Graphics.ES11.GL, OpenTK-1.0", false);
 			Assert.NotNull (gl, "ES11/GL");
-			var core = Type.GetType ("OpenTK.Graphics.ES11.GL/Core, OpenTK-1.0", false);
+			var core = Helper.GetType ("OpenTK.Graphics.ES11.GL/Core, OpenTK-1.0", false);
 			Assert.NotNull (core, "ES11/Core");
 
-			gl = Type.GetType ("OpenTK.Graphics.ES20.GL, OpenTK-1.0", false);
+			gl = Helper.GetType ("OpenTK.Graphics.ES20.GL, OpenTK-1.0", false);
 			Assert.NotNull (gl, "ES20/GL");
-			core = Type.GetType ("OpenTK.Graphics.ES20.GL/Core, OpenTK-1.0", false);
+			core = Helper.GetType ("OpenTK.Graphics.ES20.GL/Core, OpenTK-1.0", false);
 			Assert.NotNull (core, "ES20/Core");
 		}
 #endif // !__WATCHOS__
@@ -435,7 +435,7 @@ public void OpenTk10_Preserved ()
 		public void NestedNSObject ()
 		{
 			// Parent type is not used - but it's not linked out
-			var p = Type.GetType ("LinkAll.Parent");
+			var p = Helper.GetType ("LinkAll.Parent");
 			Assert.NotNull (p, "Parent");
 			// because a nested type is a subclass of NSObject (and not part of monotouch.dll)
 			var n = p.GetNestedType ("Derived");
@@ -539,7 +539,7 @@ public void AppleTls ()
 		{
 			// make test work for classic (monotouch) and unified (iOS, tvOS and watchOS)
 			var fqn = typeof (NSObject).AssemblyQualifiedName.Replace ("Foundation.NSObject", "Security.Tls.AppleTlsProvider");
-			Assert.Null (Type.GetType (fqn), "Should NOT be included (no SslStream or Socket support)");
+			Assert.Null (Helper.GetType (fqn), "Should NOT be included (no SslStream or Socket support)");
 		}
 
 		[Test]
@@ -548,7 +548,7 @@ public void WebKit_NSProxy ()
 		{
 			// this test works only because "Link all" does not use WebKit
 			var fqn = typeof (NSObject).AssemblyQualifiedName.Replace ("Foundation.NSObject", "Foundation.NSProxy");
-			Assert.Null (Type.GetType (fqn), fqn);
+			Assert.Null (Helper.GetType (fqn), fqn);
 		}
 
 		static Type type_Task = typeof (Task);

tests/linker/ios/link all/SerializationTest.cs

@@ -16,6 +16,22 @@
 #endif
 using NUnit.Framework;
 
+namespace LinkAll
+{
+	static class Helper
+	{
+		public static Type GetType (string name)
+		{
+			return Type.GetType (name);
+		}
+
+		public static Type GetType (string typeName, bool throwOnError)
+		{
+			return Type.GetType (typeName, throwOnError);
+		}
+	}
+}
+
 namespace LinkAll.Serialization {
 
 	[Serializable]
@@ -75,7 +91,7 @@ public class SerializationAttributeTests {
 		public void UnusedType ()
 		{
 			// the serialization attributes only keeps the method(s) if the type was used
-			var t = Type.GetType ("LinkAll.Serialization.Unused");
+			var t = Helper.GetType ("LinkAll.Serialization.Unused");
 			// since it's not used in the app then it's removed by the linker
 			Assert.Null (t, "type");
 		}
@@ -84,7 +100,7 @@ public void UnusedType ()
 		public void UsedType ()
 		{
 			// the serialization attributes only keeps the method(s) if the type was used
-			var t = Type.GetType ("LinkAll.Serialization.Used");
+			var t = Helper.GetType ("LinkAll.Serialization.Used");
 			// since it's used here...
 			Assert.NotNull (new Used (), "reference");
 			// it's not removed by the linker

tests/linker/ios/link sdk/LinkSdkRegressionTest.cs

@@ -436,14 +436,14 @@ public void OpenTk_Preserved ()
 #else
 			const string OpenTKAssembly = "OpenTK";
 #endif
-			var gl = Type.GetType ("OpenTK.Graphics.ES11.GL, " + OpenTKAssembly, false);
+			var gl = GetTypeHelper ("OpenTK.Graphics.ES11.GL, " + OpenTKAssembly, false);
 			Assert.NotNull (gl, "ES11/GL");
-			var core = Type.GetType ("OpenTK.Graphics.ES11.GL/Core, " + OpenTKAssembly, false);
+			var core = GetTypeHelper ("OpenTK.Graphics.ES11.GL/Core, " + OpenTKAssembly, false);
 			Assert.NotNull (core, "ES11/Core");
 
-			gl = Type.GetType ("OpenTK.Graphics.ES20.GL, " + OpenTKAssembly, false);
+			gl = GetTypeHelper ("OpenTK.Graphics.ES20.GL, " + OpenTKAssembly, false);
 			Assert.NotNull (gl, "ES20/GL");
-			core = Type.GetType ("OpenTK.Graphics.ES20.GL/Core, " + OpenTKAssembly, false);
+			core = GetTypeHelper ("OpenTK.Graphics.ES20.GL/Core, " + OpenTKAssembly, false);
 			Assert.NotNull (core, "ES20/Core");
 		}
 #endif // !__WATCHOS__
@@ -773,7 +773,7 @@ public void ForeignKey_650402 ()
 		public void Pointer_5200 ()
 		{
 			// ensure the linker did not remove the type, which is used by the runtime
-			Assert.NotNull (Type.GetType ("System.Reflection.Pointer, mscorlib"));
+			Assert.NotNull (GetTypeHelper ("System.Reflection.Pointer, mscorlib"));
 		}
 
 		[Test]
@@ -1065,8 +1065,8 @@ public void SecurityDeclaration ()
 			// we ensure that we can create the type / call the code
 			Assert.True (SecurityDeclarationDecoratedUserCode.Check (), "call");
 			// we ensure that both the permission and the flag are NOT part of the final/linked binary (link removes security declarations)
-			Assert.Null (Type.GetType ("System.Security.Permissions.FileIOPermissionAttribute, mscorlib"), "FileIOPermissionAttribute");
-			Assert.Null (Type.GetType ("System.Security.Permissions.FileIOPermissionAccess, mscorlib"), "FileIOPermissionAccess");
+			Assert.Null (GetTypeHelper ("System.Security.Permissions.FileIOPermissionAttribute, mscorlib"), "FileIOPermissionAttribute");
+			Assert.Null (GetTypeHelper ("System.Security.Permissions.FileIOPermissionAccess, mscorlib"), "FileIOPermissionAccess");
 		}
 
 #if !__WATCHOS__
@@ -1094,7 +1094,7 @@ public void UIButtonSubclass ()
 		[Test]
 		public void MonoRuntime34671 ()
 		{
-			Assert.NotNull (Type.GetType ("Mono.Runtime"), "Mono.Runtime");
+			Assert.NotNull (GetTypeHelper ("Mono.Runtime"), "Mono.Runtime");
 		}
 
 		[Test]
@@ -1119,15 +1119,15 @@ public void OldTlsProvider_LinkedOut ()
 		{
 			// make test work for classic (monotouch) and unified (iOS, tvOS and watchOS)
 			var fqn = typeof (NSObject).AssemblyQualifiedName.Replace ("Foundation.NSObject", "Security.Tls.OldTlsProvider");
-			Assert.Null (Type.GetType (fqn), "Should not be included");
+			Assert.Null (GetTypeHelper (fqn), "Should not be included");
 		}
 
 		[Test]
 		public void AppleTls_Default ()
 		{
 			// make test work for classic (monotouch) and unified (iOS, tvOS and watchOS)
 			var fqn = typeof (NSObject).AssemblyQualifiedName.Replace ("Foundation.NSObject", "Security.Tls.AppleTlsProvider");
-			Assert.Null (Type.GetType (fqn), "Should be included");
+			Assert.Null (GetTypeHelper (fqn), "Should be included");
 		}
 
 		[Test]
@@ -1138,7 +1138,18 @@ public void WebKit_NSProxy ()
 			var t = typeof (WKWebView);
 			Assert.NotNull (t, "avoid compiler optimization of unused variable"); 
 			var fqn = typeof (NSObject).AssemblyQualifiedName.Replace ("Foundation.NSObject", "Foundation.NSProxy");
-			Assert.NotNull (Type.GetType (fqn), fqn);
+			Assert.NotNull (GetTypeHelper (fqn), fqn);
+		}
+
+		// Fools linker not to keep the type by using it in test check
+		static Type GetTypeHelper (string name)
+		{
+			return Type.GetType (name);
+		}
+
+		static Type GetTypeHelper (string name, bool throwOnError)
+		{
+			return Type.GetType (name, throwOnError);
 		}
 	}
 }

tests/mmptest/regression/common/Test.cs

@@ -31,9 +31,12 @@ public static TextWriter Log {
 			}
 		}
 
+		static string linker_removed_type = "MonoMac.CoreImage.CIColor, XamMac";
+
 		public static void EnsureLinker (bool enabled)
 		{
-			if ((Type.GetType ("MonoMac.CoreImage.CIColor, XamMac") != null) == enabled) {
+
+			if ((Type.GetType (linker_removed_type) != null) == enabled) {
 				Log.WriteLine ("[FAIL]\tThe linker was {0}enabled on this build", enabled ? "not " : String.Empty);
 			}
 		}

tests/mmptest/regression/link-typedescriptor-1/LinkTypeDescriptor1.cs

@@ -18,6 +18,7 @@ public class CustomConverter : TypeConverter {
 	} 
 
 	class TypeDescriptorTest {
+		static string typeToCheck = "Xamarin.Mac.Linker.Test.CustomConverter";
 
 		static void Check (string typeName)
 		{
@@ -57,7 +58,7 @@ static void Main (string[] args)
 			Check ("System.ComponentModel.CollectionConverter");
 			Check ("System.ComponentModel.EnumConverter");
 
-			var t = Type.GetType ("Xamarin.Mac.Linker.Test.CustomConverter", false);
+			var t = Type.GetType (typeToCheck, false);
 			Test.Log.WriteLine ("{0}\tXamarin.Mac.Linker.Test.CustomConverter", t == null ? "[PASS]" : "[FAIL]");
 
 			Test.Terminate ();