diff --git a/Source/LibationAvalonia/Dialogs/UpgradeNotification.axaml.cs b/Source/LibationAvalonia/Dialogs/UpgradeNotification.axaml.cs index 22f78178..b00cbc91 100644 --- a/Source/LibationAvalonia/Dialogs/UpgradeNotification.axaml.cs +++ b/Source/LibationAvalonia/Dialogs/UpgradeNotification.axaml.cs @@ -1,3 +1,4 @@ +using AppScaffolding; using Avalonia.Controls; using Dinah.Core; using System; @@ -21,11 +22,11 @@ namespace LibationAvalonia.Dialogs InitializeComponent(); } - public UpgradeNotification(Version version, string packageUrl, string zipFileName) : this() + public UpgradeNotification(UpgradeProperties upgradeProperties) : this() { - VersionText = $"Libation version {version.ToString(3)} is now available."; - PackageUrl = packageUrl; - DownloadLinkText = $"Download {zipFileName}"; + VersionText = $"Libation version {upgradeProperties.LatestRelease.ToString(3)} is now available."; + PackageUrl = upgradeProperties.ZipUrl; + DownloadLinkText = $"Download {upgradeProperties.ZipName}"; DataContext = this; } diff --git a/Source/LibationAvalonia/Views/MainWindow.Update.cs b/Source/LibationAvalonia/Views/MainWindow.Update.cs index 442952a0..d7871210 100644 --- a/Source/LibationAvalonia/Views/MainWindow.Update.cs +++ b/Source/LibationAvalonia/Views/MainWindow.Update.cs @@ -100,12 +100,7 @@ namespace LibationAvalonia.Views if (config.GetObject(ignoreUpdate)?.ToString() == upgradeProperties.LatestRelease.ToString()) return; - var notificationResult = - await new UpgradeNotification( - upgradeProperties.LatestRelease, - upgradeProperties.ZipUrl, - upgradeProperties.ZipName) - .ShowDialog(this); + var notificationResult = await new UpgradeNotification(upgradeProperties).ShowDialog(this); if (notificationResult == DialogResult.Ignore) config.SetObject(ignoreUpdate, upgradeProperties.LatestRelease.ToString());