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

Merge branch 'release' into dev

This commit is contained in:
John Luo 2016-04-11 09:58:29 -07:00
parent 797c05777d 03fcadc576
commit da08d2d9e2
4 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/WebSites/CorsMiddlewareWebSite/Startup.cs
View File

@ -24,7 +24,7 @@ namespace CorsMiddlewareWebSite
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseDefaultHostingConfiguration(args) .UseDefaultHostingConfiguration(args)
.UseKestrel() .UseKestrel()
.UseIISPlatformHandlerUrl() .UseIISIntegration()
.UseStartup<Startup>() .UseStartup<Startup>()
.Build(); .Build();

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

@ -2,21 +2,24 @@
"compilationOptions": { "compilationOptions": {
"emitEntryPoint": true "emitEntryPoint": true
}, },
"commands": {
"web": "CorsMiddlewareWebSite"
},
"dependencies": { "dependencies": {
"Microsoft.AspNetCore.Cors": "1.0.0-*", "Microsoft.AspNetCore.Cors": "1.0.0-*",
"Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*" "Microsoft.NETCore.Platforms": "1.0.1-*"
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"netstandardapp1.5": { "netstandardapp1.5": {
"dependencies": {
"NETStandard.Library": "1.5.0-*"
},
"imports": [ "imports": [
"dnxcore50" "dnxcore50"
] ]
} }
} },
"content": [
"web.config"
]
} }

9
test/WebSites/CorsMiddlewareWebSite/web.config Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0"?>
<configuration>
<system.webServer>
<handlers>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified" />
</handlers>
<aspNetCore processPath=".\CorsMiddlewareWebSite.exe" arguments="" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
</system.webServer>
</configuration>

9
test/WebSites/CorsMiddlewareWebSite/wwwroot/web.config
View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<system.webServer>
<handlers>
<add name="httpPlatformHandler" path="*" verb="*" modules="httpPlatformHandler" resourceType="Unspecified"/>
</handlers>
<httpPlatform processPath="%DNX_PATH%" arguments="%DNX_ARGS%" stdoutLogEnabled="false" startupTimeLimit="3600"/>
</system.webServer>
</configuration>