From dfcd6a62272a58394f470d7d02ed37f89c4c83fb Mon Sep 17 00:00:00 2001
From: Kiran Challa <kichalla@microsoft.com>
Date: Tue, 9 Feb 2016 23:47:50 -0800
Subject: [PATCH] Enable tests to run using dotnet xunit runner

---
 .../project.json                              | 19 ++---
 .../project.json                              | 75 +++++++++----------
 2 files changed, 44 insertions(+), 50 deletions(-)

diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/project.json
index 1a081b1e3a..0f4db08fdb 100644
--- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/project.json
+++ b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/project.json
@@ -9,23 +9,20 @@
     "xunit": "2.1.0"
   },
   "frameworks": {
+    "dnxcore50": {
+      "dependencies": {
+        "dotnet-test-xunit": "1.0.0-dev-*"
+      },
+      "imports": "portable-net451+win8"
+    },
     "dnx451": {
       "dependencies": {
         "xunit.runner.console": "2.1.0"
       }
-    },
-    "dnxcore50": {
-      "dependencies": {
-        "xunit.runner.aspnet": "2.0.0-aspnet-*"
-      },
-      "imports": "portable-net45+win8"
     }
   },
   "compilationOptions": {
     "allowUnsafe": true
   },
-  "testRunner": "xunit",
-  "commands": {
-    "test": "xunit.runner.aspnet"
-  }
-}
+  "testRunner": "xunit"
+}
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/project.json b/test/Microsoft.AspNetCore.Server.KestrelTests/project.json
index e87ccc77ff..1d079264a8 100644
--- a/test/Microsoft.AspNetCore.Server.KestrelTests/project.json
+++ b/test/Microsoft.AspNetCore.Server.KestrelTests/project.json
@@ -1,41 +1,38 @@
 {
-    "version": "1.0.0-*",
-    "dependencies": {
-        "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
-        "Microsoft.AspNetCore.Server.Kestrel.Https": "1.0.0-*",
-        "Microsoft.AspNetCore.Testing": "1.0.0-*",
-        "Microsoft.NETCore.Platforms": "1.0.1-*",
-        "System.Net.Http": "4.0.1-*",
-        "xunit": "2.1.0"
+  "version": "1.0.0-*",
+  "dependencies": {
+    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
+    "Microsoft.AspNetCore.Server.Kestrel.Https": "1.0.0-*",
+    "Microsoft.AspNetCore.Testing": "1.0.0-*",
+    "Microsoft.NETCore.Platforms": "1.0.1-*",
+    "System.Net.Http": "4.0.1-*",
+    "xunit": "2.1.0"
+  },
+  "frameworks": {
+    "dnxcore50": {
+      "dependencies": {
+        "System.Diagnostics.TraceSource": "4.0.0-*",
+        "System.Globalization.Extensions": "4.0.1-*",
+        "System.IO": "4.1.0-*",
+        "System.Net.Http.WinHttpHandler": "4.0.0-*",
+        "System.Net.Sockets": "4.1.0-*",
+        "System.Runtime.Handles": "4.0.1-*",
+        "dotnet-test-xunit": "1.0.0-dev-*"
+      },
+      "imports": "portable-net451+win8"
     },
-    "frameworks": {
-        "dnx451": {
-            "dependencies": {
-                "xunit.runner.console": "2.1.0"
-            }
-        },
-        "dnxcore50": {
-            "dependencies": {
-                "System.Diagnostics.TraceSource": "4.0.0-*",
-                "System.Globalization.Extensions": "4.0.1-*",
-                "System.IO": "4.1.0-*",
-                "System.Net.Http.WinHttpHandler": "4.0.0-*",
-                "System.Net.Sockets": "4.1.0-*",
-                "System.Runtime.Handles": "4.0.1-*",
-                "xunit.runner.aspnet": "2.0.0-aspnet-*"
-            },
-            "imports": "portable-net45+win8"
-        }
-    },
-    "compilationOptions": {
-        "allowUnsafe": true,
-        "keyFile": "../../tools/Key.snk"
-    },
-    "testRunner": "xunit",
-    "commands": {
-        "test": "xunit.runner.aspnet"
-    },
-    "content": [
-        "TestResources/testCert.pfx"
-    ]
-}
+    "dnx451": {
+      "dependencies": {
+        "xunit.runner.console": "2.1.0"
+      }
+    }
+  },
+  "compilationOptions": {
+    "allowUnsafe": true,
+    "keyFile": "../../tools/Key.snk"
+  },
+  "testRunner": "xunit",
+  "content": [
+    "TestResources/testCert.pfx"
+  ]
+}
\ No newline at end of file