diff --git a/BodyshopUploader/Utils/UpdateHandler.cs b/BodyshopUploader/Utils/UpdateHandler.cs index e2232ef..b556284 100644 --- a/BodyshopUploader/Utils/UpdateHandler.cs +++ b/BodyshopUploader/Utils/UpdateHandler.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Reflection; using System.Text; using System.Threading.Tasks; +using System.Windows; namespace BodyshopPartner.Utils { @@ -31,7 +32,7 @@ namespace BodyshopPartner.Utils } updateInfo.ReleasesToApply.ForEach(release => logger.Debug("Release to apply " + release.Version)); - + return true; } } @@ -61,12 +62,16 @@ namespace BodyshopPartner.Utils var updateInfo = await updateManager.CheckForUpdate(); var releases = updateInfo.ReleasesToApply; logger.Debug("Applying releases", releases.ToString()); - await updateManager.DownloadReleases(releases, _ => { + await updateManager.DownloadReleases(releases, _ => + { logger.Debug("Download Release Progress " + _.ToString()); - DownloadProgress = _; }); - await updateManager.ApplyReleases(updateInfo, _ => { + DownloadProgress = _; + }); + await updateManager.ApplyReleases(updateInfo, _ => + { logger.Debug("Install Progress " + _.ToString()); - InstallProgress = _; }); + InstallProgress = _; + }); } catch (Exception Ex) { diff --git a/BodyshopUploader/Views/Main.xaml b/BodyshopUploader/Views/Main.xaml index 956639a..4e2eaec 100644 --- a/BodyshopUploader/Views/Main.xaml +++ b/BodyshopUploader/Views/Main.xaml @@ -20,8 +20,7 @@ Background="{DynamicResource MaterialDesignPaper}" FontFamily="{DynamicResource MaterialDesignFont}" Loaded="Window_Loaded" - Closing="Window_Closing" - > + Closing="Window_Closing"> @@ -133,10 +132,6 @@