Use Assembly.LoadFrom for loading assemblies

Assembly.LoadFile is meant for a special case that is not relevant to BepInEx
Agateshefi · Sep 11, 2022 · b9fe507 · b9fe507
1 parent c0b9eae
commit b9fe507
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/BepInEx.Core/Bootstrap/BaseChainloader.cs b/BepInEx.Core/Bootstrap/BaseChainloader.cs
@@ -125,7 +125,7 @@ protected static bool PluginTargetsWrongBepin(PluginInfo pluginInfo)
     ///     Contains information about what certain plugins were not loaded.
     /// </summary>
     public List<string> DependencyErrors { get; } = new();
-    
+
     /// <summary>
     ///     Occurs after a plugin is loaded.
     /// </summary>
@@ -404,7 +404,7 @@ static bool IsHardDependency(BepInDependency dep) =>
                 Logger.Log(LogLevel.Info, $"Loading [{plugin}]");
 
                 if (!loadedAssemblies.TryGetValue(plugin.Location, out var ass))
-                    loadedAssemblies[plugin.Location] = ass = Assembly.LoadFile(plugin.Location);
+                    loadedAssemblies[plugin.Location] = ass = Assembly.LoadFrom(plugin.Location);
 
                 Plugins[plugin.Metadata.GUID] = plugin;
                 TryRunModuleCtor(plugin, ass);

diff --git a/BepInEx.Core/Utility.cs b/BepInEx.Core/Utility.cs
@@ -242,7 +242,7 @@ public static bool IsSubtypeOf(this TypeDefinition self, Type td)
     /// <param name="assembly">The loaded assembly.</param>
     /// <returns>True, if the assembly was found and loaded. Otherwise, false.</returns>
     public static bool TryResolveDllAssembly(AssemblyName assemblyName, string directory, out Assembly assembly) =>
-        TryResolveDllAssembly(assemblyName, directory, Assembly.LoadFile, out assembly);
+        TryResolveDllAssembly(assemblyName, directory, Assembly.LoadFrom, out assembly);
 
     /// <summary>
     ///     Try to resolve and load the given assembly DLL.

diff --git a/Runtimes/NET/BepInEx.NET.Shared/SharedEntrypoint.cs b/Runtimes/NET/BepInEx.NET.Shared/SharedEntrypoint.cs
@@ -139,6 +139,6 @@ private static bool TryResolveDllAssembly<T>(AssemblyName assemblyName,
         /// <param name="assembly">The loaded assembly.</param>
         /// <returns>True, if the assembly was found and loaded. Otherwise, false.</returns>
         public static bool TryResolveDllAssembly(AssemblyName assemblyName, string directory, out Assembly assembly) =>
-            TryResolveDllAssembly(assemblyName, directory, Assembly.LoadFile, out assembly);
+            TryResolveDllAssembly(assemblyName, directory, Assembly.LoadFrom, out assembly);
     }
 }