v6 - Bump Il2CppInterop to 1.5.0-ci.620 (#1106)

This commit is contained in:
ManlyMarco authored and GitHub committed 2025-06-21 02:59:18 +02:00
1 parent 5fef3570f2
commit af0cba71fb
2 files changed
+7 -10

No files matched your search

@@ -15,10 +15,10 @@
<ItemGroup>
<PackageReference Include="HarmonyX" Version="2.10.2" />
<PackageReference Include="Iced" Version="1.21.0" />
<PackageReference Include="Il2CppInterop.Generator" Version="1.4.6-ci.426"/>
<PackageReference Include="Il2CppInterop.HarmonySupport" Version="1.4.6-ci.426"/>
<PackageReference Include="Il2CppInterop.Generator" Version="1.5.0-ci.620"/>
<PackageReference Include="Il2CppInterop.HarmonySupport" Version="1.5.0-ci.620"/>
<PackageReference Include="Il2CppInterop.ReferenceLibs" Version="1.0.0" IncludeAssets="compile" PrivateAssets="all"/>
<PackageReference Include="Il2CppInterop.Runtime" Version="1.4.6-ci.426"/>
<PackageReference Include="Il2CppInterop.Runtime" Version="1.5.0-ci.620"/>
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" IncludeAssets="compile" PrivateAssets="all"/>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" IncludeAssets="compile" PrivateAssets="all"/>
<PackageReference Include="MonoMod.RuntimeDetour" Version="22.7.31.1"/>
@@ -263,17 +263,16 @@ internal static partial class Il2CppInteropManager
AppDomain.CurrentDomain.AddCecilPlatformAssemblies(UnityBaseLibsDirectory);
DownloadUnityAssemblies();
var asmResolverAssemblies = RunCpp2Il();
var cecilAssemblies = new AsmToCecilConverter(asmResolverAssemblies).ConvertAll();
if (DumpDummyAssemblies.Value)
{
var dummyPath = Path.Combine(Paths.BepInExRootPath, "dummy");
Directory.CreateDirectory(dummyPath);
foreach (var assemblyDefinition in cecilAssemblies)
assemblyDefinition.Write(Path.Combine(dummyPath, $"{assemblyDefinition.Name.Name}.dll"));
foreach (var assemblyDefinition in asmResolverAssemblies)
assemblyDefinition.Write(Path.Combine(dummyPath, $"{assemblyDefinition.Name}.dll"));
}
RunIl2CppInteropGenerator(cecilAssemblies);
RunIl2CppInteropGenerator(asmResolverAssemblies);
File.WriteAllText(HashPath, ComputeHash());
}
@@ -360,7 +359,7 @@ internal static partial class Il2CppInteropManager
return assemblies;
}
private static void RunIl2CppInteropGenerator(List<AssemblyDefinition> sourceAssemblies)
private static void RunIl2CppInteropGenerator(List<AsmResolver.DotNet.AssemblyDefinition> sourceAssemblies)
{
var opts = new GeneratorOptions
{
@@ -387,8 +386,6 @@ internal static partial class Il2CppInteropManager
.AddLogger(logger)
.AddInteropAssemblyGenerator()
.Run();
sourceAssemblies.Do(x => x.Dispose());
}
internal static void PreloadInteropAssemblies()