From b855ac3ffeff852cd15b44618c38e8bb201a53b8 Mon Sep 17 00:00:00 2001
From: Alexey Skalozub <pieceofsummer@gmail.com>
Date: Sat, 10 Jun 2017 22:30:14 +0300
Subject: [PATCH] Migrate to vs2017

---
 Hangfire.Console.sln                          |  9 ++---
 global.json                                   |  6 ---
 src/Hangfire.Console/Hangfire.Console.csproj  | 39 +++++++++++++++++++
 src/Hangfire.Console/Hangfire.Console.xproj   | 21 ----------
 src/Hangfire.Console/project.json             | 36 -----------------
 .../Hangfire.Console.Tests.csproj             | 35 +++++++++++++++++
 .../Hangfire.Console.Tests.xproj              | 22 -----------
 tests/Hangfire.Console.Tests/project.json     | 29 --------------
 8 files changed, 78 insertions(+), 119 deletions(-)
 delete mode 100644 global.json
 create mode 100644 src/Hangfire.Console/Hangfire.Console.csproj
 delete mode 100644 src/Hangfire.Console/Hangfire.Console.xproj
 delete mode 100644 src/Hangfire.Console/project.json
 create mode 100644 tests/Hangfire.Console.Tests/Hangfire.Console.Tests.csproj
 delete mode 100644 tests/Hangfire.Console.Tests/Hangfire.Console.Tests.xproj
 delete mode 100644 tests/Hangfire.Console.Tests/project.json

diff --git a/Hangfire.Console.sln b/Hangfire.Console.sln
index ca001e1..ac3fe85 100644
--- a/Hangfire.Console.sln
+++ b/Hangfire.Console.sln
@@ -1,7 +1,7 @@
 
 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
@@ -9,15 +9,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	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
deleted file mode 100644
index 1aea5e4..0000000
--- a/global.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "projects": [ "src", "tests" ],
-  "sdk": {
-    "version": "1.0.0-preview2-1-003177"
-  }
-}
diff --git a/src/Hangfire.Console/Hangfire.Console.csproj b/src/Hangfire.Console/Hangfire.Console.csproj
new file mode 100644
index 0000000..203dd7f
--- /dev/null
+++ 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
deleted file mode 100644
index 51422e4..0000000
--- a/src/Hangfire.Console/Hangfire.Console.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>c18cbfcc-955b-4b21-b698-851cc56364af</ProjectGuid>
-    <RootNamespace>Hangfire.Console</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/src/Hangfire.Console/project.json b/src/Hangfire.Console/project.json
deleted file mode 100644
index 22aed09..0000000
--- a/src/Hangfire.Console/project.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "version": "1.3.1-*",
-
-  "title": "Hangfire.Console",
-  "description": "Job console for Hangfire",
-  "authors": [ "Alexey Skalozub" ],
-
-  "packOptions": {
-    "summary": "Job console for Hangfire",
-    "tags": [ "hangfire", "console", "logging" ],
-    "owners": [ "Alexey Skalozub" ],
-    "iconUrl": "https://raw.githubusercontent.com/pieceofsummer/Hangfire.Console/master/hangfire.console.png",
-    "licenseUrl": "https://raw.githubusercontent.com/pieceofsummer/Hangfire.Console/master/LICENSE.md",
-    "releaseNotes": "- Consoles are now expired along with parent job by default!\n- Added **FollowJobRetentionPolicy** option to switch between old/new expiration modes\n- Fix compatibility with Hangfire 1.6.11+",
-    "repository": {
-      "type": "git",
-      "url": "https://github.com/pieceofsummer/Hangfire.Console"
-    }
-  },
-
-  "buildOptions": {
-    "warningsAsErrors": true,
-    "xmlDoc": true,
-
-    "embed": [ "Resources/*" ]
-  },
-
-  "dependencies": {
-    "Hangfire.Core": "1.6.0"
-  },
-
-  "frameworks": {
-    "netstandard1.3": {},
-    "net45": {}
-  }
-}
diff --git a/tests/Hangfire.Console.Tests/Hangfire.Console.Tests.csproj b/tests/Hangfire.Console.Tests/Hangfire.Console.Tests.csproj
new file mode 100644
index 0000000..2e5b337
--- /dev/null
+++ 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
deleted file mode 100644
index 8761a88..0000000
--- a/tests/Hangfire.Console.Tests/Hangfire.Console.Tests.xproj
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>d5068e09-a43c-4b05-8068-c50e9497eb25</ProjectGuid>
-    <RootNamespace>Hangfire.Console.Tests</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/tests/Hangfire.Console.Tests/project.json b/tests/Hangfire.Console.Tests/project.json
deleted file mode 100644
index c6754b9..0000000
--- a/tests/Hangfire.Console.Tests/project.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "version": "1.0.0-*",
-
-  "buildOptions": {
-    "debugType": "portable"
-  },
-
-  "testRunner": "xunit",
-
-  "dependencies": {
-    "xunit": "2.2.0-*",
-    "dotnet-test-xunit": "2.2.0-*",
-    "Moq": "4.6.38-alpha",
-    "Hangfire.Console": { "target": "project" }
-  },
-
-  "frameworks": {
-    "netcoreapp1.0": {
-      "imports": "dnxcore50",
-      "dependencies": {
-        "Microsoft.NETCore.App": {
-          "type": "platform",
-          "version": "1.0.1"
-        },
-        "System.Reflection.TypeExtensions": "4.1.0"
-      }
-    }
-  }
-}