Merge branch 'release' into dev

2016-04-15 07:39:49 -07:00 · 2016-04-15 07:39:49 -07:00 · df742cbd07
parent c1239acce2 ab50213acd
commit df742cbd07
1 changed files with 2 additions and 4 deletions
--- a/src/Microsoft.AspNetCore.Server.IISIntegration.Tools/project.json
+++ b/src/Microsoft.AspNetCore.Server.IISIntegration.Tools/project.json
@ -14,17 +14,15 @@
    "Microsoft.DotNet.ProjectModel": "1.0.0-*",
    "System.Diagnostics.Process": "4.1.0-*"
  },
-
  "frameworks": {
    "netcoreapp1.0": {
      "imports": [
-        "portable-net451+win8",
-        "dnxcore50"
+        "portable-dnxcore50+net45+win8+wp8+wpa81"
      ],
      "dependencies": {
        "Microsoft.NETCore.App": {
          "type": "platform",
-          "version": "1.0.0-rc2-23931"
+          "version": "1.0.0-*"
        }
      }
    }