Merge branch 'release' into dev

2015-11-02 12:23:20 -08:00 · 2015-11-02 12:23:20 -08:00 · c78ad32b1e
parent bb7f2c3636 8a06966024
commit c78ad32b1e
2 changed files with 4 additions and 0 deletions
--- a/src/Microsoft.AspNet.JsonPatch/project.json
+++ b/src/Microsoft.AspNet.JsonPatch/project.json
@ -1,5 +1,9 @@
 {
  "version": "1.0.0-*",
+  "compilationOptions": {
+    "warningsAsErrors": true,
+    "keyFile": "../../tools/Key.snk"
+  },
  "repository": {
    "type": "git",
    "url": "git://github.com/aspnet/mvc"
--- a/tools/Key.snk
+++ b/tools/Key.snk