Bump Cpp2IL & Il2CppInterop (#869)

BepInEx · May 16, 2024 · a23612f · a23612f
1 parent 4901521
commit a23612f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/Runtimes/Unity/BepInEx.Unity.Common/BepInEx.Unity.Common.csproj b/Runtimes/Unity/BepInEx.Unity.Common/BepInEx.Unity.Common.csproj
@@ -6,7 +6,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="AssetRipper.VersionUtilities" Version="1.2.1"/>
+        <PackageReference Include="AssetRipper.Primitives" Version="2.1.1"/>
         <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all"/>
         <PackageReference Include="MonoMod.Utils" Version="22.5.1.1"/>
     </ItemGroup>

diff --git a/Runtimes/Unity/BepInEx.Unity.Common/UnityInfo.cs b/Runtimes/Unity/BepInEx.Unity.Common/UnityInfo.cs
@@ -1,9 +1,9 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Runtime.CompilerServices;
 using System.Text;
-using AssetRipper.VersionUtilities;
+using AssetRipper.Primitives;
 using MonoMod.Utils;
 
 [assembly: InternalsVisibleTo("BepInEx.Unity.Mono.Preloader")]

diff --git a/Runtimes/Unity/BepInEx.Unity.IL2CPP/BepInEx.Unity.IL2CPP.csproj b/Runtimes/Unity/BepInEx.Unity.IL2CPP/BepInEx.Unity.IL2CPP.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <Description>BepInEx support library for Il2Cpp games</Description>
         <TargetFramework>net6.0</TargetFramework>
@@ -14,15 +14,15 @@
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="HarmonyX" Version="2.10.1"/>
-        <PackageReference Include="Iced" Version="1.18.0"/>
-        <PackageReference Include="Il2CppInterop.Generator" Version="1.4.6-ci.389"/>
-        <PackageReference Include="Il2CppInterop.HarmonySupport" Version="1.4.6-ci.389"/>
+        <PackageReference Include="Iced" Version="1.20.0"/>
+        <PackageReference Include="Il2CppInterop.Generator" Version="1.4.6-ci.426"/>
+        <PackageReference Include="Il2CppInterop.HarmonySupport" Version="1.4.6-ci.426"/>
         <PackageReference Include="Il2CppInterop.ReferenceLibs" Version="1.0.0" IncludeAssets="compile" PrivateAssets="all"/>
-        <PackageReference Include="Il2CppInterop.Runtime" Version="1.4.6-ci.389"/>
+        <PackageReference Include="Il2CppInterop.Runtime" Version="1.4.6-ci.426"/>
         <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.5.1.1"/>
-        <PackageReference Include="Samboy063.Cpp2IL.Core" Version="2022.1.0-development.866"/>
+        <PackageReference Include="Samboy063.Cpp2IL.Core" Version="2022.1.0-development.972"/>
     </ItemGroup>
 
     <!-- CopyLocalLockFileAssemblies causes to also output shared assemblies: https://github.com/NuGet/Home/issues/4837#issuecomment-354536302 -->

diff --git a/Runtimes/Unity/BepInEx.Unity.IL2CPP/Il2CppInteropManager.cs b/Runtimes/Unity/BepInEx.Unity.IL2CPP/Il2CppInteropManager.cs
@@ -316,7 +316,7 @@ private static List<AsmResolver.DotNet.AssemblyDefinition> RunCpp2Il()
             cpp2IlProcessingLayer.Process(Cpp2IlApi.CurrentAppContext);
         }
 
-        var assemblies = new AsmResolverDummyDllOutputFormat().BuildAssemblies(Cpp2IlApi.CurrentAppContext);
+        var assemblies = new AsmResolverDllOutputFormatDefault().BuildAssemblies(Cpp2IlApi.CurrentAppContext);
 
         LibCpp2IlMain.Reset();
         Cpp2IlApi.CurrentAppContext = null;

diff --git a/Runtimes/Unity/BepInEx.Unity.Mono.Preloader/EntrypointPatcher.cs b/Runtimes/Unity/BepInEx.Unity.Mono.Preloader/EntrypointPatcher.cs
@@ -31,9 +31,9 @@ internal class EntrypointPatcher : BasePatcher
      "The name of the method in the specified entrypoint assembly and type to hook and load Chainloader from.");
 
     private static string DefaultEntrypointAssembly =>
-        UnityInfo.Version.IsLess(2017) ? "UnityEngine.dll" : "UnityEngine.CoreModule.dll";
+        UnityInfo.Version.LessThan(2017) ? "UnityEngine.dll" : "UnityEngine.CoreModule.dll";
 
-    private static string DefaultEntrypointType => UnityInfo.Version.IsLess(5) ? "MonoBehaviour" : "Application";
+    private static string DefaultEntrypointType => UnityInfo.Version.LessThan(5) ? "MonoBehaviour" : "Application";
 
     private bool HasLoaded { get; set; }