[xaprepare] Replace msbuild with dotnet build (#6388)

As part of a broader effort to `dotnet build` all the things, replace
all usage of `msbuild` in xaprepare with `dotnet build`.

I've also attempted to simplify local and external prepare steps, as
there seemed to be a lot of duplicated restore logic in the various
`make` and `msbuild` invocations in those steps.

These changes should hopefully solve or reduce the frequency of the
Linux failures we've been seeing during various restore operations:

	stderr |   The SSL connection could not be established, see inner exception.
	stderr |   Authentication failed, see inner exception.
	stderr |   Ssl error:1000007d:SSL routines:OPENSSL_internal:CERTIFICATE_VERIFY_FAILED
	stderr |     at /build/mono-6.12.0.147/external/boringssl/ssl/handshake_client.c:1132

Author: pjcollins

build-tools/automation/azure-pipelines.yaml

@@ -423,10 +423,6 @@ stages:
       workingDirectory: $(System.DefaultWorkingDirectory)/xamarin-android
       displayName: make prepare-external-git-dependencies
 
-    - script: make prepare PREPARE_CI=1 PREPARE_AUTOPROVISION=1 CONFIGURATION=$(XA.Build.Configuration)
-      workingDirectory: $(System.DefaultWorkingDirectory)/xamarin-android
-      displayName: make prepare
-
     - script: make jenkins PREPARE_CI=1 PREPARE_AUTOPROVISION=1 CONFIGURATION=$(XA.Build.Configuration)
       workingDirectory: $(System.DefaultWorkingDirectory)/xamarin-android
       displayName: make jenkins

build-tools/xaprepare/xaprepare/Steps/Step_PrepareExternal.Unix.cs

@@ -15,29 +15,21 @@ protected override async Task<bool> Execute (Context context)
 			var msbuild = new MSBuildRunner (context);
 
 			string slnPath = Path.Combine (Configurables.Paths.ExternalDir, "debugger-libs", "debugger-libs.sln");
-			bool result = await msbuild.Run (
+			bool result = await msbuild.Restore (
 				projectPath: slnPath,
 				logTag: "debugger-libs-restore",
-				arguments: new List <string> {
-				   "/t:Restore"
-			    },
 				binlogName: "prepare-debugger-libs-restore"
 			);
 
 			if (!result)
 				return false;
 
-			return await ExecuteOSSpecific (context);
+			return await msbuild.Restore (
+				projectPath: Path.Combine (Configurables.Paths.ExternalXamarinAndroidToolsSln),
+				logTag: "xat-restore",
+				binlogName: "prepare-xat-restore"
+			);
 		}
 
-		async Task<bool> NuGetRestore (NuGetRunner nuget, string solutionFilePath)
-		{
-			if (!await nuget.Restore (solutionFilePath)) {
-				Log.ErrorLine ($"NuGet restore for solution {solutionFilePath} failed");
-				return false;
-			}
-
-			return true;
-		}
 	}
 }

build-tools/xaprepare/xaprepare/Steps/Step_PrepareExternal.Windows.cs

@@ -16,33 +16,18 @@ async Task<bool> ExecuteOSSpecific (Context context)
 			var make = new MakeRunner (context) {
 				NoParallelJobs = true
 			};
-			var result = await make.Run (
-				logTag: "java-interop-prepare",
+			return await make.Run (
+				logTag: "java-interop-prepare-core",
 				workingDirectory: javaInteropDir,
 				arguments: new List <string> {
-					"prepare",
+					"prepare-core",
 					$"CONFIGURATION={context.Configuration}",
 					$"JI_JAVA_HOME={context.OS.JavaHome}",
 					$"JAVA_HOME={context.OS.JavaHome}",
 					$"JI_MAX_JDK={Configurables.Defaults.MaxJDKVersion}",
 					$"DOTNET_TOOL_PATH={dotnetTool}"
 				}
 			);
-			if (!result)
-				return false;
-
-			Log.StatusLine ();
-			result = await make.Run (
-				logTag: "java-interop-props",
-				workingDirectory: javaInteropDir,
-				arguments: new List <string> {
-					$"bin/Build{context.Configuration}/JdkInfo.props",
-					$"CONFIGURATION={context.Configuration}",
-					$"JI_MAX_JDK={Configurables.Defaults.MaxJDKVersion}",
-					$"DOTNET_TOOL_PATH={dotnetTool}"
-				}
-			);
-			return result;
 		}
 	}
 }

build-tools/xaprepare/xaprepare/Steps/Step_PrepareExternal.cs

@@ -9,19 +9,6 @@ partial class Step_PrepareExternalJavaInterop
 #pragma warning disable CS1998
 		async Task<bool> ExecuteOSSpecific (Context context)
 		{
-			string javaInteropDir = context.Properties.GetRequiredValue (KnownProperties.JavaInteropFullPath);
-			string projectPath = Path.Combine (javaInteropDir, "build-tools", "Java.Interop.BootstrapTasks", "Java.Interop.BootstrapTasks.csproj");
-			var msbuild = new MSBuildRunner (context);
-			bool result = await msbuild.Run (
-				projectPath: projectPath,
-				logTag: "java-interop-prepare",
-				binlogName: "build-java-interop-prepare"
-			);
-
-			if (!result) {
-				Log.ErrorLine ("Failed to build java-interop-prepare");
-				return false;
-			}
 			return true;
 		}
 #pragma warning restore CS1998

build-tools/xaprepare/xaprepare/Steps/Step_PrepareExternalJavaInterop.Unix.cs

@@ -12,7 +12,29 @@ public Step_PrepareExternalJavaInterop ()
 
 		protected override async Task<bool> Execute (Context context)
 		{
-			return await ExecuteOSSpecific (context);
+			// make prepare-core on Unix
+			var result = await ExecuteOSSpecific (context);
+			if (!result)
+				return false;
+
+			string javaInteropDir = context.Properties.GetRequiredValue (KnownProperties.JavaInteropFullPath);
+			var dotnetPath = context.Properties.GetRequiredValue (KnownProperties.DotNetPreviewPath);
+			var dotnetTool = Path.Combine (dotnetPath, "dotnet");
+			var msbuild = new MSBuildRunner (context);
+
+			return await msbuild.Run (
+				projectPath: Path.Combine (javaInteropDir, "Java.Interop.sln"),
+				logTag: "java-interop-prepare",
+				arguments: new List<string> {
+				   "-t:Prepare",
+				   $"-p:MaximumJdkVersion={Configurables.Defaults.MaxJDKVersion}",
+				   $"-p:MaxJdkVersion={Configurables.Defaults.MaxJDKVersion}",
+				   $"-p:JdksRoot={context.OS.JavaHome}",
+				   $"-p:DotnetToolPath={dotnetTool}"
+				},
+				binlogName: "java-interop-prepare",
+				workingDirectory: javaInteropDir
+			);
 		}
 	}
 }

build-tools/xaprepare/xaprepare/Steps/Step_PrepareExternalJavaInterop.Windows.cs

@@ -10,29 +10,22 @@ public Step_PrepareLocal ()
 			: base ("Preparing local components")
 		{}
 
-		async Task<bool> Restore (MSBuildRunner msbuild, string csprojPath, string logTag, string binLogName, string additionalArgument = null)
-		{
-			var args = new List<string> { "/t:Restore" };
-			if (additionalArgument != null)
-				args.Add (additionalArgument);
-
-			return await msbuild.Run (
-				projectPath: csprojPath,
-				logTag: logTag,
-				arguments: args,
-				binlogName: binLogName
-			);
-		}
 
 		protected override async Task<bool> Execute(Context context)
 		{
 			var msbuild = new MSBuildRunner (context);
-
 			string xfTestPath = Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "tests", "Xamarin.Forms-Performance-Integration", "Xamarin.Forms.Performance.Integration.csproj");
-			if (!await Restore (msbuild, xfTestPath, "xfperf", "prepare-restore"))
+
+			if (!await msbuild.Restore (projectPath: xfTestPath, logTag: "xfperf", binlogName: "prepare-local"))
 				return false;
 
-			return await Restore (msbuild, xfTestPath, "xfperf", "prepare-restore", "/p:BundleAssemblies=true");
+			// The Xamarin.Forms PackageReference version varies based on the value of $(BundleAssemblies)
+			return await msbuild.Restore (
+				projectPath: xfTestPath,
+				logTag: "xfperfbundle",
+				arguments: new List<string> { "-p:BundleAssemblies=true" },
+				binlogName: "prepare-local-bundle"
+			);
 		}
 	}
 }

build-tools/xaprepare/xaprepare/Steps/Step_PrepareExternalJavaInterop.cs

@@ -7,8 +7,8 @@ namespace Xamarin.Android.Prepare
 {
 	partial class MSBuildRunner : ToolRunner
 	{
-		protected override string DefaultToolExecutableName => "msbuild";
-		protected override string ToolName                  => "MSBuild";
+		protected override string DefaultToolExecutableName => "dotnet";
+		protected override string ToolName                  => "dotnet";
 
 		public List<string> StandardArguments { get; }
 
@@ -18,8 +18,8 @@ public MSBuildRunner (Context context, Log? log = null, string? msbuildPath = nu
 			ProcessTimeout = TimeSpan.FromMinutes (30);
 
 			StandardArguments = new List<string> {
-				$"/p:Configuration={context.Configuration}",
-				"/restore",
+				"build", // dotnet build includes implicit restore
+				$"-p:Configuration={context.Configuration}",
 			};
 		}
 
@@ -32,11 +32,12 @@ public async Task<bool> Run (string projectPath, string logTag, List<string>? ar
 				workingDirectory = BuildPaths.XamarinAndroidSourceRoot;
 
 			ProcessRunner runner = CreateProcessRunner ();
+
 			AddArguments (runner, StandardArguments);
 			if (!String.IsNullOrEmpty (binlogName)) {
 				string logPath = Utilities.GetRelativePath (workingDirectory!, Path.Combine (Configurables.Paths.BuildBinDir, $"msbuild-{Context.BuildTimeStamp}-{binlogName}.binlog"));
-				runner.AddArgument ("/v:normal");
-				runner.AddQuotedArgument ($"/bl:{logPath}");
+				runner.AddArgument ("-v:n");
+				runner.AddQuotedArgument ($"-bl:{logPath}");
 			}
 			AddArguments (runner, arguments);
 			runner.AddQuotedArgument (Utilities.GetRelativePath (workingDirectory!, projectPath));
@@ -60,6 +61,21 @@ public async Task<bool> Run (string projectPath, string logTag, List<string>? ar
 			}
 		}
 
+		public async Task<bool> Restore (string projectPath, string logTag, List<string>? arguments = null, string? binlogName = null, string? workingDirectory = null)
+		{
+			var args = new List<string> { "-t:Restore" };
+			if (arguments != null)
+				args.AddRange (arguments);
+
+			return await Run (
+				projectPath: projectPath,
+				logTag: logTag,
+				arguments: args,
+				binlogName: binlogName,
+				workingDirectory: workingDirectory
+			);
+		}
+
 		protected override TextWriter CreateLogSink (string? logFilePath)
 		{
 			return new OutputSink (Log, logFilePath);