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

Merge branch 'release' into dev

This commit is contained in:
Pavel Krymets 2016-04-14 16:40:17 -07:00
parent dfca01d2b7 e720824bfd
commit 32d0994ebe
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
samples/StaticFileSample/project.json
View File

@ -6,14 +6,16 @@
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*",
"Microsoft.Extensions.Logging.Console": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*"
"Microsoft.Extensions.Logging.Console": "1.0.0-*"
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"netcoreapp1.0": {
"dependencies": {
"NETStandard.Library": "1.5.0-*"
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
},
"imports": [
"dnxcore50"

7
test/Microsoft.AspNetCore.StaticFiles.Tests/project.json
View File

@ -15,10 +15,13 @@
"xunit": "2.1.0"
},
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"dotnet-test-xunit": "1.0.0-dev-*",
"NETStandard.Library": "1.5.0-*",
"System.Diagnostics.Process": "4.1.0-*"
},
"imports": [