From 8505b8c7ef6b88ee2d554c0f18d68375d00800e3 Mon Sep 17 00:00:00 2001 From: aers Date: Sun, 8 Jan 2023 18:01:45 -0800 Subject: [PATCH 1/3] Update ClientStructs to the .NET 7 version --- Dalamud.sln | 2 +- Dalamud/ServiceManager.cs | 4 ++-- lib/FFXIVClientStructs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dalamud.sln b/Dalamud.sln index a618f1156..b3817d45e 100644 --- a/Dalamud.sln +++ b/Dalamud.sln @@ -32,7 +32,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dalamud.CorePlugin", "Dalam EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FFXIVClientStructs", "lib\FFXIVClientStructs\FFXIVClientStructs\FFXIVClientStructs.csproj", "{C9B87BD7-AF49-41C3-91F1-D550ADEB7833}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FFXIVClientStructs.Generators", "lib\FFXIVClientStructs\FFXIVClientStructs.Generators\FFXIVClientStructs.Generators.csproj", "{05AB2F46-268B-4915-806F-DDF813E2D59D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FFXIVClientStructs.InteropSourceGenerators", "lib\FFXIVClientStructs\FFXIVClientStructs.InteropSourceGenerators\FFXIVClientStructs.InteropSourceGenerators.csproj", "{05AB2F46-268B-4915-806F-DDF813E2D59D}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DalamudCrashHandler", "DalamudCrashHandler\DalamudCrashHandler.vcxproj", "{317A264C-920B-44A1-8A34-F3A6827B0705}" EndProject diff --git a/Dalamud/ServiceManager.cs b/Dalamud/ServiceManager.cs index a7eb7457d..d49fe5aa6 100644 --- a/Dalamud/ServiceManager.cs +++ b/Dalamud/ServiceManager.cs @@ -68,8 +68,8 @@ internal static class ServiceManager using (Timings.Start("CS Resolver Init")) { - FFXIVClientStructs.Resolver.InitializeParallel( - new FileInfo(Path.Combine(cacheDir.FullName, $"{startInfo.GameVersion}_cs.json"))); + FFXIVClientStructs.Interop.Resolver.GetInstance.SetupSearchSpace(Service.Get().SearchBase, new FileInfo(Path.Combine(cacheDir.FullName, $"{startInfo.GameVersion}_cs.json"))); + FFXIVClientStructs.Interop.Resolver.GetInstance.Resolve(); } } diff --git a/lib/FFXIVClientStructs b/lib/FFXIVClientStructs index 2152fef49..80c299eb8 160000 --- a/lib/FFXIVClientStructs +++ b/lib/FFXIVClientStructs @@ -1 +1 @@ -Subproject commit 2152fef49d3a5574121c23c45e70d0c24647a025 +Subproject commit 80c299eb8083fd8117fed5d025106806236c0eab From dda94cc4c80c788da70f994e9ea061203c5eee6e Mon Sep 17 00:00:00 2001 From: aers Date: Sun, 8 Jan 2023 18:59:34 -0800 Subject: [PATCH 2/3] Update FFXIVClientStructs --- lib/FFXIVClientStructs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/FFXIVClientStructs b/lib/FFXIVClientStructs index 80c299eb8..b942f41dd 160000 --- a/lib/FFXIVClientStructs +++ b/lib/FFXIVClientStructs @@ -1 +1 @@ -Subproject commit 80c299eb8083fd8117fed5d025106806236c0eab +Subproject commit b942f41dd81be189877184d4dfcfeea8ee3ad517 From a3a0450079ee73069583985191e9e7ce8f8db21b Mon Sep 17 00:00:00 2001 From: aers Date: Sun, 8 Jan 2023 22:23:05 -0800 Subject: [PATCH 3/3] Update FFXIVClientStructs --- lib/FFXIVClientStructs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/FFXIVClientStructs b/lib/FFXIVClientStructs index b942f41dd..2ee44846c 160000 --- a/lib/FFXIVClientStructs +++ b/lib/FFXIVClientStructs @@ -1 +1 @@ -Subproject commit b942f41dd81be189877184d4dfcfeea8ee3ad517 +Subproject commit 2ee44846c128b1a6a2983cec3b49712a1035a0e1