From b74b411e7829e3e9783556f08cf27e6f3c1f8937 Mon Sep 17 00:00:00 2001 From: Danil Kislov Date: Fri, 22 Mar 2019 14:59:47 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5=20=D0=B8?= =?UTF-8?q?=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .semver.txt | 2 +- .../Configuration/PasswordEncryptionClass.cs | 8 +-- src/JiraTimeBot/Properties/AssemblyInfo.cs | 62 +++++++++---------- .../TaskTime/TaskTimeByCommitsCalculator.cs | 2 +- src/JiraTimeBot/UI/frmMain.cs | 1 + src/JiraTimeBot/Update/UpdateChecker.cs | 2 +- 6 files changed, 39 insertions(+), 38 deletions(-) diff --git a/.semver.txt b/.semver.txt index 9495615..15245f3 100644 --- a/.semver.txt +++ b/.semver.txt @@ -1 +1 @@ -1.0.31 +1.0.32 diff --git a/src/JiraTimeBot/Configuration/PasswordEncryptionClass.cs b/src/JiraTimeBot/Configuration/PasswordEncryptionClass.cs index ccfc955..06c522c 100644 --- a/src/JiraTimeBot/Configuration/PasswordEncryptionClass.cs +++ b/src/JiraTimeBot/Configuration/PasswordEncryptionClass.cs @@ -17,10 +17,10 @@ namespace JiraTimeBot.Configuration { byte[] entropy = GetEntropy(address + username); byte[] pass = Encoding.UTF8.GetBytes(password); - byte[] crypted = ProtectedData.Protect(pass, entropy, DataProtectionScope.LocalMachine); - var cryptedBase64 = Convert.ToBase64String(crypted); + byte[] encrypted = ProtectedData.Protect(pass, entropy, DataProtectionScope.LocalMachine); + var encryptedBase64 = Convert.ToBase64String(encrypted); - return cryptedBase64; + return encryptedBase64; } public string Decrypt(string username, string password, string address) @@ -32,7 +32,7 @@ namespace JiraTimeBot.Configuration pass = ProtectedData.Unprotect(pass, entropy, DataProtectionScope.LocalMachine); return Encoding.UTF8.GetString(pass); } - catch (Exception ex) + catch (Exception) { return ""; } diff --git a/src/JiraTimeBot/Properties/AssemblyInfo.cs b/src/JiraTimeBot/Properties/AssemblyInfo.cs index 1f4a62a..0feb50c 100644 --- a/src/JiraTimeBot/Properties/AssemblyInfo.cs +++ b/src/JiraTimeBot/Properties/AssemblyInfo.cs @@ -1,31 +1,31 @@ -using System.Reflection; -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("JiraTimeBot")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("JiraTimeBot")] -[assembly: AssemblyCopyright("Copyright © 2019")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")] -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// 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.31")] -[assembly: AssemblyFileVersion("1.0.31")] -[assembly: AssemblyInformationalVersion("1.0.31")] +using System.Reflection; +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("JiraTimeBot")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("JiraTimeBot")] +[assembly: AssemblyCopyright("Copyright © 2019")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")] +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// 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.32")] +[assembly: AssemblyFileVersion("1.0.32")] +[assembly: AssemblyInformationalVersion("1.0.32")] diff --git a/src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs b/src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs index 8b895fd..3a303dd 100644 --- a/src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs +++ b/src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs @@ -51,7 +51,7 @@ namespace JiraTimeBot.TaskTime Time = TimeSpan.FromMinutes(30), Branch = settings.TimeControlTask, Commits = 1, - Description = "Время на учет задач", + Description = "Ведение учета времени", StartTime = DateTime.Now.Date }); } diff --git a/src/JiraTimeBot/UI/frmMain.cs b/src/JiraTimeBot/UI/frmMain.cs index 97e22fc..973edad 100644 --- a/src/JiraTimeBot/UI/frmMain.cs +++ b/src/JiraTimeBot/UI/frmMain.cs @@ -100,6 +100,7 @@ namespace JiraTimeBot.UI if (System.Diagnostics.Debugger.IsAttached) { _log.Trace("Приложение запущено в режиме отладки. Отключаю обновление."); + //tmrUpdate.Enabled = true; } else { diff --git a/src/JiraTimeBot/Update/UpdateChecker.cs b/src/JiraTimeBot/Update/UpdateChecker.cs index aa2e53e..f4df302 100644 --- a/src/JiraTimeBot/Update/UpdateChecker.cs +++ b/src/JiraTimeBot/Update/UpdateChecker.cs @@ -69,7 +69,7 @@ namespace JiraTimeBot.Update return reader.ReadToEnd(); } } - catch (Exception ex) + catch (Exception) { return ""; }