[build] Use Mono with MSBuild 16.10 (#6014)

Changes: xamarin/monodroid@1f2ce15...3653600

  * xamarin/monodroid@d111a7a: [tools/msbuild] Add additional fallbacks to GetPrimaryCpuAbi.
  * xamarin/monodroid@3653600: Bump to xamarin/androidtools@14e679e and ee49249

Changes:  dotnet/android-tools@49936d6...c055fa8

  * dotnet/android-tools@c055fa8: [Microsoft.Android.Build] Bump to MSBuild 16.10.0

We've been seeing a NuGet restore issue when running prepare on a macOS
system with .NET 6 Preview 4 (or greater) installed:

    Restoring packages for /Users/peter/source/java.interop/tools/logcat-parse/logcat-parse.csproj...
    NU1202: Package Mono.CSharp 4.0.0.143 is not compatible with net6.0 (.NETCoreApp,Version=v6.0). Package Mono.CSharp 4.0.0.143 supports: net45 (.NETFramework,Version=v4.5)
    ...
    Errors in /Users/peter/source/java.interop/tools/logcat-parse/logcat-parse.csproj
        NU1202: Package Mono.CSharp 4.0.0.143 is not compatible with net6.0 (.NETCoreApp,Version=v6.0). Package Mono.CSharp 4.0.0.143 supports: net45 (.NETFramework,Version=v4.5)

I have encountered other issues with .NET 6 Preview 4 and greater when
building some projects targeting net6.0:

    Version 'x' of the .NET Core SDK requires at least version 16.10.0 of MSBuild. The current available version of MSBuild is 16.9.0. Change the .NET Core SDK specified in global.json to an older version that requires the MSBuild version currently available.

These issues should be addressed by using MSBuild 16.10 on macOS.

Author: pjcollins

.external

@@ -1,2 +1,2 @@
-xamarin/monodroid:main@1f2ce156245ef1bf63ec8014882d283b3224216b
+xamarin/monodroid:main@36536006a74d9fa9b08b14301f73b2e7da93d75d
 mono/mono:2020-02@c633fe923832f0c3db3c4e6aa98e5592bf5a06e7

Configuration.props

@@ -93,8 +93,8 @@
     <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/2020-02/144/b4a385816ed4f1398d0184c38f19f560e868fd80/MonoFramework-MDK-6.12.0.137.macos10.xamarin.universal.pkg</MonoDarwinPackageUrl>
-    <MonoRequiredMinimumVersion Condition=" '$(MonoRequiredMinimumVersion)' == '' ">6.12.0.137</MonoRequiredMinimumVersion>
+    <MonoDarwinPackageUrl>https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2020-02/151/c633fe923832f0c3db3c4e6aa98e5592bf5a06e7/MonoFramework-MDK-6.12.0.145.macos10.xamarin.universal.pkg</MonoDarwinPackageUrl>
+    <MonoRequiredMinimumVersion Condition=" '$(MonoRequiredMinimumVersion)' == '' ">6.12.0.145</MonoRequiredMinimumVersion>
     <MonoRequiredMaximumVersion Condition=" '$(MonoRequiredMaximumVersion)' == '' ">$(MonoRequiredMinimumVersion)</MonoRequiredMaximumVersion>
     <IgnoreMaxMonoVersion Condition=" '$(IgnoreMaxMonoVersion)' == '' And '$(RunningOnCI)' == 'true' ">False</IgnoreMaxMonoVersion>
     <IgnoreMaxMonoVersion Condition=" '$(IgnoreMaxMonoVersion)' == '' ">True</IgnoreMaxMonoVersion>

external/xamarin-android-tools

@@ -10,13 +10,13 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="1.2.5.0" />
+        <bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="5.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="4.0.6.0" />
+        <bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="5.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/App.config

@@ -345,6 +345,11 @@ protected bool BuildInternal (string projectOrSolution, string target, string []
 			psi.EnvironmentVariables ["ghprbPullLongDescription"] =
 				psi.EnvironmentVariables ["BUILD_SOURCEVERSIONMESSAGE"] = "";
 
+			// Ensure any variable alteration from DotNetXamarinProject.Construct is cleared.
+			if (!Builder.UseDotNet && !TestEnvironment.IsWindows) {
+				psi.EnvironmentVariables ["MSBUILD_EXE_PATH"] = null;
+			}
+
 			psi.Arguments = args.ToString ();
 
 			psi.CreateNoWindow = true;

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/Builder.cs

@@ -53,6 +53,10 @@ protected bool Execute (params string [] args)
 				p.StartInfo.UseShellExecute = false;
 				p.StartInfo.RedirectStandardOutput = true;
 				p.StartInfo.RedirectStandardError = true;
+				// Ensure any variable alteration from DotNetXamarinProject.Construct is cleared.
+				if (!Builder.UseDotNet && !TestEnvironment.IsWindows) {
+					p.StartInfo.EnvironmentVariables ["MSBUILD_EXE_PATH"] = null;
+				}
 
 				p.ErrorDataReceived += (sender, e) => {
 					if (e.Data != null) {

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetCLI.cs

@@ -94,7 +94,20 @@ public void AddSources (params string [] sources)
 
 		public virtual ProjectRootElement Construct ()
 		{
-			var root = ProjectRootElement.Create ();
+			// Workaround for https://github.com/dotnet/msbuild/issues/2554 when using Microsoft.Build.Construction.ProjectRootElement.Create
+			var msbuildExePathVarName = "MSBUILD_EXE_PATH";
+			if (!Builder.UseDotNet && !TestEnvironment.IsWindows) {
+				Environment.SetEnvironmentVariable (msbuildExePathVarName, typeof (DotNetXamarinProject).Assembly.Location);
+			}
+			ProjectRootElement root = null;
+			try {
+				root = ProjectRootElement.Create ();
+			} finally {
+				if (!Builder.UseDotNet && !TestEnvironment.IsWindows) {
+					Environment.SetEnvironmentVariable (msbuildExePathVarName, null);
+				}
+			}
+
 			if (Packages.Any ())
 				root.AddItemGroup ().AddItem (BuildActions.None, "packages.config");
 			foreach (var pkg in Packages.Where (p => p.AutoAddReferences))

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetXamarinProject.cs

@@ -50,7 +50,6 @@
     <PackageReference Include="NuGet.Protocol" Version="$(NuGetApiPackageVersion)" />
     <PackageReference Include="NuGet.Versioning" Version="$(NuGetApiPackageVersion)" />
     <PackageReference Include="System.CodeDom" Version="4.7.0" />
-    <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
     <PackageReference Include="System.Reflection.Metadata" Version="1.8.0" />
     <PackageReference Include="System.Runtime" Version="4.3.1" />
     <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />