Moved to Visual Studio 2017, fixed #63 (#63).

hangfire-postgres · Mar 14, 2017 · 1fbaf90 · 1fbaf90
1 parent b6b09ac
commit 1fbaf90
Show file tree

Hide file tree

Showing 12 changed files with 291 additions and 332 deletions.
diff --git a/Hangfire.PostgreSql.sln b/Hangfire.PostgreSql.sln
@@ -1,17 +1,17 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.4
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{766BE831-F758-46BC-AFD3-BBEEFE0F686F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5CA38188-92EE-453C-A04E-A506DF15A787}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Hangfire.PostgreSql", "src\Hangfire.PostgreSql\Hangfire.PostgreSql.xproj", "{3E4DBC41-F38E-4D1C-A6A7-206A132A29D6}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0D30A51B-814F-474E-93B8-44E9C155255C}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Hangfire.PostgreSql.Tests", "tests\Hangfire.PostgreSql.Tests\Hangfire.PostgreSql.Tests.xproj", "{6044A48D-730B-4D1F-B03A-EB2B458DAF53}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hangfire.PostgreSql", "src\Hangfire.PostgreSql\Hangfire.PostgreSql.csproj", "{3E4DBC41-F38E-4D1C-A6A7-206A132A29D6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hangfire.PostgreSql.Tests", "tests\Hangfire.PostgreSql.Tests\Hangfire.PostgreSql.Tests.csproj", "{6044A48D-730B-4D1F-B03A-EB2B458DAF53}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/build.cake b/build.cake
@@ -12,11 +12,7 @@ var target = Argument("target", "Default");
 
 IEnumerable<string> GetFrameworks(string path) 
 {
-    var projectJObject = DeserializeJsonFromFile<JObject>(path);
-    foreach(var prop in ((JObject)projectJObject["frameworks"]).Properties()) 
-    {
-        yield return prop.Name;   
-    }    
+	return new string[] { "netstandard1.4", "net451" };
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -26,7 +22,7 @@ IEnumerable<string> GetFrameworks(string path)
 Task("Restore")
   .Does(() =>
 {
-    DotNetCoreRestore("src/\" \"tests/");
+    DotNetCoreRestore();
 });
 
 Task("Build")
@@ -38,9 +34,11 @@ Task("Build")
         Configuration = "Release"
     };
 
-    var projects = GetFiles("./src/**/project.json");
+    var projects = GetFiles("./src/**/*.csproj");
 	foreach(var project in projects)
 	{
+		Information("Found project: {0}", project);
+	
 		foreach(var framework in GetFrameworks(project.ToString()))
         {
             if (!IsRunningOnWindows() && !framework.StartsWith("netstandard"))
@@ -58,7 +56,7 @@ Task("Test")
     .IsDependentOn("Build")
   .Does(() =>
 {
-    var files = GetFiles("tests/**/project.json");
+    var files = GetFiles("tests/**/*.csproj");
     foreach(var file in files)
     {
         DotNetCoreTest(file.ToString());
@@ -76,7 +74,7 @@ Task("Pack")
         NoBuild = true
     };
 
-    var files = GetFiles("src/**/project.json");
+    var files = GetFiles("src/**/*.csproj");
     foreach(var file in files)
     {
         DotNetCorePack(file.ToString(), settings);

diff --git a/global.json b/global.json
diff --git a/src/Hangfire.PostgreSql/Hangfire.PostgreSql.csproj b/src/Hangfire.PostgreSql/Hangfire.PostgreSql.csproj
@@ -0,0 +1,41 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>PostgreSql storage implementation for Hangfire (background job system for ASP.NET applications).</Description>
+    <Copyright>Copyright © 2014-2017 Frank Hommers and others</Copyright>
+    <AssemblyTitle>Hangfire PostgreSql Storage</AssemblyTitle>
+    <VersionPrefix>1.4.6</VersionPrefix>
+    <Authors>Frank Hommers and others (Burhan Irmikci (barhun), Zachary Sims(zsims), kgamecarter, Stafford Williams (staff0rd), briangweber, Viktor Svyatokha (ahydrax), Christopher Dresel (Dresel), Ben Herila (bherila), Vytautas Kasparavičius (vytautask)</Authors>
+    <TargetFrameworks>netstandard1.4;net451</TargetFrameworks>
+    <AssemblyName>Hangfire.PostgreSql</AssemblyName>
+    <OutputType>Library</OutputType>
+    <PackageId>Hangfire.PostgreSql</PackageId>
+    <PackageTags>Hangfire;PostgreSql;Postgres</PackageTags>
+    <PackageReleaseNotes>https://github.com/frankhommers/Hangfire.PostgreSql/releases</PackageReleaseNotes>
+    <PackageProjectUrl>http://hmm.rs/Hangfire.PostgreSql</PackageProjectUrl>
+    <PackageLicenseUrl>https://raw.github.com/frankhommers/Hangfire.PostgreSql/master/LICENSE.md</PackageLicenseUrl>
+    <Version>1.4.7</Version>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="*.sql" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Dapper" Version="1.50.2" />
+    <PackageReference Include="Hangfire.Core" Version="1.6.10" />
+    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="Npgsql" Version="3.2.1" />
+  </ItemGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.4' ">
+    <DefineConstants>$(DefineConstants);NETCORE1</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+    <Reference Include="System.Configuration" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Hangfire.PostgreSql/Hangfire.PostgreSql.xproj b/src/Hangfire.PostgreSql/Hangfire.PostgreSql.xproj
diff --git a/src/Hangfire.PostgreSql/PostgreSqlJobQueueMonitoringApi.cs b/src/Hangfire.PostgreSql/PostgreSqlJobQueueMonitoringApi.cs
@@ -34,8 +34,8 @@ internal class PostgreSqlJobQueueMonitoringApi : IPersistentJobQueueMonitoringAp
 
         public PostgreSqlJobQueueMonitoringApi(IDbConnection connection, PostgreSqlStorageOptions options)
         {
-            if (connection == null) throw new ArgumentNullException("connection");
-            if (options == null) throw new ArgumentNullException("options");
+            if (connection == null) throw new ArgumentNullException(nameof(connection));
+            if (options == null) throw new ArgumentNullException(nameof(options));
 
             _connection = connection;
             _options = options;

diff --git a/src/Hangfire.PostgreSql/PostgreSqlMonitoringApi.cs b/src/Hangfire.PostgreSql/PostgreSqlMonitoringApi.cs
@@ -44,7 +44,7 @@ public PostgreSqlMonitoringApi(
             PostgreSqlStorageOptions options,
             PersistentJobQueueProviderCollection queueProviders)
         {
-            if(options==null) throw new ArgumentNullException("options");
+            if(options==null) throw new ArgumentNullException(nameof(options));
 
             _connectionString = connectionString;
             _queueProviders = queueProviders;