Merge branch 'release' into dev

2015-06-03 11:52:58 -07:00 · 2015-06-03 11:52:58 -07:00 · 39fa2782d2
parent 3fa5dee2d7 499de6536b
commit 39fa2782d2
1 changed files with 2 additions and 1 deletions
--- a/src/Microsoft.AspNet.Diagnostics.Entity/project.json
+++ b/src/Microsoft.AspNet.Diagnostics.Entity/project.json
@ -12,7 +12,8 @@
    "frameworks": {
        "dnx451": {
            "frameworkAssemblies": {
-                "System.Configuration": ""
+                "System.Configuration": "",
+                "System.Threading.Tasks": ""
            }
        },
        "dnxcore50": {