fix: improve assembly name search and comparison

Author: Krzyhau

Source/AssemblyResolving/AssemblyResolveCompability.cs

@@ -0,0 +1,56 @@
+using System.Reflection;
+
+namespace HatModLoader.Source.AssemblyResolving
+{
+    internal static class AssemblyResolveCompability
+    {
+        public static bool MatchesRequest(this AssemblyName assemblyName, ResolveEventArgs args, bool allowRollForward)
+        {
+            var requestedName = new AssemblyName(args.Name);
+
+            return assemblyName.Name == requestedName.Name &&
+                   assemblyName.CultureName == requestedName.CultureName &&
+                   ComparePublicKeyTokens(assemblyName.GetPublicKeyToken(), requestedName.GetPublicKeyToken()) &&
+                   CompareVersions(assemblyName.Version, requestedName.Version, allowRollForward);
+        }
+        
+        private static bool ComparePublicKeyTokens(byte[] tokenA, byte[] tokenB)
+        {
+            // Avoiding usage of stuff like SequenceEqual to prevent accidental dependency request at this stage.
+            
+            if (tokenA == null && tokenB == null)
+            {
+                return true;
+            }
+
+            if (tokenA == null || tokenB == null || tokenA.Length != tokenB.Length)
+            {
+                return false;
+            }
+
+            for (int i = 0; i < tokenA.Length; i++)
+            {
+                if (tokenA[i] != tokenB[i])
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+        
+        private static bool CompareVersions(Version checkedVersion, Version requiredVersion, bool allowRollForward)
+        {
+            if (allowRollForward)
+            {
+                return checkedVersion >= requiredVersion;
+            }
+            
+            return checkedVersion.Major == requiredVersion.Major &&
+                   checkedVersion.Minor == requiredVersion.Minor &&
+                   checkedVersion.Build == requiredVersion.Build &&
+                   checkedVersion.Revision >= requiredVersion.Revision;
+        }
+    }
+}
+

Source/AssemblyResolving/HatSubdirectoryAssemblyResolver.cs

@@ -1,4 +1,3 @@
-
 using System.Reflection;
 
 namespace HatModLoader.Source.AssemblyResolving
@@ -19,8 +18,12 @@ public Assembly ProvideAssembly(object sender, ResolveEventArgs args)
         {
             foreach (var file in EnumerateAssemblyFilesInSubdirectory())
             {
-                var assemblyName = AssemblyName.GetAssemblyName(file);
-                if (assemblyName.FullName == args.Name)
+                if (!TryGetAssemblyName(file, out var assemblyName))
+                {
+                    continue;
+                }
+                
+                if (assemblyName.MatchesRequest(args, true))
                 {
                     return Assembly.LoadFrom(file);
                 }
@@ -48,5 +51,19 @@ private IEnumerable<string> EnumerateAssemblyFilesInSubdirectory()
                 yield return file;
             }
         }
+
+        private bool TryGetAssemblyName(string filePath, out AssemblyName assemblyName)
+        {
+            assemblyName = null;
+            try
+            {
+                assemblyName = AssemblyName.GetAssemblyName(filePath);
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
+        }
     }
-}
+}

Source/AssemblyResolving/ModInternalAssemblyResolver.cs

@@ -8,7 +8,7 @@ internal class ModInternalAssemblyResolver : IAssemblyResolver
     {
         private readonly Mod _mod;
 
-        private readonly Dictionary<string, string> _cachedAssemblyPaths = new();
+        private readonly Dictionary<AssemblyName, string> _cachedAssemblyPaths = new();
 
         public ModInternalAssemblyResolver(Mod mod)
         {
@@ -18,19 +18,21 @@ public ModInternalAssemblyResolver(Mod mod)
 
         public Assembly ProvideAssembly(object sender, ResolveEventArgs args)
         {
-            if (_mod.Assembly?.FullName == args.Name)
+            if (_mod.Assembly != null && _mod.Assembly.GetName().MatchesRequest(args, false))
             {
                 return _mod.Assembly;
             }
 
-            if (_cachedAssemblyPaths.TryGetValue(args.Name, out var assemblyPath))
+            foreach(var assemblyName in _cachedAssemblyPaths.Keys)
             {
-                using var assemblyData = _mod.FileProxy.OpenFile(assemblyPath);
-                var assemblyBytes = new byte[assemblyData.Length];
-                assemblyData.Read(assemblyBytes, 0, assemblyBytes.Length);
-                return Assembly.Load(assemblyBytes);
+                if (assemblyName.MatchesRequest(args, false))
+                {
+                    using var assemblyData = _mod.FileProxy.OpenFile(_cachedAssemblyPaths[assemblyName]);
+                    var assemblyBytes = new byte[assemblyData.Length];
+                    assemblyData.Read(assemblyBytes, 0, assemblyBytes.Length);
+                    return Assembly.Load(assemblyBytes);
+                }
             }
-            
             return null;
         }
 
@@ -40,7 +42,7 @@ private void CacheAssemblyPaths()
             {
                 using var assemblyFile = _mod.FileProxy.OpenFile(filePath);
                 using var assemblyDef = AssemblyDefinition.ReadAssembly(assemblyFile, new ReaderParameters { ReadSymbols = false });
-                var fullName = assemblyDef.Name.ToString();
+                var fullName = new AssemblyName(assemblyDef.Name.ToString());
 
                 if (!_cachedAssemblyPaths.ContainsKey(fullName))
                 {