Merge remote-tracking branch 'upstream/master'

Author: JPVenson

src/Hangfire.PostgreSql/Hangfire.PostgreSql.csproj

@@ -14,9 +14,9 @@
     <PackageReleaseNotes>https://github.com/frankhommers/Hangfire.PostgreSql/releases</PackageReleaseNotes>
     <PackageProjectUrl>http://hmm.rs/Hangfire.PostgreSql</PackageProjectUrl>
     <PackageLicenseUrl></PackageLicenseUrl>
-    <Version>1.8.4.0</Version>
-    <FileVersion>1.8.4.0</FileVersion>
-    <AssemblyVersion>1.8.4.0</AssemblyVersion>
+    <Version>1.8.5.4</Version>
+    <FileVersion>1.8.5.4</FileVersion>
+    <AssemblyVersion>1.8.5.4</AssemblyVersion>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
     <RepositoryUrl>https://github.com/frankhommers/Hangfire.PostgreSql</RepositoryUrl>
@@ -32,7 +32,7 @@
     <PackageReference Include="Dapper" Version="2.0.78" />
     <PackageReference Include="Hangfire.Core" Version="1.7.18" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Npgsql" Version="5.0.0" />
+    <PackageReference Include="Npgsql" Version="5.0.7" />
   </ItemGroup>
 
   <ItemGroup>

src/Hangfire.PostgreSql/PostgreSqlDistributedLock.cs

@@ -79,7 +79,8 @@ private static void PostgreSqlDistributedLock_Init_Transaction(string resource,
 WHERE NOT EXISTS (
     SELECT 1 FROM ""{options.SchemaName}"".""lock"" 
     WHERE ""resource"" = @resource
-);
+)
+ON CONFLICT DO NOTHING;
 ",
                             new
                             {
@@ -163,7 +164,8 @@ private static void PostgreSqlDistributedLock_Init_UpdateCount(string resource,
 WHERE NOT EXISTS (
     SELECT 1 FROM ""{options.SchemaName}"".""lock"" 
     WHERE ""resource"" = @resource
-);
+)
+ON CONFLICT DO NOTHING;
 ", new
                     {
                         resource = resource,