PDB Generation.

Author: thehambeard

ILSpyAutomation/ILSpyAutomation.cs

@@ -11,7 +11,7 @@ namespace ILSpyAutomation
 {
     public static class ILSpyAutomation
     {
-        public static ProjectItem Decompile(string inputFile, string outputDirectory, IDecompileLogger logger, IProgress<DecompilationProgress> progress /*, bool generatePDB = true*/)
+        public static ProjectItem Decompile(string inputFile, string outputDirectory, IDecompileLogger logger, IProgress<DecompilationProgress> progress, bool generatePDB = true)
         {
             Directory.CreateDirectory(outputDirectory);
 
@@ -21,12 +21,12 @@ public static ProjectItem Decompile(string inputFile, string outputDirectory, ID
 
             var pid = DecompileAsProject(inputFile, projectFileName, progress);
 
-            //if (generatePDB)
-            //{
-            //    logger.Log($"Generating PDB");
+            if (generatePDB)
+            {
+                logger.Log($"Generating PDB");
 
-            //    GeneratePdbForAssembly(inputFile, Path.Combine(outputDirectory, Path.GetFileNameWithoutExtension(inputFile) + ".pdb"), progress, outputDirectory);
-            //}
+                GeneratePdbForAssembly(inputFile, Path.Combine(outputDirectory, Path.GetFileNameWithoutExtension(inputFile) + ".pdb"), progress, outputDirectory);
+            }
 
             return new ProjectItem(projectFileName, pid.PlatformName, pid.Guid, pid.TypeGuid);
         }
@@ -75,7 +75,7 @@ private static int GeneratePdbForAssembly(string assemblyFileName, string pdbFil
                 var decompiler = GetDecompiler(assemblyFileName);
                 var progess = progress;
 
-                PortablePdbWriter.WritePdb(module, decompiler, GetSettings(module), stream, namePrefix: namePrefix, progress: progess);
+                PortablePdbWriter.WritePdb(module, decompiler, GetSettings(module), stream, namePrefix: namePrefix, progress: progess, noLogo: true);
             }
 
             return 0;

Unity2Debug.Common/Automation/Automator.cs

@@ -37,16 +37,7 @@ public void Start()
                 if (_debugSettings.CreateDebugCopy)
                 {
                     CreateDebug();
-
-                    //var paths = _debugSettings.ToDebugAssemblyPaths(_decompileSettings.AssemblyPaths);
-                    //if (paths == null)
-                    //{
-                    //    _logger.Error("Could not generate debug assembly paths.");
-                    //    throw new NullReferenceException();
-                    //}
-
-                    //Task.Run(() => DecompileAsync(paths)).Wait();
-
+                    
                     Task.Run(() => DecompileAsync(_decompileSettings.AssemblyPaths)).Wait();
 
                     UnityAutomator unityAutomator = new(_debugSettings, _logger);
@@ -119,23 +110,23 @@ private async Task DecompileAsync(List<string> assemblyPaths)
                     assembly,
                     outputDir,
                     new DecompileLogger(_logger),
-                    _decompilationProgress
-                    /*_debugSettings.CreateDebugCopy*/));
+                    _decompilationProgress,
+                    _debugSettings.CreateDebugCopy));
 
                 if (project != null)
                 {
                     projects.Add(project);
 
-                    //if (_debugSettings.CreateDebugCopy)
-                    //{
-                    //    _logger.Log("Copying PDB to Debug Directory...");
+                    if (_debugSettings.CreateDebugCopy)
+                    {
+                        _logger.Log("Copying PDB to Debug Directory...");
 
-                    //    var pdb = Path.ChangeExtension(project.FilePath, ".pdb");
-                    //    var name = Path.GetFileNameWithoutExtension(_debugSettings.RetailGameExe);
-                    //    var path = Path.Combine(_debugSettings.DebugOutputPath, $@"{name}_Data\Managed", Path.GetFileName(pdb));
+                        var pdb = Path.ChangeExtension(project.FilePath, ".pdb");
+                        var name = Path.GetFileNameWithoutExtension(_debugSettings.RetailGameExe);
+                        var path = Path.Combine(_debugSettings.DebugOutputPath, $@"{name}_Data\Managed", Path.GetFileName(pdb));
 
-                    //    File.Copy(pdb, path, true);
-                    //}
+                        File.Copy(pdb, path, true);
+                    }
                 }
 
                 ResetProgress();

Unity2Debug.Common/Automation/PatchingAutomator.cs

@@ -20,20 +20,9 @@ public PatchingAutomator(DebugSettings debugSettings, DecompileSettings decompil
         public void Start()
         {
             DoCreateSteamAppIdTxt();
-
-            foreach (var assembly in _decompileSettings.AssemblyPaths)
-            {
-                if (string.IsNullOrEmpty(assembly) || !File.Exists(assembly))
-                {
-                    _logger.Error($"Could not patch {assembly}, file not found. Skipping...");
-                    continue;
-                }
-
-                var outputFile = _debugSettings.ToDebugAssemblyPath(assembly);
-                //DoDe4Dot(assembly, outputFile);
-                DoCreateINI(assembly, outputFile);
-            }
+            //Saved incase De4Dot or debug INI's are needed later.  Owlcat games do not require it.
         }
+
         private void DoDe4Dot(string assembly, string outputFile)
         {
             _logger.Log($"Patching {assembly} to point at proper PDB");