diff --git a/HardHat.sln b/HardHat.sln
index c82167b..9a8d74a 100644
--- a/HardHat.sln
+++ b/HardHat.sln
@@ -1,21 +1,20 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26430.6
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2213F1A9-1E90-473E-A04F-F089BBC16098}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{597DE320-32E2-4B4E-80E5-33838AA160E5}"
ProjectSection(SolutionItems) = preProject
- global.json = global.json
Readme.md = Readme.md
EndProjectSection
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "HardHat", "src\HardHat\HardHat.xproj", "{B4448494-6C80-4BDA-890C-D8900B33FE17}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HardHat", "src\HardHat\HardHat.csproj", "{B4448494-6C80-4BDA-890C-D8900B33FE17}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "HardHat.Example", "src\HardHat.Example\HardHat.Example.xproj", "{1DEE94FD-A3D3-4E46-868D-1BB9028FEC86}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HardHat.Example", "src\HardHat.Example\HardHat.Example.csproj", "{1DEE94FD-A3D3-4E46-868D-1BB9028FEC86}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "HardHat.UnitTests", "src\HardHat.UnitTests\HardHat.UnitTests.xproj", "{5FCE3103-91ED-4708-921B-2E881D67AD53}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HardHat.UnitTests", "src\HardHat.UnitTests\HardHat.UnitTests.csproj", "{5FCE3103-91ED-4708-921B-2E881D67AD53}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000..4509bea
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,21 @@
+
+image: Visual Studio 2017
+version: 1.0.{build}
+build_script:
+- ps: >-
+ dotnet restore HardHat.sln --source https://api.nuget.org/v3/index.json
+ dotnet build HardHat.sln
+ if($env:APPVEYOR_REPO_TAG -eq "true")
+ {
+ dotnet pack src\HardHat\HardHat.csproj --configuration Release --output ..\..\output /p:Version=$env:APPVEYOR_REPO_TAG_NAME
+ }
+test_script:
+- ps: dotnet test src\HardHat.UnitTests\HardHat.UnitTests.csproj
+artifacts:
+- path: output\**.nupkg
+deploy:
+- provider: NuGet
+ api_key:
+ secure: bGn7M6dHOJ3QjwYIv7e34tcY/n9cCUZmL1MnM6jRfmnJOOfwlrS+cdRj2n8Wf31n
+ on:
+appveyor_repo_tag: true
\ No newline at end of file
diff --git a/global.json b/global.json
deleted file mode 100644
index 9d09ab5..0000000
--- a/global.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "projects": [ "src", "test" ],
- "sdk": {
- "version": "1.0.0-preview2-003131"
- }
-}
diff --git a/src/HardHat.Example/HardHat.Example.csproj b/src/HardHat.Example/HardHat.Example.csproj
new file mode 100644
index 0000000..a01757f
--- /dev/null
+++ b/src/HardHat.Example/HardHat.Example.csproj
@@ -0,0 +1,48 @@
+
+
+
+ netcoreapp1.0
+ true
+ HardHat.Example
+ Exe
+ HardHat.Example
+ 1.0.4
+ $(PackageTargetFallback);dotnet5.6;portable-net45+win8
+
+
+
+
+ PreserveNewest
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/HardHat.Example/HardHat.Example.xproj b/src/HardHat.Example/HardHat.Example.xproj
deleted file mode 100644
index 20be0a6..0000000
--- a/src/HardHat.Example/HardHat.Example.xproj
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- 1dee94fd-a3d3-4e46-868d-1bb9028fec86
- HardHat.Example
- .\obj
- .\bin\
- v4.6.2
-
-
- 2.0
-
-
-
-
-
-
-
diff --git a/src/HardHat.Example/project.json b/src/HardHat.Example/project.json
deleted file mode 100644
index a1f99d4..0000000
--- a/src/HardHat.Example/project.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
- "dependencies": {
- "Microsoft.NETCore.App": {
- "version": "1.0.1",
- "type": "platform"
- },
- "Microsoft.AspNetCore.Diagnostics": "1.0.0",
- "Microsoft.AspNetCore.Mvc": "1.0.1",
- "Microsoft.AspNetCore.Razor.Tools": {
- "version": "1.0.0-preview2-final",
- "type": "build"
- },
- "Microsoft.AspNetCore.Routing": "1.0.1",
- "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0",
- "Microsoft.AspNetCore.Server.Kestrel": "1.0.1",
- "Microsoft.AspNetCore.StaticFiles": "1.0.0",
- "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
- "Microsoft.Extensions.Configuration.Json": "1.0.0",
- "Microsoft.Extensions.Logging": "1.0.0",
- "Microsoft.Extensions.Logging.Console": "1.0.0",
- "Microsoft.Extensions.Logging.Debug": "1.0.0",
- "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0",
- "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0",
- "HardHat": "1.0.0"
- },
-
- "tools": {
- "BundlerMinifier.Core": "2.0.238",
- "Microsoft.AspNetCore.Razor.Tools": "1.0.0-preview2-final",
- "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final"
- },
-
- "frameworks": {
- "netcoreapp1.0": {
- "imports": [
- "dotnet5.6",
- "portable-net45+win8"
- ]
- }
- },
-
- "buildOptions": {
- "emitEntryPoint": true,
- "preserveCompilationContext": true
- },
-
- "runtimeOptions": {
- "configProperties": {
- "System.GC.Server": true
- }
- },
-
- "publishOptions": {
- "include": [
- "wwwroot",
- "**/*.cshtml",
- "appsettings.json",
- "web.config"
- ]
- },
-
- "scripts": {
- "prepublish": [ "bower install", "dotnet bundle" ],
- "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
- }
-}
diff --git a/src/HardHat.UnitTests/HardHat.UnitTests.csproj b/src/HardHat.UnitTests/HardHat.UnitTests.csproj
new file mode 100644
index 0000000..30e0934
--- /dev/null
+++ b/src/HardHat.UnitTests/HardHat.UnitTests.csproj
@@ -0,0 +1,26 @@
+
+
+
+ netcoreapp1.0
+ HardHat.UnitTests
+ HardHat.UnitTests
+ true
+ 1.0.4
+ false
+ false
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/HardHat.UnitTests/HardHat.UnitTests.xproj b/src/HardHat.UnitTests/HardHat.UnitTests.xproj
deleted file mode 100644
index aa5a52f..0000000
--- a/src/HardHat.UnitTests/HardHat.UnitTests.xproj
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- 5fce3103-91ed-4708-921b-2e881d67ad53
- HardHat.UnitTests
- .\obj
- .\bin\
- v4.6.2
-
-
- 2.0
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/HardHat.UnitTests/project.json b/src/HardHat.UnitTests/project.json
deleted file mode 100644
index f0ae315..0000000
--- a/src/HardHat.UnitTests/project.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "version": "1.0.0-*",
- "testRunner": "xunit",
- "dependencies": {
- "xunit": "2.2.0-beta2-build3300",
- "dotnet-test-xunit": "2.2.0-preview2-build1029",
- "HardHat": "1.0.0-*",
- "Moq": "4.6.38-alpha",
- "Microsoft.AspNetCore.Http.Abstractions": "1.0.0"
- },
- "frameworks": {
- "netcoreapp1.0": {
- "dependencies": {
- "Microsoft.NETCore.App": {
- "type": "platform",
- "version": "1.0.0"
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/src/HardHat/HardHat.csproj b/src/HardHat/HardHat.csproj
new file mode 100644
index 0000000..09e819b
--- /dev/null
+++ b/src/HardHat/HardHat.csproj
@@ -0,0 +1,20 @@
+
+
+
+ .Net core Middleware, Add various headers to help secure your site
+ Tommy Parnell
+ netstandard1.6
+ HardHat
+ HardHat
+ xss;clickjack;clickjacking;security;.net core;Middleware;core
+ https://media.githubusercontent.com/media/TerribleDev/HardHat/master/Hat.png
+ https://github.com/TerribleDev/HardHat
+ https://opensource.org/licenses/MIT
+ $(PackageTargetFallback);dnxcore50
+
+
+
+
+
+
+
diff --git a/src/HardHat/HardHat.xproj b/src/HardHat/HardHat.xproj
deleted file mode 100644
index 7682e7e..0000000
--- a/src/HardHat/HardHat.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
-
- b4448494-6c80-4bda-890c-d8900b33fe17
- HardHat
- .\obj
- .\bin\
- v4.6.2
-
-
-
- 2.0
-
-
-
diff --git a/src/HardHat/Properties/AssemblyInfo.cs b/src/HardHat/Properties/AssemblyInfo.cs
index d0ecbfa..a8f5029 100644
--- a/src/HardHat/Properties/AssemblyInfo.cs
+++ b/src/HardHat/Properties/AssemblyInfo.cs
@@ -5,9 +5,6 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("HardHat")]
[assembly: AssemblyTrademark("")]
// Setting ComVisible to false makes the types in this assembly not visible
diff --git a/src/HardHat/project.json b/src/HardHat/project.json
deleted file mode 100644
index 161dd7d..0000000
--- a/src/HardHat/project.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "version": "1.0.0-*",
- "description": ".Net core Middleware, Add various headers to help secure your site",
- "authors": [ "Tommy Parnell" ],
- "packOptions": {
- "tags": [ "xss", "clickjack", "clickjacking", "security", ".net core", "Middleware", "core" ],
- "projectUrl": "https://github.com/TerribleDev/HardHat",
- "licenseUrl": "https://opensource.org/licenses/MIT",
- "iconUrl": "https://media.githubusercontent.com/media/TerribleDev/HardHat/master/Hat.png"
- },
- "dependencies": {
- "NETStandard.Library": "1.6.0",
- "Microsoft.AspNetCore.Http.Abstractions": "1.0.0"
- },
-
- "frameworks": {
- "netstandard1.6": {
- "imports": "dnxcore50"
- }
- }
-}