From 47cfb8176c2fcb84291f8b23b71efb35413f79ff Mon Sep 17 00:00:00 2001
From: LukeFZ <17146677+LukeFZ@users.noreply.github.com>
Date: Sat, 25 Jan 2025 16:59:12 +0100
Subject: [PATCH] update dependencies and remove cxxdemangler, as it was
outdated
---
Il2CppInspector.Common/FileFormatStreams/ElfReader.cs | 2 +-
Il2CppInspector.Common/FileFormatStreams/MachOReader.cs | 2 +-
Il2CppInspector.Common/FileFormatStreams/Symbol.cs | 2 --
Il2CppInspector.Common/Il2CppInspector.csproj | 5 +----
Il2CppInspector.Common/Outputs/JSONMetadata.cs | 1 -
Il2CppTests/Il2CppTests.csproj | 4 ++--
README.md | 1 -
7 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/Il2CppInspector.Common/FileFormatStreams/ElfReader.cs b/Il2CppInspector.Common/FileFormatStreams/ElfReader.cs
index 62d5654..b8a58aa 100644
--- a/Il2CppInspector.Common/FileFormatStreams/ElfReader.cs
+++ b/Il2CppInspector.Common/FileFormatStreams/ElfReader.cs
@@ -463,7 +463,7 @@ namespace Il2CppInspector
var symbolItem = new Symbol {Name = name, Type = type, VirtualAddress = conv.ULong(symbol.st_value) };
symbolTable.TryAdd(name, symbolItem);
if (symbol.st_shndx != (ushort) Elf.SHN_UNDEF)
- exportTable.TryAdd(name, new Export {Name = symbolItem.DemangledName, VirtualAddress = conv.ULong(symbol.st_value)});
+ exportTable.TryAdd(name, new Export {Name = symbolItem.Name, VirtualAddress = conv.ULong(symbol.st_value)});
}
}
diff --git a/Il2CppInspector.Common/FileFormatStreams/MachOReader.cs b/Il2CppInspector.Common/FileFormatStreams/MachOReader.cs
index f5cfc74..e65fc0e 100644
--- a/Il2CppInspector.Common/FileFormatStreams/MachOReader.cs
+++ b/Il2CppInspector.Common/FileFormatStreams/MachOReader.cs
@@ -282,7 +282,7 @@ namespace Il2CppInspector
: SymbolType.Unknown;
if (type == SymbolType.Unknown) {
- Console.WriteLine($"Unknown symbol type: {((int) ntype):x2} {value:x16} " + CxxDemangler.CxxDemangler.Demangle(name));
+ Console.WriteLine($"Unknown symbol type: {((int) ntype):x2} {value:x16} {name}");
}
// Ignore duplicates
diff --git a/Il2CppInspector.Common/FileFormatStreams/Symbol.cs b/Il2CppInspector.Common/FileFormatStreams/Symbol.cs
index 6ab330a..c7c1dc9 100644
--- a/Il2CppInspector.Common/FileFormatStreams/Symbol.cs
+++ b/Il2CppInspector.Common/FileFormatStreams/Symbol.cs
@@ -20,7 +20,5 @@ namespace Il2CppInspector
public ulong VirtualAddress { get; set; }
public string Name { get; set; }
public SymbolType Type { get; set; }
-
- public string DemangledName => CxxDemangler.CxxDemangler.Demangle(Name);
}
}
diff --git a/Il2CppInspector.Common/Il2CppInspector.csproj b/Il2CppInspector.Common/Il2CppInspector.csproj
index fa982aa..23462ef 100644
--- a/Il2CppInspector.Common/Il2CppInspector.csproj
+++ b/Il2CppInspector.Common/Il2CppInspector.csproj
@@ -41,10 +41,7 @@
-
-
- NU1605
-
+
diff --git a/Il2CppInspector.Common/Outputs/JSONMetadata.cs b/Il2CppInspector.Common/Outputs/JSONMetadata.cs
index 57a27c0..725575b 100644
--- a/Il2CppInspector.Common/Outputs/JSONMetadata.cs
+++ b/Il2CppInspector.Common/Outputs/JSONMetadata.cs
@@ -217,7 +217,6 @@ namespace Il2CppInspector.Outputs
foreach (var symbol in symbols) {
writeObject(() => {
writeName(symbol.VirtualAddress, symbol.Name);
- writer.WriteString("demangledName", symbol.DemangledName);
writer.WriteString("type", symbol.Type.ToString());
});
}
diff --git a/Il2CppTests/Il2CppTests.csproj b/Il2CppTests/Il2CppTests.csproj
index 26ebca8..ba1e70f 100644
--- a/Il2CppTests/Il2CppTests.csproj
+++ b/Il2CppTests/Il2CppTests.csproj
@@ -213,9 +213,9 @@
-
+
-
+
diff --git a/README.md b/README.md
index 6c33eaf..c2b44f3 100644
--- a/README.md
+++ b/README.md
@@ -785,7 +785,6 @@ Thanks to the following major contributors!
This project uses:
- [MultiKeyDictionary](https://www.codeproject.com/Articles/32894/C-Multi-key-Generic-Dictionary) by Aron Weiler
-- [CxxDemangler](https://github.com/southpolenator/CxxDemangler) by Vuk Jovanovic
- [CommandLineParser](https://github.com/commandlineparser/commandline)
- [Ookii.Dialogs.Wpf](https://github.com/augustoproiete/ookii-dialogs-wpf)
- [XamlAnimatedGif](https://github.com/XamlAnimatedGif/WpfAnimatedGif) by Thomas Levesque