Merge branch 'release' into dev

2015-11-03 13:39:10 -08:00 · 2015-11-03 13:39:10 -08:00 · 830a3a46b6
--- a/src/Microsoft.AspNet.Cors/project.json
+++ b/src/Microsoft.AspNet.Cors/project.json
@ -5,7 +5,8 @@
    "url": "https://github.com/aspnet/cors"
  },
  "compilationOptions": {
-    "warningsAsErrors": true
+    "warningsAsErrors": true,
+    "keyFile": "../../tools/Key.snk"
  },
  "dependencies": {
    "Microsoft.AspNet.Http.Extensions": "1.0.0-*",
--- a/tools/Key.snk
+++ b/tools/Key.snk