Fixed an issue with .NET Bundle Extraction attempting to extract to a…

… folder of the same name as the executable
LavaGang · Dec 8, 2024 · f059fd2 · f059fd2
1 parent 095c3f4
commit f059fd2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/Dependencies/Il2CppAssemblyGenerator/FileHandler.cs b/Dependencies/Il2CppAssemblyGenerator/FileHandler.cs
@@ -1,8 +1,6 @@
 using System;
 using System.IO;
 using System.IO.Compression;
-using System.Linq;
-using MelonLoader.Lemons.Cryptography;
 
 namespace MelonLoader.Il2CppAssemblyGenerator
 {

diff --git a/Dependencies/Il2CppAssemblyGenerator/Packages/Cpp2IL.cs b/Dependencies/Il2CppAssemblyGenerator/Packages/Cpp2IL.cs
@@ -74,7 +74,6 @@ internal override bool Execute()
 
             ], false, new Dictionary<string, string>() {
                 {"NO_COLOR", "1"},
-                {"DOTNET_BUNDLE_EXTRACT_BASE_DIR", BaseFolder }
             });
     }
 }
diff --git a/Dependencies/Il2CppAssemblyGenerator/Packages/Models/ExecutablePackage.cs b/Dependencies/Il2CppAssemblyGenerator/Packages/Models/ExecutablePackage.cs
@@ -38,6 +38,11 @@ internal bool Execute(string[] args, bool parenthesize_args = true, Dictionary<s
             Core.Logger.Msg($"Executing {Name}...");
             try
             {
+                string tempFolder = Path.Combine(Path.GetDirectoryName(ExeFilePath),
+                    $"{Path.GetFileNameWithoutExtension(ExeFilePath)}_Temp");
+                if (!Directory.Exists(tempFolder))
+                    Directory.CreateDirectory(tempFolder);
+
                 ResetEvent_Output = new AutoResetEvent(false);
                 ResetEvent_Error = new AutoResetEvent(false);
 
@@ -64,10 +69,9 @@ internal bool Execute(string[] args, bool parenthesize_args = true, Dictionary<s
 
                 if (environment != null)
                 {
+                    processStartInfo.EnvironmentVariables["DOTNET_BUNDLE_EXTRACT_BASE_DIR"] = tempFolder;
                     foreach (var kvp in environment)
-                    {
                         processStartInfo.EnvironmentVariables[kvp.Key] = kvp.Value;
-                    }
                 }
 
                 Core.Logger.Msg("\"" + ExeFilePath + "\" " + processStartInfo.Arguments);
@@ -88,6 +92,10 @@ internal bool Execute(string[] args, bool parenthesize_args = true, Dictionary<s
                 ResetEvent_Error.WaitOne();
 
                 SetProcessId(0);
+
+                if (Directory.Exists(tempFolder))
+                    Directory.Delete(tempFolder, true);
+
                 return process.ExitCode == 0;
             }
             catch (Exception ex)