Updated library to run in Cofoundry 0.2/net core.

Author: HeyJoel

README.md

@@ -25,7 +25,7 @@ Cofoundry does not include a background task runner by default so it is recommen
 
 ## Settings
 
-- **Cofoundry.Plugins.Hangfire.DisableHangfire:** Prevents the HangFire server being configuted and started. Defaults to false.
+- **Cofoundry.Plugins.Hangfire.Disabled:** Prevents the HangFire server being configuted and started. Defaults to false.
 - **Cofoundry.Plugins.Hangfire.EnableHangfireDashboard:** Enables the HangFire dashboard for Cofoundry admin users at */admin/hangfire*. Defaults to false.
 
 ## Customizing the HangFire Initialization Process

appveyor.yml

@@ -1,5 +1,5 @@
 version: '{build}'
-image: Visual Studio 2015
+image: Visual Studio 2017
 environment:
   NUGET_API_KEY:
     secure: KBgtBksw79Z4kFehSqUePYoknzeWB8Tq8eAzSFPxDysRJCjJT3iUiCzk7OweTp0K

build.cake

@@ -1,5 +1,7 @@
 #tool "nuget:?package=GitVersion.CommandLine"
 
+using System.Text.RegularExpressions;
+
 //////////////////////////////////////////////////////////////////////
 // ARGUMENTS
 //////////////////////////////////////////////////////////////////////
@@ -10,6 +12,11 @@ var pushPackages = Argument("PushPackages", "false") == "true";
 bool isPrerelease = false;
 GitVersion versionInfo = null;
 
+var projectsToBuild = new string[]{
+    "./src/Cofoundry.Plugins.BackgroundTasks.Hangfire/Cofoundry.Plugins.BackgroundTasks.Hangfire.csproj",
+};
+
+
 //////////////////////////////////////////////////////////////////////
 // PREPARATION
 //////////////////////////////////////////////////////////////////////
@@ -29,12 +36,6 @@ Task("Clean")
     CleanDirectories("./src/**/obj/" + configuration);
 });
 
-Task("Restore-NuGet-Packages")
-    .IsDependentOn("Clean")
-    .Does(() =>
-{
-    NuGetRestore("./src/Cofoundry.Plugins.BackgroundTasks.Hangfire.sln");
-});
 
 Task("Patch-Assembly-Version")
     .IsDependentOn("Clean")
@@ -44,49 +45,65 @@ Task("Patch-Assembly-Version")
         UpdateAssemblyInfo = false
     });
 
-    Information("Building version {0} of Cofoundry.Plugins.DependencyInjection.Autofac.", versionInfo.InformationalVersion);
+    Information("Building version {0} of Cofoundry.", versionInfo.InformationalVersion);
 
     isPrerelease = !string.IsNullOrEmpty(versionInfo.PreReleaseNumber);
 
-    var file = "./src/SolutionInfo.cs";
-	CreateAssemblyInfo(file, new AssemblyInfoSettings {
-		Version = versionInfo.AssemblySemVer,
-		FileVersion = versionInfo.MajorMinorPatch + ".0",
-		InformationalVersion = versionInfo.InformationalVersion,
-		Copyright = "Copyright © Cofoundry.org " + DateTime.Now.Year
-	});
+    // Patch the version number so it's picked up when dependent projects are references
+    // as nuget dependencies. Can't find a better way to do this.
+    // Also this needs to run before DotNetCoreRestore for some reason (cached?)
+    var file = MakeAbsolute(File("./src/Directory.Build.props"));
+    var xml = System.IO.File.ReadAllText(file.FullPath, Encoding.UTF8);
+    xml = Regex.Replace(xml, @"(<Version>)(.+)(<\/Version>)", "${1}" +  versionInfo.NuGetVersion +"${3}");
+    System.IO.File.WriteAllText(file.FullPath, xml, Encoding.UTF8);
+});
+
+Task("Restore-NuGet-Packages")
+    .IsDependentOn("Patch-Assembly-Version")
+    .Does(() =>
+{
+    foreach (var projectToBuild in projectsToBuild)
+    {
+        DotNetCoreRestore(projectToBuild);
+    }
 });
 
 Task("Build")
     .IsDependentOn("Restore-NuGet-Packages")
-    .IsDependentOn("Patch-Assembly-Version")
     .Does(() =>
 {
-    if(IsRunningOnWindows())
+    
+    var settings = new DotNetCoreBuildSettings
+        {
+            Configuration = configuration,
+            ArgumentCustomization = args => args
+                .Append("/p:NuGetVersion=" + versionInfo.NuGetVersion)
+                .Append("/p:AssemblyVersion=" + versionInfo.AssemblySemVer)
+                .Append("/p:FileVersion=" + versionInfo.MajorMinorPatch + ".0")
+                .Append("/p:InformationalVersion=" + versionInfo.InformationalVersion)
+                .Append("/p:Copyright=" + "\"Copyright © Cofoundry.org " + DateTime.Now.Year + "\"")
+        };
+    
+    foreach (var projectToBuild in projectsToBuild)
     {
-      // Use MSBuild
-      MSBuild("./src/Cofoundry.Plugins.BackgroundTasks.Hangfire.sln", settings => settings.SetConfiguration(configuration));
+        DotNetCoreBuild(projectToBuild, settings);
     }
 });
 
 Task("Pack")
     .IsDependentOn("Build")
     .Does(() =>
 {
-    var nugetFilePaths = GetFiles("./src/Cofoundry.*/*.nuspec");
-    
-    var nuGetPackSettings = new NuGetPackSettings
-    {   
-        Version = versionInfo.NuGetVersion,
-        OutputDirectory = nugetPackageDir,
-        Verbosity = NuGetVerbosity.Detailed,
-        ArgumentCustomization = args => args.Append("-Prop Configuration=" + configuration)
-    };
+    var settings = new DotNetCorePackSettings
+        {
+            Configuration = configuration,
+            OutputDirectory = "./artifacts/",
+            NoBuild = true
+        };
 
-    foreach (var path in nugetFilePaths)
+    foreach (var projectToBuild in projectsToBuild)
     {
-        Information("Packing:" + path);
-        NuGetPack(path, nuGetPackSettings);
+        DotNetCorePack(projectToBuild, settings);
     }
 });
 

src/Cofoundry.Plugins.BackgroundTasks.Hangfire.sln

@@ -1,20 +1,20 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.26430.13
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cofoundry.Plugins.BackgroundTasks.Hangfire", "Cofoundry.Plugins.BackgroundTasks.Hangfire\Cofoundry.Plugins.BackgroundTasks.Hangfire.csproj", "{332E1E55-2B6B-4616-BA4D-25C1E5054266}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cofoundry.Plugins.BackgroundTasks.Hangfire", "Cofoundry.Plugins.BackgroundTasks.Hangfire\Cofoundry.Plugins.BackgroundTasks.Hangfire.csproj", "{962BB845-1E06-4775-9C29-32E11B257603}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{332E1E55-2B6B-4616-BA4D-25C1E5054266}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{332E1E55-2B6B-4616-BA4D-25C1E5054266}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{332E1E55-2B6B-4616-BA4D-25C1E5054266}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{332E1E55-2B6B-4616-BA4D-25C1E5054266}.Release|Any CPU.Build.0 = Release|Any CPU
+		{962BB845-1E06-4775-9C29-32E11B257603}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{962BB845-1E06-4775-9C29-32E11B257603}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{962BB845-1E06-4775-9C29-32E11B257603}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{962BB845-1E06-4775-9C29-32E11B257603}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/Cofoundry.Plugins.BackgroundTasks.Hangfire/Bootstrap/HangfireBackgroundTasksDependencyRegistration.cs

@@ -17,7 +17,6 @@ public void Register(IContainerRegister container)
                 .RegisterType<IHangfireBackgroundTaskInitializer, HangfireBackgroundTaskInitializer>()
                 .RegisterType<IHangfireServerInitializer, HangfireServerInitializer>()
                 .RegisterType<IBackgroundTaskScheduler, HangfireBackgroundTaskScheduler>()
-                .RegisterFactory<HangfireSettings, ConfigurationSettingsFactory<HangfireSettings>>()
                 ;
         }
     }