Merge branch 'release' into dev

2015-11-03 10:47:24 -08:00 · 2015-11-03 10:47:24 -08:00 · 60032c9bf6
parent 34ae239e4f 5444794c01
commit 60032c9bf6
4 changed files with 6 additions and 3 deletions
--- a/src/Microsoft.AspNet.Server.WebListener/project.json
+++ b/src/Microsoft.AspNet.Server.WebListener/project.json
@ -7,7 +7,8 @@
    "Microsoft.Net.Http.Server": "1.0.0-*"
  },
  "compilationOptions": {
-    "allowUnsafe": true
+    "allowUnsafe": true,
+    "keyFile": "../../tools/Key.snk"
  },
  "frameworks": {
    "dnx451": {},
--- a/src/Microsoft.Net.Http.Server/project.json
+++ b/src/Microsoft.Net.Http.Server/project.json
@ -7,7 +7,8 @@
    "Microsoft.Net.WebSockets": "1.0.0-*"
  },
  "compilationOptions": {
-    "allowUnsafe": true
+    "allowUnsafe": true,
+    "keyFile": "../../tools/Key.snk"
  },
  "frameworks": {
    "net451": {},
--- a/src/Microsoft.Net.WebSockets/project.json
+++ b/src/Microsoft.Net.WebSockets/project.json
@ -3,7 +3,8 @@
  "description": "Implementation of WebSocket abstract base class. Used by WebListener.",
  "dependencies": {},
  "compilationOptions": {
-    "allowUnsafe": true
+    "allowUnsafe": true,
+    "keyFile": "../../tools/Key.snk"
  },
  "frameworks": {
    "net451": {},
--- a/tools/Key.snk
+++ b/tools/Key.snk