From 331022b738923fa9e4b3ff3e216e02a14a3ce9b3 Mon Sep 17 00:00:00 2001 From: praydog Date: Mon, 16 Sep 2024 18:45:08 -0700 Subject: [PATCH] .NET: Fix ObjectExplorer.cs compilation in DMC5 --- csharp-api/CMakeLists.txt | 6 ++++++ csharp-api/cmake.toml | 6 ++++++ csharp-api/test/Test/ObjectExplorer.cs | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/csharp-api/CMakeLists.txt b/csharp-api/CMakeLists.txt index 923aa76f9..d544b7e14 100644 --- a/csharp-api/CMakeLists.txt +++ b/csharp-api/CMakeLists.txt @@ -119,10 +119,16 @@ check_dlls_exist("re2" "${RE2_DLLS}" "REFRAMEWORK_REF_ASSEMBLIES_EXIST_RE2") set(RE4_DLLS "REFramework.NET._mscorlib.dll;REFramework.NET._System.dll;REFramework.NET._System.Core.dll;REFramework.NET.application.dll;REFramework.NET.viacore.dll") check_dlls_exist("re4" "${RE4_DLLS}" "REFRAMEWORK_REF_ASSEMBLIES_EXIST_RE4") +# DMC5 +set(DMC5_DLLS "REFramework.NET._mscorlib.dll;REFramework.NET._System.dll;REFramework.NET._System.Core.dll;REFramework.NET.application.dll;REFramework.NET.viacore.dll") +check_dlls_exist("dmc5" "${DMC5_DLLS}" "REFRAMEWORK_REF_ASSEMBLIES_EXIST_DMC5") + # DD2 set(DD2_DLLS "REFramework.NET._System.dll;REFramework.NET.application.dll;REFramework.NET.viacore.dll") check_dlls_exist("dd2" "${DD2_DLLS}" "REFRAMEWORK_REF_ASSEMBLIES_EXIST_DD2") + + # Define a list of NuGet packages and their versions # the last part, the package framework will only be used for copying the files set(REFRAMEWORK_NUGET_PACKAGES diff --git a/csharp-api/cmake.toml b/csharp-api/cmake.toml index 389f08cc4..46bd4b62d 100644 --- a/csharp-api/cmake.toml +++ b/csharp-api/cmake.toml @@ -92,10 +92,16 @@ check_dlls_exist("re2" "${RE2_DLLS}" "REFRAMEWORK_REF_ASSEMBLIES_EXIST_RE2") set(RE4_DLLS "REFramework.NET._mscorlib.dll;REFramework.NET._System.dll;REFramework.NET._System.Core.dll;REFramework.NET.application.dll;REFramework.NET.viacore.dll") check_dlls_exist("re4" "${RE4_DLLS}" "REFRAMEWORK_REF_ASSEMBLIES_EXIST_RE4") +# DMC5 +set(DMC5_DLLS "REFramework.NET._mscorlib.dll;REFramework.NET._System.dll;REFramework.NET._System.Core.dll;REFramework.NET.application.dll;REFramework.NET.viacore.dll") +check_dlls_exist("dmc5" "${DMC5_DLLS}" "REFRAMEWORK_REF_ASSEMBLIES_EXIST_DMC5") + # DD2 set(DD2_DLLS "REFramework.NET._System.dll;REFramework.NET.application.dll;REFramework.NET.viacore.dll") check_dlls_exist("dd2" "${DD2_DLLS}" "REFRAMEWORK_REF_ASSEMBLIES_EXIST_DD2") + + # Define a list of NuGet packages and their versions # the last part, the package framework will only be used for copying the files set(REFRAMEWORK_NUGET_PACKAGES diff --git a/csharp-api/test/Test/ObjectExplorer.cs b/csharp-api/test/Test/ObjectExplorer.cs index c65efe49a..1597d438e 100644 --- a/csharp-api/test/Test/ObjectExplorer.cs +++ b/csharp-api/test/Test/ObjectExplorer.cs @@ -475,7 +475,7 @@ public static void Render() { if (ImGui.TreeNode("AppDomain")) { if (assemblies != null && ImGui.TreeNode("Assemblies")) { for (int i = 0; i < assemblies.Length; i++) { - var assembly = assemblies[i]; + var assembly = assemblies.Get(i); // There is a strange thing in the generation where newer REE games do not generate an accessor for this, so we have to use Get instead var assemblyT = (assembly as IObject).GetTypeDefinition(); var location = assembly.Location ?? "null";