Re-add revision to version number displays
This commit is contained in:
@@ -80,11 +80,11 @@ public class CompactUi : WindowMediatorSubscriberBase
|
|||||||
#if DEBUG
|
#if DEBUG
|
||||||
string dev = "Dev Build";
|
string dev = "Dev Build";
|
||||||
var ver = Assembly.GetExecutingAssembly().GetName().Version!;
|
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();
|
Toggle();
|
||||||
#else
|
#else
|
||||||
var ver = Assembly.GetExecutingAssembly().GetName().Version!;
|
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
|
#endif
|
||||||
Mediator.Subscribe<SwitchToMainUiMessage>(this, (_) => IsOpen = true);
|
Mediator.Subscribe<SwitchToMainUiMessage>(this, (_) => IsOpen = true);
|
||||||
Mediator.Subscribe<SwitchToIntroUiMessage>(this, (_) => IsOpen = false);
|
Mediator.Subscribe<SwitchToIntroUiMessage>(this, (_) => IsOpen = false);
|
||||||
|
|||||||
@@ -192,8 +192,8 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IM
|
|||||||
if (_connectionDto.CurrentClientVersion > currentClientVer)
|
if (_connectionDto.CurrentClientVersion > currentClientVer)
|
||||||
{
|
{
|
||||||
Mediator.Publish(new NotificationMessage("Client incompatible",
|
Mediator.Publish(new NotificationMessage("Client incompatible",
|
||||||
$"Your client is outdated ({currentClientVer.Major}.{currentClientVer.Minor}.{currentClientVer.Build}), current is: " +
|
$"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.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.",
|
$"This client version is incompatible and will not be able to connect. Please update your Loporrit client.",
|
||||||
NotificationType.Error));
|
NotificationType.Error));
|
||||||
}
|
}
|
||||||
@@ -204,8 +204,8 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IM
|
|||||||
if (_connectionDto.CurrentClientVersion > currentClientVer)
|
if (_connectionDto.CurrentClientVersion > currentClientVer)
|
||||||
{
|
{
|
||||||
Mediator.Publish(new NotificationMessage("Client outdated",
|
Mediator.Publish(new NotificationMessage("Client outdated",
|
||||||
$"Your client is outdated ({currentClientVer.Major}.{currentClientVer.Minor}.{currentClientVer.Build}), current is: " +
|
$"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.Major}.{_connectionDto.CurrentClientVersion.Minor}.{_connectionDto.CurrentClientVersion.Build}.{_connectionDto.CurrentClientVersion.Revision} " +
|
||||||
$"Please keep your Loporrit client up-to-date.",
|
$"Please keep your Loporrit client up-to-date.",
|
||||||
NotificationType.Warning, TimeSpan.FromSeconds(15)));
|
NotificationType.Warning, TimeSpan.FromSeconds(15)));
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user