Skip to content

Commit 596518e

Browse files
authored
Merge pull request #251 from Arthri/feat/load-pdb-in-AssemblyResolve
Also load symbols in AssemblyResolve
2 parents f205e2f + e9f66d4 commit 596518e

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

TerrariaServerAPI/TerrariaApi.Server/ServerApi.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,8 @@ private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEven
517517
Assembly assembly;
518518
if (!loadedAssemblies.TryGetValue(fileName, out assembly))
519519
{
520-
assembly = Assembly.Load(File.ReadAllBytes(path));
520+
var pdbPath = Path.ChangeExtension(fileName, ".pdb");
521+
assembly = Assembly.Load(File.ReadAllBytes(path), File.Exists(pdbPath) ? File.ReadAllBytes(pdbPath) : null);
521522
// We just do this to return a proper error message incase this is a resolved plugin assembly
522523
// referencing an old TerrariaServer version.
523524
if (!InvalidateAssembly(assembly, fileName))

0 commit comments

Comments
 (0)