Revert "Bump to mono/mono@e66c7667 (dotnet#2701)"

This reverts commit b8c30f9.
jonpryor · May 1, 2019 · 8c0a7b7 · 8c0a7b7
1 parent e47da71
commit 8c0a7b7
Show file tree

Hide file tree

Showing 16 changed files with 15 additions and 75 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -29,7 +29,7 @@
 [submodule "external/mono"]
     path = external/mono
     url = https://github.com/mono/mono.git
-    branch = 2019-02
+    branch = 2018-10
 [submodule "external/mxe"]
     path = external/mxe
     url = https://github.com/xamarin/mxe.git

diff --git a/Configuration.props b/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)' == '' ">6.0.0</MonoRequiredMinimumVersion>
-    <MonoRequiredMaximumVersion Condition=" '$(MonoRequiredMaximumVersion)' == '' ">6.1.0</MonoRequiredMaximumVersion>
+    <MonoRequiredMinimumVersion Condition=" '$(MonoRequiredMinimumVersion)' == '' ">5.20.0</MonoRequiredMinimumVersion>
+    <MonoRequiredMaximumVersion Condition=" '$(MonoRequiredMaximumVersion)' == '' ">5.21.0</MonoRequiredMaximumVersion>
     <IgnoreMaxMonoVersion Condition=" '$(IgnoreMaxMonoVersion)' == '' ">True</IgnoreMaxMonoVersion>
-    <MonoRequiredDarwinMinimumVersion>$(MonoRequiredMinimumVersion).6</MonoRequiredDarwinMinimumVersion>
-    <LinkerSourceDirectory>$(MSBuildThisFileDirectory)external\mono\external\linker\src</LinkerSourceDirectory>
+    <MonoRequiredDarwinMinimumVersion>$(MonoRequiredMinimumVersion).249</MonoRequiredDarwinMinimumVersion>
+    <LinkerSourceDirectory>$(MSBuildThisFileDirectory)external\mono\external\linker</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>

diff --git a/build-tools/dependencies/dependencies.projitems b/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-6.0.0.6.macos10.xamarin.universal.pkg</_DarwinMonoFramework>
+    <_DarwinMonoFramework>MonoFramework-MDK-5.20.0.217.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/2019-02/7/12cadb2b21da7f1ad8f5999fd2c5ec8a127c5795/$(_DarwinMonoFramework)</DarwinMinimumUrl>
+      <DarwinMinimumUrl>https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2018-10/196/2b6f395180b09cf31c849104f7774be3c04fd46f/$(_DarwinMonoFramework)</DarwinMinimumUrl>
       <DarwinInstall>installer -pkg "$(AndroidToolchainCacheDirectory)\$(_DarwinMonoFramework)" -target /</DarwinInstall>
     </RequiredProgram>
   </ItemGroup>

diff --git a/build-tools/installers/create-installers.targets b/build-tools/installers/create-installers.targets
@@ -153,7 +153,6 @@
     <_MSBuildFilesUnix Include="$(MSBuildSrcDir)\$(HostOS)\illinkanalyzer" />
     <_MSBuildFilesUnix Include="$(MSBuildSrcDir)\$(HostOS)\jit-times" />
     <_MSBuildFilesUnix Include="$(MSBuildSrcDir)\$(HostOS)\mono" />
-    <_MSBuildFilesUnix Include="$(MSBuildSrcDir)\$(HostOS)\mono.config" />
     <_MSBuildFilesUnix Include="$(MSBuildSrcDir)\$(HostOS)\mono-symbolicate" />
     <_MSBuildFilesUnix Include="$(MSBuildSrcDir)\$(HostOS)\aapt2" />
     <_MSBuildFilesUnix Include="$(MSBuildSrcDir)\$(HostOS)\lib64\libc++.$(LibExtension)" />

diff --git a/build-tools/scripts/gen-ProfileAssemblies.sh b/build-tools/scripts/gen-ProfileAssemblies.sh
@@ -58,10 +58,6 @@ PrintTestItemGroup                    "external/mono/sdks/out/android-bcl/monodr
 cat <<EOF
   <!-- Manual fixups -->
   <ItemGroup>
-    <!-- Mono.CSharp testsuite dynamically loads Microsoft.CSharp -->
-    <MonoTestAssembly Include="Microsoft.CSharp.dll">
-      <TestType>reference</TestType>
-    </MonoTestAssembly>
     <!-- This is referenced by monodroid_corlib_xunit-test.dll -->
     <MonoTestAssembly Include="System.Runtime.CompilerServices.Unsafe.dll">
       <TestType>reference</TestType>

diff --git a/external/llvm b/external/llvm
diff --git a/external/mono b/external/mono
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs
@@ -309,9 +309,6 @@ public virtual void NuGetRestore (string directory, string packagesDirectory = n
 				RedirectStandardError = true,
 				RedirectStandardOutput = true,
 			};
-			//TODO: possibly remove this later?
-			psi.EnvironmentVariables.Add ("MONO_LOG_LEVEL", "debug");
-			Console.WriteLine ($"{psi.FileName} {psi.Arguments}");
 			using (var process = new Process {
 				StartInfo = psi,
 			}) {

diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
@@ -369,9 +369,6 @@
     <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>
@@ -384,9 +381,6 @@
     <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>
@@ -468,21 +462,6 @@
     <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" />
@@ -515,6 +494,9 @@
     <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>

diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets
@@ -272,9 +272,7 @@
     <_MonoScript Include="illinkanalyzer" />
     <_MonoScript Include="jit-times" />
     <_MonoScriptSource Include="@(_MonoScript->'$(_MonoScriptSourceDirectory)\%(Identity)')" />
-    <_MonoScriptSource Include="mono.config" />
     <_MonoScriptDestination Include="@(_MonoScript->'$(_MonoScriptDestinationDirectory)\%(Identity)')" />
-    <_MonoScriptDestination Include="$(_MonoScriptDestinationDirectory)\mono.config" />
   </ItemGroup>
 
   <Target Name="_BuildMonoScripts"

diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -2102,7 +2102,7 @@ because xbuild doesn't support framework reference assemblies.
     <_AssembliesToProcess Include="@(ResolvedAssemblies)" Condition=" '%(Filename)' != '' And '@(_JniFrameworkAssembly)' != '' " />
   </ItemGroup>
   <Exec
-       Command="MONO_CONFIG=&quot;$(MonoAndroidBinDirectory)mono.config&quot; MONO_PATH=&quot;$(_XATargetFrameworkDirectories):$(MonoAndroidLinkerInputDir)&quot; &quot;$(MonoAndroidBinDirectory)mono&quot; --debug &quot;$(MonoAndroidToolsDirectory)\jnimarshalmethod-gen.exe&quot; --jvm=&quot;$(JdkJvmPath)&quot; $(AndroidGenerateJniMarshalMethodsAdditionalArguments) @(_AssembliesToProcess->'&quot;$(MonoAndroidLinkerInputDir)%(Filename)%(Extension)&quot;', ' ')"
+       Command="MONO_PATH=&quot;$(_XATargetFrameworkDirectories):$(MonoAndroidLinkerInputDir)&quot; &quot;$(MonoAndroidBinDirectory)\mono&quot; --debug &quot;$(MonoAndroidToolsDirectory)\jnimarshalmethod-gen.exe&quot; --jvm=&quot;$(JdkJvmPath)&quot; $(AndroidGenerateJniMarshalMethodsAdditionalArguments) @(_AssembliesToProcess->'&quot;$(MonoAndroidLinkerInputDir)%(Filename)%(Extension)&quot;', ' ')"
   />
   <Touch Files="$(_AndroidJniMarshalMethodsFlag)" AlwaysCreate="True" />
 </Target>

diff --git a/src/Xamarin.Android.Build.Tasks/mono.config b/src/Xamarin.Android.Build.Tasks/mono.config
diff --git a/src/mono-runtimes/ProfileAssemblies.projitems b/src/mono-runtimes/ProfileAssemblies.projitems
@@ -193,8 +193,6 @@
     <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" />
@@ -249,12 +247,6 @@
     <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">
@@ -298,17 +290,9 @@
     <MonoTestAssembly Include="monodroid_System_xunit-test.dll">
       <TestType>xunit</TestType>
     </MonoTestAssembly>
-    <MonoTestAssembly Include="System.Reflection.TestModule.dll">
-    </MonoTestAssembly>
-    <MonoTestAssembly Include="TestLoadAssembly.dll">
-    </MonoTestAssembly>
   </ItemGroup>
   <!-- Manual fixups -->
   <ItemGroup>
-    <!-- Mono.CSharp testsuite dynamically loads Microsoft.CSharp -->
-    <MonoTestAssembly Include="Microsoft.CSharp.dll">
-      <TestType>reference</TestType>
-    </MonoTestAssembly>
     <!-- This is referenced by monodroid_corlib_xunit-test.dll -->
     <MonoTestAssembly Include="System.Runtime.CompilerServices.Unsafe.dll">
       <TestType>reference</TestType>

diff --git a/src/monodroid/jni/dylib-mono.cc b/src/monodroid/jni/dylib-mono.cc
@@ -148,7 +148,6 @@ 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 ();

diff --git a/src/monodroid/jni/dylib-mono.h b/src/monodroid/jni/dylib-mono.h
@@ -377,7 +377,6 @@ 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);
@@ -538,7 +537,6 @@ 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;

diff --git a/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.targets b/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.targets
@@ -7,9 +7,7 @@
       DependsOnTargets="_RemapAssemblies"
       BeforeTargets="ResolveAssemblyReferences">
     <ItemGroup>
-      <Reference Include="@(MonoTestAssembly->'$(IntermediateOutputPath)%(Identity)')">
-        <Private>False</Private>
-      </Reference>
+      <Reference Include="@(MonoTestAssembly->'$(IntermediateOutputPath)%(Identity)')" />
       <Reference Remove="$(IntermediateOutputPath)nunitlite.dll" />
       <_BclTestSatelliteAssemblySource  Include="@(MonoTestSatelliteAssembly->'..\..\..\bin\$(Configuration)\bcl-tests\%(Identity)')" />
       <_BclTestSatelliteAssemblyDest    Include="@(MonoTestSatelliteAssembly->'$(IntermediateOutputPath)%(Identity)')" />
@@ -24,7 +22,7 @@
       Outputs="@(MonoTestAssembly->'$(IntermediateOutputPath)%(Identity)')">
     <MakeDir Directories="$(IntermediateOutputPath)" />
     <ItemGroup>
-      <_Source  Include="@(MonoTestAssembly->'..\..\..\bin\$(Configuration)\bcl-tests\%(Identity)')" Condition="%(MonoTestAssembly.TestType) != 'xunit'" />
+      <_Source  Include="@(MonoTestAssembly->'..\..\..\bin\$(Configuration)\bcl-tests\%(Identity)')" />
     </ItemGroup>
     <ResolveAssemblyReference
         Assemblies="Xamarin.Android.NUnitLite"
@@ -34,11 +32,6 @@
     <Exec
         Command="$(RemapAssemblyRefTool) &quot;%(_Source.Identity)&quot; &quot;$(IntermediateOutputPath)%(_Source.Filename)%(_Source.Extension)&quot; nunitlite &quot;$(_NUnit)&quot;"
     />
-    <!-- Nothing to remap for the xunit tests, but we still need them in the intermediate output path in order to resolve their references. -->
-    <ItemGroup>
-      <_XunitTestAssembly Include="@(MonoTestAssembly->'..\..\..\bin\$(Configuration)\bcl-tests\%(Identity)')"  Condition="%(MonoTestAssembly.TestType) == 'xunit'" />
-    </ItemGroup>
-    <Copy SourceFiles="@(_XunitTestAssembly)" DestinationFolder="$(IntermediateOutputPath)" />
     <ItemGroup>
       <_DebugSymbol
           Include="..\..\..\bin\$(Configuration)\bcl-tests\%(MonoTestAssembly.Filename).pdb"