From c29c969eb61e6ba44b78504cd4f5aa53cd0a8ae4 Mon Sep 17 00:00:00 2001 From: goat Date: Sat, 29 Jun 2024 16:33:03 +0200 Subject: [PATCH 1/5] allow windows targeting for Dalamud --- Dalamud/Dalamud.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/Dalamud/Dalamud.csproj b/Dalamud/Dalamud.csproj index b25aeecce..57acc68cb 100644 --- a/Dalamud/Dalamud.csproj +++ b/Dalamud/Dalamud.csproj @@ -5,6 +5,7 @@ x64 x64;AnyCPU 12.0 + True From 93ed6e1d3f905316ccb788f37d9f3d812c86989d Mon Sep 17 00:00:00 2001 From: goat Date: Sat, 29 Jun 2024 21:02:43 +0200 Subject: [PATCH 2/5] build project must target net8.0 --- build/build.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build.csproj b/build/build.csproj index 46d416199..fbdbae542 100644 --- a/build/build.csproj +++ b/build/build.csproj @@ -1,7 +1,7 @@  Exe - net7.0 + net8.0 disable IDE0002;IDE0051;IDE1006;CS0649;CS0169 From ee362acf70d47dd30c46da931f55958010fbf502 Mon Sep 17 00:00:00 2001 From: goat Date: Sat, 29 Jun 2024 21:22:30 +0200 Subject: [PATCH 3/5] enable binary formatter in nuke project --- build/build.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/build/build.csproj b/build/build.csproj index fbdbae542..219b668bd 100644 --- a/build/build.csproj +++ b/build/build.csproj @@ -8,6 +8,7 @@ .. .. 1 + true From cccb2709faa0566b9142336b9e8a8407ed5fe258 Mon Sep 17 00:00:00 2001 From: Kaz Wolfe Date: Mon, 1 Jul 2024 09:18:48 -0700 Subject: [PATCH 4/5] bump cs --- lib/FFXIVClientStructs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/FFXIVClientStructs b/lib/FFXIVClientStructs index 31afa02c8..15dcf7cfc 160000 --- a/lib/FFXIVClientStructs +++ b/lib/FFXIVClientStructs @@ -1 +1 @@ -Subproject commit 31afa02c8f423ad57a28fd6b9109e8da348ce528 +Subproject commit 15dcf7cfcea43f658f6309b7649db72e30f4f017 From d48d42d307462fc7bc53e9e0d90473bcc2ff81b3 Mon Sep 17 00:00:00 2001 From: Kaz Wolfe Date: Mon, 1 Jul 2024 09:19:32 -0700 Subject: [PATCH 5/5] Change log level for manifest issues --- Dalamud/Plugin/Internal/PluginManager.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dalamud/Plugin/Internal/PluginManager.cs b/Dalamud/Plugin/Internal/PluginManager.cs index ef2116669..1d15e7ef2 100644 --- a/Dalamud/Plugin/Internal/PluginManager.cs +++ b/Dalamud/Plugin/Internal/PluginManager.cs @@ -554,14 +554,14 @@ internal class PluginManager : IInternalDisposableService var manifestFile = LocalPluginManifest.GetManifestFile(dllFile); if (!manifestFile.Exists) { - Log.Information("DLL at {DllPath} has no manifest, this is no longer valid", dllFile.FullName); + Log.Error("DLL at {DllPath} has no manifest, this is no longer valid", dllFile.FullName); continue; } var manifest = LocalPluginManifest.Load(manifestFile); if (manifest == null) { - Log.Information("Could not deserialize manifest for DLL at {DllPath}", dllFile.FullName); + Log.Error("Could not deserialize manifest for DLL at {DllPath}", dllFile.FullName); continue; } @@ -816,14 +816,14 @@ internal class PluginManager : IInternalDisposableService var manifestFile = LocalPluginManifest.GetManifestFile(dllFile); if (!manifestFile.Exists) { - Log.Information("DLL at {DllPath} has no manifest, this is no longer valid", dllFile.FullName); + Log.Error("DLL at {DllPath} has no manifest, this is no longer valid", dllFile.FullName); continue; } var manifest = LocalPluginManifest.Load(manifestFile); if (manifest == null) { - Log.Information("Could not deserialize manifest for DLL at {DllPath}", dllFile.FullName); + Log.Error("Could not deserialize manifest for DLL at {DllPath}", dllFile.FullName); continue; }