Merge branch 'release' into dev

2016-04-08 06:48:35 -07:00 · 2016-04-08 06:48:35 -07:00 · f6be65d69e
parent 1366621f97 4d9d196b4a
commit f6be65d69e
2 changed files with 2 additions and 9 deletions
--- a/src/Microsoft.AspNetCore.Html.Abstractions/project.json
+++ b/src/Microsoft.AspNetCore.Html.Abstractions/project.json
@ -24,10 +24,7 @@
      "dependencies": {
        "System.Collections": "4.0.11-*",
        "System.Resources.ResourceManager": "4.0.1-*"
-      },
-      "imports": [
-        "dotnet5.1"
-      ]
+      }
    }
  }
 }
--- a/src/Microsoft.Extensions.WebEncoders/project.json
+++ b/src/Microsoft.Extensions.WebEncoders/project.json
@ -23,10 +23,6 @@
    "System.Text.Encodings.Web": "4.0.0-*"
  },
  "frameworks": {
-    "netstandard1.0": {
-      "imports": [
-        "dotnet5.1"
-      ]
-    }
+    "netstandard1.0": {}
  }
 }