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:19:22 -07:00
parent da08d2d9e2 80f6654911
commit dbf925ec0c
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/Microsoft.AspNetCore.Cors.Test/project.json
View File

@ -9,12 +9,16 @@
},
"testRunner": "xunit",
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"dotnet-test-xunit": "1.0.0-dev-*",
"moq.netcore": "4.4.0-beta8",
"NETStandard.Library": "1.5.0-*",
"System.Diagnostics.Process": "4.1.0-*"
"System.Diagnostics.Process": "4.1.0-*",
"System.Diagnostics.TraceSource": "4.0.0-*"
},
"imports": [
"dnxcore50",

10
test/WebSites/CorsMiddlewareWebSite/project.json
View File

@ -5,14 +5,16 @@
"dependencies": {
"Microsoft.AspNetCore.Cors": "1.0.0-*",
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*"
"Microsoft.AspNetCore.Server.Kestrel": "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"