From 8ddc5f7332de044dd2053cc32e5d782b90b7058a Mon Sep 17 00:00:00 2001 From: Caraxi Date: Sun, 22 Jan 2023 18:48:23 +1030 Subject: [PATCH 1/3] Update FFXIVClientStructs --- lib/FFXIVClientStructs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/FFXIVClientStructs b/lib/FFXIVClientStructs index 6625b6179..47ffffaa0 160000 --- a/lib/FFXIVClientStructs +++ b/lib/FFXIVClientStructs @@ -1 +1 @@ -Subproject commit 6625b6179ffe27b04302fc7621c41b61aa1f9d73 +Subproject commit 47ffffaa05ee72d286772cef9ab2f62ab1422e45 From 7b3a09e40553f0134e0a6e1b68ed32f4d036651d Mon Sep 17 00:00:00 2001 From: Caraxi Date: Sun, 22 Jan 2023 18:48:51 +1030 Subject: [PATCH 2/3] Show FFXIVClientStructs Version ID in dev menu --- Dalamud/EntryPoint.cs | 2 +- Dalamud/Interface/Internal/DalamudInterface.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dalamud/EntryPoint.cs b/Dalamud/EntryPoint.cs index 702d46d0a..11f270b63 100644 --- a/Dalamud/EntryPoint.cs +++ b/Dalamud/EntryPoint.cs @@ -177,7 +177,7 @@ public sealed class EntryPoint InitSymbolHandler(info); var dalamud = new Dalamud(info, configuration, mainThreadContinueEvent); - Log.Information("This is Dalamud - Core: {GitHash}, CS: {CsGitHash}", Util.GetGitHash(), Util.GetGitHashClientStructs()); + Log.Information("This is Dalamud - Core: {GitHash}, CS: {CsGitHash} [{CsVersion}]", Util.GetGitHash(), Util.GetGitHashClientStructs(), FFXIVClientStructs.Interop.Resolver.Version); dalamud.WaitForUnload(); diff --git a/Dalamud/Interface/Internal/DalamudInterface.cs b/Dalamud/Interface/Internal/DalamudInterface.cs index 97313730f..a32db0036 100644 --- a/Dalamud/Interface/Internal/DalamudInterface.cs +++ b/Dalamud/Interface/Internal/DalamudInterface.cs @@ -697,7 +697,7 @@ internal class DalamudInterface : IDisposable, IServiceType ImGui.MenuItem(Util.AssemblyVersion, false); ImGui.MenuItem(startInfo.GameVersion?.ToString() ?? "Unknown version", false); - ImGui.MenuItem($"D: {Util.GetGitHash()} CS: {Util.GetGitHashClientStructs()}", false); + ImGui.MenuItem($"D: {Util.GetGitHash()} CS: {Util.GetGitHashClientStructs()} [{FFXIVClientStructs.Interop.Resolver.Version}]", false); ImGui.MenuItem($"CLR: {Environment.Version}", false); ImGui.EndMenu(); From 3455025b3a9ff3772944920ac600362cd7d05eca Mon Sep 17 00:00:00 2001 From: Caraxi Date: Sun, 22 Jan 2023 18:59:59 +1030 Subject: [PATCH 3/3] Update main.yml --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cf708326b..ddc03558b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,9 +10,10 @@ jobs: runs-on: windows-2022 steps: - name: Checkout Dalamud - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: recursive + fetch-depth: 0 - name: Setup MSBuild uses: microsoft/setup-msbuild@v1.0.2 - name: Define VERSION