Use updated Cpp2IL and AsmResolver

This commit is contained in:
ds5678 2025-12-08 10:13:46 -08:00
parent 025e670e8a
commit f5dfad75e2
7 changed files with 14 additions and 15 deletions

View File

@ -7,8 +7,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AsmResolver.DotNet" Version="6.0.0-beta.4" /> <PackageReference Include="AsmResolver.DotNet" Version="6.0.0-beta.5" />
<PackageReference Include="AsmResolver.Symbols.Pdb" Version="6.0.0-beta.4" /> <PackageReference Include="AsmResolver.Symbols.Pdb" Version="6.0.0-beta.5" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -50,7 +50,7 @@ internal class Program
HashSet<EnumTypeRecord> records = new(); HashSet<EnumTypeRecord> records = new();
foreach (ICodeViewSymbol symbol in symbols) foreach (ICodeViewSymbol symbol in symbols)
{ {
if (symbol is ConstantSymbol constantSymbol && constantSymbol.Type is EnumTypeRecord enumRecord) if (symbol is ConstantSymbol constantSymbol && constantSymbol.ConstantType is EnumTypeRecord enumRecord)
{ {
records.Add(enumRecord); records.Add(enumRecord);
} }
@ -64,7 +64,7 @@ internal class Program
foreach (ICodeViewSymbol symbol in symbols) foreach (ICodeViewSymbol symbol in symbols)
{ {
if (symbol is ConstantSymbol constantSymbol if (symbol is ConstantSymbol constantSymbol
&& constantSymbol.Type is not null and not EnumTypeRecord && constantSymbol.ConstantType is not null and not EnumTypeRecord
&& IsValidName(constantSymbol.Name.ToString().Trim())) && IsValidName(constantSymbol.Name.ToString().Trim()))
{ {
records.Add(constantSymbol); records.Add(constantSymbol);
@ -79,7 +79,7 @@ internal class Program
foreach (ICodeViewSymbol symbol in symbols) foreach (ICodeViewSymbol symbol in symbols)
{ {
if (symbol is UserDefinedTypeSymbol constantSymbol if (symbol is UserDefinedTypeSymbol constantSymbol
&& constantSymbol.Type is ClassTypeRecord) && constantSymbol.SymbolType is ClassTypeRecord)
{ {
records.Add(constantSymbol); records.Add(constantSymbol);
} }
@ -129,7 +129,7 @@ internal class Program
switch (symbol) switch (symbol)
{ {
case ConstantSymbol constantSymbol: case ConstantSymbol constantSymbol:
writer.WriteLine($"Constant, Value: {constantSymbol.Value} Type: {constantSymbol.Type?.LeafKind} Name: {constantSymbol.Name}"); writer.WriteLine($"Constant, Value: {constantSymbol.Value} Type: {constantSymbol.ConstantType?.LeafKind} Name: {constantSymbol.Name}");
break; break;
case PublicSymbol publicSymbol: case PublicSymbol publicSymbol:
if (publicSymbol.IsCode) if (publicSymbol.IsCode)
@ -139,7 +139,7 @@ internal class Program
writer.WriteLine($"Public, Function: {publicSymbol.IsFunction} Name: {publicSymbol.Name}"); writer.WriteLine($"Public, Function: {publicSymbol.IsFunction} Name: {publicSymbol.Name}");
break; break;
case UserDefinedTypeSymbol userDefinedTypeSymbol: case UserDefinedTypeSymbol userDefinedTypeSymbol:
writer.WriteLine($"User Defined Type, {userDefinedTypeSymbol.Type?.LeafKind} Name: {userDefinedTypeSymbol.Name}"); writer.WriteLine($"User Defined Type, {userDefinedTypeSymbol.SymbolType?.LeafKind} Name: {userDefinedTypeSymbol.Name}");
break; break;
case UnknownSymbol unknownSymbol: case UnknownSymbol unknownSymbol:
writer.WriteLine($"Unknown, Type: {unknownSymbol.CodeViewSymbolType} Size: {unknownSymbol.Data.Length}"); writer.WriteLine($"Unknown, Type: {unknownSymbol.CodeViewSymbolType} Size: {unknownSymbol.Data.Length}");

View File

@ -7,9 +7,9 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AsmResolver.DotNet" Version="6.0.0-beta.4" /> <PackageReference Include="AsmResolver.DotNet" Version="6.0.0-beta.5" />
<PackageReference Include="AssetRipper.Checksum" Version="1.1.0" /> <PackageReference Include="AssetRipper.Checksum" Version="1.1.0" />
<PackageReference Include="AssetRipper.CIL" Version="1.2.1" /> <PackageReference Include="AssetRipper.CIL" Version="1.2.2" />
<PackageReference Include="AssetRipper.Tpk.TypeTrees.Json" Version="1.1.0" /> <PackageReference Include="AssetRipper.Tpk.TypeTrees.Json" Version="1.1.0" />
</ItemGroup> </ItemGroup>

View File

@ -6,7 +6,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AsmResolver.DotNet" Version="6.0.0-beta.4" /> <PackageReference Include="AsmResolver.DotNet" Version="6.0.0-beta.5" />
<PackageReference Include="AssetRipper.Primitives" Version="3.2.0" /> <PackageReference Include="AssetRipper.Primitives" Version="3.2.0" />
</ItemGroup> </ItemGroup>

View File

@ -7,12 +7,11 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AsmResolver.DotNet" Version="6.0.0-beta.4" /> <PackageReference Include="AsmResolver.DotNet" Version="6.0.0-beta.5" />
<PackageReference Include="AssetRipper.Gee.External.Capstone" Version="2.3.2" /> <PackageReference Include="AssetRipper.Cpp2IL.Core" Version="1.0.0" />
<PackageReference Include="AssetRipper.Mining.PredefinedAssets" Version="1.5.0" /> <PackageReference Include="AssetRipper.Mining.PredefinedAssets" Version="1.5.0" />
<PackageReference Include="AssetRipper.Primitives" Version="3.2.0" /> <PackageReference Include="AssetRipper.Primitives" Version="3.2.0" />
<PackageReference Include="AssetRipper.Tpk" Version="1.1.0" /> <PackageReference Include="AssetRipper.Tpk" Version="1.1.0" />
<PackageReference Include="Samboy063.Cpp2IL.Core" Version="2022.1.0-development.1390" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -7,7 +7,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AssetRipper.CIL" Version="1.2.1" /> <PackageReference Include="AssetRipper.CIL" Version="1.2.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -6,7 +6,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AsmResolver.DotNet" Version="6.0.0-beta.4" /> <PackageReference Include="AsmResolver.DotNet" Version="6.0.0-beta.5" />
<PackageReference Include="AssetRipper.Primitives" Version="3.2.0" /> <PackageReference Include="AssetRipper.Primitives" Version="3.2.0" />
</ItemGroup> </ItemGroup>