Hopefully fix some tests and builds

Author: grendello

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

@@ -28,7 +28,6 @@ public class GeneratePackageManagerJava : AndroidTask
 		[Required]
 		public ITaskItem[] ResolvedUserAssemblies { get; set; }
 
-		[Required]
 		public ITaskItem[] NativeLibraries { get; set; }
 
 		public ITaskItem[] MonoComponents { get; set; }
@@ -355,16 +354,18 @@ void AddEnvironment ()
 			}
 
 			var uniqueNativeLibraries = new List<ITaskItem> ();
-			var seenNativeLibraryNames = new HashSet<string> (StringComparer.OrdinalIgnoreCase);
-			foreach (ITaskItem item in NativeLibraries) {
-				// We don't care about different ABIs here, just the file name
-				string name = Path.GetFileName (item.ItemSpec);
-				if (seenNativeLibraryNames.Contains (name)) {
-					continue;
-				}
+			if (NativeLibraries != null) {
+				var seenNativeLibraryNames = new HashSet<string> (StringComparer.OrdinalIgnoreCase);
+				foreach (ITaskItem item in NativeLibraries) {
+					// We don't care about different ABIs here, just the file name
+					string name = Path.GetFileName (item.ItemSpec);
+					if (seenNativeLibraryNames.Contains (name)) {
+						continue;
+					}
 
-				seenNativeLibraryNames.Add (name);
-				uniqueNativeLibraries.Add (item);
+					seenNativeLibraryNames.Add (name);
+					uniqueNativeLibraries.Add (item);
+				}
 			}
 
 			bool haveRuntimeConfigBlob = !String.IsNullOrEmpty (RuntimeConfigBinFilePath) && File.Exists (RuntimeConfigBinFilePath);

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

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Globalization;
 using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -42,7 +43,7 @@ public sealed class ApplicationConfig
 
 		static readonly object ndkInitLock = new object ();
 		static readonly char[] readElfFieldSeparator = new [] { ' ', '\t' };
-		static readonly Regex stringLabelRegex = new Regex ("^\\.L\\.env\\.str\\.[0-9]+:", RegexOptions.Compiled);
+		static readonly Regex stringLabelRegex = new Regex ("^\\.L\\.autostr\\.[0-9]+:", RegexOptions.Compiled);
 
 		static readonly HashSet <string> expectedPointerTypes = new HashSet <string> (StringComparer.Ordinal) {
 			".long",
@@ -103,7 +104,6 @@ static ApplicationConfig ReadApplicationConfig (string envFile)
 
 					line = lines [++i];
 					field = GetField (envFile, line, i);
-
 					AssertFieldType (envFile, ".asciz", field [0], i);
 					strings [label] = AssertIsAssemblerString (envFile, field [1], i);
 					continue;
@@ -222,7 +222,7 @@ static ApplicationConfig ReadApplicationConfig (string envFile)
 				if (String.Compare (".size", field [0], StringComparison.Ordinal) == 0) {
 					fieldCount--;
 					Assert.IsTrue (field [1].StartsWith ("application_config", StringComparison.Ordinal), $"Mismatched .size directive in '{envFile}:{i}'");
-					break; // We've reached the end of the application_config structure
+					gatherFields = false; // We've reached the end of the application_config structure
 				}
 			}
 			Assert.AreEqual (ApplicationConfigFieldCount, fieldCount, $"Invalid 'application_config' field count in environment file '{envFile}'");
@@ -317,13 +317,20 @@ static Dictionary<string, string> ReadEnvironmentVariables (string envFile)
 		static bool IsCommentLine (string line)
 		{
 			string l = line?.Trim ();
-			return !String.IsNullOrEmpty (l) && l.StartsWith ("/*", StringComparison.Ordinal);
+			if (String.IsNullOrEmpty (l)) {
+				return false;
+			}
+
+			return l.StartsWith ("/*", StringComparison.Ordinal) ||
+				l.StartsWith ("//", StringComparison.Ordinal) ||
+				l.StartsWith ("#", StringComparison.Ordinal) ||
+				l.StartsWith ("@", StringComparison.Ordinal);
 		}
 
 		static string[] GetField (string file, string line, int lineNumber)
 		{
 			string[] ret = line?.Trim ()?.Split ('\t');
-			Assert.AreEqual (2, ret.Length, $"Invalid assembler field format in file '{file}:{lineNumber}': '{line}'");
+			Assert.IsTrue (ret.Length >= 2, $"Invalid assembler field format in file '{file}:{lineNumber}': '{line}'");
 
 			return ret;
 		}
@@ -503,10 +510,11 @@ static void DumpLines (string streamName, List <string> lines)
 
 		static bool ConvertFieldToBool (string fieldName, string envFile, int fileLine, string value)
 		{
-			Assert.AreEqual (1, value.Length, $"Field '{fieldName}' in {envFile}:{fileLine} is not a valid boolean value (too long)");
+			// Allow both decimal and hexadecimal values
+			Assert.IsTrue (value.Length > 0 && value.Length <= 3, $"Field '{fieldName}' in {envFile}:{fileLine} is not a valid boolean value (length not between 1 and 3)");
 
 			uint fv;
-			Assert.IsTrue (UInt32.TryParse (value, out fv), $"Field '{fieldName}' in {envFile}:{fileLine} is not a valid boolean value (not a valid integer)");
+			Assert.IsTrue (TryParseInteger (value, out fv), $"Field '{fieldName}' in {envFile}:{fileLine} is not a valid boolean value (not a valid integer)");
 			Assert.IsTrue (fv == 0 || fv == 1, $"Field '{fieldName}' in {envFile}:{fileLine} is not a valid boolean value (not a valid boolean value 0 or 1)");
 
 			return fv == 1;
@@ -517,7 +525,7 @@ static uint ConvertFieldToUInt32 (string fieldName, string envFile, int fileLine
 			Assert.IsTrue (value.Length > 0, $"Field '{fieldName}' in {envFile}:{fileLine} is not a valid uint32_t value (not long enough)");
 
 			uint fv;
-			Assert.IsTrue (UInt32.TryParse (value, out fv), $"Field '{fieldName}' in {envFile}:{fileLine} is not a valid uint32_t value (not a valid integer)");
+			Assert.IsTrue (TryParseInteger (value, out fv), $"Field '{fieldName}' in {envFile}:{fileLine} is not a valid uint32_t value (not a valid integer)");
 
 			return fv;
 		}
@@ -527,9 +535,27 @@ static byte ConvertFieldToByte (string fieldName, string envFile, int fileLine,
 			Assert.IsTrue (value.Length > 0, $"Field '{fieldName}' in {envFile}:{fileLine} is not a valid uint8_t value (not long enough)");
 
 			byte fv;
-			Assert.IsTrue (Byte.TryParse (value, out fv), $"Field '{fieldName}' in {envFile}:{fileLine} is not a valid uint8_t value (not a valid integer)");
+			Assert.IsTrue (TryParseInteger (value, out fv), $"Field '{fieldName}' in {envFile}:{fileLine} is not a valid uint8_t value (not a valid integer)");
 
 			return fv;
 		}
+
+		static bool TryParseInteger (string value, out uint fv)
+		{
+			if (value.StartsWith ("0x", StringComparison.Ordinal)) {
+				return UInt32.TryParse (value.Substring (2), NumberStyles.AllowHexSpecifier, null, out fv);
+			}
+
+			return UInt32.TryParse (value, out fv);
+		}
+
+		static bool TryParseInteger (string value, out byte fv)
+		{
+			if (value.StartsWith ("0x", StringComparison.Ordinal)) {
+				return Byte.TryParse (value.Substring (2), NumberStyles.AllowHexSpecifier, null, out fv);
+			}
+
+			return Byte.TryParse (value, out fv);
+		}
 	}
 }

src/monodroid/jni/embedded-assemblies.cc

@@ -2,7 +2,7 @@
 
 #if !defined (__MINGW32__) || (defined (__MINGW32__) && __GNUC__ >= 10)
 #include <compare>
-#endif
+#endif // ndef MINGW32 || def MINGW32 && GNUC >= 10
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
@@ -345,7 +345,7 @@ EmbeddedAssemblies::individual_assemblies_open_from_bundles (dynamic_local_strin
 }
 
 force_inline const AssemblyStoreHashEntry*
-EmbeddedAssemblies::find_assembly_store_entry (hash_t hash, const AssemblyStoreHashEntry *entries, size_t entry_count) noexcept
+EmbeddedAssemblies::find_assembly_store_entry ([[maybe_unused]] hash_t hash, [[maybe_unused]] const AssemblyStoreHashEntry *entries, [[maybe_unused]] size_t entry_count) noexcept
 {
 #if !defined (__MINGW32__) || (defined (__MINGW32__) && __GNUC__ >= 10)
 	hash_t entry_hash;

src/monodroid/jni/monodroid-glue.cc

@@ -9,8 +9,9 @@
 #include <strings.h>
 #include <cctype>
 #include <cerrno>
+#if !defined (__MINGW32__) || (defined (__MINGW32__) && __GNUC__ >= 10)
 #include <compare>
-
+#endif // ndef MINGW32 || def MINGW32 && GNUC >= 10
 #if defined (APPLE_OS_X)
 #include <dlfcn.h>
 #endif  // def APPLE_OX_X
@@ -1284,8 +1285,9 @@ MonodroidRuntime::init_internal_api_dso (void *handle)
 #endif // ndef NET6
 
 force_inline DSOCacheEntry*
-MonodroidRuntime::find_dso_cache_entry (hash_t hash) noexcept
+MonodroidRuntime::find_dso_cache_entry ([[maybe_unused]] hash_t hash) noexcept
 {
+#if !defined (__MINGW32__) || (defined (__MINGW32__) && __GNUC__ >= 10)
 	hash_t entry_hash;
 	DSOCacheEntry *ret = nullptr;
 	size_t entry_count = application_config.number_of_dso_cache_entries;
@@ -1307,7 +1309,7 @@ MonodroidRuntime::find_dso_cache_entry (hash_t hash) noexcept
 			return ret;
 		}
 	}
-
+#endif // ndef MINGW32 || def MINGW32 && GNUC >= 10
 	return nullptr;
 }