[Xamarin.Android.Build.Tasks] Fix Aapt2 warnings showing as errors (#2027)

Fixes (again): #1770

On Windows we are hitting the same issue where the warnings `aapt2`
is producing are being logged as errors.

The weird part is that the "file" group was not being populated
with the right information.  This turns out to be down to how
`aapt2` is reporting the warnings: there may be *spaces* within the
line number portion:

	W/ResourceType(23681): For resource 0x0101053d, entry index(1341) is beyond type entryCount(733)
	W/ResourceType( 5536): For resource 0x0101053d, entry index(1341) is beyond type entryCount(1155)
		       ^

This space throws off our regex and results in the entire line ending
up in the `message` property.  The fix is to update the regex to
allow spaces for the `line` capture group.  We then also need to Trim
that value before passing it into `int.Parse()` to ensure we don't
get an error.

Author: dellis1972

src/Xamarin.Android.Build.Tasks/Tasks/Aapt.cs

@@ -412,7 +412,7 @@ protected void LogEventsFromTextOutput (string singleLine, MessageImportance mes
 				var file = match.Groups["file"].Value;
 				int line = 0;
 				if (!string.IsNullOrEmpty (match.Groups["line"]?.Value))
-					line = int.Parse (match.Groups["line"].Value) + 1;
+					line = int.Parse (match.Groups["line"].Value.Trim ()) + 1;
 				var level = match.Groups["level"].Value.ToLowerInvariant ();
 				var message = match.Groups ["message"].Value;
 				if (message.Contains ("fakeLogOpen")) {

src/Xamarin.Android.Build.Tasks/Tasks/Aapt2.cs

@@ -103,13 +103,14 @@ protected bool LogAapt2EventsFromOutput (string singleLine, MessageImportance me
 				var file = match.Groups ["file"].Value;
 				int line = 0;
 				if (!string.IsNullOrEmpty (match.Groups ["line"]?.Value))
-					line = int.Parse (match.Groups ["line"].Value) + 1;
+					line = int.Parse (match.Groups ["line"].Value.Trim ()) + 1;
 				var level = match.Groups ["level"].Value.ToLowerInvariant ();
 				var message = match.Groups ["message"].Value;
 
 				// Handle the following which is NOT an error :(
 				// W/ResourceType(23681): For resource 0x0101053d, entry index(1341) is beyond type entryCount(733)
-				if (file.StartsWith ("W/")) {
+				// W/ResourceType( 3681): For resource 0x0101053d, entry index(1341) is beyond type entryCount(733)
+				if (file.StartsWith ("W/", StringComparison.OrdinalIgnoreCase)) {
 					LogCodedWarning ("APT0000", singleLine);
 					return true;
 				}

src/Xamarin.Android.Build.Tasks/Tasks/AndroidToolTask.cs

@@ -91,9 +91,9 @@ public static Regex AndroidErrorRegex {
  (?<path>
   (?<file>.+[\\/][^:\(]+)
   (
-   ([:](?<line>\d+))
+   ([:](?<line>[\d ]+))
    |
-   (\((?<line>\d+)\))
+   (\((?<line>[\d ]+)\))
   )?
  )
  \s*

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

@@ -130,6 +130,22 @@ public IEnumerator GetEnumerator ()
 					/*expectedLevel*/	"",
 					/*expectedMessage*/	"invalid resource directory name: bar-55"
 				};
+				yield return new object [] {
+					/*message*/		"W/ResourceType(23681): For resource 0x0101053d, entry index(1341) is beyond type entryCount(733)",
+					/*expectedToMatch*/	true,
+					/*expectedFile*/	"W/ResourceType",
+					/*expectedLine*/	"23681",
+					/*expectedLevel*/	"",
+					/*expectedMessage*/	"For resource 0x0101053d, entry index(1341) is beyond type entryCount(733)"
+				};
+				yield return new object [] {
+					/*message*/		"W/ResourceType( 5536): For resource 0x0101053d, entry index(1341) is beyond type entryCount(1155)",
+					/*expectedToMatch*/	true,
+					/*expectedFile*/	"W/ResourceType",
+					/*expectedLine*/	" 5536",
+					/*expectedLevel*/	"",
+					/*expectedMessage*/	"For resource 0x0101053d, entry index(1341) is beyond type entryCount(1155)"
+				};
 			}
 		}