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-18 17:02:49 -07:00
parent dbf925ec0c 67ea570e87
commit 4ab5b3b76b
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-*",
"CorsMiddlewareWebSite": "1.0.0-*", "CorsMiddlewareWebSite": "1.0.0-*",
"Microsoft.AspNetCore.Cors": "1.0.0-*", "Microsoft.AspNetCore.Cors": "1.0.0-*",
"Microsoft.AspNetCore.TestHost": "1.0.0-*", "Microsoft.AspNetCore.TestHost": "1.0.0-*",

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

@ -3,6 +3,7 @@
"emitEntryPoint": true "emitEntryPoint": true
}, },
"dependencies": { "dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.Cors": "1.0.0-*", "Microsoft.AspNetCore.Cors": "1.0.0-*",
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*" "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"