diff --git a/ZenovaLauncher/Pages/ModsPage.xaml b/ZenovaLauncher/Pages/ModsPage.xaml index 0833be7..a76c861 100644 --- a/ZenovaLauncher/Pages/ModsPage.xaml +++ b/ZenovaLauncher/Pages/ModsPage.xaml @@ -88,7 +88,7 @@ - + diff --git a/ZenovaLauncher/Pages/PlayPage.xaml b/ZenovaLauncher/Pages/PlayPage.xaml index 237a9f4..bffb6e4 100644 --- a/ZenovaLauncher/Pages/PlayPage.xaml +++ b/ZenovaLauncher/Pages/PlayPage.xaml @@ -160,7 +160,7 @@ - + diff --git a/ZenovaLauncher/Pages/ProfilesPage.xaml b/ZenovaLauncher/Pages/ProfilesPage.xaml index 50aa441..dd12243 100644 --- a/ZenovaLauncher/Pages/ProfilesPage.xaml +++ b/ZenovaLauncher/Pages/ProfilesPage.xaml @@ -97,7 +97,7 @@ - + diff --git a/ZenovaLauncher/Pages/SettingsPage.xaml b/ZenovaLauncher/Pages/SettingsPage.xaml index 9d3ddea..d7e4a51 100644 --- a/ZenovaLauncher/Pages/SettingsPage.xaml +++ b/ZenovaLauncher/Pages/SettingsPage.xaml @@ -43,7 +43,28 @@ - + + + + + + + + + + + + + + + + + + + + + + diff --git a/ZenovaLauncher/Pages/SettingsPage.xaml.cs b/ZenovaLauncher/Pages/SettingsPage.xaml.cs index 2493a29..2ff37a8 100644 --- a/ZenovaLauncher/Pages/SettingsPage.xaml.cs +++ b/ZenovaLauncher/Pages/SettingsPage.xaml.cs @@ -1,4 +1,5 @@ -using System.Windows; +using System.Collections.ObjectModel; +using System.Windows; using System.Windows.Controls; namespace ZenovaLauncher @@ -8,6 +9,8 @@ namespace ZenovaLauncher /// public partial class SettingsPage : Page { + private ObservableCollection Assemblies = new ObservableCollection(); + public SettingsPage() { InitializeComponent(); @@ -16,6 +19,12 @@ public SettingsPage() FreeSpaceBox.DataContext = Preferences.instance; DebugBox.DataContext = Preferences.instance; UpdateBox.DataContext = Preferences.instance; + + Assemblies.Add(ZenovaUpdater.InstallerAssembly); + Assemblies.Add(ZenovaUpdater.ApiAssembly); + Assemblies.Add(ZenovaUpdater.LoaderAssembly); + + AboutPanel.ItemsSource = Assemblies; } private void FreeSpaceClick(object sender, RoutedEventArgs e) diff --git a/ZenovaLauncher/Properties/AssemblyInfo.cs b/ZenovaLauncher/Properties/AssemblyInfo.cs index 9d2c054..3b17c64 100644 --- a/ZenovaLauncher/Properties/AssemblyInfo.cs +++ b/ZenovaLauncher/Properties/AssemblyInfo.cs @@ -49,5 +49,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.1.2")] -[assembly: AssemblyFileVersion("1.0.1.2")] +[assembly: AssemblyVersion("1.0.1.3")] +[assembly: AssemblyFileVersion("1.0.1.3")] diff --git a/ZenovaLauncher/Utils/ZenovaUpdater.cs b/ZenovaLauncher/Utils/ZenovaUpdater.cs index 4ba03bd..53376ce 100644 --- a/ZenovaLauncher/Utils/ZenovaUpdater.cs +++ b/ZenovaLauncher/Utils/ZenovaUpdater.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Linq; using System.Net.Http; using System.Reflection; using System.Threading; @@ -118,8 +119,8 @@ public async Task CheckUpdate(AssemblyType type) { try { - var releases = await Client.Repository.Release.GetAll("MinecraftZenova", type.RepositoryName); - type.LatestRelease = releases[0]; + type.LatestRelease = await Client.Repository.Release.GetLatest("MinecraftZenova", type.RepositoryName); + type.TagInfo = (await Client.Repository.GetAllTags("MinecraftZenova", type.RepositoryName)).FirstOrDefault(x => x.Name == type.LatestRelease.TagName); if (type.InstalledVersion == null) return true; @@ -206,6 +207,7 @@ public class AssemblyType private Version _installedVersion; public string RepositoryName { get; set; } public Release LatestRelease { get; set; } + public RepositoryTag TagInfo { get; set; } public GetDLPath DownloadPath { get; set; } public PostDownload PostDownloadTask { get; set; } public Version InstalledVersion @@ -234,6 +236,10 @@ private static Version GetVersionFromPath(string path) } return null; } + + public string InstalledVersionString => InstalledVersion.ToString(); + public string PublishDateString => LatestRelease?.PublishedAt.Value.DateTime.ToString("dddd, MMMM dd, yyyy, HH:mm:ss"); + public string CommitHashString => TagInfo.Commit.Sha; } } }