Merge pull request #736 from LavaGang/alpha-development

MelonLoader v0.6.5

Author: HerpDerpinstine

.github/workflows/build.yml

@@ -118,6 +118,9 @@ jobs:
           toolchain: nightly
           # Target triple to install for this toolchain
           targets: x86_64-unknown-linux-gnu
+      - name: update environment
+        shell: bash
+        run: sudo apt-get update
       - name: install dev dependencies
         shell: bash
         run: sudo apt-get install libgtk-3-dev 
@@ -171,8 +174,10 @@ jobs:
         shell: cmd
         run: |
           echo Copying Managed Libs...
-          mkdir Output\Debug\x64\MelonLoader\Managed\
-          xcopy BaseLibs\Managed Output\Debug\x64\MelonLoader\Managed\ /E /H /Y
+          mkdir Output\Debug\x64\MelonLoader\Dependencies\Mono
+          xcopy BaseLibs\Mono Output\Debug\x64\MelonLoader\Dependencies\Mono\ /E /H /Y
+          xcopy BaseLibs\net35 Output\Debug\x64\MelonLoader\net35\ /E /H /Y
+          xcopy BaseLibs\net6 Output\Debug\x64\MelonLoader\net6\ /E /H /Y
           echo.
           echo Copying Dobby x64...
           xcopy BaseLibs\dobby_x64.dll Output\Debug\x64\dobby.dll*
@@ -213,8 +218,10 @@ jobs:
         shell: cmd
         run: |
           echo Copying Managed Libs...
-          mkdir Output\Debug\x86\MelonLoader\Managed\
-          xcopy BaseLibs\Managed Output\Debug\x86\MelonLoader\Managed\ /E /H /Y
+          mkdir Output\Debug\x86\MelonLoader\Dependencies\Mono
+          xcopy BaseLibs\Mono Output\Debug\x86\MelonLoader\Dependencies\Mono\ /E /H /Y
+          xcopy BaseLibs\net35 Output\Debug\x86\MelonLoader\net35\ /E /H /Y
+          xcopy BaseLibs\net6 Output\Debug\x86\MelonLoader\net6\ /E /H /Y
           echo.
           echo Copying Dobby x86...
           xcopy BaseLibs\dobby_x86.dll Output\Debug\x86\dobby.dll*
@@ -255,8 +262,10 @@ jobs:
         shell: cmd
         run: |
           echo Copying Managed Libs...
-          mkdir Output\Release\x64\MelonLoader\Managed\
-          xcopy BaseLibs\Managed Output\Release\x64\MelonLoader\Managed\ /E /H /Y
+          mkdir Output\Release\x64\MelonLoader\Dependencies\Mono
+          xcopy BaseLibs\Mono Output\Release\x64\MelonLoader\Dependencies\Mono\ /E /H /Y
+          xcopy BaseLibs\net35 Output\Release\x64\MelonLoader\net35\ /E /H /Y
+          xcopy BaseLibs\net6 Output\Release\x64\MelonLoader\net6\ /E /H /Y
           echo.
           echo Copying Dobby x64...
           xcopy BaseLibs\dobby_x64.dll Output\Release\x64\dobby.dll*
@@ -297,11 +306,13 @@ jobs:
         shell: cmd
         run: |
           echo Copying Managed Libs...
-          mkdir Output\Release\x86\MelonLoader\Managed\
-          xcopy BaseLibs\Managed Output\Release\x86\MelonLoader\Managed\ /E /H /Y
+          mkdir Output\Release\x86\MelonLoader\Dependencies\Mono
+          xcopy BaseLibs\Mono Output\Release\x86\MelonLoader\Dependencies\Mono\ /E /H /Y
+          xcopy BaseLibs\net35 Output\Release\x86\MelonLoader\net35\ /E /H /Y
+          xcopy BaseLibs\net6 Output\Release\x86\MelonLoader\net6\ /E /H /Y
           echo.
           echo Copying Dobby x86...
-          echo F | xcopy BaseLibs\dobby_x86.dll Output\Release\x86\dobby.dll*
+          xcopy BaseLibs\dobby_x86.dll Output\Release\x86\dobby.dll*
           echo.
           echo Copying documentation files...
           copy NOTICE.txt Output\Release\x86
@@ -339,8 +350,10 @@ jobs:
         shell: cmd
         run: |
           echo Copying Managed Libs...
-          mkdir Output\Debug\x64\MelonLoader\Managed\
-          xcopy BaseLibs\Managed Output\Debug\x64\MelonLoader\Managed\ /E /H /Y
+          mkdir Output\Debug\x64\MelonLoader\Dependencies\Mono
+          xcopy BaseLibs\Mono Output\Debug\x64\MelonLoader\Dependencies\Mono\ /E /H /Y
+          xcopy BaseLibs\net35 Output\Debug\x64\MelonLoader\net35\ /E /H /Y
+          xcopy BaseLibs\net6 Output\Debug\x64\MelonLoader\net6\ /E /H /Y
           echo.
           echo Copying documentation files...
           copy NOTICE.txt Output\Debug\x64
@@ -378,8 +391,10 @@ jobs:
         shell: cmd
         run: |
           echo Copying Managed Libs...
-          mkdir Output\Release\x64\MelonLoader\Managed\
-          xcopy BaseLibs\Managed Output\Release\x64\MelonLoader\Managed\ /E /H /Y
+          mkdir Output\Release\x64\MelonLoader\Dependencies\Mono
+          xcopy BaseLibs\Mono Output\Release\x64\MelonLoader\Dependencies\Mono\ /E /H /Y
+          xcopy BaseLibs\net35 Output\Release\x64\MelonLoader\net35\ /E /H /Y
+          xcopy BaseLibs\net6 Output\Release\x64\MelonLoader\net6\ /E /H /Y
           echo.
           echo Copying documentation files...
           copy NOTICE.txt Output\Release\x64

.github/workflows/nuget.yml

@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup .NET
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
         with:
           dotnet-version: 7.0.x
       - name: .NET Pack
@@ -23,4 +23,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: MelonLoaderNuGetPackage
-          path: MelonLoader/Output/Release/MelonLoader/LavaGang.MelonLoader.0.6.4.nupkg
+          path: MelonLoader/Output/Release/MelonLoader/LavaGang.MelonLoader.0.6.5.nupkg