Fixed an issue with Preload Support Module attempting to resolve its …

…own NetStandardPatches folder during compilation
LavaGang · Nov 5, 2024 · c31fd05 · c31fd05
1 parent 9ec682e
commit c31fd05
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -194,6 +194,8 @@ jobs:
           cp -r BaseLibs/Mono Output/Debug/x64/MelonLoader/Dependencies/
           cp -r BaseLibs/net35 Output/Debug/x64/MelonLoader/
           cp -r BaseLibs/net6 Output/Debug/x64/MelonLoader/
+          mkdir -p Output/Debug/x64/MelonLoader/Dependencies/SupportModules/NetStandardPatches
+          cp -r BaseLibs/NetStandardPatches Output/Debug/x64/MelonLoader/Dependencies/SupportModules/NetStandardPatches
           echo
           echo Copying Dobby x64...
           cp BaseLibs/dobby_x64.dll Output/Debug/x64/MelonLoader/Dependencies/dobby.dll
@@ -234,6 +236,8 @@ jobs:
           cp -r BaseLibs/Mono Output/Release/x64/MelonLoader/Dependencies/
           cp -r BaseLibs/net35 Output/Release/x64/MelonLoader/
           cp -r BaseLibs/net6 Output/Release/x64/MelonLoader/
+          mkdir -p Output/Release/x64/MelonLoader/Dependencies/SupportModules/NetStandardPatches
+          cp -r BaseLibs/NetStandardPatches Output/Release/x64/MelonLoader/Dependencies/SupportModules/NetStandardPatches
           echo
           echo Copying Dobby x64...
           cp BaseLibs/dobby_x64.dll Output/Release/x64/MelonLoader/Dependencies/dobby.dll
@@ -269,6 +273,8 @@ jobs:
           cp -r BaseLibs/Mono Output/Debug/x86/MelonLoader/Dependencies/
           cp -r BaseLibs/net35 Output/Debug/x86/MelonLoader/
           cp -r BaseLibs/net6 Output/Debug/x86/MelonLoader/
+          mkdir -p Output/Debug/x86/MelonLoader/Dependencies/SupportModules/NetStandardPatches
+          cp -r BaseLibs/NetStandardPatches Output/Debug/x86/MelonLoader/Dependencies/SupportModules/NetStandardPatches
           echo
           echo Copying Dobby x86...
           cp BaseLibs/dobby_x86.dll Output/Debug/x86/MelonLoader/Dependencies/dobby.dll
@@ -304,6 +310,8 @@ jobs:
           cp -r BaseLibs/Mono Output/Release/x86/MelonLoader/Dependencies/
           cp -r BaseLibs/net35 Output/Release/x86/MelonLoader/
           cp -r BaseLibs/net6 Output/Release/x86/MelonLoader/
+          mkdir -p Output/Release/x86/MelonLoader/Dependencies/SupportModules/NetStandardPatches
+          cp -r BaseLibs/NetStandardPatches Output/Release/x86/MelonLoader/Dependencies/SupportModules/NetStandardPatches
           echo
           echo Copying Dobby x86...
           cp BaseLibs/dobby_x86.dll Output/Release/x86/MelonLoader/Dependencies/dobby.dll
@@ -349,6 +357,8 @@ jobs:
           cp -r BaseLibs/Mono Output/Debug/x64/MelonLoader/Dependencies/
           cp -r BaseLibs/net35 Output/Debug/x64/MelonLoader/
           cp -r BaseLibs/net6 Output/Debug/x64/MelonLoader/
+          mkdir -p Output/Debug/x64/MelonLoader/Dependencies/SupportModules/NetStandardPatches
+          cp -r BaseLibs/NetStandardPatches Output/Debug/x64/MelonLoader/Dependencies/SupportModules/NetStandardPatches
           echo
           echo Copying documentation files...
           cp NOTICE.txt Output/Debug/x64
@@ -384,6 +394,8 @@ jobs:
           cp -r BaseLibs/Mono Output/Release/x64/MelonLoader/Dependencies/
           cp -r BaseLibs/net35 Output/Release/x64/MelonLoader/
           cp -r BaseLibs/net6 Output/Release/x64/MelonLoader/
+          mkdir -p Output/Release/x64/MelonLoader/Dependencies/SupportModules/NetStandardPatches
+          cp -r BaseLibs/NetStandardPatches Output/Release/x64/MelonLoader/Dependencies/SupportModules/NetStandardPatches
           echo
           echo Copying documentation files...
           cp NOTICE.txt Output/Release/x64/

diff --git a/...reload/NetStandardPatches/System.Core.dll → BaseLibs/NetStandardPatches/System.Core.dll b/...reload/NetStandardPatches/System.Core.dll → BaseLibs/NetStandardPatches/System.Core.dll
diff --git a/...oad/NetStandardPatches/System.Drawing.dll → ...ibs/NetStandardPatches/System.Drawing.dll b/...oad/NetStandardPatches/System.Drawing.dll → ...ibs/NetStandardPatches/System.Drawing.dll
diff --git a/...les/Preload/NetStandardPatches/System.dll → BaseLibs/NetStandardPatches/System.dll b/...les/Preload/NetStandardPatches/System.dll → BaseLibs/NetStandardPatches/System.dll
diff --git a/MelonLoader/Fixes/Il2CppICallInjector.cs b/MelonLoader/Fixes/Il2CppICallInjector.cs
@@ -10,6 +10,8 @@
 using Il2CppInterop.HarmonySupport;
 using HarmonyLib;
 
+#pragma warning disable 0649
+
 namespace MelonLoader.Fixes
 {
     internal static class Il2CppICallInjector

diff --git a/MelonLoader/MelonUtils.cs b/MelonLoader/MelonUtils.cs
@@ -306,7 +306,11 @@ public static IEnumerable<Type> GetValidTypes(this Assembly asm, LemonFunc<Type,
                 //MelonLogger.Error($"Failed to get all types in assembly {asm.FullName} due to: {ex.Message}", ex);
                 returnval = ex.Types; 
             }
-
+            //catch (Exception ex)
+            //{
+                //MelonLogger.Error($"Failed to get all types in assembly {asm.FullName} due to: {ex.Message}", ex);
+            //    returnval = null;
+            //}
             return returnval.Where(x => (x != null) && (predicate == null || predicate(x)));
         }
 
@@ -317,7 +321,7 @@ public static Type GetValidType(this Assembly asm, string typeName, LemonFunc<Ty
         {
             Type x = null;
             try { x = asm.GetType(typeName); }
-            catch (Exception ex)
+            catch //(Exception ex)
             {
                 //MelonLogger.Error($"Failed to get type {typeName} from assembly {asm.FullName} due to: {ex.Message}", ex);
                 x = null;