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

ManlyMarco · web-flow · commit af0cba71fb69 · 2025-06-21T02:59:18.000+02:00
diff --git a/Runtimes/Unity/BepInEx.Unity.IL2CPP/BepInEx.Unity.IL2CPP.csproj b/Runtimes/Unity/BepInEx.Unity.IL2CPP/BepInEx.Unity.IL2CPP.csproj
@@ -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"/>
diff --git a/Runtimes/Unity/BepInEx.Unity.IL2CPP/Il2CppInteropManager.cs b/Runtimes/Unity/BepInEx.Unity.IL2CPP/Il2CppInteropManager.cs
@@ -263,17 +263,16 @@ private static void GenerateInteropAssemblies()
             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 @@ private static void DownloadUnityAssemblies() {
         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 @@ private static void RunIl2CppInteropGenerator(List<AssemblyDefinition> sourceAss
                               .AddLogger(logger)
                               .AddInteropAssemblyGenerator()
                               .Run();
-
-        sourceAssemblies.Do(x => x.Dispose());
     }
 
     internal static void PreloadInteropAssemblies()

Original file line number	Diff line number	Diff line change
`@@ -263,17 +263,16 @@ private static void GenerateInteropAssemblies()`
`263`	`263`	`AppDomain.CurrentDomain.AddCecilPlatformAssemblies(UnityBaseLibsDirectory);`
`264`	`264`	`DownloadUnityAssemblies();`
`265`	`265`	`var asmResolverAssemblies = RunCpp2Il();`
`266`		`- var cecilAssemblies = new AsmToCecilConverter(asmResolverAssemblies).ConvertAll();`
`267`	`266`
`268`	`267`	`if (DumpDummyAssemblies.Value)`
`269`	`268`	`{`
`270`	`269`	`var dummyPath = Path.Combine(Paths.BepInExRootPath, "dummy");`
`271`	`270`	`Directory.CreateDirectory(dummyPath);`
`272`		`- foreach (var assemblyDefinition in cecilAssemblies)`
`273`		`- assemblyDefinition.Write(Path.Combine(dummyPath, $"{assemblyDefinition.Name.Name}.dll"));`
	`271`	`+ foreach (var assemblyDefinition in asmResolverAssemblies)`
	`272`	`+ assemblyDefinition.Write(Path.Combine(dummyPath, $"{assemblyDefinition.Name}.dll"));`
`274`	`273`	`}`
`275`	`274`
`276`		`- RunIl2CppInteropGenerator(cecilAssemblies);`
	`275`	`+ RunIl2CppInteropGenerator(asmResolverAssemblies);`
`277`	`276`
`278`	`277`	`File.WriteAllText(HashPath, ComputeHash());`
`279`	`278`	`}`
`@@ -360,7 +359,7 @@ private static void DownloadUnityAssemblies() {`
`360`	`359`	`return assemblies;`
`361`	`360`	`}`
`362`	`361`
`363`		`- private static void RunIl2CppInteropGenerator(List<AssemblyDefinition> sourceAssemblies)`
	`362`	`+ private static void RunIl2CppInteropGenerator(List<AsmResolver.DotNet.AssemblyDefinition> sourceAssemblies)`
`364`	`363`	`{`
`365`	`364`	`var opts = new GeneratorOptions`
`366`	`365`	`{`
`@@ -387,8 +386,6 @@ private static void RunIl2CppInteropGenerator(List<AssemblyDefinition> sourceAss`
`387`	`386`	`.AddLogger(logger)`
`388`	`387`	`.AddInteropAssemblyGenerator()`
`389`	`388`	`.Run();`
`390`		`-`
`391`		`- sourceAssemblies.Do(x => x.Dispose());`
`392`	`389`	`}`
`393`	`390`
`394`	`391`	`internal static void PreloadInteropAssemblies()`