use pdbpath from TryOpenAssociatedPortablePdb

Author: Lordfirespeed

NetcodePatcher/CodeGen/CompiledAssemblyFromFile.cs

@@ -28,6 +28,7 @@ public CompiledAssemblyFromFile(string assemblyPath)
     }
 
     public bool DebugSymbolsAreEmbedded { get; private set; }
+    public string? PortableDebugSymbolsFilePath { get; private set; }
 
     public string Name => Path.GetFileNameWithoutExtension(_assemblyPath);
     public string[] References { get; set; } = Array.Empty<string>();
@@ -54,6 +55,7 @@ public byte[] ReadPdb(FileStream peStream)
         else
         {
             Log.Information("Found debug info : ({PdbFileName})", Path.GetFileName(pdbPath));
+            PortableDebugSymbolsFilePath = pdbPath;
         }
 
         return pdbReader.ReadAllBytes();

NetcodePatcher/CodeGen/NetcodeILPPApplicator.cs

@@ -29,7 +29,6 @@ public NetcodeILPPApplicator(string assemblyPath, string outputPath, string[] re
     private string AssemblyName => Path.GetFileNameWithoutExtension(AssemblyPath);
     private string AssemblyFileName => Path.GetFileName(AssemblyPath);
     private string AssemblyDirName => Path.GetDirectoryName(AssemblyPath)!;
-    private string PdbPath => Path.Combine(AssemblyDirName, $"{AssemblyName}.pdb");
 
     public static bool HasNetcodePatchedAttribute(ICompiledAssembly assembly)
     {
@@ -63,6 +62,7 @@ public void ApplyProcesses()
         }
 
         var debugSymbolsAreEmbedded = assemblyFromFile.DebugSymbolsAreEmbedded;
+        var pdbPath = assemblyFromFile.PortableDebugSymbolsFilePath;
         ICompiledAssembly assembly = assemblyFromFile;
 
         if (HasNetcodePatchedAttribute(assembly))
@@ -81,7 +81,7 @@ public void ApplyProcesses()
             // remove files with _original.dll and _original.pdb
 
             renameAssemblyPath = Path.Combine(AssemblyDirName, $"{AssemblyName}_original.dll");
-            renamePdbPath = Path.Combine(AssemblyDirName, $"{AssemblyName}_original.pdb");
+            renamePdbPath = Path.Combine(Path.GetDirectoryName(pdbPath)!, $"{Path.GetFileNameWithoutExtension(pdbPath)}_original.pdb");
 
             if (File.Exists(renameAssemblyPath))
             {
@@ -96,8 +96,8 @@ public void ApplyProcesses()
             }
 
             File.Move(AssemblyPath, renameAssemblyPath);
-            if (!debugSymbolsAreEmbedded)
-                File.Move(PdbPath, renamePdbPath);
+            if (pdbPath is not null)
+                File.Move(pdbPath, renamePdbPath);
         }
 
         ICompiledAssembly ApplyProcess<TProcessor>(ICompiledAssembly assemblyToApplyProcessTo)
@@ -167,10 +167,10 @@ ICompiledAssembly ApplyProcess<TProcessor>(ICompiledAssembly assemblyToApplyProc
                     File.Move(renameAssemblyPath!, AssemblyPath);
                 }
 
-                if (File.Exists(renamePdbPath!))
+                if (pdbPath is not null && File.Exists(renamePdbPath!))
                 {
-                    if (File.Exists(PdbPath)) File.Delete(PdbPath);
-                    File.Move(renamePdbPath!, PdbPath);
+                    if (File.Exists(pdbPath)) File.Delete(pdbPath);
+                    File.Move(renamePdbPath!, pdbPath!);
                 }
             }