Merge pull request #2 from monster1025/dependabot/nuget/src/JiraTimeBot/Newtonsoft.Json-13.0.2

Bump Newtonsoft.Json from 13.0.1 to 13.0.2 in /src/JiraTimeBot
2024-01-07 12:12:40 +03:00 · 2022-12-08 14:50:30 +00:00 · 2021-07-16 10:02:22 +03:00 · 2021-07-16 09:57:07 +03:00 · 2021-07-15 11:20:13 +03:00 · 2021-05-26 13:24:20 +03:00
6 changed files with 54 additions and 43 deletions
@@ -1 +1 @@
-1.0.92
+1.0.95
@@ -23,7 +23,7 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="RestSharp" publicKeyToken="598062e77f915f75" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-106.11.7.0" newVersion="106.11.7.0" />
+        <bindingRedirect oldVersion="0.0.0.0-106.12.0.0" newVersion="106.12.0.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -33,6 +33,10 @@
        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.1" newVersion="5.0.0.1" />
+      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 </configuration>
@@ -82,8 +82,8 @@
    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
-    <Reference Include="RestSharp, Version=106.11.7.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
-      <HintPath>..\packages\RestSharp.106.11.7\lib\net452\RestSharp.dll</HintPath>
+    <Reference Include="RestSharp, Version=106.12.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
+      <HintPath>..\packages\RestSharp.106.12.0\lib\net452\RestSharp.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -92,8 +92,8 @@
    <Reference Include="System.ComponentModel.Composition" />
    <Reference Include="System.Configuration" />
    <Reference Include="System.Core" />
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=5.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.5.0.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
    </Reference>
    <Reference Include="System.DirectoryServices" />
    <Reference Include="System.IO.Compression" />
@@ -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.92")] 
-[assembly: AssemblyFileVersion("1.0.92")] 
-[assembly: AssemblyInformationalVersion("1.0.92")] 
+[assembly: AssemblyVersion("1.0.95")] 
+[assembly: AssemblyFileVersion("1.0.95")] 
+[assembly: AssemblyInformationalVersion("1.0.95")] 
@@ -114,12 +114,11 @@ namespace JiraTimeBot.RepositoryProviders
                        continue;
                    }

-                    var regex = new Regex("[a-zA-Z0-9]{1,4}-[0-9]{1,6}");
+                    var regex = new Regex("[a-zA-Z0-9]{1,5}-[0-9]{1,6}");
                    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)
                    {
@@ -200,7 +199,15 @@ namespace JiraTimeBot.RepositoryProviders

            foreach (var branch in repo.Branches)
            {
-                var commits = repo.Commits.QueryBy(new CommitFilter { IncludeReachableFrom = branch }).Where(c => c.Sha == commitSha);
+                List<Commit> commits = new List<Commit>();
+                try
+                {
+                    commits = repo.Commits.QueryBy(new CommitFilter {IncludeReachableFrom = branch}).Where(c => c.Sha == commitSha).ToList();
+                }
+                catch (Exception)
+                {
+                    continue;
+                }

                if (!commits.Any())
                {
@@ -8,10 +8,10 @@
  <package id="LibGit2Sharp.NativeBinaries" version="2.0.306" targetFramework="net461" />
  <package id="Mercurial.Net" version="1.1.1.607" targetFramework="net461" />
  <package id="Microsoft.Bcl.AsyncInterfaces" version="5.0.0" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
-  <package id="RestSharp" version="106.11.7" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="13.0.2" targetFramework="net461" />
+  <package id="RestSharp" version="106.12.0" targetFramework="net461" />
  <package id="System.Buffers" version="4.5.1" targetFramework="net461" />
-  <package id="System.Diagnostics.DiagnosticSource" version="4.7.1" targetFramework="net461" />
+  <package id="System.Diagnostics.DiagnosticSource" version="5.0.1" targetFramework="net461" />
  <package id="System.Memory" version="4.5.4" targetFramework="net461" />
  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
  <package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net461" />
Author	SHA1	Message	Date
monster	84da8dad7b	Merge pull request #2 from monster1025/dependabot/nuget/src/JiraTimeBot/Newtonsoft.Json-13.0.2 Bump Newtonsoft.Json from 13.0.1 to 13.0.2 in /src/JiraTimeBot	2024-01-07 12:12:40 +03:00
dependabot[bot]	1c7781f443	Bump Newtonsoft.Json from 13.0.1 to 13.0.2 in /src/JiraTimeBot Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 13.0.1 to 13.0.2. - [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases) - [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/13.0.1...13.0.2) --- updated-dependencies: - dependency-name: Newtonsoft.Json dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2022-12-08 14:50:30 +00:00
Danil Kislov	fff4d661f7	Обновление версий библиотек	2021-07-16 10:02:22 +03:00
Danil Kislov	34b8d2638e	Исправлена регулярочка для веток	2021-07-16 09:57:07 +03:00
monster	9d665f6b30	Префикси проекта - из 5 символов	2021-07-15 11:20:13 +03:00
monster	1210b424e9	Исправление падения git-а	2021-05-26 13:24:20 +03:00
@@ -1 +1 @@
 .0.92
 .0.95