Bump to mono/mono@d90665a4 (#4219)

Changes: mono/api-snapshot@53a841f...5b8247e

	$ git diff --shortstat 53a841ff...5b8247e2
	 9 files changed, 572 insertions(+), 13 deletions(-)

Changes: mono/corefx@1cdb9c2...7c9e215

	$ git diff --shortstat 1cdb9c20...7c9e2158
	 24 files changed, 2393 insertions(+), 396 deletions(-)

Changes: dotnet/cecil@a6a7f5c...8021f3f

	$ git diff --shortstat a6a7f5c0...8021f3fb
	 16 files changed, 98 insertions(+), 25 deletions(-)

Changes: dotnet/linker@e8d054b...e1c7a72

	$ git diff --shortstat e8d054bf...e1c7a729
	 220 files changed, 9758 insertions(+), 3165 deletions(-)

Changes: mono/mono@2ff8988...d90665a

	$ git diff --shortstat 2ff89885...d90665a4
	 612 files changed, 20193 insertions(+), 10239 deletions(-)

Context: mono/mono#9726
Context: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1048838
Context: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1050615
Context: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1069059
Context: mono/mono#10643
Context: mono/mono#10651
Context: mono/mono#12022
Context: mono/mono#12995
Context: mono/mono#15612
Context: mono/mono#16513
Context: mono/mono#16588
Context: mono/mono#16778
Context: mono/mono#16969
Context: mono/mono#17140
Context: mono/mono#17601
Context: mono/mono#17869
Context: mono/mono#17878
Context: mono/mono#17916
Context: mono/mono#17926
Context: mono/mono#17980
Context: mono/mono#18006
Context: mono/mono#18019
Context: mono/mono#18020
Context: mono/mono#18030
Context: mono/mono#18061
Context: mono/mono#18064
Context: mono/mono#18106
Context: mono/mono#18120
Context: mono/mono#18191
Context: mono/mono#18202
Context: mono/mono#18213
Context: mono/mono#18221
Context: mono/mono#18247
Context: mono/mono#18273
Context: mono/mono#18276
Context: mono/mono#18317
Context: mono/mono#18323
Context: mono/mono#18364
Context: mono/mono#18370
Context: mono/mono#18417
Context: mono/mono#18418
Context: mono/mono#18455
Context: mono/mono#18506
Context: mono/mono#18524
Context: mono/mono#18530
Context: mono/mono#18554
Context: mono/mono#18572
Context: mono/mono#18578
Context: mono/mono#18584
Context: mono/mono#18612
Context: mono/mono#18614
Context: mono/mono#18675
Context: mono/mono#18676
Context: mono/mono#18925
Context: mono/mono#19009
Context: https://issuetracker.unity3d.com/issues/unity-physics-collisions-do-not-work-and-errors-are-thrown-when-entering-play-mode
Context: https://xamarin.github.io/bugzilla-archives/20/20233/bug.html

.external

@@ -1,2 +1,2 @@
 xamarin/monodroid:master@34f5275d1db891e25af17d743b425cc318e6e7df
-mono/mono:2019-12@2ff898859b8b75f123a5c895959a7e82dc829ea5
+mono/mono:2020-02@d90665a422e9f8d015585b3ca381d74faa033cc4

Configuration.props

@@ -80,9 +80,9 @@
     <AndroidSupportedTargetJitAbis Condition=" '$(AndroidSupportedTargetJitAbis)' == '' ">armeabi-v7a:arm64-v8a:x86:x86_64</AndroidSupportedTargetJitAbis>
     <JavaInteropSourceDirectory Condition=" '$(JavaInteropSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\Java.Interop</JavaInteropSourceDirectory>
     <MonoSourceDirectory>$(MSBuildThisFileDirectory)external\mono</MonoSourceDirectory>
-    <MonoDarwinPackageUrl>https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2019-12/51/fe455fcb344f19200271b6426c3108f20cc0880e/MonoFramework-MDK-6.10.0.50.macos10.xamarin.universal.pkg</MonoDarwinPackageUrl>
-    <MonoRequiredMinimumVersion Condition=" '$(MonoRequiredMinimumVersion)' == '' ">6.10.0.50</MonoRequiredMinimumVersion>
-    <MonoRequiredMaximumVersion Condition=" '$(MonoRequiredMaximumVersion)' == '' ">6.10.99</MonoRequiredMaximumVersion>
+    <MonoDarwinPackageUrl>https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2020-02/43/f0ce5105d47bb3b465c2763f9dfc3eaee860540f/MonoFramework-MDK-6.12.0.41.macos10.xamarin.universal.pkg</MonoDarwinPackageUrl>
+    <MonoRequiredMinimumVersion Condition=" '$(MonoRequiredMinimumVersion)' == '' ">6.12.0.41</MonoRequiredMinimumVersion>
+    <MonoRequiredMaximumVersion Condition=" '$(MonoRequiredMaximumVersion)' == '' ">6.12.99</MonoRequiredMaximumVersion>
     <IgnoreMaxMonoVersion Condition=" '$(IgnoreMaxMonoVersion)' == '' And '$(RunningOnCI)' == 'true' ">False</IgnoreMaxMonoVersion>
     <IgnoreMaxMonoVersion Condition=" '$(IgnoreMaxMonoVersion)' == '' ">True</IgnoreMaxMonoVersion>
     <LinkerSourceDirectory>$(MSBuildThisFileDirectory)external\mono\sdks\out\android-sources\external\linker\src</LinkerSourceDirectory>

Makefile

@@ -208,7 +208,9 @@ prepare-help: prepare-build
 
 .PHONY: prepare-update-mono
 prepare-update-mono: prepare-build
+	pgrep -lfi VBCSCompiler.exe
 	mono --debug $(PREPARE_EXE) $(_PREPARE_ARGS) -s:UpdateMono
+	pgrep -lfi VBCSCompiler.exe
 
 prepare-external-git-dependencies: prepare-build
 	mono --debug $(PREPARE_EXE) $(_PREPARE_ARGS) -s:PrepareExternalGitDependencies

Xamarin.Android.sln

@@ -50,6 +50,9 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "monodroid", "src\monodroid\monodroid.csproj", "{53EE4C57-1C03-405A-8243-8DA539546C88}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.NUnitLite", "src\Xamarin.Android.NUnitLite\Xamarin.Android.NUnitLite.csproj", "{4D603AA3-3BFD-43C8-8050-0CD6C2601126}"
+	ProjectSection(ProjectDependencies) = postProject
+		{3F1F2F50-AF1A-4A5A-BEDB-193372F068D7} = {3F1F2F50-AF1A-4A5A-BEDB-193372F068D7}
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483}"
 EndProject
@@ -58,6 +61,9 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Build.Tests", "src\Xamarin.Android.Build.Tasks\Tests\Xamarin.Android.Build.Tests\Xamarin.Android.Build.Tests.csproj", "{53E4ABF0-1085-45F9-B964-DCAE4B819998}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.EnterpriseServices", "src\System.EnterpriseServices\System.EnterpriseServices.csproj", "{2868FC32-A4E7-4008-87C8-2C7879CACB58}"
+	ProjectSection(ProjectDependencies) = postProject
+		{3F1F2F50-AF1A-4A5A-BEDB-193372F068D7} = {3F1F2F50-AF1A-4A5A-BEDB-193372F068D7}
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "unix-distribution-setup", "build-tools\unix-distribution-setup\unix-distribution-setup.csproj", "{2CF172E5-BDAE-4ABA-8BC8-08040ED3E77A}"
 EndProject
@@ -68,6 +74,9 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sqlite-xamarin", "src\sqlite-xamarin\sqlite-xamarin.csproj", "{B8F799C5-D7CE-4E09-9CE6-BAA4173E7EC8}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTK", "src\OpenTK-1.0\OpenTK.csproj", "{5EB9E888-E357-417E-9F39-DDEC195CE47F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{3F1F2F50-AF1A-4A5A-BEDB-193372F068D7} = {3F1F2F50-AF1A-4A5A-BEDB-193372F068D7}
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Cecil", "external\Java.Interop\src\Xamarin.Android.Cecil\Xamarin.Android.Cecil.csproj", "{15945D4B-FF56-4BCC-B598-2718D199DD08}"
 EndProject

build-tools/automation/azure-pipelines.yaml

@@ -262,6 +262,7 @@ stages:
         solution: Xamarin.Android.sln
         configuration: $(XA.Build.Configuration)
         msbuildArguments: /t:Build /bl:$(System.DefaultWorkingDirectory)\bin\Build$(XA.Build.Configuration)\msbuild-build.binlog
+        maximumCpuCount: true
 
     - task: MSBuild@1
       displayName: msbuild create-vsix

build-tools/scripts/MSBuildReferences.projitems

@@ -16,10 +16,6 @@
       <SpecificVersion>True</SpecificVersion>
       <HintPath>$(MSBuildToolsPath)\Microsoft.Build.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Build.Engine, Version=$(MSBuildReferenceVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(OS)' != 'Windows_NT' ">
-      <SpecificVersion>True</SpecificVersion>
-      <HintPath>$(MSBuildToolsPath)\Microsoft.Build.Engine.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.Build.Framework, Version=$(MSBuildReferenceVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(OS)' != 'Windows_NT' ">
       <SpecificVersion>True</SpecificVersion>
       <HintPath>$(MSBuildToolsPath)\Microsoft.Build.Framework.dll</HintPath>

src/Mono.Android/Test/Xamarin.Android.Net/AndroidClientHandlerTests.cs

@@ -27,6 +27,7 @@
 //
 
 using System;
+using System.Reflection;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
@@ -236,13 +237,29 @@ static bool IsSecureChannelFailure (Exception e)
 			return Exceptions (e).Any (v => (v as WebException)?.Status == WebExceptionStatus.SecureChannelFailure);
 		}
 
+		static Type GetInnerHandlerType (HttpClient httpClient)
+		{
+			BindingFlags bflasgs = BindingFlags.Instance | BindingFlags.NonPublic;
+			FieldInfo handlerField = typeof (HttpMessageInvoker).GetField("_handler", bflasgs);
+			Assert.IsNotNull (handlerField);
+			object handler = handlerField.GetValue (httpClient);
+			FieldInfo innerHandlerField = handler.GetType ().GetField ("_delegatingHandler", bflasgs);
+			Assert.IsNotNull (handlerField);
+			object innerHandler = innerHandlerField.GetValue (handler);
+			return innerHandler.GetType ();
+		}
+
 		[Test]
 		public void Sanity_Tls_1_2_Url_WithMonoClientHandlerFails ()
 		{
 			var tlsProvider   = global::System.Environment.GetEnvironmentVariable ("XA_TLS_PROVIDER");
 			var supportTls1_2 = tlsProvider.Equals ("btls", StringComparison.OrdinalIgnoreCase);
 			using (var c = new HttpClient (new HttpClientHandler ())) {
 				try {
+					Assert.AreEqual ("SocketsHttpHandler", GetInnerHandlerType (c).Name, 
+						"Underlying HttpClientHandler is expected to use SocketsHttpHandler by default. " + 
+						"XA_HTTP_CLIENT_HANDLER_TYPE=" + global::System.Environment.GetEnvironmentVariable ("XA_HTTP_CLIENT_HANDLER_TYPE"));
+
 					var tr = ConnectIgnoreFailure (() => c.GetAsync (Tls_1_2_Url), out bool connectionFailed);
 					if (connectionFailed)
 						return;

src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FixAbstractMethodsStep.cs

@@ -32,7 +32,7 @@ protected override void ProcessAssembly (AssemblyDefinition assembly)
 			if (IsProductOrSdkAssembly (assembly))
 				return;
 
-			CheckAppDomainUsageUnconditional (assembly, (string msg) => Context.Logger.LogMessage (MessageImportance.High, msg));
+			CheckAppDomainUsageUnconditional (assembly, (string msg) => Context.LogMessage (MessageImportance.High, msg));
 
 			if (FixAbstractMethodsUnconditional (assembly)) {
 				Context.SafeReadSymbols (assembly);
@@ -209,7 +209,7 @@ bool FixAbstractMethods (TypeDefinition type)
 				var iface    = ifaceInfo.InterfaceType;
 				var ifaceDef = iface.Resolve ();
 				if (ifaceDef == null) {
-					LogMessage ("Unable to unresolve interface: {0}", iface.FullName);
+					LogMessage ($"Unable to unresolve interface: {iface.FullName}");
 					continue;
 				}
 				if (ifaceDef.HasGenericParameters)
@@ -257,7 +257,7 @@ void AddNewExceptionMethod (TypeDefinition type, MethodDefinition method)
 
 			type.Methods.Add (newMethod);
 
-			LogMessage ("Added method: {0} to type: {1} scope: {2}", method, type.FullName, type.Scope);
+			LogMessage ($"Added method: {method} to type: {type.FullName} scope: {type.Scope}");
 		}
 
 		MethodReference abstractMethodErrorConstructor;
@@ -287,9 +287,9 @@ void AddNewExceptionMethod (TypeDefinition type, MethodDefinition method)
 			}
 		}
 
-		public virtual void LogMessage (string message, params object [] values)
+		public virtual void LogMessage (string message)
 		{
-			Context.LogMessage (message, values);
+			Context.LogMessage (message);
 		}
 
 		protected virtual AssemblyDefinition GetMonoAndroidAssembly ()

src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/StripEmbeddedLibraries.cs

@@ -27,7 +27,7 @@ protected override void ProcessAssembly (AssemblyDefinition assembly)
 			foreach (var mod in assembly.Modules) {
 				foreach (var r in mod.Resources.ToArray ()) {
 					if (ShouldStripResource (r)) {
-						Context.LogMessage ("    Stripped {0} from {1}", r.Name, fileName);
+						Context.LogMessage ($"    Stripped {r.Name} from {fileName}");
 						mod.Resources.Remove (r);
 						assembly_modified = true;
 					}

src/Xamarin.Android.Build.Tasks/Tasks/LinkAssembliesNoShrink.cs

@@ -106,9 +106,9 @@ protected override AssemblyDefinition GetMonoAndroidAssembly ()
 				return resolver.GetAssembly ("Mono.Android.dll");
 			}
 
-			public override void LogMessage (string message, params object [] values)
+			public override void LogMessage (string message)
 			{
-				logger.LogDebugMessage (message, values);
+				logger.LogDebugMessage ("{0}", message);
 			}
 		}
 	}

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

@@ -15,6 +15,7 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <DefineConstants>$(DefineConstants);TRACE;HAVE_CECIL;MSBUILD;ANDROID_24</DefineConstants>
     <AndroidGeneratedClassDirectory Condition=" '$(AndroidGeneratedClassDirectory)' == '' ">..\..\src\Mono.Android\obj\$(Configuration)\android-$(AndroidLatestStableApiLevel)\mcw</AndroidGeneratedClassDirectory>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -171,6 +172,21 @@
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\PreserveDependencyLookupStep.cs">
       <Link>Linker\Linker.Steps\PreserveDependencyLookupStep.cs</Link>
     </Compile>
+    <Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\BodySubstituterStep.cs">
+      <Link>Linker\Linker.Steps\BodySubstituterStep.cs</Link>
+    </Compile>
+    <Compile Include="$(LinkerSourceFullPath)\linker\Linker\IDependencyRecorder.cs">
+      <Link>Linker\Linker\IDependencyRecorder.cs</Link>
+    </Compile>
+    <Compile Include="$(LinkerSourceFullPath)\linker\Linker\IReflectionPatternRecorder.cs">
+      <Link>Linker\Linker\IReflectionPatternRecorder.cs</Link>
+    </Compile>
+    <Compile Include="$(LinkerSourceFullPath)\linker\Linker\LoggingReflectionPatternRecorder.cs">
+      <Link>Linker\Linker\LoggingReflectionPatternRecorder.cs</Link>
+    </Compile>
+    <Compile Include="$(LinkerSourceFullPath)\linker\Linker\XmlDependencyRecorder.cs">
+      <Link>Linker\Linker\XmlDependencyRecorder.cs</Link>
+    </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker\LoadException.cs">
       <Link>Linker\Linker\LoadException.cs</Link>
     </Compile>