From ae1837b8f534e86e19e04029edb4ccae56a1c052 Mon Sep 17 00:00:00 2001 From: Loporrit <141286461+loporrit@users.noreply.github.com> Date: Fri, 15 Aug 2025 06:06:21 +0000 Subject: [PATCH] Re-add revision to version number displays --- MareSynchronos/UI/CompactUI.cs | 4 ++-- MareSynchronos/WebAPI/SignalR/ApiController.cs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MareSynchronos/UI/CompactUI.cs b/MareSynchronos/UI/CompactUI.cs index e124f21..c322cb6 100644 --- a/MareSynchronos/UI/CompactUI.cs +++ b/MareSynchronos/UI/CompactUI.cs @@ -80,11 +80,11 @@ public class CompactUi : WindowMediatorSubscriberBase #if DEBUG string dev = "Dev Build"; var ver = Assembly.GetExecutingAssembly().GetName().Version!; - WindowName = $"Loporrit Sync {dev} ({ver.Major}.{ver.Minor}.{ver.Build})###LoporritSyncMainUIDev"; + WindowName = $"Loporrit Sync {dev} ({ver.Major}.{ver.Minor}.{ver.Build}.{ver.Revision})###LoporritSyncMainUIDev"; Toggle(); #else var ver = Assembly.GetExecutingAssembly().GetName().Version!; - WindowName = "Loporrit Sync " + ver.Major + "." + ver.Minor + "." + ver.Build + "###LoporritSyncMainUI"; + WindowName = $"Loporrit Sync {ver.Major}.{ver.Minor}.{ver.Build}.{ver.Revision}###LoporritSyncMainUI"; #endif Mediator.Subscribe(this, (_) => IsOpen = true); Mediator.Subscribe(this, (_) => IsOpen = false); diff --git a/MareSynchronos/WebAPI/SignalR/ApiController.cs b/MareSynchronos/WebAPI/SignalR/ApiController.cs index a2f5453..84d046a 100644 --- a/MareSynchronos/WebAPI/SignalR/ApiController.cs +++ b/MareSynchronos/WebAPI/SignalR/ApiController.cs @@ -192,8 +192,8 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IM if (_connectionDto.CurrentClientVersion > currentClientVer) { Mediator.Publish(new NotificationMessage("Client incompatible", - $"Your client is outdated ({currentClientVer.Major}.{currentClientVer.Minor}.{currentClientVer.Build}), current is: " + - $"{_connectionDto.CurrentClientVersion.Major}.{_connectionDto.CurrentClientVersion.Minor}.{_connectionDto.CurrentClientVersion.Build}. " + + $"Your client is outdated ({currentClientVer.Major}.{currentClientVer.Minor}.{currentClientVer.Build}.{currentClientVer.Revision}), current is: " + + $"{_connectionDto.CurrentClientVersion.Major}.{_connectionDto.CurrentClientVersion.Minor}.{_connectionDto.CurrentClientVersion.Build}.{_connectionDto.CurrentClientVersion.Revision} " + $"This client version is incompatible and will not be able to connect. Please update your Loporrit client.", NotificationType.Error)); } @@ -204,8 +204,8 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IM if (_connectionDto.CurrentClientVersion > currentClientVer) { Mediator.Publish(new NotificationMessage("Client outdated", - $"Your client is outdated ({currentClientVer.Major}.{currentClientVer.Minor}.{currentClientVer.Build}), current is: " + - $"{_connectionDto.CurrentClientVersion.Major}.{_connectionDto.CurrentClientVersion.Minor}.{_connectionDto.CurrentClientVersion.Build}. " + + $"Your client is outdated ({currentClientVer.Major}.{currentClientVer.Minor}.{currentClientVer.Build}.{currentClientVer.Revision}), current is: " + + $"{_connectionDto.CurrentClientVersion.Major}.{_connectionDto.CurrentClientVersion.Minor}.{_connectionDto.CurrentClientVersion.Build}.{_connectionDto.CurrentClientVersion.Revision} " + $"Please keep your Loporrit client up-to-date.", NotificationType.Warning, TimeSpan.FromSeconds(15))); }