From fff4d661f78295394a199161affacd449c5ae4cb Mon Sep 17 00:00:00 2001 From: Danil Kislov Date: Fri, 16 Jul 2021 10:02:22 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B9=20?= =?UTF-8?q?=D0=B1=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE=D1=82=D0=B5=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .semver.txt | 2 +- src/JiraTimeBot/App.config | 6 +- src/JiraTimeBot/JiraTimeBot.csproj | 8 +-- src/JiraTimeBot/Properties/AssemblyInfo.cs | 62 +++++++++---------- src/JiraTimeBot/RepositoryProviders/GitLog.cs | 1 - src/JiraTimeBot/packages.config | 4 +- 6 files changed, 43 insertions(+), 40 deletions(-) diff --git a/.semver.txt b/.semver.txt index 236fd5b..41b9ca6 100644 --- a/.semver.txt +++ b/.semver.txt @@ -1 +1 @@ -1.0.94 +1.0.95 diff --git a/src/JiraTimeBot/App.config b/src/JiraTimeBot/App.config index 79dcf68..e7a5c4a 100644 --- a/src/JiraTimeBot/App.config +++ b/src/JiraTimeBot/App.config @@ -23,7 +23,7 @@ - + @@ -33,6 +33,10 @@ + + + + diff --git a/src/JiraTimeBot/JiraTimeBot.csproj b/src/JiraTimeBot/JiraTimeBot.csproj index 19bdffa..6b293ae 100644 --- a/src/JiraTimeBot/JiraTimeBot.csproj +++ b/src/JiraTimeBot/JiraTimeBot.csproj @@ -82,8 +82,8 @@ ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - ..\packages\RestSharp.106.11.7\lib\net452\RestSharp.dll + + ..\packages\RestSharp.106.12.0\lib\net452\RestSharp.dll @@ -92,8 +92,8 @@ - - ..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll + + ..\packages\System.Diagnostics.DiagnosticSource.5.0.1\lib\net46\System.Diagnostics.DiagnosticSource.dll diff --git a/src/JiraTimeBot/Properties/AssemblyInfo.cs b/src/JiraTimeBot/Properties/AssemblyInfo.cs index b0df602..b60d80a 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 © 2020")] -[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.94")] -[assembly: AssemblyFileVersion("1.0.94")] -[assembly: AssemblyInformationalVersion("1.0.94")] +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 © 2020")] +[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.95")] +[assembly: AssemblyFileVersion("1.0.95")] +[assembly: AssemblyInformationalVersion("1.0.95")] diff --git a/src/JiraTimeBot/RepositoryProviders/GitLog.cs b/src/JiraTimeBot/RepositoryProviders/GitLog.cs index feb3a58..33ac6ef 100644 --- a/src/JiraTimeBot/RepositoryProviders/GitLog.cs +++ b/src/JiraTimeBot/RepositoryProviders/GitLog.cs @@ -118,7 +118,6 @@ public List GetRepositoryLog(Settings settings, string currentRepo var branch = ListBranchesContainsCommit(repo, commit.Sha) .Select(f => f.FriendlyName) .FirstOrDefault(f => regex.IsMatch(f)); - //.Where(f => f.Contains("-") && !f.Contains("/")).Distinct().FirstOrDefault(); if (branch == null) diff --git a/src/JiraTimeBot/packages.config b/src/JiraTimeBot/packages.config index 0f59953..6adefd2 100644 --- a/src/JiraTimeBot/packages.config +++ b/src/JiraTimeBot/packages.config @@ -9,9 +9,9 @@ - + - +