Skip to content

Commit 6c0d224

Browse files
HerpDerpinstineHerpDerpinstine
authored
Merge pull request #676 from LavaGang/alpha-development
Bug Fixes for v0.6.3
2 parents 4d338a6 + e30c8e4 commit 6c0d224

File tree

12 files changed

+113
-80
lines changed

12 files changed

+113
-80
lines changed

‎.github/workflows/build.yml

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -11,35 +11,35 @@ jobs:
1111
build_core_debug:
1212
runs-on: windows-latest
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
- name: setup-msbuild
16-
uses: microsoft/setup-msbuild@v1
16+
uses: microsoft/setup-msbuild@v2
1717
- name: Build Melonloader Core
1818
shell: cmd
1919
run: msbuild /restore /p:Platform="Windows - x64" # Platform is actually irrelevant for core, it's compiled as AnyCPU either way
2020
- name: Upload core artifact
21-
uses: actions/upload-artifact@v3
21+
uses: actions/upload-artifact@v4
2222
with:
2323
name: MLCoreDebug
2424
path: Output/Debug/MelonLoader/
2525
build_core_release:
2626
runs-on: windows-latest
2727
steps:
28-
- uses: actions/checkout@v3
28+
- uses: actions/checkout@v4
2929
- name: setup-msbuild
30-
uses: microsoft/setup-msbuild@v1
30+
uses: microsoft/setup-msbuild@v2
3131
- name: Build Melonloader Core
3232
shell: cmd
3333
run: msbuild /restore /p:Configuration=Release /p:Platform="Windows - x64"
3434
- name: Upload core artifact
35-
uses: actions/upload-artifact@v3
35+
uses: actions/upload-artifact@v4
3636
with:
3737
name: MLCoreRelease
3838
path: Output/Release/MelonLoader/
3939
build_rust_windows:
4040
runs-on: windows-latest
4141
steps:
42-
- uses: actions/checkout@v3
42+
- uses: actions/checkout@v4
4343
- name: rust-toolchain
4444
uses: dtolnay/rust-toolchain@stable
4545
with:
@@ -62,56 +62,56 @@ jobs:
6262
run: cargo +nightly build --target x86_64-pc-windows-msvc
6363
# Upload Proxy Release - x86
6464
- name: Upload Proxy Release | Windows x86
65-
uses: actions/upload-artifact@v3
65+
uses: actions/upload-artifact@v4
6666
with:
6767
name: MLProxyX86-Windows-Release
6868
path: target/i686-pc-windows-msvc/release/version.dll
6969
# Upload Bootstrap Release - x86
7070
- name: Upload Bootstrap Release | Windows x86
71-
uses: actions/upload-artifact@v3
71+
uses: actions/upload-artifact@v4
7272
with:
7373
name: MLBootstrapX86-Windows-Release
7474
path: target/i686-pc-windows-msvc/release/Bootstrap.dll
7575
# Upload Proxy Release - x64
7676
- name: Upload Proxy Release | Windows x64
77-
uses: actions/upload-artifact@v3
77+
uses: actions/upload-artifact@v4
7878
with:
7979
name: MLProxyX64-Windows-Release
8080
path: target/x86_64-pc-windows-msvc/release/version.dll
8181
# Upload Bootstrap Release - x64
8282
- name: Upload Bootstrap Release | Windows x64
83-
uses: actions/upload-artifact@v3
83+
uses: actions/upload-artifact@v4
8484
with:
8585
name: MLBootstrapX64-Windows-Release
8686
path: target/x86_64-pc-windows-msvc/release/Bootstrap.dll
8787
# Upload Proxy Debug - x86
8888
- name: Upload Proxy Debug | Windows x86
89-
uses: actions/upload-artifact@v3
89+
uses: actions/upload-artifact@v4
9090
with:
9191
name: MLProxyX86-Windows-Debug
9292
path: target/i686-pc-windows-msvc/debug/version.dll
9393
# Upload Bootstrap Debug - x86
9494
- name: Upload Bootstrap Debug | Windows x86
95-
uses: actions/upload-artifact@v3
95+
uses: actions/upload-artifact@v4
9696
with:
9797
name: MLBootstrapX86-Windows-Debug
9898
path: target/i686-pc-windows-msvc/debug/Bootstrap.dll
9999
# Upload Proxy Debug - x64
100100
- name: Upload Proxy Debug | Windows x64
101-
uses: actions/upload-artifact@v3
101+
uses: actions/upload-artifact@v4
102102
with:
103103
name: MLProxyX64-Windows-Debug
104104
path: target/x86_64-pc-windows-msvc/debug/version.dll
105105
# Upload Bootstrap Debug - x64
106106
- name: Upload Bootstrap Debug | Windows x64
107-
uses: actions/upload-artifact@v3
107+
uses: actions/upload-artifact@v4
108108
with:
109109
name: MLBootstrapX64-Windows-Debug
110110
path: target/x86_64-pc-windows-msvc/debug/Bootstrap.dll
111111
build_rust_linux:
112112
runs-on: ubuntu-latest
113113
steps:
114-
- uses: actions/checkout@v3
114+
- uses: actions/checkout@v4
115115
- name: rust-toolchain
116116
uses: dtolnay/rust-toolchain@stable
117117
with:
@@ -128,42 +128,42 @@ jobs:
128128
shell: bash
129129
run: cargo +nightly build --target x86_64-unknown-linux-gnu
130130
- name: Upload Proxy Release | Linux x64
131-
uses: actions/upload-artifact@v3
131+
uses: actions/upload-artifact@v4
132132
with:
133133
name: MLProxyX64-Linux-Release
134134
path: target/x86_64-unknown-linux-gnu/release/libversion.so
135135
- name: Upload Bootstrap Release | Linux x64
136-
uses: actions/upload-artifact@v3
136+
uses: actions/upload-artifact@v4
137137
with:
138138
name: MLBootstrapX64-Linux-Release
139139
path: target/x86_64-unknown-linux-gnu/release/libBootstrap.so
140140
- name: Upload Proxy Debug | Linux x64
141-
uses: actions/upload-artifact@v3
141+
uses: actions/upload-artifact@v4
142142
with:
143143
name: MLProxyX64-Linux-Debug
144144
path: target/x86_64-unknown-linux-gnu/debug/libversion.so
145145
- name: Upload Bootstrap Debug | Linux x64
146-
uses: actions/upload-artifact@v3
146+
uses: actions/upload-artifact@v4
147147
with:
148148
name: MLBootstrapX64-Linux-Debug
149149
path: target/x86_64-unknown-linux-gnu/debug/libBootstrap.so
150150
finalize_x64_debug_zip_windows:
151151
runs-on: windows-latest
152152
needs: [build_core_debug, build_rust_windows]
153153
steps:
154-
- uses: actions/checkout@v3
154+
- uses: actions/checkout@v4
155155
- name: Download core artifact
156-
uses: actions/download-artifact@v3
156+
uses: actions/download-artifact@v4
157157
with:
158158
name: MLCoreDebug
159159
path: Output/Debug/x64/MelonLoader/
160160
- name: Download proxy x64
161-
uses: actions/download-artifact@v3
161+
uses: actions/download-artifact@v4
162162
with:
163163
name: MLProxyX64-Windows-Debug
164164
path: Output/Debug/x64/
165165
- name: Download bootstrap x64
166-
uses: actions/download-artifact@v3
166+
uses: actions/download-artifact@v4
167167
with:
168168
name: MLBootstrapX64-Windows-Debug
169169
path: Output/Debug/x64/MelonLoader/Dependencies/
@@ -184,7 +184,7 @@ jobs:
184184
copy LICENSE.md Output\Debug\x64\MelonLoader\Documentation\
185185
copy NOTICE.txt Output\Debug\x64\MelonLoader\Documentation\
186186
copy README.md Output\Debug\x64\MelonLoader\Documentation\
187-
- uses: actions/upload-artifact@v3
187+
- uses: actions/upload-artifact@v4
188188
name: Upload Zip | Windows - x64
189189
with:
190190
name: MelonLoader.Windows.x64.CI.Debug
@@ -193,19 +193,19 @@ jobs:
193193
runs-on: windows-latest
194194
needs: [build_core_debug, build_rust_windows]
195195
steps:
196-
- uses: actions/checkout@v3
196+
- uses: actions/checkout@v4
197197
- name: Download core artifact
198-
uses: actions/download-artifact@v3
198+
uses: actions/download-artifact@v4
199199
with:
200200
name: MLCoreDebug
201201
path: Output/Debug/x86/MelonLoader/
202202
- name: Download proxy x86
203-
uses: actions/download-artifact@v3
203+
uses: actions/download-artifact@v4
204204
with:
205205
name: MLProxyX86-Windows-Debug
206206
path: Output/Debug/x86/
207207
- name: Download bootstrap x86
208-
uses: actions/download-artifact@v3
208+
uses: actions/download-artifact@v4
209209
with:
210210
name: MLBootstrapX86-Windows-Debug
211211
path: Output/Debug/x86/MelonLoader/Dependencies/
@@ -226,7 +226,7 @@ jobs:
226226
copy LICENSE.md Output\Debug\x86\MelonLoader\Documentation\
227227
copy NOTICE.txt Output\Debug\x86\MelonLoader\Documentation\
228228
copy README.md Output\Debug\x86\MelonLoader\Documentation\
229-
- uses: actions/upload-artifact@v3
229+
- uses: actions/upload-artifact@v4
230230
name: Upload Zip | Windows - x86
231231
with:
232232
name: MelonLoader.Windows.x86.CI.Debug
@@ -235,19 +235,19 @@ jobs:
235235
runs-on: windows-latest
236236
needs: [build_core_release, build_rust_windows]
237237
steps:
238-
- uses: actions/checkout@v3
238+
- uses: actions/checkout@v4
239239
- name: Download core artifact
240-
uses: actions/download-artifact@v3
240+
uses: actions/download-artifact@v4
241241
with:
242242
name: MLCoreRelease
243243
path: Output/Release/x64/MelonLoader/
244244
- name: Download proxy x64
245-
uses: actions/download-artifact@v3
245+
uses: actions/download-artifact@v4
246246
with:
247247
name: MLProxyX64-Windows-Release
248248
path: Output/Release/x64/
249249
- name: Download bootstrap x64
250-
uses: actions/download-artifact@v3
250+
uses: actions/download-artifact@v4
251251
with:
252252
name: MLBootstrapX64-Windows-Release
253253
path: Output/Release/x64/MelonLoader/Dependencies/
@@ -268,7 +268,7 @@ jobs:
268268
copy LICENSE.md Output\Release\x64\MelonLoader\Documentation\
269269
copy NOTICE.txt Output\Release\x64\MelonLoader\Documentation\
270270
copy README.md Output\Release\x64\MelonLoader\Documentation\
271-
- uses: actions/upload-artifact@v3
271+
- uses: actions/upload-artifact@v4
272272
name: Upload Zip | Windows - x64
273273
with:
274274
name: MelonLoader.Windows.x64.CI.Release
@@ -277,19 +277,19 @@ jobs:
277277
runs-on: windows-latest
278278
needs: [build_core_release, build_rust_windows]
279279
steps:
280-
- uses: actions/checkout@v3
280+
- uses: actions/checkout@v4
281281
- name: Download core artifact
282-
uses: actions/download-artifact@v3
282+
uses: actions/download-artifact@v4
283283
with:
284284
name: MLCoreRelease
285285
path: Output/Release/x86/MelonLoader/
286286
- name: Download proxy x86
287-
uses: actions/download-artifact@v3
287+
uses: actions/download-artifact@v4
288288
with:
289289
name: MLProxyX86-Windows-Release
290290
path: Output/Release/x86/
291291
- name: Download bootstrap x86
292-
uses: actions/download-artifact@v3
292+
uses: actions/download-artifact@v4
293293
with:
294294
name: MLBootstrapX86-Windows-Release
295295
path: Output/Release/x86/MelonLoader/Dependencies/
@@ -310,7 +310,7 @@ jobs:
310310
copy LICENSE.md Output\Release\x86\MelonLoader\Documentation\
311311
copy NOTICE.txt Output\Release\x86\MelonLoader\Documentation\
312312
copy README.md Output\Release\x86\MelonLoader\Documentation\
313-
- uses: actions/upload-artifact@v3
313+
- uses: actions/upload-artifact@v4
314314
name: Upload Zip | Windows - x86
315315
with:
316316
name: MelonLoader.Windows.x86.CI.Release
@@ -319,19 +319,19 @@ jobs:
319319
runs-on: windows-latest
320320
needs: [build_core_debug, build_rust_linux]
321321
steps:
322-
- uses: actions/checkout@v3
322+
- uses: actions/checkout@v4
323323
- name: Download core artifact
324-
uses: actions/download-artifact@v3
324+
uses: actions/download-artifact@v4
325325
with:
326326
name: MLCoreDebug
327327
path: Output/Debug/x64/MelonLoader/
328328
- name: Download proxy x64
329-
uses: actions/download-artifact@v3
329+
uses: actions/download-artifact@v4
330330
with:
331331
name: MLProxyX64-Linux-Debug
332332
path: Output/Debug/x64/
333333
- name: Download bootstrap x64
334-
uses: actions/download-artifact@v3
334+
uses: actions/download-artifact@v4
335335
with:
336336
name: MLBootstrapX64-Linux-Debug
337337
path: Output/Debug/x64/MelonLoader/Dependencies/
@@ -349,7 +349,7 @@ jobs:
349349
copy LICENSE.md Output\Debug\x64\MelonLoader\Documentation\
350350
copy NOTICE.txt Output\Debug\x64\MelonLoader\Documentation\
351351
copy README.md Output\Debug\x64\MelonLoader\Documentation\
352-
- uses: actions/upload-artifact@v3
352+
- uses: actions/upload-artifact@v4
353353
name: Upload Zip | Linux - x64
354354
with:
355355
name: MelonLoader.Linux.x64.CI.Debug
@@ -358,19 +358,19 @@ jobs:
358358
runs-on: windows-latest
359359
needs: [build_core_release, build_rust_linux]
360360
steps:
361-
- uses: actions/checkout@v3
361+
- uses: actions/checkout@v4
362362
- name: Download core artifact
363-
uses: actions/download-artifact@v3
363+
uses: actions/download-artifact@v4
364364
with:
365365
name: MLCoreRelease
366366
path: Output/Release/x64/MelonLoader/
367367
- name: Download proxy x64
368-
uses: actions/download-artifact@v3
368+
uses: actions/download-artifact@v4
369369
with:
370370
name: MLProxyX64-Linux-Release
371371
path: Output/Release/x64/
372372
- name: Download bootstrap x64
373-
uses: actions/download-artifact@v3
373+
uses: actions/download-artifact@v4
374374
with:
375375
name: MLBootstrapX64-Linux-Release
376376
path: Output/Release/x64/MelonLoader/Dependencies/
@@ -388,7 +388,7 @@ jobs:
388388
copy LICENSE.md Output\Release\x64\MelonLoader\Documentation\
389389
copy NOTICE.txt Output\Release\x64\MelonLoader\Documentation\
390390
copy README.md Output\Release\x64\MelonLoader\Documentation\
391-
- uses: actions/upload-artifact@v3
391+
- uses: actions/upload-artifact@v4
392392
name: Upload Zip | Linux - x64
393393
with:
394394
name: MelonLoader.Linux.x64.CI.Release
@@ -397,7 +397,7 @@ jobs:
397397
runs-on: windows-latest
398398
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]
399399
steps:
400-
- uses: GeekyEggo/delete-artifact@v2.0.0
400+
- uses: GeekyEggo/delete-artifact@v5.0.0
401401
with:
402402
name: |
403403
MLCoreDebug

‎.github/workflows/nuget.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
build_nuget_package:
1212
runs-on: windows-latest
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
- name: Setup .NET
1616
uses: actions/[email protected]
1717
with:
@@ -20,7 +20,7 @@ jobs:
2020
run: dotnet pack -c Release
2121
working-directory: ./MelonLoader/
2222
- name: Upload artifact
23-
uses: actions/upload-artifact@v3
23+
uses: actions/upload-artifact@v4
2424
with:
2525
name: MelonLoaderNuGetPackage
2626
path: MelonLoader/Output/Release/MelonLoader/LavaGang.MelonLoader.0.6.3.nupkg

‎CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
1. Updated NuGet Packages
4141
2. Updated Cpp2IL to 2022.1.0-pre-release.14
42-
3. Updated Il2CppInterop to 1.4.6-ci.394
42+
3. Updated Il2CppInterop to 1.4.6-ci.433
4343
4. Updated Tomlet to 5.3.1
4444
5. Fixed Referenced DLLs not being resolved properly resulting in crashes
4545
6. Fixed Proxy being unable to find Original DLL (Credits to [RinLovesYou](https://github.com/RinLovesYou) :3)
@@ -51,6 +51,9 @@
5151
12. Rewrote the Demeo Compatibility Layer to be less prone to breakage
5252
13. Fixed DarkRed ConsoleColor (Credits to [Scoolnik](https://github.com/Scoolnik) :D)
5353
14. Fixed several .NET Framework 2.0 compatibility issues (Credits to [slxdy](https://github.com/slxdy) :D)
54+
15. Fixed an issue with Mods loading when Il2Cpp Assembly Generation fails
55+
16. Added `--melonloader.sab` Launch Option to disable the Analytics Blocker
56+
17. Fixed an issue with MelonCompatibilityLayer causing crashes on some games
5457

5558
---
5659

‎Dependencies/Il2CppAssemblyGenerator/Il2CppAssemblyGenerator.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
</PropertyGroup>
1515
<ItemGroup>
1616
<PackageReference Include="Iced" Version="1.21.0" />
17-
<PackageReference Include="Il2CppInterop.Generator" Version="1.4.6-ci.394" ExcludeAssets="Runtime" />
18-
<PackageReference Include="Il2CppInterop.Common" Version="1.4.6-ci.394" ExcludeAssets="Runtime" />
19-
<PackageReference Include="Il2CppInterop.Runtime" Version="1.4.6-ci.394" ExcludeAssets="Runtime" />
20-
<PackageReference Include="Il2CppInterop.HarmonySupport" Version="1.4.6-ci.394" IncludeAssets="Runtime" />
17+
<PackageReference Include="Il2CppInterop.Generator" Version="1.4.6-ci.433" ExcludeAssets="Runtime" />
18+
<PackageReference Include="Il2CppInterop.Common" Version="1.4.6-ci.433" ExcludeAssets="Runtime" />
19+
<PackageReference Include="Il2CppInterop.Runtime" Version="1.4.6-ci.433" ExcludeAssets="Runtime" />
20+
<PackageReference Include="Il2CppInterop.HarmonySupport" Version="1.4.6-ci.433" IncludeAssets="Runtime" />
2121
<PackageReference Include="Mono.Cecil" Version="0.11.5" ExcludeAssets="Runtime" />
2222
<ProjectReference Include="..\..\MelonLoader\MelonLoader.csproj" Private="false" />
2323
<PackageReference Include="AssetRipper.VersionUtilities" Version="1.5.0" ExcludeAssets="Runtime" />

0 commit comments

Comments
 (0)