.NET Core support for Hangfire

.nuget/packages.config

@@ -2,7 +2,7 @@
 <packages>
   <package id="7-Zip.CommandLine" version="9.20.0" />
   <package id="coveralls.io" version="1.3.4" />
-  <package id="Hangfire.Build" version="0.1.3" />
+  <package id="Hangfire.Build" version="0.2.5" />
   <package id="ilmerge" version="2.14.1208" />
   <package id="OpenCover" version="4.5.3723" />
   <package id="psake" version="4.4.1" />

.travis.yml

@@ -6,6 +6,7 @@ sudo: required
 
 # Make sure build dependencies are installed.
 install:
+ - export HOSTNAME=localhost
  - travis_retry nuget install .nuget/packages.config -OutputDirectory packages
  - travis_retry nuget restore Hangfire.Mono.sln
 

Hangfire.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleSample", "samples\ConsoleSample\ConsoleSample.csproj", "{C02BB718-2AE4-434C-8668-C894FF663FCE}"
 EndProject
@@ -24,6 +24,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{15E186DF
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuspecs", "nuspecs", "{5E687025-A525-4534-8869-CB685C7B11C4}"
 	ProjectSection(SolutionItems) = preProject
+		nuspecs\Hangfire.AspNetCore.nuspec = nuspecs\Hangfire.AspNetCore.nuspec
 		nuspecs\Hangfire.Core.nuspec = nuspecs\Hangfire.Core.nuspec
 		nuspecs\Hangfire.nuspec = nuspecs\Hangfire.nuspec
 		nuspecs\Hangfire.SqlServer.MSMQ.nuspec = nuspecs\Hangfire.SqlServer.MSMQ.nuspec
@@ -48,6 +49,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{F710C9
 		.nuget\packages.config = .nuget\packages.config
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8667E5ED-006A-4542-B200-9C0C2C48FF13}"
+	ProjectSection(SolutionItems) = preProject
+		global.json = global.json
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hangfire.Core.NetStandard", "src\Hangfire.Core\Hangfire.Core.NetStandard.csproj", "{2A528F3A-5120-430A-B881-E265FA09ABB5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hangfire.SqlServer.NetStandard", "src\Hangfire.SqlServer\Hangfire.SqlServer.NetStandard.csproj", "{1513919A-5746-46CE-B8C6-C2FDB3361C2D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hangfire.AspNetCore", "src\Hangfire.AspNetCore\Hangfire.AspNetCore.csproj", "{6DCC60C2-4F6E-4855-82EC-E8E1ABB36700}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -86,6 +98,18 @@ Global
 		{DBC6BC12-06AD-4597-9E0F-B77BE754FA2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DBC6BC12-06AD-4597-9E0F-B77BE754FA2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DBC6BC12-06AD-4597-9E0F-B77BE754FA2C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2A528F3A-5120-430A-B881-E265FA09ABB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2A528F3A-5120-430A-B881-E265FA09ABB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2A528F3A-5120-430A-B881-E265FA09ABB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2A528F3A-5120-430A-B881-E265FA09ABB5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1513919A-5746-46CE-B8C6-C2FDB3361C2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1513919A-5746-46CE-B8C6-C2FDB3361C2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1513919A-5746-46CE-B8C6-C2FDB3361C2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1513919A-5746-46CE-B8C6-C2FDB3361C2D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6DCC60C2-4F6E-4855-82EC-E8E1ABB36700}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6DCC60C2-4F6E-4855-82EC-E8E1ABB36700}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6DCC60C2-4F6E-4855-82EC-E8E1ABB36700}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6DCC60C2-4F6E-4855-82EC-E8E1ABB36700}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

build.bat

@@ -1,3 +1,3 @@
 @echo off
-.nuget\NuGet.exe install .nuget\packages.config -OutputDirectory packages
+.nuget\NuGet.exe install .nuget\packages.config -OutputDirectory packages -Verbosity normal
 powershell.exe -NoProfile -ExecutionPolicy unrestricted -Command "& {Import-Module '.\packages\psake.*\tools\psake.psm1'; invoke-psake .\psake-project.ps1 %*; if ($LastExitCode -and $LastExitCode -ne 0) {write-host "ERROR CODE: $LastExitCode" -fore RED; exit $lastexitcode} }"

global.json

@@ -0,0 +1,3 @@
+{
+    "projects": [ "src" ]
+}

nuspecs/Hangfire.AspNetCore.nuspec

@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>Hangfire.AspNetCore</id>
+    <version>0.0.0</version>
+    <title>Hangfire ASP.NET Core Support</title>
+    <authors>Sergey Odinokov</authors>
+    <owners>odinserj</owners>
+    <projectUrl>http://hangfire.io/</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <licenseUrl>https://raw.github.com/HangfireIO/Hangfire/master/LICENSE.md</licenseUrl>
+    <description>ASP.NET Core support for Hangfire (background job system for ASP.NET applications).</description>
+    <copyright>Copyright © 2016 Sergey Odinokov</copyright>
+    <tags>hangfire aspnetcore</tags>
+    <releaseNotes>http://hangfire.io/blog/
+
+1.6.0 – Initial Release
+    </releaseNotes>
+    <dependencies>
+      <group targetFramework="netstandard1.3">
+        <dependency id="Microsoft.NETCore.Portable.Compatibility" version="1.0.1" />
+        <dependency id="NETStandard.Library" version="1.6.0" />
+        <dependency id="System.ComponentModel" version="4.0.1" />
+        <dependency id="Microsoft.AspNetCore.Hosting.Abstractions" version="1.0.0" />
+        <dependency id="Microsoft.AspNetCore.Http.Abstractions" version="1.0.0" />
+        <dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0" />
+        <dependency id="Microsoft.Extensions.Logging.Abstractions" version="1.0.0" />
+        <dependency id="Hangfire.Core" version="[0.0.0]" />
+      </group>
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="netstandard1.3\Hangfire.AspNetCore.dll" target="lib\netstandard1.3" />
+    <file src="netstandard1.3\Hangfire.AspNetCore.xml" target="lib\netstandard1.3" />
+    <file src="netstandard1.3\Hangfire.AspNetCore.pdb" target="lib\netstandard1.3" />
+
+    <file src="..\src\Hangfire.AspNetCore\**\*.cs" target="src" exclude="**\obj*\**\*.cs" />
+  </files>
+</package>

nuspecs/Hangfire.Core.nuspec

@@ -45,14 +45,27 @@ Backported from 1.5.5
 * Fixed – ToGenericTypeString method now supports nested classes.
     </releaseNotes>
     <dependencies>
-      <dependency id="Owin" version="1.0" />
-      <dependency id="Newtonsoft.Json" version="5.0.0" />
+      <group targetFramework="net45">
+        <dependency id="Owin" version="1.0" />
+        <dependency id="Newtonsoft.Json" version="5.0.0" />
+      </group>
+      <group targetFramework="netstandard1.3">
+        <dependency id="Microsoft.NETCore.Portable.Compatibility" version="1.0.1" />
+        <dependency id="NETStandard.Library" version="1.6.0" />
+        <dependency id="System.Threading.Thread" version="4.0.0" />
+        <dependency id="Newtonsoft.Json" version="9.0.1" />
+      </group>
     </dependencies>
   </metadata>
   <files>
-    <file src="Net45\Hangfire.Core.dll" target="lib\net45" />
-    <file src="Net45\Hangfire.Core.xml" target="lib\net45" />
-    <file src="Net45\Hangfire.Core.pdb" target="lib\net45" />
-    <file src="..\src\Hangfire.Core\**\*.cs;..\src\Hangfire.Core\**\*.cshtml" target="src" />
+    <file src="net45\Hangfire.Core.dll" target="lib\net45" />
+    <file src="net45\Hangfire.Core.xml" target="lib\net45" />
+    <file src="net45\Hangfire.Core.pdb" target="lib\net45" />
+
+    <file src="netstandard1.3\Hangfire.Core.dll" target="lib\netstandard1.3" />
+    <file src="netstandard1.3\Hangfire.Core.xml" target="lib\netstandard1.3" />
+    <file src="netstandard1.3\Hangfire.Core.pdb" target="lib\netstandard1.3" />
+
+    <file src="..\src\Hangfire.Core\**\*.cs;..\src\Hangfire.Core\**\*.cshtml" target="src" exclude="**\obj*\**\*.cs" />
   </files>
 </package>

nuspecs/Hangfire.SqlServer.MSMQ.nuspec

@@ -36,9 +36,9 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="Net45\Hangfire.SqlServer.Msmq.dll" target="lib\net45" />
-    <file src="Net45\Hangfire.SqlServer.Msmq.xml" target="lib\net45" />
-    <file src="Net45\Hangfire.SqlServer.Msmq.pdb" target="lib\net45" />
-    <file src="..\src\Hangfire.SqlServer.Msmq\**\*.cs" target="src" />
+    <file src="net45\Hangfire.SqlServer.Msmq.dll" target="lib\net45" />
+    <file src="net45\Hangfire.SqlServer.Msmq.xml" target="lib\net45" />
+    <file src="net45\Hangfire.SqlServer.Msmq.pdb" target="lib\net45" />
+    <file src="..\src\Hangfire.SqlServer.Msmq\**\*.cs" target="src" exclude="**\obj*\**\*.cs" />
   </files>
 </package>

nuspecs/Hangfire.SqlServer.nuspec

@@ -39,14 +39,30 @@ Backported from 1.5.6
 * Changed – `SqlServerStorage` class constructor now takes `DbConnection` instances.
     </releaseNotes>
     <dependencies>
-      <dependency id="Hangfire.Core" version="[0.0.0]" />
+      <group targetFramework="net45">
+        <dependency id="Hangfire.Core" version="[0.0.0]" />
+      </group>
+
+      <group targetFramework="netstandard1.3">
+        <dependency id="Microsoft.NETCore.Portable.Compatibility" version="1.0.1" />
+        <dependency id="NETStandard.Library" version="1.6.0" />
+        <dependency id="System.Data.Common" version="4.1.0" />
+        <dependency id="System.Data.SqlClient" version="4.1.0" />
+        <dependency id="Dapper" version="1.50.0-rc3" />
+        <dependency id="Hangfire.Core" version="[0.0.0]" />
+      </group>
     </dependencies>
   </metadata>
   <files>
-    <file src="Net45\Hangfire.SqlServer.dll" target="lib\net45" />
-    <file src="Net45\Hangfire.SqlServer.xml" target="lib\net45" />
-    <file src="Net45\Hangfire.SqlServer.pdb" target="lib\net45" />
+    <file src="net45\Hangfire.SqlServer.dll" target="lib\net45" />
+    <file src="net45\Hangfire.SqlServer.xml" target="lib\net45" />
+    <file src="net45\Hangfire.SqlServer.pdb" target="lib\net45" />
+
+    <file src="netstandard1.3\Hangfire.SqlServer.dll" target="lib\netstandard1.3" />
+    <file src="netstandard1.3\Hangfire.SqlServer.xml" target="lib\netstandard1.3" />
+    <file src="netstandard1.3\Hangfire.SqlServer.pdb" target="lib\netstandard1.3" />
+
     <file src="Tools\DefaultInstall.sql" target="tools\install.sql" />
-    <file src="..\src\Hangfire.SqlServer\**\*.cs" target="src" />
+    <file src="..\src\Hangfire.SqlServer\**\*.cs" target="src" exclude="**\obj*\**\*.cs" />
   </files>
 </package>

nuspecs/Hangfire.nuspec

@@ -77,9 +77,16 @@ Hangfire.SqlServer.Msmq
 * Fixed – Package now depends on the latest Hangfire.SqlServer instead of version 1.2.2.
     </releaseNotes>
     <dependencies>
-      <dependency id="Hangfire.Core" version="[0.0.0]" />
-      <dependency id="Hangfire.SqlServer" version="[0.0.0]" />
-      <dependency id="Microsoft.Owin.Host.SystemWeb" version="3.0.0" />
+      <group targetFramework="net45">
+        <dependency id="Hangfire.Core" version="[0.0.0]" />
+        <dependency id="Hangfire.SqlServer" version="[0.0.0]" />
+        <dependency id="Microsoft.Owin.Host.SystemWeb" version="3.0.0" />
+      </group>
+      <group targetFramework="netstandard1.3">
+        <dependency id="Hangfire.Core" version="[0.0.0]" />
+        <dependency id="Hangfire.SqlServer" version="[0.0.0]" />
+        <dependency id="Hangfire.AspNetCore" version="[0.0.0]" />
+      </group>
     </dependencies>
   </metadata>
   <files>

psake-project.ps1

@@ -1,71 +1,51 @@
 Framework 4.5.1
+Include "packages\Hangfire.Build.0.2.5\tools\psake-common.ps1"
+
 Properties {
     $solution = "Hangfire.sln"
-    $opencover = "packages\OpenCover.*\opencover.console.exe"
     $coverage_file = "coverage.xml"
     $coverage_filter = "+[Hangfire.*]* -[*.Tests]* -[*]*.Annotations.* -[*]*.Dashboard.* -[*]*.Logging.* -[*]*.ExpressionUtil.*"
 }
 
-Include "packages\Hangfire.Build.0.1.3\tools\psake-common.ps1"
-
 Task Default -Depends Collect
 
 Task Test -Depends Compile -Description "Run unit and integration tests under OpenCover." {
-    If (Test-Path $coverage_file) {
-        "Removing '$coverage_file'..."
-        Remove-Item $coverage_file -Force
-    }
+	Remove-File $coverage_file
 
-    Run-OpenCover "Hangfire.Core.Tests"
-    Run-OpenCover "Hangfire.SqlServer.Tests"
-    Run-OpenCover "Hangfire.SqlServer.Msmq.Tests"
+    Run-OpenCover "Hangfire.Core.Tests" $coverage_file $coverage_filter
+    Run-OpenCover "Hangfire.SqlServer.Tests" $coverage_file $coverage_filter
+    Run-OpenCover "Hangfire.SqlServer.Msmq.Tests" $coverage_file $coverage_filter
 }
 
 Task Merge -Depends Test -Description "Run ILMerge /internalize to merge assemblies." {
     # Remove `*.pdb` file to be able to prepare NuGet symbol packages.
-    Remove-Item ((Get-SrcOutputDir "Hangfire.SqlServer") + "\Dapper.pdb")
+	Remove-File ((Get-SrcOutputDir "Hangfire.SqlServer") + "\Dapper.pdb")
 
     Merge-Assembly "Hangfire.Core" @("NCrontab", "CronExpressionDescriptor", "Microsoft.Owin")
     Merge-Assembly "Hangfire.SqlServer" @("Dapper")
 }
 
 Task Collect -Depends Merge -Description "Copy all artifacts to the build folder." {
-    Collect-Assembly "Hangfire.Core" "Net45"
-    Collect-Assembly "Hangfire.SqlServer" "Net45"
-    Collect-Assembly "Hangfire.SqlServer.Msmq" "Net45"
+    Collect-Assembly "Hangfire.Core" "net45"
+    Collect-Assembly "Hangfire.SqlServer" "net45"
+    Collect-Assembly "Hangfire.SqlServer.Msmq" "net45"
+
+	Collect-Assembly "Hangfire.Core" "netstandard1.3"
+	Collect-Assembly "Hangfire.SqlServer" "netstandard1.3"
+	Collect-Assembly "Hangfire.AspNetCore" "netstandard1.3"
 
     Collect-Content "content\readme.txt"
     Collect-Tool "src\Hangfire.SqlServer\DefaultInstall.sql"
 }
 
 Task Pack -Depends Collect -Description "Create NuGet packages and archive files." {
-    $version = Get-BuildVersion
+    $version = Get-PackageVersion
 
-    $tag = $env:APPVEYOR_REPO_TAG_NAME
-    if ($tag -And $tag.StartsWith("v$version-")) {
-        "Using tag-based version for packages."
-        $version = $tag.Substring(1)
-    }
-
     Create-Archive "Hangfire-$version"
 
     Create-Package "Hangfire" $version
     Create-Package "Hangfire.Core" $version
     Create-Package "Hangfire.SqlServer" $version
     Create-Package "Hangfire.SqlServer.Msmq" $version
-}
-
-function Run-OpenCover($assembly) {
-    Exec {
-        if ($env:APPVEYOR) {
-            $xunit_path = Get-Command "xunit.console.clr4.exe" | Select-Object -ExpandProperty Definition
-            $extra = "/appveyor"
-        }
-        else {
-            $xunit_path = Resolve-Path $xunit
-        }
-
-        $opencover_path = Resolve-Path $opencover
-        .$opencover_path `"-target:$xunit_path`" `"-targetargs:$base_dir\tests\$assembly\bin\$config\$assembly.dll /noshadow $extra`" `"-filter:$coverage_filter`" -mergeoutput `"-output:$coverage_file`" -register:user -returntargetcode
-    }
+    Create-Package "Hangfire.AspNetCore" $version
 }

src/Hangfire.AspNetCore/AspNetCore/AspNetCoreJobActivator.cs

@@ -0,0 +1,38 @@
+// This file is part of Hangfire.
+// Copyright © 2016 Sergey Odinokov.
+// 
+// Hangfire is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as 
+// published by the Free Software Foundation, either version 3 
+// of the License, or any later version.
+// 
+// Hangfire is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public 
+// License along with Hangfire. If not, see <http://www.gnu.org/licenses/>.
+
+using System;
+using Hangfire.Annotations;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Hangfire.AspNetCore
+{
+    public class AspNetCoreJobActivator : JobActivator
+    {
+        private readonly IServiceScopeFactory _serviceScopeFactory;
+
+        public AspNetCoreJobActivator([NotNull] IServiceScopeFactory serviceScopeFactory)
+        {
+            if (serviceScopeFactory == null) throw new ArgumentNullException(nameof(serviceScopeFactory));
+            _serviceScopeFactory = serviceScopeFactory;
+        }
+
+        public override JobActivatorScope BeginScope(JobActivatorContext context)
+        {
+            return new AspNetCoreJobActivatorScope(_serviceScopeFactory.CreateScope());
+        }
+    }
+}