Merge branch 'release' into dev

2016-04-08 06:49:33 -07:00 · 2016-04-08 06:49:33 -07:00 · 8a4bcd9b4a
parent f5ba83bcef b984f46096
commit 8a4bcd9b4a
2 changed files with 2 additions and 4 deletions
--- a/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/project.json
+++ b/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/project.json
@ -24,15 +24,14 @@
    "Microsoft.EntityFrameworkCore.Relational": "1.0.0-*"
  },
  "frameworks": {
-    "net451": { },
+    "net451": {},
    "netstandard1.3": {
      "dependencies": {
        "System.ComponentModel.TypeConverter": "4.0.1-*"
      },
      "imports": [
-        "dotnet5.4",
        "portable-net451+win8"
      ]
    }
  }
-}
+}
--- a/src/Microsoft.AspNetCore.Identity/project.json
+++ b/src/Microsoft.AspNetCore.Identity/project.json
@ -30,7 +30,6 @@
        "System.Text.RegularExpressions": "4.0.12-*"
      },
      "imports": [
-        "dotnet5.4",
        "portable-net451+win8"
      ]
    }