Address review feedback.

Author: jpobst

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

@@ -348,8 +348,7 @@ public class Package
 public class NuGetPackageVersionFinder
 {
 	readonly LockFile lock_file;
-	readonly Regex tag = new Regex ("artifact_versioned=(?<GroupId>.+)?:(?<ArtifactId>.+?):(?<Version>.+)\\s?", RegexOptions.Compiled);
-	readonly Regex tag2 = new Regex ("artifact=(?<GroupId>.+)?:(?<ArtifactId>.+?):(?<Version>.+)\\s?", RegexOptions.Compiled);
+	readonly static Regex tag = new Regex (@"artifact(?:_versioned)?=(?<GroupId>[^:\s;,]+):(?<ArtifactId>[^:\s;,]+):(?<Version>[^:\s;,]+)", RegexOptions.Compiled, TimeSpan.FromSeconds (1));
 
 	NuGetPackageVersionFinder (LockFile lockFile)
 	{
@@ -402,25 +401,24 @@ void AddArtifactsFromNuspec (List<Artifact> artifacts, string nugetPackagePath,
 		var reader = new NuGet.Packaging.NuspecReader (nuspec);
 		var tags = reader.GetTags ();
 
-		// Try the first tag format
-		AddMatchesToCollection (artifacts, tag.Matches (tags));
-
-		// Try the second tag format
-		AddMatchesToCollection (artifacts, tag2.Matches (tags));
+		AddArtifactsFromNuspecTags (artifacts, tags);
 
 		// TODO: Define a well-known file that can be included in the package like "java-package.txt"
 	}
 
-	void AddMatchesToCollection (List<Artifact> list, MatchCollection? matches)
+	public static void AddArtifactsFromNuspecTags (List<Artifact> artifacts, string tags)
 	{
+		// Try the first tag format
+		var matches = tag.Matches (tags);
+
 		if (matches is null || matches.Count == 0)
 			return;
 
 		foreach (Match match in matches) {
 			var artifact = new Artifact (match.Groups ["GroupId"].Value, match.Groups ["ArtifactId"].Value, match.Groups ["Version"].Value);
 
-			if (!list.Any (a => a.VersionedArtifactString == artifact.VersionedArtifactString))
-				list.Add (artifact);
+			if (!artifacts.Any (a => a.VersionedArtifactString == artifact.VersionedArtifactString))
+				artifacts.Add (artifact);
 		}
 	}
 }

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

@@ -212,7 +212,7 @@ public void DependencyFulfilledByProjectReferenceExplicitMetadata ()
 			],
 			ProjectReferences = [
 				CreateAndroidLibraryTaskItem ("Google.Material.Core.csproj", null, "com.google.android:material-core:1.0"),
-				CreateAndroidLibraryTaskItem ("Google.Material.Foo.csproj", null, "org.jetbrains.kotlin:kotlin-stdlib:2.0.0,com.google.android:material-foo:1.0"),
+				CreateAndroidLibraryTaskItem ("Google.Material.Foo.csproj", null, "org.jetbrains.kotlin:kotlin-stdlib:2.0.0;com.google.android:material-foo:1.0"),
 			],
 		};
 
@@ -238,7 +238,7 @@ public void DependencyFulfilledByPackageReferenceExplicitMetadata ()
 			],
 			PackageReferences = [
 				CreateAndroidLibraryTaskItem ("Xamarin.Google.Material.Core", null, "com.google.android:material-core:1.0"),
-				CreateAndroidLibraryTaskItem ("Xamarin.Google.Material.Foo", null, "org.jetbrains.kotlin:kotlin-stdlib:2.0.0,com.google.android:material-foo:1.0"),
+				CreateAndroidLibraryTaskItem ("Xamarin.Google.Material.Foo", null, "org.jetbrains.kotlin:kotlin-stdlib:2.0.0 com.google.android:material-foo:1.0"),
 			],
 		};
 
@@ -264,7 +264,7 @@ public void DependencyIgnored ()
 			],
 			IgnoredDependencies = [
 				CreateAndroidLibraryTaskItem ("com.google.android:material-core:1.0"),
-				CreateAndroidLibraryTaskItem ("org.jetbrains.kotlin:kotlin-stdlib:2.0.0,com.google.android:material-foo:1.0"),
+				CreateAndroidLibraryTaskItem ("org.jetbrains.kotlin:kotlin-stdlib:2.0.0\r\ncom.google.android:material-foo:1.0"),
 			],
 		};
 
@@ -320,6 +320,26 @@ public void DependencyWithoutVersionNotFulfilled ()
 		Assert.AreEqual ("Java dependency 'com.google.android:material-core' is not satisfied.", engine.Errors [0].Message);
 	}
 
+	[TestCase ("artifact_versioned=androidx.core:core:1.2.0", "androidx.core:core:1.2.0")]
+	[TestCase ("artifact_versioned=androidx.core:core", "")] // Invalid specification
+	[TestCase ("artifact_versioned=androidx.core:core:1.2.0 artifact_versioned=androidx.core:core:1.2.0", "androidx.core:core:1.2.0")]  // Duplicates are ignored
+	[TestCase ("artifact_versioned=androidx.core:core:1.2.0 artifact_versioned=androidx.window.extensions.core:core:1.0.0", "androidx.core:core:1.2.0|androidx.window.extensions.core:core:1.0.0")]
+	[TestCase ("artifact_versioned=androidx.core:core:1.2.0 artifact=androidx.window.extensions.core:core:1.13.1", "androidx.core:core:1.2.0|androidx.window.extensions.core:core:1.13.1")]
+	[TestCase ("artifact=androidx.core:core:1.2.0 artifact=androidx.window.extensions.core:core:1.13.1", "androidx.core:core:1.2.0|androidx.window.extensions.core:core:1.13.1")]
+	public void AddArtifactsFromNuspecTagsTests (string tags, string expected)
+	{
+		var results = new List<Artifact> ();
+
+		NuGetPackageVersionFinder.AddArtifactsFromNuspecTags (results, tags);
+
+		if (!expected.HasValue ()) {
+			Assert.IsEmpty (results);
+			return;
+		}
+
+		Assert.AreEqual (expected, string.Join ("|", results.Select (p => p.VersionedArtifactString)));
+	}
+
 	TaskItem CreateAndroidLibraryTaskItem (string name, string? manifest = null, string? javaArtifact = null)
 	{
 		var item = new TaskItem (name);

src/Xamarin.Android.Build.Tasks/Utilities/MavenExtensions.cs

@@ -18,7 +18,7 @@ namespace Xamarin.Android.Tasks;
 static class MavenExtensions
 {
 	static readonly char [] separator = [':'];
-	static readonly char [] artifacts_separators = [';', ',', '\r', '\n'];
+	static readonly char [] artifacts_separators = [';', ',', '\r', '\n', '\t', ' '];
 
 	/// <summary>
 	/// Shortcut for !string.IsNullOrWhiteSpace (s)