Merge pull request #2 from LavaGang/alpha-development

Razzmatazzz · web-flow · commit 55610b1145c7 · 2026-03-03T18:14:21.000-06:00
Alpha development
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -11,13 +11,13 @@ updates:
     schedule:
       interval: "daily"
 
-  - package-ecosystem: "cargo"
-    directory: "/"
-    schedule:
-      interval: "monthly"
-    ignore:
-      - dependency-name: "*"
-
+  #- package-ecosystem: "cargo"
+  #  target-branch: "alpha-development"
+  #  directory: "/"
+  #  schedule:
+  #    interval: "monthly"
+  #  ignore:
+  #    - dependency-name: "*"
 
   - package-ecosystem: "github-actions"
     target-branch: "alpha-development"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,9 +4,9 @@ run-name: 0.7.2${{ github.event_name != 'workflow_dispatch' && format('-ci.{0}',
 
 on:
   push:
-    branches: [ master, alpha-development, v0.6.0-rewrite ]
+    branches: [ master, alpha-development ]
   pull_request:
-    branches: [ master, alpha-development, v0.6.0-rewrite ]
+    branches: [ master, alpha-development ]
   workflow_dispatch:
 
 jobs:
@@ -15,4 +15,16 @@ jobs:
     uses: ./.github/workflows/compile_all.yml
     with:
       SKIP_DEBUG: false
-      VERSION: "0.7.2${{ github.event_name != 'workflow_dispatch' && format('.{0}', github.run_number) || '' }}"
+      VERSION: "0.7.2${{ github.event_name != 'workflow_dispatch' && format('.{0}', github.run_number) || '' }}"
+      PACKAGE_VERSION: "0.7.2${{ github.event_name != 'workflow_dispatch' && format('{0}', github.run_number) || '' }}"
+      PACKAGE_NAME: MelonLoaderNightly
+      
+  upload_thunderstore:
+    name: Upload to Thunderstore
+    if: github.event_name != 'pull_request'
+    needs: [ build ]
+    uses: ./.github/workflows/upload_thunderstore.yml
+    with:
+      VERSION: "0.7.2${{ github.event_name != 'workflow_dispatch' && format('{0}', github.run_number) || '' }}"
+      PACKAGE_NAME: MelonLoaderNightly
+    secrets: inherit
diff --git a/.github/workflows/compile_all.yml b/.github/workflows/compile_all.yml
@@ -7,6 +7,12 @@ on:
       SKIP_DEBUG:
         required: true
         type: boolean
+      PACKAGE_VERSION:
+        required: true
+        type: string
+      PACKAGE_NAME:
+        required: true
+        type: string
 
 jobs:
   compile_windows:
@@ -41,4 +47,5 @@ jobs:
     uses: ./.github/workflows/compile_thunderstore.yml
     needs: [ compile_windows ]
     with:
-      VERSION: ${{ inputs.VERSION }}
+      VERSION: ${{ inputs.PACKAGE_VERSION }}
+      PACKAGE_NAME: ${{ inputs.PACKAGE_NAME }}
diff --git a/.github/workflows/compile_linux.yml b/.github/workflows/compile_linux.yml
@@ -27,7 +27,7 @@ jobs:
 
       - name: Upload Debug for linux-x64
         if: inputs.SKIP_DEBUG != true
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: MelonLoader.Linux.x64.CI.Debug
           path: Output/Debug/linux-x64
@@ -36,7 +36,7 @@ jobs:
         run: dotnet build --no-restore -c Release -p:Platform="x64" -p:Version="${{ inputs.VERSION }}"
 
       - name: Upload Release for linux-x64
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: MelonLoader.Linux.x64.CI.Release
           path: Output/Release/linux-x64
diff --git a/.github/workflows/compile_macos.yml b/.github/workflows/compile_macos.yml
@@ -28,7 +28,7 @@ jobs:
 
       - name: Upload Debug for osx-x64
         if: inputs.SKIP_DEBUG != true
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: MelonLoader.macOS.x64.CI.Debug
           path: Output/Debug/osx-x64
@@ -37,7 +37,7 @@ jobs:
         run: dotnet build --no-restore -c Release -p:Platform="x64" -p:Version="${{ inputs.VERSION }}"
 
       - name: Upload Release for osx-x64
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: MelonLoader.macOS.x64.CI.Release
           path: Output/Release/osx-x64
diff --git a/.github/workflows/compile_nuget.yml b/.github/workflows/compile_nuget.yml
@@ -22,7 +22,7 @@ jobs:
         run: dotnet pack -c Release -p:Platform="x64" -p:Version="${{ inputs.VERSION }}"
 
       - name: Upload NuGet Artifact
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: MelonLoader.NuGet
           path: Output/Release/win-x64/MelonLoader/LavaGang.MelonLoader.${{ inputs.VERSION }}.nupkg
diff --git a/.github/workflows/compile_thunderstore.yml b/.github/workflows/compile_thunderstore.yml
@@ -1,5 +1,4 @@
 env:
-  PACKAGE_NAME: MelonLoader
   PACKAGE_DESC: The World's First Universal Mod Loader for Unity Games compatible with both Il2Cpp and Mono
   PACKAGE_REPO: https://github.com/${{ github.repository }}
 
@@ -9,6 +8,9 @@ on:
       VERSION:
         required: true
         type: string
+      PACKAGE_NAME:
+        required: true
+        type: string
   
 jobs:
   compile_thunderstore:
@@ -18,7 +20,7 @@ jobs:
       - uses: actions/checkout@v6
         
       - name: Download Windows x64 Artifact
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: MelonLoader.Windows.x64.CI.Release
           path: ./compiled_release/thunderstore
@@ -32,21 +34,16 @@ jobs:
         run: |
           cat <<EOF > compiled_release/thunderstore/manifest.json
           {
-              "name": "${{ env.PACKAGE_NAME }}",
+              "name": "${{ inputs.PACKAGE_NAME }}",
               "version_number": "${{ inputs.VERSION }}",
               "website_url": "${{ env.PACKAGE_REPO }}",
               "description": "${{ env.PACKAGE_DESC }}",
               "dependencies": []
           }
           EOF
           
-      - name: Package Zip Archive
-        run: |
-          cd compiled_release/thunderstore
-          zip -r ../${{ github.repository_owner }}-${{ env.PACKAGE_NAME }}-${{ inputs.VERSION }}.zip ./
-
       - name: Upload Thunderstore Artifact
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: MelonLoader.Thunderstore
-          path: compiled_release/${{ github.repository_owner }}-${{ env.PACKAGE_NAME }}-${{ inputs.VERSION }}.zip
+          path: compiled_release/thunderstore
diff --git a/.github/workflows/compile_windows.yml b/.github/workflows/compile_windows.yml
@@ -27,7 +27,7 @@ jobs:
 
       - name: Upload Debug for win-x64
         if: inputs.SKIP_DEBUG != true
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: MelonLoader.Windows.x64.CI.Debug
           path: Output/Debug/win-x64
@@ -36,7 +36,7 @@ jobs:
         run: dotnet build --no-restore -c Release -p:Platform="x64" -p:Version="${{ inputs.VERSION }}"
 
       - name: Upload Release for win-x64
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: MelonLoader.Windows.x64.CI.Release
           path: Output/Release/win-x64
@@ -47,7 +47,7 @@ jobs:
 
       - name: Upload Debug for win-x86
         if: inputs.SKIP_DEBUG != true
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: MelonLoader.Windows.x86.CI.Debug
           path: Output/Debug/win-x86
@@ -56,7 +56,7 @@ jobs:
         run: dotnet build --no-restore -c Release -p:Platform="x86" -p:Version="${{ inputs.VERSION }}"
 
       - name: Upload Release for win-x86
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: MelonLoader.Windows.x86.CI.Release
           path: Output/Release/win-x86
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -30,6 +30,8 @@ jobs:
     with:
       SKIP_DEBUG: true
       VERSION: ${{ needs.fix_tag_version.outputs.clean_version }}
+      PACKAGE_VERSION: ${{ needs.fix_tag_version.outputs.clean_version }}
+      PACKAGE_NAME: MelonLoader
     
   upload:
     name: Upload
@@ -38,4 +40,7 @@ jobs:
     with:
       TAG: ${{ github.ref_name }}
       RELEASE_NAME: ${{ github.ref_name }} Open-Beta
-      VERSION: ${{ needs.fix_tag_version.outputs.clean_version }}
+      VERSION: ${{ needs.fix_tag_version.outputs.clean_version }}
+      PACKAGE_VERSION: ${{ needs.fix_tag_version.outputs.clean_version }}
+      PACKAGE_NAME: MelonLoader
+    secrets: inherit
diff --git a/.github/workflows/upload_all.yml b/.github/workflows/upload_all.yml
@@ -10,6 +10,12 @@ on:
       VERSION:
         required: true
         type: string
+      PACKAGE_VERSION:
+        required: true
+        type: string
+      PACKAGE_NAME:
+        required: true
+        type: string
 
 jobs:
   upload_github:
@@ -18,13 +24,17 @@ jobs:
     with:
       TAG: ${{ inputs.TAG }}
       RELEASE_NAME: ${{ inputs.RELEASE_NAME }}
+    secrets: inherit
   
   upload_nuget:
     name: NuGet
     uses: ./.github/workflows/upload_nuget.yml
+    secrets: inherit
     
-  #upload_thunderstore:
-  #  name: Thunderstore
-  #  uses: ./.github/workflows/upload_thunderstore.yml
-  #  with:
-  #    VERSION: ${{ inputs.VERSION }}
+  upload_thunderstore:
+    name: Thunderstore
+    uses: ./.github/workflows/upload_thunderstore.yml
+    with:
+      VERSION: ${{ inputs.PACKAGE_VERSION }}
+      PACKAGE_NAME: ${{ inputs.PACKAGE_NAME }}
+    secrets: inherit
diff --git a/.github/workflows/upload_github.yml b/.github/workflows/upload_github.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v6
       
       - name: Download Windows x86 Artifact
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: MelonLoader.Windows.x86.CI.Release
           path: ./compiled_release/windows_x86
@@ -26,7 +26,7 @@ jobs:
           zip -r ../MelonLoader.x86.zip ./
       
       - name: Download Windows x64 Artifact
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: MelonLoader.Windows.x64.CI.Release
           path: ./compiled_release/windows_x64
@@ -36,7 +36,7 @@ jobs:
           zip -r ../MelonLoader.x64.zip ./
         
       - name: Download Linux x64 Artifact
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: MelonLoader.Linux.x64.CI.Release
           path: ./compiled_release/linux_x64
@@ -46,7 +46,7 @@ jobs:
           zip -r ../MelonLoader.Linux.x64.zip  ./
         
       - name: Download MacOS x64 Artifact
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: MelonLoader.macOS.x64.CI.Release
           path: ./compiled_release/macos_x64
diff --git a/.github/workflows/upload_nuget.yml b/.github/workflows/upload_nuget.yml
@@ -14,10 +14,11 @@ jobs:
           dotnet-version: 9.0.x
           
       - name: Download NuGet Artifact
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: MelonLoader.NuGet
           path: ./compiled_release/
       
       - name: Publish NuGet Package
+        continue-on-error: true
         run: dotnet nuget push -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_API_KEY }} ./compiled_release/*.nupkg
diff --git a/.github/workflows/upload_thunderstore.yml b/.github/workflows/upload_thunderstore.yml
@@ -0,0 +1,45 @@
+env:
+  PACKAGE_DESC: The World's First Universal Mod Loader for Unity Games compatible with both Il2Cpp and Mono
+  PACKAGE_REPO: https://github.com/${{ github.repository }}
+
+on:
+  workflow_call:
+    inputs:
+      VERSION:
+        required: true
+        type: string
+      PACKAGE_NAME:
+        required: true
+        type: string
+  
+jobs:
+  upload_thunderstore:
+    name: Upload Thunderstore
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+          
+      - name: Download Artifact
+        uses: actions/download-artifact@v8
+        with:
+          name: MelonLoader.Thunderstore
+          path: ./compiled_thunderstore/
+      - name: Package Artifact into Zip Archive
+        run: |
+          cd compiled_thunderstore
+          zip -r ../${{ github.repository_owner }}-${{ inputs.PACKAGE_NAME }}-${{ inputs.VERSION }}.zip ./
+      
+      - name: Publish Package
+        id: pub
+        continue-on-error: true
+        uses: GreenTF/upload-thunderstore-package@aef20d7e07a0858d0decae64872aa5526662ab8d
+        with:
+          community: ${{ vars.TS_COM }}
+          namespace: ${{ github.repository_owner }}
+          name: ${{ inputs.PACKAGE_NAME }}
+          version: ${{ inputs.VERSION }}
+          description: ${{ env.PACKAGE_DESC }}
+          token: ${{ secrets.TS_KEY }}
+          file: ${{ github.repository_owner }}-${{ inputs.PACKAGE_NAME }}-${{ inputs.VERSION }}.zip
+          repo: thunderstore.io
+      
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -64,11 +64,11 @@
 19. Fixed an issue with Melon Subfolder Parent Context checks using an incorrect ScanType
 20. Implemented MelonInfoAttribute.SystemType Validation to prevent infinite loop during Melon Instantiation
 21. Fixed an issue with Infinite Loops from RottenMelon Instantiation calling MelonAssembly.LoadMelonAssembly
-22. Updated Cpp2IL to 2022.1.0-pre-release.20
+22. Updated Cpp2IL to 2022.1.0-pre-release.21   (Credits to [IkariDevGIT](https://github.com/IkariDevGIT) :D)
 23. Implemented Il2CppInterop GetFieldDefaultValue Fix to allow custom signatures to be added to Il2CppInterop's Class::GetFieldDefaultValue Hook
 24. Allowed exclamation marks in namespaces/types   (Credits to [Emik03](https://github.com/Emik03) :D)
-25. Updated Tomlet to 6.1.0
-26. Updated Pastel to 7.0.0
+25. Updated Tomlet to 6.2.0
+26. Updated Pastel to 7.0.1
 27. Updated AssetRipper.Primitives to 3.2.0
 28. Updated Il2CppInterop to 1.5.1
 29. Fixed an issue with Melon Subfolder toggle being inverted
@@ -94,6 +94,12 @@
 49. Fixed an issue with Command-Line Parsing sometimes failing   (Credits to [official-notfishvr](https://github.com/official-notfishvr) :D)
 50. Adjusted DotNet handling to initialize more reliably
 51. Implemented DotNet HostFXR Path Override config and launch options --melonloader.hostfxr
+52. Fixed an issue with Logging not validating Section   (Credits to [MrModification](https://github.com/MrModification) :D)
+53. Updated AssetTools.Net to 3.0.4   (Credits to [dommrogers](https://github.com/dommrogers) :D)
+54. Fixed Il2CppInterop RunFinalizer sometimes failing on certain Unity versions   (Credits to [Atmudia](https://github.com/Atmudia) :D)
+55. Fixed compilation issues with MelonStartScreen   (Credits to [official-notfishvr](https://github.com/official-notfishvr) :D)
+56. Fixed an issue with Wine console not resetting the colors after message output   (Credits to [bnfour](https://github.com/bnfour) :D)
+57. Removed broken InstancePatchFix patches   (Credits to [RaptorRush135](https://github.com/RaptorRush135) :D)
 
 ---
 
diff --git a/Dependencies/Il2CppAssemblyGenerator/Packages/Cpp2IL.cs b/Dependencies/Il2CppAssemblyGenerator/Packages/Cpp2IL.cs
diff --git a/Directory.Build.props b/Directory.Build.props
diff --git a/MelonLoader/Core.cs b/MelonLoader/Core.cs
diff --git a/MelonLoader/Fixes/MonoMod/InstancePatchFix.cs b/MelonLoader/Fixes/MonoMod/InstancePatchFix.cs
diff --git a/MelonLoader/MelonLoader.csproj b/MelonLoader/MelonLoader.csproj
diff --git a/PortablePdbToMdb/PortablePdbToMdb.csproj b/PortablePdbToMdb/PortablePdbToMdb.csproj
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
