From 55a0202c597d0cd89cf837eb321ca29ad3d7a40d Mon Sep 17 00:00:00 2001
From: John Luo <jt.luo@mail.utoronto.ca>
Date: Wed, 17 Feb 2016 16:57:26 -0800
Subject: [PATCH] Update tfm to net451 and test with xunit runner

---
 test/ServerComparison.FunctionalTests/Helpers.cs   |  2 +-
 test/ServerComparison.FunctionalTests/project.json | 11 ++++++-----
 test/ServerComparison.TestSites/Program.cs         |  1 +
 test/ServerComparison.TestSites/hosting.json       |  3 ---
 test/ServerComparison.TestSites/project.json       |  3 +--
 5 files changed, 9 insertions(+), 11 deletions(-)
 delete mode 100644 test/ServerComparison.TestSites/hosting.json

diff --git a/test/ServerComparison.FunctionalTests/Helpers.cs b/test/ServerComparison.FunctionalTests/Helpers.cs
index 07c493bd6a..073b74b19f 100644
--- a/test/ServerComparison.FunctionalTests/Helpers.cs
+++ b/test/ServerComparison.FunctionalTests/Helpers.cs
@@ -10,7 +10,7 @@ namespace ServerComparison.FunctionalTests
     {
         public static string GetApplicationPath()
         {
-            return Path.GetFullPath(Path.Combine("..", "ServerComparison.TestSites"));
+            return Path.GetFullPath(Path.Combine("..", "..", "..", "ServerComparison.TestSites"));
         }
     }
 }
\ No newline at end of file
diff --git a/test/ServerComparison.FunctionalTests/project.json b/test/ServerComparison.FunctionalTests/project.json
index a0b3d75a94..12e60d5da8 100644
--- a/test/ServerComparison.FunctionalTests/project.json
+++ b/test/ServerComparison.FunctionalTests/project.json
@@ -2,18 +2,19 @@
   "compilationOptions": {
     "warningsAsErrors": true
   },
-  "commands": {
-    "test": "xunit.runner.aspnet"
-  },
+  "testRunner": "xunit",
   "dependencies": {
     "Microsoft.AspNetCore.Server.Testing": "1.0.0-*",
+    "Microsoft.Extensions.Logging": "1.0.0-*",
     "Microsoft.Extensions.Logging.Console": "1.0.0-*",
     "Microsoft.Net.Http.Headers": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
-    "xunit.runner.aspnet": "2.0.0-aspnet-*"
   },
   "frameworks": {
-    "dnx451": {
+    "net451": {
+      "dependencies": {
+        "xunit.runner.console": "2.1.0"
+      },
       "frameworkAssemblies": {
         "System.Data": "",
         "System.Net.Http": "",
diff --git a/test/ServerComparison.TestSites/Program.cs b/test/ServerComparison.TestSites/Program.cs
index 5adfff0d9c..a8ed251a8d 100644
--- a/test/ServerComparison.TestSites/Program.cs
+++ b/test/ServerComparison.TestSites/Program.cs
@@ -13,6 +13,7 @@ namespace ServerComparison.TestSites
                 .UseDefaultConfiguration(args)
                 .UseIISPlatformHandlerUrl()
                 .UseStartup("ServerComparison.TestSites")
+                .UseServer("Microsoft.AspNetCore.Server.Kestrel")
                 .Build();
 
             host.Run();
diff --git a/test/ServerComparison.TestSites/hosting.json b/test/ServerComparison.TestSites/hosting.json
deleted file mode 100644
index 6a93dbafa8..0000000000
--- a/test/ServerComparison.TestSites/hosting.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "server": "Microsoft.AspNetCore.Server.Kestrel"
-}
diff --git a/test/ServerComparison.TestSites/project.json b/test/ServerComparison.TestSites/project.json
index ff4c0c144c..3d4e43cad8 100644
--- a/test/ServerComparison.TestSites/project.json
+++ b/test/ServerComparison.TestSites/project.json
@@ -14,8 +14,7 @@
     "emitEntryPoint": true
   },
   "content": [
-    "wwwroot/**/*",
-    "hosting.json"
+    "wwwroot/**/*"
   ],
   "frameworks": {
     "dnx451": { },