Fix a handful of oopses

Author: grendello

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/AssertionExtensions.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -130,19 +131,30 @@ public static void AssertEntryContents (this ZipArchive zip, string zipPath, str
 		[DebuggerHidden]
 		public static void AssertHasNoWarnings (this ProjectBuilder builder)
 		{
-			Assert.IsTrue (StringAssertEx.ContainsText (builder.LastBuildOutput, " 0 Warning(s)"), $"{builder.BuildLogFile} should have no MSBuild warnings.");
+			AssertHasSomeWarnings (builder.LastBuildOutput, 0, builder.BuildLogFile);
+		}
+
+		[DebuggerHidden]
+		public static void AssertHasSomeWarnings (this ProjectBuilder builder, uint numOfExpectedWarnings)
+		{
+			AssertHasSomeWarnings (builder.LastBuildOutput, numOfExpectedWarnings, builder.BuildLogFile);
 		}
 
 		[DebuggerHidden]
 		public static void AssertHasNoWarnings (this DotNetCLI dotnet)
 		{
-			Assert.IsTrue (StringAssertEx.ContainsText (dotnet.LastBuildOutput, " 0 Warning(s)"), $"{dotnet.BuildLogFile} should have no MSBuild warnings.");
+			AssertHasSomeWarnings (dotnet.LastBuildOutput, 0, dotnet.BuildLogFile);
 		}
 
 		[DebuggerHidden]
 		public static void AssertHasSomeWarnings (this DotNetCLI dotnet, uint numOfExpectedWarnings)
 		{
-			Assert.IsTrue (StringAssertEx.ContainsText (dotnet.LastBuildOutput, $" {numOfExpectedWarnings} Warning(s)"), $"{dotnet.BuildLogFile} should have {numOfExpectedWarnings} MSBuild warnings.");
+			AssertHasSomeWarnings (dotnet.LastBuildOutput, numOfExpectedWarnings, dotnet.BuildLogFile);
+		}
+
+		static void AssertHasSomeWarnings (IEnumerable<string> lastBuildOutput, uint numOfExpectedWarnings, string logFile)
+		{
+			Assert.IsTrue (StringAssertEx.ContainsText (lastBuildOutput, $" {numOfExpectedWarnings} Warning(s)"), $"{logFile} should have {numOfExpectedWarnings} MSBuild warnings.");
 		}
 	}
 }

tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs

@@ -1500,7 +1500,7 @@ public MyTextObjectFont (PdfPageTextObjectFont font) : base (font)
 				// NativeAOT generates (twice, once per arch):
 				//   warning IL3053: Assembly 'Mono.Android' produced AOT analysis warnings.
 				//
-				int expected = runtime switch {
+				uint expected = runtime switch {
 					AndroidRuntime.CoreCLR   => 1,
 					AndroidRuntime.NativeAOT => 2,
 					_ => throw new NotSupportedException ($"Unsupported runtime '{runtime}'")