Merge branch 'develop' into stable

2 files changed, 32 insertions, 8 deletions

diff --git a/src/SMAPI/Constants.cs b/src/SMAPI/Constants.cs
index 455cfd7e..667491d6 100644
--- a/src/SMAPI/Constants.cs
+++ b/src/SMAPI/Constants.cs
@@ -49,7 +49,7 @@ namespace StardewModdingAPI
         internal static int? LogScreenId { get; set; }
 
         /// <summary>SMAPI's current raw semantic version.</summary>
-        internal static string RawApiVersion = "3.13.3";
+        internal static string RawApiVersion = "3.13.4";
     }
 
     /// <summary>Contains SMAPI's constants and assumptions.</summary>
diff --git a/src/SMAPI/Program.cs b/src/SMAPI/Program.cs
index 67ff8322..0c90f2aa 100644
--- a/src/SMAPI/Program.cs
+++ b/src/SMAPI/Program.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -16,7 +17,10 @@ namespace StardewModdingAPI
         ** Fields
         *********/
         /// <summary>The absolute path to search for SMAPI's internal DLLs.</summary>
-        internal static readonly string DllSearchPath = EarlyConstants.InternalFilesPath;
+        private static readonly string DllSearchPath = EarlyConstants.InternalFilesPath;
+
+        /// <summary>The assembly paths in the search folders indexed by assembly name.</summary>
+        private static Dictionary<string, string> AssemblyPathsByName;
 
 
         /*********
@@ -57,16 +61,36 @@ namespace StardewModdingAPI
         /// <param name="e">The event arguments.</param>
         private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs e)
         {
-            try
+            // cache assembly paths by name
+            if (Program.AssemblyPathsByName == null)
             {
-                AssemblyName name = new AssemblyName(e.Name);
-                foreach (FileInfo dll in new DirectoryInfo(Program.DllSearchPath).EnumerateFiles("*.dll"))
+                Program.AssemblyPathsByName = new(StringComparer.OrdinalIgnoreCase);
+
+                foreach (string searchPath in new[] { EarlyConstants.ExecutionPath, Program.DllSearchPath })
                 {
-                    if (name.Name.Equals(AssemblyName.GetAssemblyName(dll.FullName).Name, StringComparison.OrdinalIgnoreCase))
-                        return Assembly.LoadFrom(dll.FullName);
+                    foreach (string dllPath in Directory.EnumerateFiles(searchPath, "*.dll"))
+                    {
+                        try
+                        {
+                            string curName = AssemblyName.GetAssemblyName(dllPath).Name;
+                            if (curName != null)
+                                Program.AssemblyPathsByName[curName] = dllPath;
+                        }
+                        catch
+                        {
+                            continue;
+                        }
+                    }
                 }
+            }
 
-                return null;
+            // resolve
+            try
+            {
+                string searchName = new AssemblyName(e.Name).Name;
+                return searchName != null && Program.AssemblyPathsByName.TryGetValue(searchName, out string assemblyPath)
+                    ? Assembly.LoadFrom(assemblyPath)
+                    : null;
             }
             catch (Exception ex)
             {