Skip to content

Commit 15b56bc

Browse files
committed
Lib: Add support for v29.1, Bump core + lib to 2022.0.7
1 parent c4a854c commit 15b56bc

File tree

6 files changed

+23
-11
lines changed

6 files changed

+23
-11
lines changed

Diff for: Cpp2IL.Core/Cpp2IL.Core.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
<Nullable>enable</Nullable>
77
<PackageId>Samboy063.Cpp2IL.Core</PackageId>
88
<Company>Samboy063</Company>
9-
<FileVersion>2022.0.6</FileVersion>
10-
<Version>2022.0.6</Version>
11-
<InformationalVersion>2022.0.6</InformationalVersion>
9+
<FileVersion>2022.0.7</FileVersion>
10+
<Version>2022.0.7</Version>
11+
<InformationalVersion>2022.0.7</InformationalVersion>
1212
<Copyright>Copyright © Samboy063 2019-2022</Copyright>
1313
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1414
<PackageLicenseExpression>MIT</PackageLicenseExpression>

Diff for: Cpp2IL/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("2022.0.6")]
35-
[assembly: AssemblyFileVersion("2022.0.6")]
34+
[assembly: AssemblyVersion("2022.0.7")]
35+
[assembly: AssemblyFileVersion("2022.0.7")]

Diff for: LibCpp2IL/BinaryStructures/Il2CppCodeRegistration.cs

+7-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,13 @@ public class Il2CppCodeRegistration
2525
[Version(Max = 24.5f)] //Removed in v27
2626
public ulong customAttributeGeneratorListAddress;
2727

28-
public ulong unresolvedVirtualCallCount;
29-
public ulong unresolvedVirtualCallPointers;
28+
public ulong unresolvedVirtualCallCount; //Renamed to unresolvedIndirectCallCount in v29.1
29+
public ulong unresolvedVirtualCallPointers; //Renamed to unresolvedIndirectCallPointers in v29.1
30+
31+
[Version(Min = 29.1f)]
32+
public ulong unresolvedInstanceCallPointers;
33+
[Version(Min = 29.1f)]
34+
public ulong unresolvedStaticCallPointers;
3035

3136
public ulong interopDataCount;
3237
public ulong interopData;

Diff for: LibCpp2IL/LibCpp2IL.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<LangVersion>9</LangVersion>
77
<TargetFramework>netstandard2.0</TargetFramework>
88
<PackageId>Samboy063.LibCpp2IL</PackageId>
9-
<Version>2022.0.6</Version>
9+
<Version>2022.0.7</Version>
1010
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1111
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1212
<RepositoryType>git</RepositoryType>

Diff for: LibCpp2IL/Metadata/Il2CppMetadata.cs

+8-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,14 @@ public class Il2CppMetadata : ClassReadingBinaryReader
9898
else
9999
actualVersion = version; //2017.1.0 was the first v24 version
100100
}
101-
else actualVersion = version; //Covers v29
101+
else if (version == 29)
102+
{
103+
if (unityVersion.IsGreaterEqual(2022, 1, 0, UnityVersionType.Beta, 7))
104+
actualVersion = 29.1f; //2022.1.0b7 introduces v29.1 which adds two new pointers to codereg
105+
else
106+
actualVersion = 29; //2021.3.0 introduces v29
107+
}
108+
else actualVersion = version;
102109

103110
LibLogger.InfoNewline($"\tUsing actual IL2CPP Metadata version {actualVersion}");
104111

Diff for: LibCpp2IL/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
[assembly: AssemblyCopyright("Copyright © Samboy063 2019-2022")]
99
[assembly: AssemblyTrademark("")]
1010
[assembly: AssemblyCulture("")]
11-
[assembly: AssemblyVersion("2022.0.6")]
12-
[assembly: AssemblyFileVersion("2022.0.6")]
11+
[assembly: AssemblyVersion("2022.0.7")]
12+
[assembly: AssemblyFileVersion("2022.0.7")]
1313

1414
// Setting ComVisible to false makes the types in this assembly not visible
1515
// to COM components. If you need to access a type in this assembly from

0 commit comments

Comments
 (0)