Changed method name; updated some packages

Author: azygis

src/Hangfire.PostgreSql/Hangfire.PostgreSql.csproj

@@ -30,11 +30,11 @@
 
   <ItemGroup>
     <PackageReference Include="Dapper" Version="2.0.123" />
-    <PackageReference Include="GitVersion.MsBuild" Version="5.8.1">
+    <PackageReference Include="GitVersion.MsBuild" Version="5.11.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Hangfire.Core" Version="1.7.27" />
+    <PackageReference Include="Hangfire.Core" Version="1.7.28" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
   </ItemGroup>
 

src/Hangfire.PostgreSql/PostgreSqlDistributedLock.cs

@@ -25,6 +25,7 @@
 using System.Threading;
 using System.Transactions;
 using Dapper;
+using Hangfire.Annotations;
 using Hangfire.Logging;
 using Npgsql;
 using IsolationLevel = System.Data.IsolationLevel;
@@ -126,7 +127,7 @@ public static void Lock(string resource, TimeSpan timeout, IDbConnection connect
           IDbTransaction trx = null;
           try
           {
-            TryBeginTransaction(connection, out trx);
+            trx = BeginTransactionIfNotPresent(connection);
 
             int rowsAffected = connection.Execute($@"
                 INSERT INTO ""{options.SchemaName}"".""lock""(""resource"", ""acquired"") 
@@ -189,7 +190,7 @@ private static void TryRemoveLock(string resource, IDbConnection connection, Pos
         IDbTransaction trx = null;
         try
         {
-          TryBeginTransaction(connection, out trx);
+          trx = BeginTransactionIfNotPresent(connection);
           connection.Execute($@"DELETE FROM ""{options.SchemaName}"".""lock"" WHERE ""resource"" = @Resource AND ""acquired"" < @Timeout",
             new {
               Resource = resource,
@@ -208,11 +209,12 @@ private static void TryRemoveLock(string resource, IDbConnection connection, Pos
         }
       }
 
-      private static void TryBeginTransaction(IDbConnection connection, out IDbTransaction trx)
+      [CanBeNull]
+      private static IDbTransaction BeginTransactionIfNotPresent(IDbConnection connection)
       {
         // If transaction scope was created outside of hangfire, the newly-opened connection is automatically enlisted into the transaction.
         // Starting a new transaction throws "A transaction is already in progress; nested/concurrent transactions aren't supported." in that case.
-        trx = Transaction.Current == null ? connection.BeginTransaction(IsolationLevel.ReadCommitted) : null;
+        return Transaction.Current == null ? connection.BeginTransaction(IsolationLevel.ReadCommitted) : null;
       }
     }