From b4bf453e4ce393f0a976704989b740f6e9406daa Mon Sep 17 00:00:00 2001 From: Michael Gordeev Date: Sat, 14 Mar 2020 17:31:30 +0300 Subject: [PATCH] Version display updated for UWP --- GUT.Schedule/GUTSchedule.UWP/Package.appxmanifest | 2 +- GUT.Schedule/GUTSchedule.UWP/Pages/AboutPage.xaml.cs | 2 +- GUT.Schedule/GUTSchedule.UWP/Pages/MainPage.xaml.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/GUT.Schedule/GUTSchedule.UWP/Package.appxmanifest b/GUT.Schedule/GUTSchedule.UWP/Package.appxmanifest index 64eacff..5e1af14 100644 --- a/GUT.Schedule/GUTSchedule.UWP/Package.appxmanifest +++ b/GUT.Schedule/GUTSchedule.UWP/Package.appxmanifest @@ -8,7 +8,7 @@ + Version="0.0.0.0" /> diff --git a/GUT.Schedule/GUTSchedule.UWP/Pages/AboutPage.xaml.cs b/GUT.Schedule/GUTSchedule.UWP/Pages/AboutPage.xaml.cs index b097324..83bb05f 100644 --- a/GUT.Schedule/GUTSchedule.UWP/Pages/AboutPage.xaml.cs +++ b/GUT.Schedule/GUTSchedule.UWP/Pages/AboutPage.xaml.cs @@ -26,7 +26,7 @@ namespace GUTSchedule.UWP.Pages private async void Page_Loaded(object sender, RoutedEventArgs e) { PackageVersion ver = Package.Current.Id.Version; - version.Text = $"v{ver.Major}{(ver.Minor < 1000 ? "0" + ver.Minor : ver.Minor.ToString())}.{ver.Revision} (ci-id #{ver.Build})"; + version.Text = $"v{ver.Major}.{ver.Minor}.{ver.Build}.{ver.Revision}"; List contributorsList = new List(); try diff --git a/GUT.Schedule/GUTSchedule.UWP/Pages/MainPage.xaml.cs b/GUT.Schedule/GUTSchedule.UWP/Pages/MainPage.xaml.cs index 27c96e1..238e729 100644 --- a/GUT.Schedule/GUTSchedule.UWP/Pages/MainPage.xaml.cs +++ b/GUT.Schedule/GUTSchedule.UWP/Pages/MainPage.xaml.cs @@ -32,7 +32,7 @@ namespace GUTSchedule.UWP.Pages try { PackageVersion ver = Package.Current.Id.Version; - version.Text = $"v{ver.Major}{(ver.Minor < 1000 ? "0" + ver.Minor : ver.Minor.ToString())}.{ver.Revision} (ci-id #{ver.Build})"; + version.Text = $"v{ver.Major}.{ver.Minor}.{ver.Build}.{ver.Revision}"; authorize.IsChecked = (bool?)settings.Values["Authorize"] ?? true; if (vault.RetrieveAll() is IReadOnlyList credentials && credentials.Count > 0)