Bump mono to 5.6.0.0

.gitmodules

@@ -5,7 +5,7 @@
 [submodule "external/mono"]
 	path = external/mono
 	url = https://github.com/mono/mono.git
-	branch = 2017-06
+	branch = 2017-08
 [submodule "external/mxe"]
 	path = external/mxe
 	url = https://github.com/xamarin/mxe.git

Configuration.props

@@ -54,8 +54,8 @@
     <JavaInteropSourceDirectory Condition=" '$(JavaInteropSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\Java.Interop</JavaInteropSourceDirectory>
     <LlvmSourceDirectory Condition=" '$(LlvmSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\llvm</LlvmSourceDirectory>
     <MonoSourceDirectory>$(MSBuildThisFileDirectory)external\mono</MonoSourceDirectory>
-    <MonoRequiredMinimumVersion Condition=" '$(MonoRequiredMinimumVersion)' == '' ">5.4.0</MonoRequiredMinimumVersion>
-    <MonoRequiredDarwinMinimumVersion>$(MonoRequiredMinimumVersion).147</MonoRequiredDarwinMinimumVersion>
+    <MonoRequiredMinimumVersion Condition=" '$(MonoRequiredMinimumVersion)' == '' ">5.6.0</MonoRequiredMinimumVersion>
+    <MonoRequiredDarwinMinimumVersion>$(MonoRequiredMinimumVersion).0</MonoRequiredDarwinMinimumVersion>
     <LinkerSourceDirectory>$(MSBuildThisFileDirectory)external\linker</LinkerSourceDirectory>
     <OpenTKSourceDirectory>$(MSBuildThisFileDirectory)external\opentk</OpenTKSourceDirectory>
     <LibZipSourceDirectory Condition=" '$(LibZipSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\libzip</LibZipSourceDirectory>

build-tools/dependencies/dependencies.projitems

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <_DarwinMonoFramework>MonoFramework-MDK-5.4.0.147.macos10.xamarin.universal.pkg</_DarwinMonoFramework>
+    <_DarwinMonoFramework>MonoFramework-MDK-5.6.0.0.macos10.xamarin.universal.pkg</_DarwinMonoFramework>
     <_AptGetInstall>apt-get -f -u install</_AptGetInstall>
   </PropertyGroup>
   <ItemGroup>
@@ -58,7 +58,7 @@
       <MinimumVersion>$(MonoRequiredMinimumVersion)</MinimumVersion>
       <DarwinMinimumVersion>$(MonoRequiredDarwinMinimumVersion)</DarwinMinimumVersion>
       <CurrentVersionCommand>$(MSBuildThisFileDirectory)..\scripts\mono-version</CurrentVersionCommand>
-      <DarwinMinimumUrl>https://bosstoragemirror.blob.core.windows.net/wrench/mono-2017-06/28/28a417c2c0d1a2d1231d8b0a5beea3201208b57d/$(_DarwinMonoFramework)</DarwinMinimumUrl>
+      <DarwinMinimumUrl>https://bosstoragemirror.blob.core.windows.net/wrench/mono-2017-08/94/9417be0f1183e100e7c88953d5944e1a59d5ef5f/$(_DarwinMonoFramework)</DarwinMinimumUrl>
       <DarwinInstall>installer -pkg "$(AndroidToolchainCacheDirectory)\$(_DarwinMonoFramework)" -target /</DarwinInstall>
     </RequiredProgram>
   </ItemGroup>

build-tools/mono-runtimes/mono-runtimes.targets

@@ -274,11 +274,11 @@
       />
       <_RuntimeEglibHeaderSource
           Condition=" '%(_MonoRuntime.DoBuild)' == 'True' "
-          Include="@(_MonoRuntime->'$(IntermediateOutputPath)\%(Identity)\eglib\config.h');@(_MonoRuntime->'$(IntermediateOutputPath)\%(Identity)\eglib\src\eglib-config.h')"
+          Include="@(_MonoRuntime->'$(IntermediateOutputPath)\%(Identity)\eglib\src\eglib-config.h')"
       />
       <_RuntimeEglibHeaderOutput
           Condition=" '%(_MonoRuntime.DoBuild)' == 'True' "
-          Include="@(_MonoRuntime->'$(_OutputIncludeDir)%(Identity)\eglib\config.h');@(_MonoRuntime->'$(_OutputIncludeDir)%(Identity)\eglib\eglib-config.h')"
+          Include="@(_MonoRuntime->'$(_OutputIncludeDir)%(Identity)\eglib\eglib-config.h')"
       />
       <_MonoConstsSource
           Condition=" '%(_MonoRuntime.DoBuild)' == 'True' "

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs

@@ -1058,9 +1058,11 @@ public void CheckWhichRuntimeIsIncluded (string[] supportedAbi, bool debugSymbol
 						Assert.AreEqual (runtime.Size, inApkRuntime.Size, "expected {0} got {1}", expectedRuntime, inApkRuntime.Runtime);
 						inApk = ZipHelper.ReadFileFromZip (apk, string.Format ("lib/{0}/libmono-profiler-log.so", abi));
 						if (string.Compare (expectedRuntime, "debug", StringComparison.OrdinalIgnoreCase) == 0) {
-							Assert.IsNotNull (inApk, "libmono-profiler-log.so should exist in the apk.");
+							if (inApk == null)
+								Assert.Fail ("libmono-profiler-log.so should exist in the apk.");
 						} else {
-							Assert.IsNull (inApk, "libmono-profiler-log.so should not exist in the apk.");
+							if (inApk != null)
+								Assert.Fail ("libmono-profiler-log.so should not exist in the apk.");
 						}
 					}
 				}

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj

@@ -290,12 +290,12 @@
     <Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker\MethodAction.cs">
       <Link>Linker\Mono.Linker\MethodAction.cs</Link>
     </Compile>
-    <Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker\MethodReferenceExtensions.cs">
-      <Link>Linker\Mono.Linker\MethodReferenceExtensions.cs</Link>
-    </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker\Pipeline.cs">
       <Link>Linker\Mono.Linker\Pipeline.cs</Link>
     </Compile>
+    <Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker\MethodReferenceExtensions.cs">
+      <Link>Linker\Mono.Linker\MethodReferenceExtensions.cs</Link>
+    </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker\TypePreserve.cs">
       <Link>Linker\Mono.Linker\TypePreserve.cs</Link>
     </Compile>

src/monodroid/jni/monodroid-glue.c

@@ -3426,7 +3426,7 @@ set_trace_options (void)
 /* Profiler support cribbed from mono/metadata/profiler.c */
 
 typedef void (*ProfilerInitializer) (const char*);
-#define INITIALIZER_NAME "mono_profiler_startup"
+#define INITIALIZER_NAME "mono_profiler_init"
 
 static mono_bool
 load_profiler (void *handle, const char *desc, const char *symbol)
@@ -3470,7 +3470,7 @@ load_embedded_profiler (const char *desc, const char *name)
 }
 
 static mono_bool
-load_profiler_from_directory (const char *directory, const char *libname, const char *desc)
+load_profiler_from_directory (const char *directory, const char *libname, const char *desc, const char *name)
 {
 	char *full_name = path_combine (directory, libname);
 	int  exists     = file_exists (full_name);
@@ -3485,7 +3485,9 @@ load_profiler_from_directory (const char *directory, const char *libname, const
 	free (full_name);
 
 	if (h) {
-		mono_bool result = load_profiler (h, desc, INITIALIZER_NAME);
+		char *symbol = monodroid_strdup_printf ("%s_%s", INITIALIZER_NAME, name);
+		mono_bool result = load_profiler (h, desc, symbol);
+		free (symbol);
 		if (result)
 			return 1;
 		dlclose (h);
@@ -3515,18 +3517,18 @@ monodroid_profiler_load (const char *libmono_path, const char *desc, const char
 	for (oi = 0; oi < MAX_OVERRIDES; ++oi) {
 		if (!directory_exists (override_dirs [oi]))
 			continue;
-		if ((found = load_profiler_from_directory (override_dirs [oi], libname, desc)))
+		if ((found = load_profiler_from_directory (override_dirs [oi], libname, desc, mname)))
 			break;
 	}
 
 	do {
 		if (found)
 			break;
-		if ((found = load_profiler_from_directory (app_libdir, libname, desc)))
+		if ((found = load_profiler_from_directory (app_libdir, libname, desc, mname)))
 			break;
 		if ((found = load_embedded_profiler (desc, mname)))
 			break;
-		if (libmono_path != NULL && (found = load_profiler_from_directory (libmono_path, libname, desc)))
+		if (libmono_path != NULL && (found = load_profiler_from_directory (libmono_path, libname, desc, mname)))
 			break;
 	} while (0);