Migrate to vs2017

sufyannisar · Jun 10, 2017 · b855ac3 · b855ac3
1 parent fe09c71
commit b855ac3
Show file tree

Hide file tree

Showing 8 changed files with 78 additions and 119 deletions.
diff --git a/Hangfire.Console.sln b/Hangfire.Console.sln
@@ -1,23 +1,22 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26430.12
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{436BABB0-DBF7-4301-BC7F-CBB9D09FAD36}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{657DF223-42EC-4765-990B-334C62F602EA}"
 	ProjectSection(SolutionItems) = preProject
 		appveyor.yml = appveyor.yml
 		dashboard.png = dashboard.png
-		global.json = global.json
 		README.md = README.md
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CBD2EEC6-826C-4477-B8F7-EADE2D944B74}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Hangfire.Console", "src\Hangfire.Console\Hangfire.Console.xproj", "{C18CBFCC-955B-4B21-B698-851CC56364AF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hangfire.Console", "src\Hangfire.Console\Hangfire.Console.csproj", "{C18CBFCC-955B-4B21-B698-851CC56364AF}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Hangfire.Console.Tests", "tests\Hangfire.Console.Tests\Hangfire.Console.Tests.xproj", "{D5068E09-A43C-4B05-8068-C50E9497EB25}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hangfire.Console.Tests", "tests\Hangfire.Console.Tests\Hangfire.Console.Tests.csproj", "{D5068E09-A43C-4B05-8068-C50E9497EB25}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/global.json b/global.json
diff --git a/src/Hangfire.Console/Hangfire.Console.csproj b/src/Hangfire.Console/Hangfire.Console.csproj
@@ -0,0 +1,39 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Job console for Hangfire</Description>
+    <AssemblyTitle>Hangfire.Console</AssemblyTitle>
+    <VersionPrefix>1.3.1</VersionPrefix>
+    <Authors>Alexey Skalozub</Authors>
+    <TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <AssemblyName>Hangfire.Console</AssemblyName>
+    <PackageId>Hangfire.Console</PackageId>
+    <PackageTags>hangfire;console;logging</PackageTags>
+    <PackageReleaseNotes>- Consoles are now expired along with parent job by default!
+- Added **FollowJobRetentionPolicy** option to switch between old/new expiration modes
+- Fix compatibility with Hangfire 1.6.11+</PackageReleaseNotes>
+    <PackageIconUrl>https://raw.githubusercontent.com/pieceofsummer/Hangfire.Console/master/hangfire.console.png</PackageIconUrl>
+    <PackageLicenseUrl>https://raw.githubusercontent.com/pieceofsummer/Hangfire.Console/master/LICENSE.md</PackageLicenseUrl>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/pieceofsummer/Hangfire.Console</RepositoryUrl>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Hangfire.Core" Version="1.6.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Hangfire.Console/Hangfire.Console.xproj b/src/Hangfire.Console/Hangfire.Console.xproj
diff --git a/src/Hangfire.Console/project.json b/src/Hangfire.Console/project.json
diff --git a/tests/Hangfire.Console.Tests/Hangfire.Console.Tests.csproj b/tests/Hangfire.Console.Tests/Hangfire.Console.Tests.csproj
@@ -0,0 +1,35 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <DebugType>portable</DebugType>
+    <AssemblyName>Hangfire.Console.Tests</AssemblyName>
+    <PackageId>Hangfire.Console.Tests</PackageId>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+    <PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
+    <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Hangfire.Console\Hangfire.Console.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" />
+    <PackageReference Include="xunit" Version="2.2.0-beta5-build3474" />
+    <PackageReference Include="Moq" Version="4.6.38-alpha" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
+    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.1.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+
+</Project>
diff --git a/tests/Hangfire.Console.Tests/Hangfire.Console.Tests.xproj b/tests/Hangfire.Console.Tests/Hangfire.Console.Tests.xproj
diff --git a/tests/Hangfire.Console.Tests/project.json b/tests/Hangfire.Console.Tests/project.json