Revert "Fixed an issue with Melons and UserLibs becoming File Locked …

…after Loading" This reverts commit eafab46.
LavaGang · Oct 14, 2024 · 30b8638 · 30b8638
1 parent eafab46
commit 30b8638
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/MelonLoader/Melons/MelonAssembly.cs b/MelonLoader/Melons/MelonAssembly.cs
@@ -80,7 +80,12 @@ public static MelonAssembly LoadMelonAssembly(string path, bool loadMelons = tru
 
             try
             {
-                return LoadRawMelonAssembly(path, File.ReadAllBytes(path), null, loadMelons);
+#if NET6_0_OR_GREATER
+                var assembly = AssemblyLoadContext.Default.LoadFromAssemblyPath(path);
+#else
+                var assembly = Assembly.LoadFrom(path);
+#endif
+                return LoadMelonAssembly(path, assembly, loadMelons);
             }
             catch (Exception ex)
             {

diff --git a/MelonLoader/Melons/MelonFolderHandler.cs b/MelonLoader/Melons/MelonFolderHandler.cs
@@ -102,9 +102,10 @@ private static void ProcessFolder<T>(string path,
 
             // Get Directories
             var directories = Directory.GetDirectories(path, "*", SearchOption.AllDirectories);
+
+            // Add Directories to Resolver
             if ((directories != null) && (directories.Length > 0))
             {
-                // Add Directories to Resolver
                 foreach (var dir in directories)
                 {
                     // Validate Path