Merge pull request #251 from Arthri/feat/load-pdb-in-AssemblyResolve

Also load symbols in AssemblyResolve
Pryaxis · Jan 4, 2025 · 596518e · 596518e
2 parents f205e2f + e9f66d4
commit 596518e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/TerrariaServerAPI/TerrariaApi.Server/ServerApi.cs b/TerrariaServerAPI/TerrariaApi.Server/ServerApi.cs
@@ -517,7 +517,8 @@ private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEven
 					Assembly assembly;
 					if (!loadedAssemblies.TryGetValue(fileName, out assembly))
 					{
-						assembly = Assembly.Load(File.ReadAllBytes(path));
+						var pdbPath = Path.ChangeExtension(fileName, ".pdb");
+						assembly = Assembly.Load(File.ReadAllBytes(path), File.Exists(pdbPath) ? File.ReadAllBytes(pdbPath) : null);
 						// We just do this to return a proper error message incase this is a resolved plugin assembly
 						// referencing an old TerrariaServer version.
 						if (!InvalidateAssembly(assembly, fileName))