Made to build after the merge + updated build scripts

Author: Vytautas Kasparavičius

build.cake

@@ -1,4 +1,4 @@
-#addin "Cake.Json"
+#addin nuget:?package=Newtonsoft.Json&version=9.0.1
 
 //////////////////////////////////////////////////////////////////////
 // ARGUMENTS
@@ -12,7 +12,7 @@ var target = Argument("target", "Default");
 
 IEnumerable<string> GetFrameworks(string path) 
 {
-	return new string[] { "netstandard1.4", "net451" };
+	return new string[] { "netstandard2.0", "net451" };
 }
 
 //////////////////////////////////////////////////////////////////////

src/Hangfire.PostgreSql/Hangfire.PostgreSql.csproj

@@ -29,6 +29,7 @@
     <PackageReference Include="Hangfire.Core" Version="1.6.20" />
     <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
+    <PackageReference Include="Npgsql" Version="4.0.3" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">

tests/Hangfire.PostgreSql.Tests/PersistentJobQueueProviderCollectionFacts.cs

@@ -31,7 +31,7 @@ public void Enumeration_IncludesTheDefaultProvider()
 
 			var result = collection.ToArray();
 
-			Assert.Equal(1, result.Length);
+			Assert.Single(result);
 			Assert.Same(_defaultProvider.Object, result[0]);
 		}
 

tests/Hangfire.PostgreSql.Tests/PostgreSqlConnectionFacts.cs

@@ -191,8 +191,8 @@ public void CreateExpiredJob_CreatesAJobInTheStorage_AndSetsItsParameters()
 				var sqlJob = sql.Query(@"select * from """ + GetSchemaName() + @""".""job""").Single();
 				Assert.Equal(jobId, sqlJob.id.ToString());
 				Assert.Equal(createdAt, sqlJob.createdat);
-				Assert.Equal(null, (int?) sqlJob.stateid);
-				Assert.Equal(null, (string) sqlJob.statename);
+				Assert.Null((int?) sqlJob.stateid);
+				Assert.Null((string) sqlJob.statename);
 
 				var invocationData = JobHelper.FromJson<InvocationData>((string) sqlJob.invocationdata);
 				invocationData.Arguments = sqlJob.arguments;
@@ -712,7 +712,7 @@ public void GetAllItemsFromSet_ReturnsEmptyCollection_WhenKeyDoesNotExist()
 				var result = connection.GetAllItemsFromSet("some-set");
 
 				Assert.NotNull(result);
-				Assert.Equal(0, result.Count);
+				Assert.Empty(result);
 			});
 		}
 
@@ -1349,7 +1349,9 @@ private static string GetSchemaName()
 			return ConnectionUtils.GetSchemaName();
 		}
 
+#pragma warning disable xUnit1013 // Public method should be marked as test
 		public static void SampleMethod(string arg)
+#pragma warning restore xUnit1013 // Public method should be marked as test
 		{
 		}
 	}

tests/Hangfire.PostgreSql.Tests/PostgreSqlDistributedLockFacts.cs

@@ -63,7 +63,7 @@ public void Ctor_AcquiresExclusiveApplicationLock_WithUseNativeDatabaseTransacti
                     @"select count(*) from """ + GetSchemaName() + @""".""lock"" where ""resource"" = @resource",
                     new { resource = "hello" }).Single();
 
-                Assert.Equal(lockCount, 1);
+                Assert.Equal(1, lockCount);
                 //Assert.Equal("Exclusive", lockMode);
             });
         }
@@ -111,7 +111,7 @@ public void Ctor_AcquiresExclusiveApplicationLock_WithoutUseNativeDatabaseTransa
                     @"select count(*) from """ + GetSchemaName() + @""".""lock"" where ""resource"" = @resource",
                     new { resource = "hello" }).Single();
 
-                Assert.Equal(lockCount, 1);
+                Assert.Equal(1, lockCount);
                 //Assert.Equal("Exclusive", lockMode);
             });
         }
@@ -202,7 +202,7 @@ public void Dispose_ReleasesExclusiveApplicationLock_WithUseNativeDatabaseTransa
                     @"select count(*) from """ + GetSchemaName() + @""".""lock"" where ""resource"" = @resource",
                     new { resource = "hello" }).Single();
 
-                Assert.Equal(lockCount, 0);
+                Assert.Equal(0, lockCount);
             });
         }
 
@@ -224,7 +224,7 @@ public void Dispose_ReleasesExclusiveApplicationLock_WithoutUseNativeDatabaseTra
                     @"select count(*) from """ + GetSchemaName() + @""".""lock"" where ""resource"" = @resource",
                     new { resource = "hello" }).Single();
 
-                Assert.Equal(lockCount, 0);
+                Assert.Equal(0, lockCount);
             });
         }
 

tests/Hangfire.PostgreSql.Tests/PostgreSqlJobQueueFacts.cs

@@ -448,7 +448,9 @@ private static CancellationToken CreateTimingOutCancellationToken()
 			return source.Token;
 		}
 
+#pragma warning disable xUnit1013 // Public method should be marked as test
 		public static void Sample(string arg1, string arg2)
+#pragma warning restore xUnit1013 // Public method should be marked as test
 		{
 		}
 

tests/Hangfire.PostgreSql.Tests/PostgreSqlMonitoringApiFacts.cs

@@ -91,8 +91,10 @@ private void Commit(
             }
         }
 
-        public static void SampleMethod(string arg)
-        {
+#pragma warning disable xUnit1013 // Public method should be marked as test
+		public static void SampleMethod(string arg)
+#pragma warning restore xUnit1013 // Public method should be marked as test
+		{
         }
     }
 }