[tests] Reduce default build output verbosity (#9002)

Sets the default build verbosity for MSBuild desktop and device tests to
'normal' to reduce log sizes and hopefully slightly improve test run
timings.

Tests that need to validate target outputs or other build details have
been configured to use 'detailed' verbosity.

Runtime identifier information will no longer be gathered by reading
from the build log, we will instead read from the project file or assume
a default of 64-bit architectures.

Author: pjcollins

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

@@ -8,6 +8,7 @@
 using NUnit.Framework;
 using Xamarin.Android.Tools;
 using Xamarin.ProjectTools;
+using Microsoft.Build.Framework;
 
 namespace Xamarin.Android.Build.Tests
 {
@@ -45,6 +46,7 @@ public void InstallAndroidDependenciesTest ([Values ("GoogleV2", "Xamarin")] str
 				}
 
 				using (var b = CreateApkBuilder ()) {
+					b.Verbosity = LoggerVerbosity.Detailed;
 					b.CleanupAfterSuccessfulBuild = false;
 					string defaultTarget = b.Target;
 					b.Target = "InstallAndroidDependencies";
@@ -108,6 +110,7 @@ public void GetDependencyNdkRequiredConditions (string property, bool ndkRequire
 			proj.AotAssemblies = true;
 			proj.SetProperty (property, "true");
 			using (var builder = CreateApkBuilder ()) {
+				builder.Verbosity = LoggerVerbosity.Detailed;
 				builder.Target = "GetAndroidDependencies";
 				Assert.IsTrue (builder.Build (proj), "Build should have succeeded.");
 				IEnumerable<string> taskOutput = builder.LastBuildOutput
@@ -141,6 +144,7 @@ public void GetDependencyWhenBuildToolsAreMissingTest ()
 			};
 			string buildToolsVersion = GetExpectedBuildToolsVersion ();
 			using (var builder = CreateApkBuilder (Path.Combine (path, proj.ProjectName), cleanupAfterSuccessfulBuild: false, cleanupOnDispose: false)) {
+				builder.Verbosity = LoggerVerbosity.Detailed;
 				builder.ThrowOnBuildFailure = false;
 				builder.Target = "GetAndroidDependencies";
 				Assert.True (builder.Build (proj, parameters: parameters),
@@ -178,6 +182,7 @@ public void GetDependencyWhenSDKIsMissingTest ([Values (true, false)] bool creat
 
 			string buildToolsVersion = GetExpectedBuildToolsVersion ();
 			using (var builder = CreateApkBuilder (Path.Combine (path, proj.ProjectName), cleanupAfterSuccessfulBuild: false, cleanupOnDispose: false)) {
+				builder.Verbosity = LoggerVerbosity.Detailed;
 				builder.ThrowOnBuildFailure = false;
 				builder.Target = "GetAndroidDependencies";
 				Assert.True (builder.Build (proj, parameters: parameters),

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

@@ -958,6 +958,7 @@ public void BuildAppWithManagedResourceParser()
 			appProj.SetProperty ("AndroidUseManagedDesignTimeResourceGenerator", "True");
 			appProj.SetProperty ("AndroidUseDesignerAssembly", "false");
 			using (var appBuilder = CreateApkBuilder (Path.Combine (path, appProj.ProjectName))) {
+				appBuilder.Verbosity = LoggerVerbosity.Detailed;
 				Assert.IsTrue (appBuilder.DesignTimeBuild (appProj), "DesignTime Application Build should have succeeded.");
 				Assert.IsFalse (appProj.CreateBuildOutput (appBuilder).IsTargetSkipped ("_ManagedUpdateAndroidResgen"),
 					"Target '_ManagedUpdateAndroidResgen' should have run.");
@@ -1028,10 +1029,12 @@ public void BuildAppWithManagedResourceParserAndLibraries ()
 			appProj.SetProperty ("AndroidUseManagedDesignTimeResourceGenerator", "True");
 			appProj.SetProperty ("AndroidUseDesignerAssembly", "false");
 			using (var libBuilder = CreateDllBuilder (Path.Combine (path, libProj.ProjectName), false, false)) {
+				libBuilder.Verbosity = LoggerVerbosity.Detailed;
 				libBuilder.AutomaticNuGetRestore = false;
 				Assert.IsTrue (libBuilder.RunTarget (libProj, "Restore"), "Library project should have restored.");
 				libBuilder.ThrowOnBuildFailure = false;
 				using (var appBuilder = CreateApkBuilder (Path.Combine (path, appProj.ProjectName), false, false)) {
+					appBuilder.Verbosity = LoggerVerbosity.Detailed;
 					appBuilder.AutomaticNuGetRestore = false;
 					Assert.IsTrue (appBuilder.RunTarget (appProj, "Restore"), "App project should have restored.");
 					appBuilder.ThrowOnBuildFailure = false;
@@ -1209,6 +1212,7 @@ public void CustomViewAddResourceId ()
 			proj.LayoutMain = proj.LayoutMain.Replace ("</LinearLayout>", "<android.support.design.widget.BottomNavigationView android:id=\"@+id/navigation\" /></LinearLayout>");
 			proj.PackageReferences.Add (KnownPackages.AndroidXAppCompat);
 			using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
+				b.Verbosity = LoggerVerbosity.Detailed;
 				Assert.IsTrue (b.Build (proj), "first build should have succeeded");
 
 				//Add a new android:id
@@ -1237,6 +1241,7 @@ public void CheckNoVersionVectors ()
 		{
 			var proj = new XamarinFormsAndroidApplicationProject ();
 			using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
+				b.Verbosity = LoggerVerbosity.Detailed;
 				Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
 
 				string aaptCommand = "Executing link";

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

@@ -72,6 +72,7 @@ public void BuildBasicApplicationReleaseProfiledAot ([Values (true, false)] bool
 			proj.SetProperty ("EnableLLVM", enableLLVM.ToString ());
 			proj.SetProperty (proj.ActiveConfigurationProperties, "AndroidExtraAotOptions", "--verbose");
 			using var b = CreateApkBuilder ();
+			b.Verbosity = LoggerVerbosity.Detailed;
 			Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
 			AssertProfiledAotBuildMessages (b);
 		}
@@ -93,6 +94,7 @@ public void BuildBasicApplicationReleaseWithCustomAotProfile ()
 			proj.OtherBuildItems.Add (new BuildItem ("AndroidAotProfile", "custom.aotprofile") { BinaryContent = () => custom_aot_profile });
 
 			using var b = CreateApkBuilder ();
+			b.Verbosity = LoggerVerbosity.Detailed;
 			Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
 			AssertProfiledAotBuildMessages (b);
 		}
@@ -106,6 +108,7 @@ public void BuildBasicApplicationReleaseProfiledAotWithoutDefaultProfile ()
 			};
 			proj.SetProperty (proj.ActiveConfigurationProperties, "AndroidUseDefaultAotProfile", "false");
 			using var b = CreateApkBuilder ();
+			b.Verbosity = LoggerVerbosity.Detailed;
 			Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
 			StringAssertEx.DoesNotContainRegex (@$"Using profile data file.*dotnet\.aotprofile", b.LastBuildOutput, "Should not use default AOT profile", RegexOptions.IgnoreCase);
 		}

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

@@ -8,6 +8,7 @@
 using System.Xml.Linq;
 using Xamarin.ProjectTools;
 using Microsoft.Android.Build.Tasks;
+using Microsoft.Build.Framework;
 
 namespace Xamarin.Android.Build.Tests
 {
@@ -86,6 +87,7 @@ public void BindingLibraryIncremental (string classParser)
 			});
 			proj.AndroidClassParser = classParser;
 			using (var b = CreateDllBuilder ()) {
+				b.Verbosity = LoggerVerbosity.Detailed;
 				Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
 
 				var assemblyPath = Path.Combine (Root, b.ProjectDirectory, proj.OutputPath, $"{proj.ProjectName}.dll");
@@ -679,6 +681,7 @@ public void BindingWithAndroidJavaSource ()
 			};
 			using (var libBuilder = CreateDllBuilder (Path.Combine (path, lib.ProjectName), cleanupAfterSuccessfulBuild: false))
 			using (var appBuilder = CreateApkBuilder (Path.Combine (path, app.ProjectName))) {
+				libBuilder.Verbosity = LoggerVerbosity.Detailed;
 				Assert.IsTrue (libBuilder.Build (lib), "Library build should have succeeded.");
 				var generatedCode = Path.Combine (Root, libBuilder.ProjectDirectory, lib.IntermediateOutputPath,
 					"generated", "src", "Com.Xamarin.Android.Test.Msbuildtest.JavaSourceTestExtension.cs");

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

@@ -363,6 +363,7 @@ public void CheckItemMetadata ([Values (true, false)] bool isRelease)
 			mainAxml.MetadataValues = "CustomData=ResourceMetaDataOK";
 
 			using (var builder = CreateApkBuilder (string.Format ("temp/CheckItemMetadata_{0}", isRelease))) {
+				builder.Verbosity = LoggerVerbosity.Detailed;
 				builder.Build (proj);
 				StringAssertEx.Contains ("AssetMetaDataOK", builder.LastBuildOutput, "Metadata was not copied for AndroidAsset");
 				StringAssertEx.Contains ("ResourceMetaDataOK", builder.LastBuildOutput, "Metadata was not copied for AndroidResource");
@@ -698,6 +699,7 @@ public void BuildAfterUpgradingNuget ()
 				//[TearDown] will still delete if test outcome successful, I need logs if assertions fail but build passes
 				b.CleanupAfterSuccessfulBuild =
 					b.CleanupOnDispose = false;
+				b.Verbosity = LoggerVerbosity.Detailed;
 				var projectDir = Path.Combine (Root, b.ProjectDirectory);
 				if (Directory.Exists (projectDir))
 					Directory.Delete (projectDir, true);

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

@@ -54,6 +54,7 @@ public void MarshalMethodsDefaultEnabledStatus (bool isRelease, bool marshalMeth
 			bool shouldMarshalMethodsBeEnabled = isRelease && marshalMethodsEnabled;
 
 			using (var b = CreateApkBuilder ()) {
+				b.Verbosity = LoggerVerbosity.Diagnostic;
 				Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
 				Assert.IsTrue (
 					StringAssertEx.ContainsText (b.LastBuildOutput, $"_AndroidUseMarshalMethods = {shouldMarshalMethodsBeEnabled}"),
@@ -455,6 +456,7 @@ public void SkipConvertResourcesCases ()
 				WebContent = "https://repo1.maven.org/maven2/com/balysv/material-menu/1.1.0/material-menu-1.1.0.aar"
 			});
 			using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
+				b.Verbosity = LoggerVerbosity.Detailed;
 				Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
 				Assert.IsFalse (b.Output.IsTargetSkipped (target), $"`{target}` should not be skipped.");
 
@@ -1207,9 +1209,7 @@ public void BuildBasicApplicationCheckPdb ()
 			var proj = new XamarinAndroidApplicationProject ();
 			using (var b = CreateApkBuilder ()) {
 				Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
-				foreach (string rid in b.GetBuildRuntimeIdentifiers ()) {
-					string abi = MonoAndroidHelper.RidToAbi (rid);
-
+				foreach (string abi in proj.GetRuntimeIdentifiersAsAbis ()) {
 					Assert.IsTrue (File.Exists (Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath, $"android/assets/{abi}/UnnamedProject.pdb")),
 					               $"UnnamedProject.pdb must be copied to the Intermediate directory for ABI {abi}");
 				}
@@ -1223,18 +1223,14 @@ public void BuildBasicApplicationCheckPdbRepeatBuild ()
 			using (var b = CreateApkBuilder ()) {
 				Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
 
-				foreach (string rid in b.GetBuildRuntimeIdentifiers ()) {
-					string abi = MonoAndroidHelper.RidToAbi (rid);
-
+				foreach (string abi in proj.GetRuntimeIdentifiersAsAbis ()) {
 					Assert.IsTrue (File.Exists (Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath, $"android/assets/{abi}/UnnamedProject.pdb")),
 					               $"UnnamedProject.pdb must be copied to the Intermediate directory for ABI {abi}");
 				}
 
 				Assert.IsTrue (b.Build (proj), "second build failed");
 
-				foreach (string rid in b.GetBuildRuntimeIdentifiers ()) {
-					string abi = MonoAndroidHelper.RidToAbi (rid);
-
+				foreach (string abi in proj.GetRuntimeIdentifiersAsAbis ()) {
 					Assert.IsTrue (File.Exists (Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath, $"android/assets/{abi}/UnnamedProject.pdb")),
 					               $"UnnamedProject.pdb must be copied to the Intermediate directory for ABI {abi}");
 				}
@@ -1318,8 +1314,8 @@ public Class2 ()
 					};
 
 					string apkPath = Path.Combine (outputPath, proj.PackageName + "-Signed.apk");
-					var helper = new ArchiveAssemblyHelper (apkPath, useAssemblyStores: false, b.GetBuildRuntimeIdentifiers ().ToArray ());
-					foreach (string abi in b.GetBuildAbis ()) {
+					var helper = new ArchiveAssemblyHelper (apkPath, useAssemblyStores: false, proj.GetRuntimeIdentifiers ().ToArray ());
+					foreach (string abi in proj.GetRuntimeIdentifiersAsAbis ()) {
 						foreach ((string fileName, bool existsInBin) in fileNames) {
 							EnsureFilesAreTheSame (intermediate, existsInBin ? outputPath : null, fileName, abi, helper, uncompressIfNecessary: fileName.EndsWith (".dll", StringComparison.Ordinal));
 						}

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

@@ -427,7 +427,6 @@ public void BuildWithNativeLibraries ([Values (true, false)] bool isRelease)
 					}
 				}
 			}
-			Directory.Delete (path, recursive: true);
 		}
 
 		[Test]

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

@@ -20,6 +20,7 @@ sealed class LocalBuilder : Builder
 			public LocalBuilder ()
 			{
 				BuildingInsideVisualStudio = false;
+				Verbosity = LoggerVerbosity.Detailed;
 			}
 
 			public bool Build (string projectOrSolution, string target, string [] parameters = null, Dictionary<string, string> environmentVariables = null)

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

@@ -1,6 +1,7 @@
 using NUnit.Framework;
 using System.IO;
 using Xamarin.ProjectTools;
+using Microsoft.Build.Framework;
 
 namespace Xamarin.Android.Build.Tests
 {
@@ -19,6 +20,7 @@ public void SelectivelyRunUpdateAndroidResources ()
 			app.SetProperty ("AndroidUseIntermediateDesignerFile", "True");
 
 			using (var appBuilder = CreateApkBuilder (Path.Combine (path, app.ProjectName))) {
+				appBuilder.Verbosity = LoggerVerbosity.Detailed;
 				Assert.IsTrue (appBuilder.DesignTimeBuild (app, parameters: new string[]{
 					"BuildingInsideVisualStudio=true",
 					"DeferredBuildSupported=true",

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

@@ -5,6 +5,7 @@
 using System.Xml.Linq;
 using NUnit.Framework;
 using Xamarin.ProjectTools;
+using Microsoft.Build.Framework;
 
 namespace Xamarin.Android.Build.Tests
 {
@@ -214,6 +215,7 @@ public void GetExtraLibraryLocationsForDesigner ()
 			// Each NuGet package and AAR file are in libraryprojectimports.cache, AndroidJavaSource is not
 			const int libraryProjectImportsJars = 55;
 			using (var b = CreateApkBuilder (Path.Combine ("temp", TestName), false, false)) {
+				b.Verbosity = LoggerVerbosity.Detailed;
 				// GetExtraLibraryLocationsForDesigner on new project
 				Assert.IsTrue (b.RunTarget (proj, target, parameters: DesignerParameters), $"build should have succeeded for target `{target}` 1");