From 18ecec5d46e35bd350298bc9cd614e2fcbc688fd Mon Sep 17 00:00:00 2001
From: Michael Ganss <michael@ganss.org>
Date: Sun, 5 Jun 2016 20:03:11 +0200
Subject: [PATCH] Move HtmlSanitizer.Tests to project.json

---
 .gitignore                                    |  4 ++-
 .../HtmlSanitizer.Tests.csproj                | 25 +----------------
 .../HtmlSanitizer.Tests.project.json          | 12 ++++++++
 HtmlSanitizer.Tests/Tests.cs                  |  1 -
 HtmlSanitizer.Tests/packages.config           | 12 --------
 HtmlSanitizer.Tests/project.json              | 28 +++++++++++++++++++
 global.json                                   |  6 ++++
 7 files changed, 50 insertions(+), 38 deletions(-)
 create mode 100644 HtmlSanitizer.Tests/HtmlSanitizer.Tests.project.json
 delete mode 100644 HtmlSanitizer.Tests/packages.config
 create mode 100644 HtmlSanitizer.Tests/project.json
 create mode 100644 global.json

diff --git a/.gitignore b/.gitignore
index 95eee75..0dd791e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -159,4 +159,6 @@ coverity.zip
 .vs/
 
 # dotnet
-*.lock.json
\ No newline at end of file
+*.lock.json
+*.nuget.props
+*.nuget.targets
diff --git a/HtmlSanitizer.Tests/HtmlSanitizer.Tests.csproj b/HtmlSanitizer.Tests/HtmlSanitizer.Tests.csproj
index 3551d8d..187159d 100644
--- a/HtmlSanitizer.Tests/HtmlSanitizer.Tests.csproj
+++ b/HtmlSanitizer.Tests/HtmlSanitizer.Tests.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -44,28 +44,8 @@
       <HintPath>..\packages\AngleSharp.0.9.6\lib\net45\AngleSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.2.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.2.1\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Net" />
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
   </ItemGroup>
   <Choose>
     <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
@@ -85,9 +65,6 @@
       <Name>HtmlSanitizer</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>
diff --git a/HtmlSanitizer.Tests/HtmlSanitizer.Tests.project.json b/HtmlSanitizer.Tests/HtmlSanitizer.Tests.project.json
new file mode 100644
index 0000000..4354238
--- /dev/null
+++ b/HtmlSanitizer.Tests/HtmlSanitizer.Tests.project.json
@@ -0,0 +1,12 @@
+{
+  "dependencies": {
+    "xunit": "2.1.0",
+    "xunit.runner.visualstudio": "2.1.0"
+  },
+  "frameworks": {
+    "net45": { }
+  },
+  "runtimes": {
+    "win": { }
+  }
+}
diff --git a/HtmlSanitizer.Tests/Tests.cs b/HtmlSanitizer.Tests/Tests.cs
index e2942de..445809b 100644
--- a/HtmlSanitizer.Tests/Tests.cs
+++ b/HtmlSanitizer.Tests/Tests.cs
@@ -5,7 +5,6 @@ using Xunit;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.Remoting.Channels;
 using System.Text.RegularExpressions;
 
 // Tests based on tests from http://roadkill.codeplex.com/
diff --git a/HtmlSanitizer.Tests/packages.config b/HtmlSanitizer.Tests/packages.config
deleted file mode 100644
index 19fb545..0000000
--- a/HtmlSanitizer.Tests/packages.config
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="AngleSharp" version="0.9.6" targetFramework="net45" />
-  <package id="NUnit" version="3.2.1" targetFramework="net45" />
-  <package id="xunit" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/HtmlSanitizer.Tests/project.json b/HtmlSanitizer.Tests/project.json
new file mode 100644
index 0000000..7a89a78
--- /dev/null
+++ b/HtmlSanitizer.Tests/project.json
@@ -0,0 +1,28 @@
+{
+  "version": "1.0.0-*",
+  "testRunner": "xunit",
+  "dependencies": {
+    "HtmlSanitizer": "1.0.0-VERSION",
+    "xunit": "2.1.0",
+    "dotnet-test-xunit": "1.0.0-rc2-build10025"
+  },
+  "frameworks": {
+    "netcoreapp1.0": {
+      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "type": "platform",
+          "version": "1.0.0-rc2-3002702"
+        }
+      },
+      "imports": [
+        "dnxcore50",
+        "portable-net45+win8"
+      ]
+    },
+    "net451": {
+      "dependencies": {
+        "xunit.runner.visualstudio": "2.1.0"
+      }
+    }
+  }
+}
diff --git a/global.json b/global.json
new file mode 100644
index 0000000..4c3d132
--- /dev/null
+++ b/global.json
@@ -0,0 +1,6 @@
+{
+  "projects": [ "HtmlSanitizer", "HtmlSanitizer.Tests" ],
+  "sdk": {
+    "version": "1.0.0-preview1-002702"
+  }
+}