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:01 -07:00
parent 1e36bfac8d 29a8d5b7c5
commit 136da7a245
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Microsoft.AspNetCore.Server.Kestrel.Https/project.json
View File

@ -22,7 +22,6 @@
"System.Net.Security": "4.0.0-*" "System.Net.Security": "4.0.0-*"
}, },
"imports": [ "imports": [
"dotnet5.4",
"portable-net45+win8" "portable-net45+win8"
] ]
} }

9
src/Microsoft.AspNetCore.Server.Kestrel/project.json
View File

@ -28,8 +28,12 @@
"frameworks": { "frameworks": {
"net451": { "net451": {
"frameworkAssemblies": { "frameworkAssemblies": {
"System.Runtime": { "type": "build" }, "System.Runtime": {
"System.Threading.Tasks": { "type": "build" } "type": "build"
},
"System.Threading.Tasks": {
"type": "build"
}
} }
}, },
"netstandard1.3": { "netstandard1.3": {
@ -50,7 +54,6 @@
"System.Threading.Timer": "4.0.1-*" "System.Threading.Timer": "4.0.1-*"
}, },
"imports": [ "imports": [
"dotnet5.4",
"portable-net45+win8" "portable-net45+win8"
] ]
} }