Bump to mono:2019-02

.gitmodules

@@ -25,7 +25,7 @@
 [submodule "external/mono"]
     path = external/mono
     url = https://github.com/mono/mono.git
-    branch = 2018-10
+    branch = 2019-02
 [submodule "external/mxe"]
     path = external/mxe
     url = https://github.com/xamarin/mxe.git

Configuration.props

@@ -79,11 +79,11 @@
     <JavaInteropSourceDirectory Condition=" '$(JavaInteropSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\Java.Interop</JavaInteropSourceDirectory>
     <LlvmSourceDirectory Condition=" '$(LlvmSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\llvm</LlvmSourceDirectory>
     <MonoSourceDirectory>$(MSBuildThisFileDirectory)external\mono</MonoSourceDirectory>
-    <MonoRequiredMinimumVersion Condition=" '$(MonoRequiredMinimumVersion)' == '' ">5.20.0</MonoRequiredMinimumVersion>
-    <MonoRequiredMaximumVersion Condition=" '$(MonoRequiredMaximumVersion)' == '' ">5.21.0</MonoRequiredMaximumVersion>
+    <MonoRequiredMinimumVersion Condition=" '$(MonoRequiredMinimumVersion)' == '' ">6.0.0</MonoRequiredMinimumVersion>
+    <MonoRequiredMaximumVersion Condition=" '$(MonoRequiredMaximumVersion)' == '' ">6.1.0</MonoRequiredMaximumVersion>
     <IgnoreMaxMonoVersion Condition=" '$(IgnoreMaxMonoVersion)' == '' ">True</IgnoreMaxMonoVersion>
-    <MonoRequiredDarwinMinimumVersion>$(MonoRequiredMinimumVersion).249</MonoRequiredDarwinMinimumVersion>
-    <LinkerSourceDirectory>$(MSBuildThisFileDirectory)external\mono\external\linker</LinkerSourceDirectory>
+    <MonoRequiredDarwinMinimumVersion>$(MonoRequiredMinimumVersion).6</MonoRequiredDarwinMinimumVersion>
+    <LinkerSourceDirectory>$(MSBuildThisFileDirectory)external\mono\external\linker\src</LinkerSourceDirectory>
     <OpenTKSourceDirectory>$(MSBuildThisFileDirectory)external\opentk</OpenTKSourceDirectory>
     <MingwZlibRootDirectory Condition=" '$(ZlibRootDirectory)' == '' And '$(HostOS)' == 'Linux' ">\usr</MingwZlibRootDirectory>
     <MingwZlibRootDirectory Condition=" '$(ZlibRootDirectory)' == '' And '$(HostOS)' == 'Darwin' ">$(HostHomebrewPrefix)\opt\mingw-zlib\usr</MingwZlibRootDirectory>

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.20.0.217.macos10.xamarin.universal.pkg</_DarwinMonoFramework>
+    <_DarwinMonoFramework>MonoFramework-MDK-6.0.0.6.macos10.xamarin.universal.pkg</_DarwinMonoFramework>
     <_AptGetInstall>apt-get -f -u install</_AptGetInstall>
   </PropertyGroup>
   <ItemGroup>
@@ -38,7 +38,7 @@
       <MaximumVersion Condition=" '$(IgnoreMaxMonoVersion)' == '' Or '$(IgnoreMaxMonoVersion)' == 'False' " >$(MonoRequiredMaximumVersion)</MaximumVersion>
       <DarwinMinimumVersion>$(MonoRequiredDarwinMinimumVersion)</DarwinMinimumVersion>
       <CurrentVersionCommand>$(MSBuildThisFileDirectory)..\scripts\mono-version</CurrentVersionCommand>
-      <DarwinMinimumUrl>https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2018-10/196/2b6f395180b09cf31c849104f7774be3c04fd46f/$(_DarwinMonoFramework)</DarwinMinimumUrl>
+      <DarwinMinimumUrl>https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2019-02/7/12cadb2b21da7f1ad8f5999fd2c5ec8a127c5795/$(_DarwinMonoFramework)</DarwinMinimumUrl>
       <DarwinInstall>installer -pkg "$(AndroidToolchainCacheDirectory)\$(_DarwinMonoFramework)" -target /</DarwinInstall>
     </RequiredProgram>
   </ItemGroup>

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

@@ -363,6 +363,9 @@
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker\I18nAssemblies.cs">
       <Link>Linker\Linker\I18nAssemblies.cs</Link>
     </Compile>
+    <Compile Include="$(LinkerSourceFullPath)\linker\Linker\Inflater.cs">
+      <Link>Linker\Linker\Inflater.cs</Link>
+    </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker\IXApiVisitor.cs">
       <Link>Linker\Linker\IXApiVisitor.cs</Link>
     </Compile>
@@ -375,6 +378,9 @@
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker\MethodReferenceExtensions.cs">
       <Link>Linker\Linker\MethodReferenceExtensions.cs</Link>
     </Compile>
+    <Compile Include="$(LinkerSourceFullPath)\linker\Linker\OverrideInformation.cs">
+      <Link>Linker\Linker\OverrideInformation.cs</Link>
+    </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker\Pipeline.cs">
       <Link>Linker\Linker\Pipeline.cs</Link>
     </Compile>
@@ -456,6 +462,21 @@
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker\MarkingHelpers.cs">
       <Link>Linker\Linker\MarkingHelpers.cs</Link>
     </Compile>
+    <Compile Include="$(LinkerSourceFullPath)\linker\Linker\KnownMembers.cs">
+      <Link>Linker\Linker\KnownMembers.cs</Link>
+    </Compile>
+    <Compile Include="$(LinkerSourceFullPath)\linker\Linker\MethodDefinitionExtensions.cs">
+      <Link>Linker\Linker\MethodDefinitionExtensions.cs</Link>
+    </Compile>
+    <Compile Include="$(LinkerSourceFullPath)\linker\Linker\MethodBodyScanner.cs">
+      <Link>Linker\Linker\MethodBodyScanner.cs</Link>
+    </Compile>
+    <Compile Include="$(LinkerSourceFullPath)\linker\Linker\TypeDefinitionExtensions.cs">
+      <Link>Linker\Linker\TypeDefinitionExtensions.cs</Link>
+    </Compile>
+    <Compile Include="$(LinkerSourceFullPath)\linker\Linker\BCL.cs">
+      <Link>Linker\Linker\BCL.cs</Link>
+    </Compile>
     <Compile Include="Tasks\MergeResources.cs" />
     <Compile Include="Tasks\GetConvertedJavaLibraries.cs" />
     <Compile Include="Tasks\JavaCompileToolTask.cs" />
@@ -488,9 +509,6 @@
     <Compile Include="$(LinkerSourceFullPath)\tuner\Mono.Tuner\FixModuleFlags.cs">
       <Link>Linker\Mono.Tuner\FixModuleFlags.cs</Link>
     </Compile>
-    <Compile Include="$(LinkerSourceFullPath)\tuner\Mono.Tuner\PrintTypeMap.cs">
-      <Link>Linker\Mono.Tuner\PrintTypeMap.cs</Link>
-    </Compile>
     <Compile Include="$(LinkerSourceFullPath)\tuner\Mono.Tuner\PreserveCrypto.cs">
       <Link>Linker\Mono.Tuner\PreserveCrypto.cs</Link>
     </Compile>

src/mono-runtimes/ProfileAssemblies.projitems

@@ -193,6 +193,8 @@
     <MonoProfileAssembly Include="System.Xml.Serialization.dll" />
   </ItemGroup>
   <ItemGroup>
+    <MonoTestAssembly Include="BinarySerializationOverVersionsTest.dll">
+    </MonoTestAssembly>
     <MonoTestAssembly Include="monodroid_corlib_test.dll">
     </MonoTestAssembly>
     <MonoTestSatelliteAssembly Include="es-ES/monodroid_corlib_test.resources.dll" />
@@ -247,6 +249,12 @@
     <MonoTestAssembly Include="monodroid_System.Json_xunit-test.dll">
       <TestType>xunit</TestType>
     </MonoTestAssembly>
+    <MonoTestAssembly Include="monodroid_System.Net.Http.FunctionalTests_xunit-test.dll">
+      <TestType>xunit</TestType>
+    </MonoTestAssembly>
+    <MonoTestAssembly Include="monodroid_System.Net.Http.UnitTests_xunit-test.dll">
+      <TestType>xunit</TestType>
+    </MonoTestAssembly>
     <MonoTestAssembly Include="monodroid_System.Net.Http_test.dll">
     </MonoTestAssembly>
     <MonoTestAssembly Include="monodroid_System.Numerics_test.dll">
@@ -290,6 +298,8 @@
     <MonoTestAssembly Include="monodroid_System_xunit-test.dll">
       <TestType>xunit</TestType>
     </MonoTestAssembly>
+    <MonoTestAssembly Include="TestLoadAssembly.dll">
+    </MonoTestAssembly>
   </ItemGroup>
   <!-- Manual fixups -->
   <ItemGroup>

src/mono-runtimes/mono-runtimes.targets

@@ -189,7 +189,7 @@
           Include="@(_MonoRuntime->'$(MonoSourceFullPath)\sdks\out\android-%(Identity)-$(_MonoSdksConfiguration)\lib\%(NativeLibraryPrefix)libmono-native-compat.%(NativeLibraryExtension)')"
       />
       <_RuntimeSource
-          Condition=" 'host-Darwin' != '%(Identity)' And 'host-mxe-Win32' != '%(Identity)' And 'host-mxe-Win64' != '%(Identity)' "
+          Condition=" 'host-Darwin' != '%(Identity)' And 'host-mxe-Win32' != '%(Identity)' And 'host-mxe-Win64' != '%(Identity)'"
           Include="@(_MonoRuntime->'$(MonoSourceFullPath)\sdks\out\android-%(Identity)-$(_MonoSdksConfiguration)\lib\%(NativeLibraryPrefix)libmono-native.%(NativeLibraryExtension)')"
       />
       <_InstallRuntimeOutput
@@ -218,10 +218,21 @@
           Condition=" 'host-$(HostOS)' == '%(Identity)' "
           Include="@(_MonoRuntime->'$(MonoSourceFullPath)\sdks\out\android-%(Identity)-$(_MonoSdksConfiguration)\bin\mono')"
       />
+      <_RuntimeBinarySource
+          Condition=" 'host-$(HostOS)' == '%(Identity)' And 'host-mxe-Win32' != '%(Identity)' And 'host-mxe-Win64' != '%(Identity)'"
+          Include="@(_MonoRuntime->'$(MonoSourceFullPath)\sdks\out\android-%(Identity)-$(_MonoSdksConfiguration)\lib\%(NativeLibraryPrefix)libmono-native-compat.%(NativeLibraryExtension)')"
+      />
+
       <_InstallRuntimeBinaryOutput
           Condition=" 'host-$(HostOS)' == '%(Identity)' "
           Include="@(_MonoRuntime->'$(_MSBuildDir)\$(HostOS)\mono')"
       />
+
+      <_InstallRuntimeBinaryOutput
+          Condition=" 'host-$(HostOS)' == '%(Identity)' And 'host-mxe-Win32' != '%(Identity)' And 'host-mxe-Win64' != '%(Identity)'"
+          Include="@(_MonoRuntime->'$(_MSBuildDir)\$(HostOS)\libmono-native.%(NativeLibraryExtension)')"
+      />
+
       <_CrossRuntimeBinarySource
           Include="@(_MonoCrossRuntime->'$(MonoSourceFullPath)\sdks\out\android-%(Identity)-$(_MonoSdksConfiguration)\bin\%(ExePrefix)mono-sgen%(ExeSuffix)')"
       />

src/monodroid/jni/dylib-mono.cc

@@ -148,6 +148,7 @@ bool DylibMono::init (void *libmono_handle)
 	LOAD_SYMBOL(mono_profiler_set_jit_failed_callback)
 	LOAD_SYMBOL(mono_profiler_set_thread_started_callback)
 	LOAD_SYMBOL(mono_profiler_set_thread_stopped_callback)
+	LOAD_SYMBOL(mono_add_internal_call_with_flags)
 
 	if (XA_UNLIKELY (utils.should_log (LOG_TIMING))) {
 		total_time.mark_end ();

src/monodroid/jni/dylib-mono.h

@@ -377,6 +377,7 @@ class DylibMono
 
 	typedef void                   (*monodroid_mono_config_parse_memory_fptr) (const char *buffer);
 	typedef void                   (*monodroid_mono_add_internal_call_fptr) (const char *name, const void *method);
+	typedef void                   (*monodroid_mono_add_internal_call_with_flags_fptr) (const char *name, const void *method, mono_bool cooperative);
 	typedef MonoImage*             (*monodroid_mono_assembly_get_image_fptr) (void *arg0);
 	typedef MonoAssembly*          (*monodroid_mono_assembly_load_from_full_fptr) (MonoImage *image, const char *fname, MonoImageOpenStatus *status, mono_bool refonly);
 	typedef MonoAssembly*          (*monodroid_mono_assembly_load_full_fptr) (MonoAssemblyName *aname, const char *basedir, MonoImageOpenStatus* status, mono_bool refonly);
@@ -537,6 +538,7 @@ struct DylibMono {
 	monodroid_mono_check_corlib_version_fptr                        mono_check_corlib_version;
 
 	monodroid_mono_add_internal_call_fptr                           mono_add_internal_call;
+	monodroid_mono_add_internal_call_with_flags_fptr                mono_add_internal_call_with_flags;
 	monodroid_mono_config_for_assembly_fptr                         mono_config_for_assembly;
 
 	monodroid_mono_assembly_loaded_fptr                             mono_assembly_loaded;

tests/BCL-Tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.targets

@@ -22,7 +22,7 @@
       Outputs="@(MonoTestAssembly->'$(IntermediateOutputPath)%(Identity)')">
     <MakeDir Directories="$(IntermediateOutputPath)" />
     <ItemGroup>
-      <_Source  Include="@(MonoTestAssembly->'..\..\..\bin\$(Configuration)\bcl-tests\%(Identity)')" />
+      <_Source  Include="@(MonoTestAssembly->'..\..\..\bin\$(Configuration)\bcl-tests\%(Identity)')" Condition="%(MonoTestAssembly.TestType) != 'xunit'" />
     </ItemGroup>
     <ResolveAssemblyReference
         Assemblies="Xamarin.Android.NUnitLite"