From 92830f9edf19d31e9530a98cb07913c56ec801f4 Mon Sep 17 00:00:00 2001 From: Danil Kislov Date: Tue, 19 Mar 2019 08:44:17 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=B0=D0=BB=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA?= =?UTF-8?q?=D1=82,=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D1=81=D1=82?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D0=B8,=20?= =?UTF-8?q?=D1=81=D0=BB=D0=BE=D0=BC=D0=B0=D0=BB=20=D1=81=D1=82=D0=B0=D1=80?= =?UTF-8?q?=D1=8B=D0=B5=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA?= =?UTF-8?q?=D0=B8=20(=D1=87=D1=82=D0=BE=D0=B1=D1=8B=20=D0=BF=D0=BE=D0=B4?= =?UTF-8?q?=D0=B4=D0=B5=D1=80=D0=B6=D0=B0=D1=82=D1=8C=20=D0=B2=D0=B5=D1=80?= =?UTF-8?q?=D1=81=D0=B8=D0=BE=D0=BD=D0=BD=D0=BE=D1=81=D1=82=D1=8C)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .semver.txt | 2 +- src/JiraTimeBot/Configuration/Settings.cs | 6 ++++-- src/JiraTimeBot/Properties/AssemblyInfo.cs | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.semver.txt b/.semver.txt index 59e9e60..bb83058 100644 --- a/.semver.txt +++ b/.semver.txt @@ -1 +1 @@ -1.0.11 +1.0.12 diff --git a/src/JiraTimeBot/Configuration/Settings.cs b/src/JiraTimeBot/Configuration/Settings.cs index 56edd42..0e63eba 100644 --- a/src/JiraTimeBot/Configuration/Settings.cs +++ b/src/JiraTimeBot/Configuration/Settings.cs @@ -90,7 +90,8 @@ namespace JiraTimeBotForm.Configuration public static Settings Load() { - var settingsPath = Path.Combine(Application.UserAppDataPath, _settingsFileName); + var configDir = Application.UserAppDataPath.Replace(Application.ProductVersion, ""); + var settingsPath = Path.Combine(configDir, _settingsFileName); if (!File.Exists(settingsPath)) { return null; @@ -123,7 +124,8 @@ namespace JiraTimeBotForm.Configuration var password = new PasswordEncryptionClass().Encrypt(this.JiraUserName, this.JiraPassword, this.JiraUrl); this.JiraPassword = password; - var settingsPath = Path.Combine(Application.UserAppDataPath, _settingsFileName); + var configDir = Application.UserAppDataPath.Replace(Application.ProductVersion, ""); + var settingsPath = Path.Combine(configDir, _settingsFileName); var settingsString = JsonConvert.SerializeObject(this); File.WriteAllText(settingsPath, settingsString); } diff --git a/src/JiraTimeBot/Properties/AssemblyInfo.cs b/src/JiraTimeBot/Properties/AssemblyInfo.cs index 596fe05..4b69d38 100644 --- a/src/JiraTimeBot/Properties/AssemblyInfo.cs +++ b/src/JiraTimeBot/Properties/AssemblyInfo.cs @@ -4,12 +4,12 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("JiraTimeBotForm")] +[assembly: AssemblyTitle("JiraTimeBot")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("JiraTimeBotForm")] -[assembly: AssemblyCopyright("Copyright © 2019")] +[assembly: AssemblyProduct("JiraTimeBot")] +[assembly: AssemblyCopyright("Copyright © 2019")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")]