huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'release' into dev

This commit is contained in:
Pranav K 2016-04-08 06:49:33 -07:00
parent f5ba83bcef b984f46096
commit 8a4bcd9b4a
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/project.json
View File

@ -24,15 +24,14 @@
"Microsoft.EntityFrameworkCore.Relational": "1.0.0-*" "Microsoft.EntityFrameworkCore.Relational": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"net451": { }, "net451": {},
"netstandard1.3": { "netstandard1.3": {
"dependencies": { "dependencies": {
"System.ComponentModel.TypeConverter": "4.0.1-*" "System.ComponentModel.TypeConverter": "4.0.1-*"
}, },
"imports": [ "imports": [
"dotnet5.4",
"portable-net451+win8" "portable-net451+win8"
] ]
} }
} }
} }

1
src/Microsoft.AspNetCore.Identity/project.json
View File

@ -30,7 +30,6 @@
"System.Text.RegularExpressions": "4.0.12-*" "System.Text.RegularExpressions": "4.0.12-*"
}, },
"imports": [ "imports": [
"dotnet5.4",
"portable-net451+win8" "portable-net451+win8"
] ]
} }