Nb1X/BepInEx
1
0 Fork 0
mirror of https://github.com/BepInEx/BepInEx.git synced 2026-10-20 01:46:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use LoadFrom instead of LoadFile for AssemblyPatcher

Browse Source 
CLR will ignore assemblies loaded via LoadFile because they are loaded in a different context to everything else
This commit is contained in:
Bepis committed 2021-01-25 02:35:50 +11:00
1 parent f60f6cbb62
commit 6acfa16d31
1 file changed
+7 -5
Download Patch File Download Diff File Expand all files Collapse all files
BepInEx.Preloader.Core/Patching/AssemblyPatcher.cs
+7 -5
View File
@@ -270,7 +270,7 @@ namespace BepInEx.Preloader.Core
{
try
{
assembly = AssemblyDefinition.ReadAssembly(path, TypeLoader.ReaderParameters);
assembly = AssemblyDefinition.ReadAssembly(path, TypeLoader.ReaderParameters);
return true;
}
catch (BadImageFormatException)
@@ -402,13 +402,15 @@ namespace BepInEx.Preloader.Core
if (ConfigLoadDumpedAssemblies.Value)
{
loadedAssembly = Assembly.LoadFile(Path.Combine(DumpedAssembliesPath, filename));
loadedAssembly = Assembly.LoadFrom(Path.Combine(DumpedAssembliesPath, filename));
}
else
{
using var assemblyStream = new MemoryStream();
assembly.Write(assemblyStream);
loadedAssembly = Assembly.Load(assemblyStream.ToArray());
using (var assemblyStream = new MemoryStream())
{
assembly.Write(assemblyStream);
loadedAssembly = Assembly.Load(assemblyStream.ToArray());
}
}
LoadedAssemblies.Add(filename, loadedAssembly);