Lib: Add support for v29.1, Bump core + lib to 2022.0.7

SamboyCoding · Sep 26, 2022 · 15b56bc · 15b56bc
1 parent c4a854c
commit 15b56bc
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 11 deletions.
diff --git a/Cpp2IL.Core/Cpp2IL.Core.csproj b/Cpp2IL.Core/Cpp2IL.Core.csproj
@@ -6,9 +6,9 @@
         <Nullable>enable</Nullable>
         <PackageId>Samboy063.Cpp2IL.Core</PackageId>
         <Company>Samboy063</Company>
-        <FileVersion>2022.0.6</FileVersion>
-        <Version>2022.0.6</Version>
-        <InformationalVersion>2022.0.6</InformationalVersion>
+        <FileVersion>2022.0.7</FileVersion>
+        <Version>2022.0.7</Version>
+        <InformationalVersion>2022.0.7</InformationalVersion>
         <Copyright>Copyright © Samboy063 2019-2022</Copyright>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/Cpp2IL/Properties/AssemblyInfo.cs b/Cpp2IL/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2022.0.6")]
-[assembly: AssemblyFileVersion("2022.0.6")]
+[assembly: AssemblyVersion("2022.0.7")]
+[assembly: AssemblyFileVersion("2022.0.7")]
diff --git a/LibCpp2IL/BinaryStructures/Il2CppCodeRegistration.cs b/LibCpp2IL/BinaryStructures/Il2CppCodeRegistration.cs
@@ -25,8 +25,13 @@ public class Il2CppCodeRegistration
             [Version(Max = 24.5f)] //Removed in v27
             public ulong customAttributeGeneratorListAddress;
 
-            public ulong unresolvedVirtualCallCount;
-            public ulong unresolvedVirtualCallPointers;
+            public ulong unresolvedVirtualCallCount; //Renamed to unresolvedIndirectCallCount in v29.1
+            public ulong unresolvedVirtualCallPointers; //Renamed to unresolvedIndirectCallPointers in v29.1
+
+            [Version(Min = 29.1f)] 
+            public ulong unresolvedInstanceCallPointers;
+            [Version(Min = 29.1f)] 
+            public ulong unresolvedStaticCallPointers;
 
             public ulong interopDataCount;
             public ulong interopData;

diff --git a/LibCpp2IL/LibCpp2IL.csproj b/LibCpp2IL/LibCpp2IL.csproj
@@ -6,7 +6,7 @@
         <LangVersion>9</LangVersion>
         <TargetFramework>netstandard2.0</TargetFramework>
         <PackageId>Samboy063.LibCpp2IL</PackageId>
-        <Version>2022.0.6</Version>
+        <Version>2022.0.7</Version>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <RepositoryType>git</RepositoryType>

diff --git a/LibCpp2IL/Metadata/Il2CppMetadata.cs b/LibCpp2IL/Metadata/Il2CppMetadata.cs
@@ -98,7 +98,14 @@ public class Il2CppMetadata : ClassReadingBinaryReader
                 else
                     actualVersion = version; //2017.1.0 was the first v24 version
             }
-            else actualVersion = version; //Covers v29
+            else if (version == 29)
+            {
+                if (unityVersion.IsGreaterEqual(2022, 1, 0, UnityVersionType.Beta, 7))
+                    actualVersion = 29.1f; //2022.1.0b7 introduces v29.1 which adds two new pointers to codereg
+                else
+                    actualVersion = 29; //2021.3.0 introduces v29
+            }
+            else actualVersion = version;
 
             LibLogger.InfoNewline($"\tUsing actual IL2CPP Metadata version {actualVersion}");
 

diff --git a/LibCpp2IL/Properties/AssemblyInfo.cs b/LibCpp2IL/Properties/AssemblyInfo.cs
@@ -8,8 +8,8 @@
 [assembly: AssemblyCopyright("Copyright © Samboy063 2019-2022")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("2022.0.6")]
-[assembly: AssemblyFileVersion("2022.0.6")]
+[assembly: AssemblyVersion("2022.0.7")]
+[assembly: AssemblyFileVersion("2022.0.7")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from