Merge branch 'release' into dev

2016-04-15 15:41:32 -07:00 · 2016-04-15 15:41:32 -07:00 · 68a6611984
parent 5b1ea19e1d eeed1036e3
commit 68a6611984
1 changed files with 0 additions and 8 deletions
--- a/src/Microsoft.AspNetCore.Razor.Runtime/project.json
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/project.json
@ -50,14 +50,6 @@
        "System.Xml.Linq": "4.0.0.0"
      }
    },
-    "dnx451": {
-      "frameworkAssemblies": {
-        "System.Runtime": "",
-        "System.IO": "",
-        "System.Xml": "4.0.0.0",
-        "System.Xml.Linq": "4.0.0.0"
-      }
-    },
    "netstandard1.5": {
      "dependencies": {
        "System.Collections.Concurrent": "4.0.12-*",