upgrade vs version and add unit test

icsharp · Feb 7, 2018 · 6dd0184 · 6dd0184
1 parent c68a84e
commit 6dd0184
Show file tree

Hide file tree

Showing 14 changed files with 129 additions and 197 deletions.
diff --git a/Hangfire.RecurringJobExtensions.sln b/Hangfire.RecurringJobExtensions.sln
@@ -1,26 +1,25 @@
 
 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}") = "src", "src", "{6E0E1A07-7311-4F8C-B1BD-B3803B6E621E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7A9F6A71-9A61-4817-AE86-9254999FA206}"
 	ProjectSection(SolutionItems) = preProject
 		appveyor.yml = appveyor.yml
-		global.json = global.json
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Hangfire.RecurringJobExtensions", "src\Hangfire.RecurringJobExtensions\Hangfire.RecurringJobExtensions.xproj", "{D75DFE5D-38CF-4150-8264-EB22E579237D}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{B04B5FCE-89A8-4A3E-9671-CB3070C89AAF}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{F5091E02-C3A4-407E-995C-86E07A801832}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Hangfire.Samples", "samples\Hangfire.Samples\Hangfire.Samples.xproj", "{9DCBF5BA-414C-4E39-B264-CFD6C824AA66}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hangfire.RecurringJobExtensions", "src\Hangfire.RecurringJobExtensions\Hangfire.RecurringJobExtensions.csproj", "{D75DFE5D-38CF-4150-8264-EB22E579237D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hangfire.Samples", "samples\Hangfire.Samples\Hangfire.Samples.csproj", "{9DCBF5BA-414C-4E39-B264-CFD6C824AA66}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Hangfire.RecurringJobExtensions.Tests", "test\Hangfire.RecurringJobExtensions.Tests\Hangfire.RecurringJobExtensions.Tests.xproj", "{B1AA8C91-161A-4A92-9B0A-B47742CDDB38}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hangfire.RecurringJobExtensions.Tests", "test\Hangfire.RecurringJobExtensions.Tests\Hangfire.RecurringJobExtensions.Tests.csproj", "{B1AA8C91-161A-4A92-9B0A-B47742CDDB38}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/global.json b/global.json
diff --git a/samples/Hangfire.Samples/Hangfire.Samples.csproj b/samples/Hangfire.Samples/Hangfire.Samples.csproj
@@ -0,0 +1,35 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+    <AssemblyName>Hangfire.Samples</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <PackageId>Hangfire.Samples</PackageId>
+    <RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Update="wwwroot\**\*">
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Hangfire.RecurringJobExtensions\Hangfire.RecurringJobExtensions.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Hangfire.Console" Version="1.1.5" />
+    <PackageReference Include="Hangfire.AspNetCore" Version="1.6.7" />
+    <PackageReference Include="Hangfire.Core" Version="1.6.7" />
+    <PackageReference Include="Hangfire.SqlServer" Version="1.6.7" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Hangfire.Samples/Hangfire.Samples.xproj b/samples/Hangfire.Samples/Hangfire.Samples.xproj
diff --git a/samples/Hangfire.Samples/project.json b/samples/Hangfire.Samples/project.json
diff --git a/src/Hangfire.RecurringJobExtensions/Hangfire.RecurringJobExtensions.csproj b/src/Hangfire.RecurringJobExtensions/Hangfire.RecurringJobExtensions.csproj
@@ -0,0 +1,36 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Hangfire extensions for RecurringJob</Description>
+    <AssemblyTitle>Hangfire.RecurringJobExtensions</AssemblyTitle>
+    <VersionPrefix>1.1.6</VersionPrefix>
+    <Authors>icsharp</Authors>
+    <TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <AssemblyName>Hangfire.RecurringJobExtensions</AssemblyName>
+    <PackageId>Hangfire.RecurringJobExtensions</PackageId>
+    <PackageTags>Hangfire;RecurringJob</PackageTags>
+    <PackageReleaseNotes>Add support for Hangfire RecurringJob extesions, we can use RecurringJobAttribute or Json configuration file to build RecurringJob automatically.</PackageReleaseNotes>
+    <PackageProjectUrl>https://github.com/icsharp/Hangfire.RecurringJobExtensions</PackageProjectUrl>
+    <PackageLicenseUrl>https://raw.githubusercontent.com/icsharp/Hangfire.RecurringJobExtensions/master/LICENSE</PackageLicenseUrl>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/icsharp/Hangfire.RecurringJobExtensions</RepositoryUrl>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Hangfire.Core" Version="1.6.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
+	<PackageReference Include="System.IO.FileSystem.Watcher" Version="4.0.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+    <PackageReference Include="Newtonsoft.Json" Version="5.0.1" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Hangfire.RecurringJobExtensions/Hangfire.RecurringJobExtensions.xproj b/src/Hangfire.RecurringJobExtensions/Hangfire.RecurringJobExtensions.xproj
diff --git a/src/Hangfire.RecurringJobExtensions/project.json b/src/Hangfire.RecurringJobExtensions/project.json
diff --git a/test/Hangfire.RecurringJobExtensions.Tests/Configuration/JsonConfigurationProviderTest.cs b/test/Hangfire.RecurringJobExtensions.Tests/Configuration/JsonConfigurationProviderTest.cs
@@ -19,7 +19,7 @@ public void Ctor_ThrowsAnException_WhenFileIsNullOrNotExists()
 		[Fact]
 		public void Load_ThrowsAnException_WhenFileContentIsInvliadJsonData()
 		{
-			var provider = new JsonConfigurationProvider("project.json");
+			var provider = new JsonConfigurationProvider("error.json");
 
 			Assert.Throws<JsonSerializationException>(() => provider.Load().ToList());
 		}

diff --git a/test/Hangfire.RecurringJobExtensions.Tests/Configuration/RecurringJobJsonOptionsTest.cs b/test/Hangfire.RecurringJobExtensions.Tests/Configuration/RecurringJobJsonOptionsTest.cs
@@ -4,6 +4,7 @@
 using Xunit;
 using Hangfire.RecurringJobExtensions.Configuration;
 using Hangfire.Common;
+using Newtonsoft.Json;
 
 namespace Hangfire.RecurringJobExtensions.Tests.Configuration
 {
@@ -68,5 +69,16 @@ public void DeserializeRecurringJobJsonOptionsFromJsonFile(string jsonFile)
 
 			Assert.Equal(2, o.Count);
 		}
+
+		/// <summary>
+		/// https://github.com/icsharp/Hangfire.RecurringJobExtensions/issues/5
+		/// </summary>
+		[Fact]
+		public void DeserializeRecurringJobJsonOptionsWithIssues5()
+		{
+			var data = File.ReadAllText("job1.json");
+			var o = JsonConvert.DeserializeObject<List<RecurringJobJsonOptions>>(data);
+			Assert.Equal(2, o.Count);
+		}
 	}
 }
diff --git a/test/Hangfire.RecurringJobExtensions.Tests/Hangfire.RecurringJobExtensions.Tests.csproj b/test/Hangfire.RecurringJobExtensions.Tests/Hangfire.RecurringJobExtensions.Tests.csproj
@@ -0,0 +1,38 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <AssemblyName>Hangfire.RecurringJobExtensions.Tests</AssemblyName>
+    <PackageId>Hangfire.RecurringJobExtensions.Tests</PackageId>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+    <PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
+    <RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Hangfire.RecurringJobExtensions\Hangfire.RecurringJobExtensions.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+	<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
+	<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+	<PackageReference Include="xunit" Version="2.2.0" />
+	<PackageReference Include="Moq" Version="4.7.99" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="error.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="job1.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="job2.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>
diff --git a/test/Hangfire.RecurringJobExtensions.Tests/Hangfire.RecurringJobExtensions.Tests.xproj b/test/Hangfire.RecurringJobExtensions.Tests/Hangfire.RecurringJobExtensions.Tests.xproj
diff --git a/test/Hangfire.RecurringJobExtensions.Tests/error.json b/test/Hangfire.RecurringJobExtensions.Tests/error.json
@@ -0,0 +1 @@
+{"error_message":"N/A" }
diff --git a/test/Hangfire.RecurringJobExtensions.Tests/project.json b/test/Hangfire.RecurringJobExtensions.Tests/project.json