Merge branch 'release' into dev

2016-05-02 16:23:48 -07:00 · 2016-05-02 16:23:48 -07:00 · 7494e6a10a
parent ff510875f2 296ca0f948
commit 7494e6a10a
1 changed files with 4 additions and 1 deletions
--- a/test/Microsoft.AspNetCore.Server.KestrelTests/project.json
+++ b/test/Microsoft.AspNetCore.Server.KestrelTests/project.json
@ -40,7 +40,10 @@
  },
  "buildOptions": {
    "allowUnsafe": true,
-    "keyFile": "../../tools/Key.snk"
+    "keyFile": "../../tools/Key.snk",
+    "copyToOutput": {
+      "include": "TestResources/testCert.pfx"
+    }
  },
  "testRunner": "xunit",
  "publishOptions": {