Move some of assembly packaging code to a helper class

Author: grendello

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

@@ -432,10 +432,10 @@ void AddAssemblies (ZipArchiveEx apk, bool debug, bool compress, IDictionary<And
 			}
 
 			// Add user assemblies
-			AddAssembliesFromCollection (ResolvedUserAssemblies);
+			AssemblyPackagingHelper.AddAssembliesFromCollection (Log, SupportedAbis, ResolvedUserAssemblies, DoAddAssembliesFromArchCollection);
 
 			// Add framework assemblies
-			AddAssembliesFromCollection (ResolvedFrameworkAssemblies);
+			AssemblyPackagingHelper.AddAssembliesFromCollection (Log, SupportedAbis, ResolvedFrameworkAssemblies, DoAddAssembliesFromArchCollection);
 
 			if (!UseAssemblyStore) {
 				return;
@@ -459,28 +459,6 @@ void AddAssemblies (ZipArchiveEx apk, bool debug, bool compress, IDictionary<And
 				AddFileToArchiveIfNewer (apk, wrappedSourcePath, inArchivePath, GetCompressionMethod (inArchivePath));
 			}
 
-			void AddAssembliesFromCollection (ITaskItem[] assemblies)
-			{
-				Dictionary<AndroidTargetArch, Dictionary<string, ITaskItem>> perArchAssemblies = MonoAndroidHelper.GetPerArchAssemblies (
-					assemblies,
-					SupportedAbis,
-					validate: true,
-					shouldSkip: (ITaskItem asm) => {
-						if (bool.TryParse (asm.GetMetadata ("AndroidSkipAddToPackage"), out bool value) && value) {
-							Log.LogDebugMessage ($"Skipping {asm.ItemSpec} due to 'AndroidSkipAddToPackage' == 'true' ");
-							return true;
-						}
-
-						return false;
-					}
-				);
-
-				foreach (var kvp in perArchAssemblies) {
-					Log.LogDebugMessage ($"Adding assemblies for architecture '{kvp.Key}'");
-					DoAddAssembliesFromArchCollection (kvp.Key, kvp.Value);
-				}
-			}
-
 			void DoAddAssembliesFromArchCollection (AndroidTargetArch arch, Dictionary<string, ITaskItem> assemblies)
 			{
 				// In the "all assemblies are per-RID" world, assemblies, pdb and config are disguised as shared libraries (that is,

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

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+
+using Microsoft.Android.Build.Tasks;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+using Xamarin.Android.Tools;
+
+namespace Xamarin.Android.Tasks;
+
+static class AssemblyPackagingHelper
+{
+	public static void AddAssembliesFromCollection (TaskLoggingHelper Log, ICollection<string> SupportedAbis, ICollection<ITaskItem> assemblies, Action<AndroidTargetArch, Dictionary<string, ITaskItem>> doAddAssemblies)
+	{
+		Dictionary<AndroidTargetArch, Dictionary<string, ITaskItem>> perArchAssemblies = MonoAndroidHelper.GetPerArchAssemblies (
+			assemblies,
+			SupportedAbis,
+			validate: true,
+			shouldSkip: (ITaskItem asm) => {
+				if (bool.TryParse (asm.GetMetadata ("AndroidSkipAddToPackage"), out bool value) && value) {
+					Log.LogDebugMessage ($"Skipping {asm.ItemSpec} due to 'AndroidSkipAddToPackage' == 'true' ");
+					return true;
+				}
+
+				return false;
+			}
+		);
+
+		foreach (var kvp in perArchAssemblies) {
+			Log.LogDebugMessage ($"Adding assemblies for architecture '{kvp.Key}'");
+			doAddAssemblies (kvp.Key, kvp.Value);
+		}
+	}
+}