ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-23 17:09:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #1945 from KazWolfe/fixed-versioning

Browse source 
feat: Use new versioning strategy
This commit is contained in:
goat 2024-07-25 01:01:50 +02:00 • committed by GitHub
commit bd170ee74a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 71 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs
View file

@ -305,7 +305,7 @@ internal class PluginInstallerWindow : Window, IDisposable
return;
var versionInfo = t.Result;
if (versionInfo.AssemblyVersion != Util.GetGitHash() &&
if (versionInfo.AssemblyVersion != Util.GetScmVersion() &&
versionInfo.Track != "release" &&
string.Equals(versionInfo.Key, config.DalamudBetaKey, StringComparison.OrdinalIgnoreCase))
this.staleDalamudNewVersion = versionInfo.AssemblyVersion;
@ -1564,7 +1564,7 @@ internal class PluginInstallerWindow : Window, IDisposable
DrawWarningIcon();
DrawLinesCentered("A new version of Dalamud is available.\n" +
"Please restart the game to ensure compatibility with updated plugins.\n" +
$"old: {Util.GetGitHash()} new: {this.staleDalamudNewVersion}");
$"old: {Util.GetScmVersion()} new: {this.staleDalamudNewVersion}");
ImGuiHelpers.ScaledDummy(10);
}