Merge branch 'Pryaxis:general-devel' into net9-upgrade

Author: SignatureBeef

TerrariaServerAPI/TerrariaApi.Server/ServerApi.cs

@@ -75,6 +75,7 @@ public static bool IsWorldRunning
 
 		static ServerApi()
 		{
+			AppContext.SetSwitch("Switch.System.Diagnostics.StackTrace.ShowILOffsets", true);
 			Dictionary<string, string> args = Utils.ParseArguements(Environment.GetCommandLineArgs());
 			Hooks = new HookManager();
 			LogWriter = new LogWriterManager(enabled: !args.ContainsKey("-nolog"));
@@ -517,7 +518,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))