diff --git a/src/JiraTimeBot/Properties/AssemblyInfo.cs b/src/JiraTimeBot/Properties/AssemblyInfo.cs index 1b85309..71734a3 100644 --- a/src/JiraTimeBot/Properties/AssemblyInfo.cs +++ b/src/JiraTimeBot/Properties/AssemblyInfo.cs @@ -26,6 +26,6 @@ using System.Runtime.InteropServices; // // 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.17")] -[assembly: AssemblyFileVersion("1.0.17")] -[assembly: AssemblyInformationalVersion("1.0.17")] +[assembly: AssemblyVersion("1.0.16")] +[assembly: AssemblyFileVersion("1.0.16")] +[assembly: AssemblyInformationalVersion("1.0.16")] diff --git a/src/JiraTimeBot/UI/frmMain.cs b/src/JiraTimeBot/UI/frmMain.cs index ab36612..41ba259 100644 --- a/src/JiraTimeBot/UI/frmMain.cs +++ b/src/JiraTimeBot/UI/frmMain.cs @@ -210,13 +210,13 @@ namespace JiraTimeBotForm.UI var downloadUrl = checker.GetDownloadUrl(release); _log.Info($"Доступна новая версия: {gitVersion} {downloadUrl}"); - var success = checker.DownloadFile(downloadUrl); + var success = checker.DownloadFile(downloadUrl, "update.zip"); if (!success) { return; } - var result = InstallUpdate(gitVersion); + var result = InstallUpdate(gitVersion, "update.zip"); if (result) { //если обновились - отключаем до рестарта @@ -231,7 +231,7 @@ namespace JiraTimeBotForm.UI } } - private bool InstallUpdate(Version gitVersion) + private bool InstallUpdate(Version gitVersion, string updateFile) { try { @@ -244,7 +244,7 @@ namespace JiraTimeBotForm.UI Directory.CreateDirectory(bkpDir); } - using (ZipArchive archive = ZipFile.OpenRead(Path.Combine(appFile.DirectoryName, "update.zip"))) + using (ZipArchive archive = ZipFile.OpenRead(Path.Combine(appFile.DirectoryName, updateFile))) { foreach (ZipArchiveEntry entry in archive.Entries) { diff --git a/src/JiraTimeBot/Update/UpdateChecker.cs b/src/JiraTimeBot/Update/UpdateChecker.cs index bcd0a22..3d038da 100644 --- a/src/JiraTimeBot/Update/UpdateChecker.cs +++ b/src/JiraTimeBot/Update/UpdateChecker.cs @@ -38,7 +38,7 @@ namespace JiraTimeBotForm.Update return release; } - public bool DownloadFile(string url) + public bool DownloadFile(string url, string to) { try { @@ -47,7 +47,7 @@ namespace JiraTimeBotForm.Update { client.Headers.Add("User-Agent", "Mozilla/5.0 (X11; Linux i686; rv:64.0) Gecko/20100101 Firefox/64.0"); - client.DownloadFile(url, "update.zip"); + client.DownloadFile(url, to); return true; } }