Merge pull request #676 from LavaGang/alpha-development

Bug Fixes for v0.6.3
LavaGang · Jun 23, 2024 · 6c0d224 · 6c0d224
2 parents 4d338a6 + e30c8e4
commit 6c0d224
Show file tree

Hide file tree

Showing 12 changed files with 113 additions and 80 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,35 +11,35 @@ jobs:
   build_core_debug:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: setup-msbuild
-        uses: microsoft/setup-msbuild@v1
+        uses: microsoft/setup-msbuild@v2
       - name: Build Melonloader Core
         shell: cmd
         run: msbuild /restore /p:Platform="Windows - x64" # Platform is actually irrelevant for core, it's compiled as AnyCPU either way
       - name: Upload core artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: MLCoreDebug
           path: Output/Debug/MelonLoader/
   build_core_release:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: setup-msbuild
-        uses: microsoft/setup-msbuild@v1
+        uses: microsoft/setup-msbuild@v2
       - name: Build Melonloader Core
         shell: cmd
         run: msbuild /restore /p:Configuration=Release /p:Platform="Windows - x64"
       - name: Upload core artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: MLCoreRelease
           path: Output/Release/MelonLoader/
   build_rust_windows:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: rust-toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
@@ -62,56 +62,56 @@ jobs:
         run: cargo +nightly build --target x86_64-pc-windows-msvc
         # Upload Proxy Release - x86
       - name: Upload Proxy Release | Windows x86
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: MLProxyX86-Windows-Release
           path: target/i686-pc-windows-msvc/release/version.dll
         # Upload Bootstrap Release - x86
       - name: Upload Bootstrap Release | Windows x86
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: MLBootstrapX86-Windows-Release
           path: target/i686-pc-windows-msvc/release/Bootstrap.dll
         # Upload Proxy Release - x64
       - name: Upload Proxy Release | Windows x64
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: MLProxyX64-Windows-Release
           path: target/x86_64-pc-windows-msvc/release/version.dll
         # Upload Bootstrap Release - x64
       - name: Upload Bootstrap Release | Windows x64
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: MLBootstrapX64-Windows-Release
           path: target/x86_64-pc-windows-msvc/release/Bootstrap.dll
         # Upload Proxy Debug - x86
       - name: Upload Proxy Debug | Windows x86
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: MLProxyX86-Windows-Debug
           path: target/i686-pc-windows-msvc/debug/version.dll
         # Upload Bootstrap Debug - x86
       - name: Upload Bootstrap Debug | Windows x86
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: MLBootstrapX86-Windows-Debug
           path: target/i686-pc-windows-msvc/debug/Bootstrap.dll
         # Upload Proxy Debug - x64
       - name: Upload Proxy Debug | Windows x64
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: MLProxyX64-Windows-Debug
           path: target/x86_64-pc-windows-msvc/debug/version.dll
         # Upload Bootstrap Debug - x64
       - name: Upload Bootstrap Debug | Windows x64
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: MLBootstrapX64-Windows-Debug
           path: target/x86_64-pc-windows-msvc/debug/Bootstrap.dll
   build_rust_linux:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: rust-toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
@@ -128,42 +128,42 @@ jobs:
         shell: bash
         run: cargo +nightly build --target x86_64-unknown-linux-gnu
       - name: Upload Proxy Release | Linux x64
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: MLProxyX64-Linux-Release
           path: target/x86_64-unknown-linux-gnu/release/libversion.so
       - name: Upload Bootstrap Release | Linux x64
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: MLBootstrapX64-Linux-Release
           path: target/x86_64-unknown-linux-gnu/release/libBootstrap.so
       - name: Upload Proxy Debug | Linux x64
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: MLProxyX64-Linux-Debug
           path: target/x86_64-unknown-linux-gnu/debug/libversion.so
       - name: Upload Bootstrap Debug | Linux x64
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: MLBootstrapX64-Linux-Debug
           path: target/x86_64-unknown-linux-gnu/debug/libBootstrap.so
   finalize_x64_debug_zip_windows:
     runs-on: windows-latest
     needs: [build_core_debug, build_rust_windows]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Download core artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: MLCoreDebug
           path: Output/Debug/x64/MelonLoader/
       - name: Download proxy x64
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: MLProxyX64-Windows-Debug
           path: Output/Debug/x64/
       - name: Download bootstrap x64
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: MLBootstrapX64-Windows-Debug
           path: Output/Debug/x64/MelonLoader/Dependencies/
@@ -184,7 +184,7 @@ jobs:
           copy LICENSE.md Output\Debug\x64\MelonLoader\Documentation\
           copy NOTICE.txt Output\Debug\x64\MelonLoader\Documentation\
           copy README.md Output\Debug\x64\MelonLoader\Documentation\
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         name: Upload Zip | Windows - x64
         with:
           name: MelonLoader.Windows.x64.CI.Debug
@@ -193,19 +193,19 @@ jobs:
     runs-on: windows-latest
     needs: [build_core_debug, build_rust_windows]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Download core artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: MLCoreDebug
           path: Output/Debug/x86/MelonLoader/
       - name: Download proxy x86
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: MLProxyX86-Windows-Debug
           path: Output/Debug/x86/
       - name: Download bootstrap x86
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: MLBootstrapX86-Windows-Debug
           path: Output/Debug/x86/MelonLoader/Dependencies/
@@ -226,7 +226,7 @@ jobs:
           copy LICENSE.md Output\Debug\x86\MelonLoader\Documentation\
           copy NOTICE.txt Output\Debug\x86\MelonLoader\Documentation\
           copy README.md Output\Debug\x86\MelonLoader\Documentation\
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         name: Upload Zip | Windows - x86
         with:
           name: MelonLoader.Windows.x86.CI.Debug
@@ -235,19 +235,19 @@ jobs:
     runs-on: windows-latest
     needs: [build_core_release, build_rust_windows]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Download core artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: MLCoreRelease
           path: Output/Release/x64/MelonLoader/
       - name: Download proxy x64
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: MLProxyX64-Windows-Release
           path: Output/Release/x64/
       - name: Download bootstrap x64
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: MLBootstrapX64-Windows-Release
           path: Output/Release/x64/MelonLoader/Dependencies/
@@ -268,7 +268,7 @@ jobs:
           copy LICENSE.md Output\Release\x64\MelonLoader\Documentation\
           copy NOTICE.txt Output\Release\x64\MelonLoader\Documentation\
           copy README.md Output\Release\x64\MelonLoader\Documentation\
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         name: Upload Zip | Windows - x64
         with:
           name: MelonLoader.Windows.x64.CI.Release
@@ -277,19 +277,19 @@ jobs:
     runs-on: windows-latest
     needs: [build_core_release, build_rust_windows]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Download core artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: MLCoreRelease
           path: Output/Release/x86/MelonLoader/
       - name: Download proxy x86
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: MLProxyX86-Windows-Release
           path: Output/Release/x86/
       - name: Download bootstrap x86
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: MLBootstrapX86-Windows-Release
           path: Output/Release/x86/MelonLoader/Dependencies/
@@ -310,7 +310,7 @@ jobs:
           copy LICENSE.md Output\Release\x86\MelonLoader\Documentation\
           copy NOTICE.txt Output\Release\x86\MelonLoader\Documentation\
           copy README.md Output\Release\x86\MelonLoader\Documentation\
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         name: Upload Zip | Windows - x86
         with:
           name: MelonLoader.Windows.x86.CI.Release
@@ -319,19 +319,19 @@ jobs:
     runs-on: windows-latest
     needs: [build_core_debug, build_rust_linux]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Download core artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: MLCoreDebug
           path: Output/Debug/x64/MelonLoader/
       - name: Download proxy x64
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: MLProxyX64-Linux-Debug
           path: Output/Debug/x64/
       - name: Download bootstrap x64
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: MLBootstrapX64-Linux-Debug
           path: Output/Debug/x64/MelonLoader/Dependencies/
@@ -349,7 +349,7 @@ jobs:
           copy LICENSE.md Output\Debug\x64\MelonLoader\Documentation\
           copy NOTICE.txt Output\Debug\x64\MelonLoader\Documentation\
           copy README.md Output\Debug\x64\MelonLoader\Documentation\
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         name: Upload Zip | Linux - x64
         with:
           name: MelonLoader.Linux.x64.CI.Debug
@@ -358,19 +358,19 @@ jobs:
     runs-on: windows-latest
     needs: [build_core_release, build_rust_linux]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Download core artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: MLCoreRelease
           path: Output/Release/x64/MelonLoader/
       - name: Download proxy x64
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: MLProxyX64-Linux-Release
           path: Output/Release/x64/
       - name: Download bootstrap x64
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: MLBootstrapX64-Linux-Release
           path: Output/Release/x64/MelonLoader/Dependencies/
@@ -388,7 +388,7 @@ jobs:
           copy LICENSE.md Output\Release\x64\MelonLoader\Documentation\
           copy NOTICE.txt Output\Release\x64\MelonLoader\Documentation\
           copy README.md Output\Release\x64\MelonLoader\Documentation\
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         name: Upload Zip | Linux - x64
         with:
           name: MelonLoader.Linux.x64.CI.Release
@@ -397,7 +397,7 @@ jobs:
     runs-on: windows-latest
     needs: [finalize_x86_debug_zip_windows, finalize_x64_debug_zip_windows, finalize_x86_release_zip_windows, finalize_x64_release_zip_windows, finalize_x64_debug_zip_linux, finalize_x64_release_zip_linux]
     steps:
-      - uses: GeekyEggo/delete-artifact@v2.0.0
+      - uses: GeekyEggo/delete-artifact@v5.0.0
         with:
           name: |
             MLCoreDebug

diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml
@@ -11,7 +11,7 @@ jobs:
   build_nuget_package:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup .NET
         uses: actions/[email protected]
         with:
@@ -20,7 +20,7 @@ jobs:
         run: dotnet pack -c Release
         working-directory: ./MelonLoader/
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: MelonLoaderNuGetPackage
           path: MelonLoader/Output/Release/MelonLoader/LavaGang.MelonLoader.0.6.3.nupkg
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -39,7 +39,7 @@
 
 1. Updated NuGet Packages
 2. Updated Cpp2IL to 2022.1.0-pre-release.14
-3. Updated Il2CppInterop to 1.4.6-ci.394
+3. Updated Il2CppInterop to 1.4.6-ci.433
 4. Updated Tomlet to 5.3.1
 5. Fixed Referenced DLLs not being resolved properly resulting in crashes
 6. Fixed Proxy being unable to find Original DLL    (Credits to [RinLovesYou](https://github.com/RinLovesYou) :3)
@@ -51,6 +51,9 @@
 12. Rewrote the Demeo Compatibility Layer to be less prone to breakage
 13. Fixed DarkRed ConsoleColor   (Credits to [Scoolnik](https://github.com/Scoolnik) :D)
 14. Fixed several .NET Framework 2.0 compatibility issues   (Credits to [slxdy](https://github.com/slxdy) :D)
+15. Fixed an issue with Mods loading when Il2Cpp Assembly Generation fails
+16. Added `--melonloader.sab` Launch Option to disable the Analytics Blocker
+17. Fixed an issue with MelonCompatibilityLayer causing crashes on some games
 
 ---
 

diff --git a/Dependencies/Il2CppAssemblyGenerator/Il2CppAssemblyGenerator.csproj b/Dependencies/Il2CppAssemblyGenerator/Il2CppAssemblyGenerator.csproj
@@ -14,10 +14,10 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Iced" Version="1.21.0" />
-		<PackageReference Include="Il2CppInterop.Generator" Version="1.4.6-ci.394" ExcludeAssets="Runtime" />
-		<PackageReference Include="Il2CppInterop.Common" Version="1.4.6-ci.394" ExcludeAssets="Runtime" />
-		<PackageReference Include="Il2CppInterop.Runtime" Version="1.4.6-ci.394" ExcludeAssets="Runtime" />
-		<PackageReference Include="Il2CppInterop.HarmonySupport" Version="1.4.6-ci.394" IncludeAssets="Runtime" />
+		<PackageReference Include="Il2CppInterop.Generator" Version="1.4.6-ci.433" ExcludeAssets="Runtime" />
+		<PackageReference Include="Il2CppInterop.Common" Version="1.4.6-ci.433" ExcludeAssets="Runtime" />
+		<PackageReference Include="Il2CppInterop.Runtime" Version="1.4.6-ci.433" ExcludeAssets="Runtime" />
+		<PackageReference Include="Il2CppInterop.HarmonySupport" Version="1.4.6-ci.433" IncludeAssets="Runtime" />
 		<PackageReference Include="Mono.Cecil" Version="0.11.5" ExcludeAssets="Runtime" />
 		<ProjectReference Include="..\..\MelonLoader\MelonLoader.csproj" Private="false" />
 		<PackageReference Include="AssetRipper.VersionUtilities" Version="1.5.0" ExcludeAssets="Runtime" />