From f5dfad75e25f23754a08008bcc8cf3fe9718c17a Mon Sep 17 00:00:00 2001
From: ds5678 <49847914+ds5678@users.noreply.github.com>
Date: Mon, 8 Dec 2025 10:13:46 -0800
Subject: [PATCH] Use updated Cpp2IL and AsmResolver
---
...setRipper.AssemblyDumper.NativeEnumExtractor.csproj | 4 ++--
.../Program.cs | 10 +++++-----
.../AssetRipper.AssemblyDumper.csproj | 4 ++--
.../AssetRipper.DocExtraction.csproj | 2 +-
Source/AssetRipper.Import/AssetRipper.Import.csproj | 5 ++---
.../AssetRipper.Processing.csproj | 2 +-
.../AssetRipper.SerializationLogic.csproj | 2 +-
7 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/Source/AssetRipper.AssemblyDumper.NativeEnumExtractor/AssetRipper.AssemblyDumper.NativeEnumExtractor.csproj b/Source/AssetRipper.AssemblyDumper.NativeEnumExtractor/AssetRipper.AssemblyDumper.NativeEnumExtractor.csproj
index 4e99f05eb..72ff90460 100644
--- a/Source/AssetRipper.AssemblyDumper.NativeEnumExtractor/AssetRipper.AssemblyDumper.NativeEnumExtractor.csproj
+++ b/Source/AssetRipper.AssemblyDumper.NativeEnumExtractor/AssetRipper.AssemblyDumper.NativeEnumExtractor.csproj
@@ -7,8 +7,8 @@
-
-
+
+
diff --git a/Source/AssetRipper.AssemblyDumper.NativeEnumExtractor/Program.cs b/Source/AssetRipper.AssemblyDumper.NativeEnumExtractor/Program.cs
index f3452f7b0..6831bf3c5 100644
--- a/Source/AssetRipper.AssemblyDumper.NativeEnumExtractor/Program.cs
+++ b/Source/AssetRipper.AssemblyDumper.NativeEnumExtractor/Program.cs
@@ -50,7 +50,7 @@ internal class Program
HashSet records = new();
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);
}
@@ -64,7 +64,7 @@ internal class Program
foreach (ICodeViewSymbol symbol in symbols)
{
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()))
{
records.Add(constantSymbol);
@@ -79,7 +79,7 @@ internal class Program
foreach (ICodeViewSymbol symbol in symbols)
{
if (symbol is UserDefinedTypeSymbol constantSymbol
- && constantSymbol.Type is ClassTypeRecord)
+ && constantSymbol.SymbolType is ClassTypeRecord)
{
records.Add(constantSymbol);
}
@@ -129,7 +129,7 @@ internal class Program
switch (symbol)
{
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;
case PublicSymbol publicSymbol:
if (publicSymbol.IsCode)
@@ -139,7 +139,7 @@ internal class Program
writer.WriteLine($"Public, Function: {publicSymbol.IsFunction} Name: {publicSymbol.Name}");
break;
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;
case UnknownSymbol unknownSymbol:
writer.WriteLine($"Unknown, Type: {unknownSymbol.CodeViewSymbolType} Size: {unknownSymbol.Data.Length}");
diff --git a/Source/AssetRipper.AssemblyDumper/AssetRipper.AssemblyDumper.csproj b/Source/AssetRipper.AssemblyDumper/AssetRipper.AssemblyDumper.csproj
index 684371ac0..5f1648133 100644
--- a/Source/AssetRipper.AssemblyDumper/AssetRipper.AssemblyDumper.csproj
+++ b/Source/AssetRipper.AssemblyDumper/AssetRipper.AssemblyDumper.csproj
@@ -7,9 +7,9 @@
-
+
-
+
diff --git a/Source/AssetRipper.DocExtraction/AssetRipper.DocExtraction.csproj b/Source/AssetRipper.DocExtraction/AssetRipper.DocExtraction.csproj
index 15bf1c1e9..8a89498be 100644
--- a/Source/AssetRipper.DocExtraction/AssetRipper.DocExtraction.csproj
+++ b/Source/AssetRipper.DocExtraction/AssetRipper.DocExtraction.csproj
@@ -6,7 +6,7 @@
-
+
diff --git a/Source/AssetRipper.Import/AssetRipper.Import.csproj b/Source/AssetRipper.Import/AssetRipper.Import.csproj
index 30d68f0cb..aef6d4585 100644
--- a/Source/AssetRipper.Import/AssetRipper.Import.csproj
+++ b/Source/AssetRipper.Import/AssetRipper.Import.csproj
@@ -7,12 +7,11 @@
-
-
+
+
-
diff --git a/Source/AssetRipper.Processing/AssetRipper.Processing.csproj b/Source/AssetRipper.Processing/AssetRipper.Processing.csproj
index fd87ab082..1efdf7c9f 100644
--- a/Source/AssetRipper.Processing/AssetRipper.Processing.csproj
+++ b/Source/AssetRipper.Processing/AssetRipper.Processing.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/Source/AssetRipper.SerializationLogic/AssetRipper.SerializationLogic.csproj b/Source/AssetRipper.SerializationLogic/AssetRipper.SerializationLogic.csproj
index d2c5537e8..7652e16f6 100644
--- a/Source/AssetRipper.SerializationLogic/AssetRipper.SerializationLogic.csproj
+++ b/Source/AssetRipper.SerializationLogic/AssetRipper.SerializationLogic.csproj
@@ -6,7 +6,7 @@
-
+