Merge branch 'develop' into stable

1 files changed, 6 insertions, 14 deletions

diff --git a/src/SMAPI/Framework/ModLoading/AssemblyDefinitionResolver.cs b/src/SMAPI/Framework/ModLoading/AssemblyDefinitionResolver.cs
index d85a9a28..91c9e192 100644
--- a/src/SMAPI/Framework/ModLoading/AssemblyDefinitionResolver.cs
+++ b/src/SMAPI/Framework/ModLoading/AssemblyDefinitionResolver.cs
@@ -10,7 +10,7 @@ namespace StardewModdingAPI.Framework.ModLoading
         ** Properties
         *********/
         /// <summary>The known assemblies.</summary>
-        private readonly IDictionary<string, AssemblyDefinition> Loaded = new Dictionary<string, AssemblyDefinition>();
+        private readonly IDictionary<string, AssemblyDefinition> Lookup = new Dictionary<string, AssemblyDefinition>();
 
 
         /*********
@@ -22,8 +22,9 @@ namespace StardewModdingAPI.Framework.ModLoading
         {
             foreach (AssemblyDefinition assembly in assemblies)
             {
-                this.Loaded[assembly.Name.Name] = assembly;
-                this.Loaded[assembly.Name.FullName] = assembly;
+                this.RegisterAssembly(assembly);
+                this.Lookup[assembly.Name.Name] = assembly;
+                this.Lookup[assembly.Name.FullName] = assembly;
             }
         }
 
@@ -36,15 +37,6 @@ namespace StardewModdingAPI.Framework.ModLoading
         /// <param name="parameters">The assembly reader parameters.</param>
         public override AssemblyDefinition Resolve(AssemblyNameReference name, ReaderParameters parameters) => this.ResolveName(name.Name) ?? base.Resolve(name, parameters);
 
-        /// <summary>Resolve an assembly reference.</summary>
-        /// <param name="fullName">The assembly full name (including version, etc).</param>
-        public override AssemblyDefinition Resolve(string fullName) => this.ResolveName(fullName) ?? base.Resolve(fullName);
-
-        /// <summary>Resolve an assembly reference.</summary>
-        /// <param name="fullName">The assembly full name (including version, etc).</param>
-        /// <param name="parameters">The assembly reader parameters.</param>
-        public override AssemblyDefinition Resolve(string fullName, ReaderParameters parameters) => this.ResolveName(fullName) ?? base.Resolve(fullName, parameters);
-
 
         /*********
         ** Private methods
@@ -53,8 +45,8 @@ namespace StardewModdingAPI.Framework.ModLoading
         /// <param name="name">The assembly's short or full name.</param>
         private AssemblyDefinition ResolveName(string name)
         {
-            return this.Loaded.ContainsKey(name)
-                ? this.Loaded[name]
+            return this.Lookup.TryGetValue(name, out AssemblyDefinition match)
+                ? match
                 : null;
         }
     }