Bump the toolchain and try to make AOT logs show in order

Author: grendello

build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs

@@ -15,7 +15,7 @@ namespace Xamarin.Android.Prepare
 	//
 	partial class Configurables
 	{
-		const string BinutilsVersion                = "L_13.0.1-B_2.37-3.0.0-beta2";
+		const string BinutilsVersion                = "L_13.0.1-B_2.37-3.0.0-beta3";
 
 		const string MicrosoftOpenJDK11Version      = "11.0.10";
 		const string MicrosoftOpenJDK11Release      = "9.1";

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs

@@ -132,9 +132,8 @@ public void SmokeTestBuildWithSpecialCharacters ([Values (false, true)] bool for
 				new XamarinAndroidApplicationProject ();
 			proj.ProjectName = testName;
 			proj.IsRelease = true;
-			// TODO: AOT fails https://github.com/xamarin/xamarin-android/issues/6685
-			// .NET 6 uses AOT by default for Release
-			proj.AotAssemblies = false;
+			proj.AotAssemblies = true;
+
 			if (forms) {
 				proj.PackageReferences.Clear ();
 				proj.PackageReferences.Add (KnownPackages.XamarinForms_4_7_0_1142);

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

@@ -305,6 +305,7 @@ protected bool BuildInternal (string projectOrSolution, string target, string []
 			}
 			args.Append ($" @\"{responseFile}\"");
 			using (var sw = new StreamWriter (responseFile, append: false, encoding: Encoding.UTF8)) {
+				sw.WriteLine ("/p:_DisableParallelAot=true");
 				sw.WriteLine ($" /p:BuildingInsideVisualStudio={BuildingInsideVisualStudio}");
 				if (BuildingInsideVisualStudio) {
 					sw.WriteLine (" /p:BuildingOutOfProcess=true");

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

@@ -148,7 +148,8 @@ List<string> GetDefaultCommandLineArgs (string verb, string target = null, strin
 				$"\"{projectOrSolution}\"",
 				"/noconsolelogger",
 				$"/flp1:LogFile=\"{BuildLogFile}\";Encoding=UTF-8;Verbosity={Verbosity}",
-				$"/bl:\"{Path.Combine (testDir, $"{binlog}.binlog")}\""
+				$"/bl:\"{Path.Combine (testDir, $"{binlog}.binlog")}\"",
+				"/p:_DisableParallelAot=true",
 			};
 			if (!string.IsNullOrEmpty (target)) {
 				arguments.Add ($"/t:{target}");