Simplify min SDK version implementation based on feedback

Co-authored-by: jonathanpeppers <[email protected]>

Author: Copilot

src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Aapt2.targets

@@ -166,6 +166,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
       JavaPlatformJarPath="$(JavaPlatformJarPath)"
       JavaDesignerOutputDirectory="$(ResgenTemporaryDirectory)"
       CompiledResourceFlatFiles="@(_CompiledFlatFiles)"
+      AndroidManifestFile="$(_AndroidManifestAbs)"
       ManifestFiles="$(ResgenTemporaryDirectory)\AndroidManifest.xml"
       AdditionalAndroidResourcePaths="@(_LibraryResourceDirectories)"
       YieldDuringToolExecution="$(YieldDuringToolExecution)"

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

@@ -84,7 +84,6 @@ public class Aapt2Link : Aapt2 {
 		SortedSet<string> rulesFiles = new SortedSet<string> ();
 		Dictionary<string, long> apks = new Dictionary<string, long> ();
 		string resourceSymbolsTextFileTemp;
-		int? minSdkVersion;
 
 		protected override int GetRequiredDaemonInstances ()
 		{
@@ -98,13 +97,6 @@ public async override System.Threading.Tasks.Task RunTaskAsync ()
 
 				resourceSymbolsTextFileTemp = GetTempFile ();
 
-				// Compute min SDK version once from AndroidManifestFile or first ManifestFiles item
-				ITaskItem manifestFile = AndroidManifestFile ?? (ManifestFiles?.Length > 0 ? ManifestFiles [0] : null);
-				if (manifestFile is { ItemSpec.Length: > 0 }) {
-					var doc = AndroidAppManifest.Load (manifestFile.ItemSpec, MonoAndroidHelper.SupportedVersions);
-					minSdkVersion = doc.MinSdkVersion;
-				}
-
 				await this.WhenAll (ManifestFiles, ProcessManifest);
 
 				ProcessOutput ();
@@ -186,13 +178,6 @@ string [] GenerateCommandLineCommands (string ManifestFile, string currentAbi, s
 				cmd.Add ("-v");
 			cmd.Add ($"--manifest");
 			cmd.Add (GetFullPath (manifestFile));
-
-			//NOTE: if this is blank, we can omit --min-sdk-version in this call
-			if (minSdkVersion.HasValue) {
-				cmd.Add ("--min-sdk-version");
-				cmd.Add (minSdkVersion.Value.ToString ());
-			}
-
 			if (!string.IsNullOrEmpty (JavaDesignerOutputDirectory)) {
 				var designerDirectory = Path.IsPathRooted (JavaDesignerOutputDirectory) ? JavaDesignerOutputDirectory : Path.Combine (WorkingDirectory, JavaDesignerOutputDirectory);
 				Directory.CreateDirectory (designerDirectory);
@@ -335,6 +320,15 @@ string [] GenerateCommandLineCommands (string ManifestFile, string currentAbi, s
 			cmd.Add ("-o");
 			cmd.Add (GetFullPath (currentResourceOutputFile));
 
+			// Add min SDK version from AndroidManifestFile if available
+			if (AndroidManifestFile is { ItemSpec.Length: > 0 }) {
+				var doc = AndroidAppManifest.Load (AndroidManifestFile.ItemSpec, MonoAndroidHelper.SupportedVersions);
+				if (doc.MinSdkVersion.HasValue) {
+					cmd.Add ("--min-sdk-version");
+					cmd.Add (doc.MinSdkVersion.Value.ToString ());
+				}
+			}
+
 			return cmd.ToArray ();
 		}