Merge branch 'release' into dev

2016-04-14 15:55:14 -07:00 · 2016-04-14 15:55:14 -07:00 · 588abbc588
parent 4f8c1d49d0 010e8a4e37
commit 588abbc588
1 changed files with 3 additions and 1 deletions
--- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/project.json
+++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/project.json
@ -46,12 +46,14 @@
    },
    "Microsoft.Extensions.WebEncoders": "1.0.0-*",
    "Newtonsoft.Json": "8.0.3",
-    "System.Runtime.Serialization.Primitives": "4.1.1-*",
    "System.Buffers": "4.0.0-*"
  },
  "frameworks": {
    "net451": { },
    "netstandard1.5": {
+      "dependencies": {
+        "System.Runtime.Serialization.Primitives": "4.1.1-*"
+      },
      "imports": [
        "portable-net451+win8"
      ]