Merge branch 'release' into dev

2016-04-08 06:49:22 -07:00 · 2016-04-08 06:49:22 -07:00 · 730a23e5ca
parent 4316282a3f e06a0f0898
commit 730a23e5ca
2 changed files with 2 additions and 8 deletions
--- a/src/Microsoft.AspNetCore.WebSockets.Protocol/project.json
+++ b/src/Microsoft.AspNetCore.WebSockets.Protocol/project.json
@ -30,10 +30,7 @@
        "System.Threading": "4.0.11-*",
        "System.Threading.Tasks": "4.0.11-*",
        "System.Threading.Timer": "4.0.1-*"
-      },
-      "imports": [
-        "dotnet5.4"
-      ]
+      }
    }
  }
 }
--- a/src/Microsoft.AspNetCore.WebSockets.Server/project.json
+++ b/src/Microsoft.AspNetCore.WebSockets.Server/project.json
@ -21,10 +21,7 @@
  "frameworks": {
    "net451": {},
    "netstandard1.3": {
-      "dependencies": {},
-      "imports": [
-        "dotnet5.4"
-      ]
+      "dependencies": {}
    }
  }
 }