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:49:43 -07:00
parent b30cf982d1 8e8d7ad6b0
commit 10f0f0c64a
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
samples/IISSample/web.config
View File

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

2
test/TestSites/project.json
View File

@ -4,7 +4,7 @@
"emitEntryPoint": true "emitEntryPoint": true
}, },
"content": [ "content": [
"wwwroot/**/*" "web.config"
], ],
"dependencies": { "dependencies": {
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",

3
test/TestSites/wwwroot/web.config → test/TestSites/web.config
View File

@ -1,10 +1,11 @@
<?xml version="1.0"?>
<configuration> <configuration>
<system.webServer> <system.webServer>
<!-- This repository cannot use the iis publish tool because there's a bug in the installer if the tool package is a package reference --> <!-- This repository cannot use the iis publish tool because there's a bug in the installer if the tool package is a package reference -->
<!-- See https://github.com/dotnet/cli/issues/1215 --> <!-- See https://github.com/dotnet/cli/issues/1215 -->
<aspNetCore forwardWindowsAuthToken="true" processPath="..\TestSites.exe" stdoutLogEnabled="false" stdoutLogFile="..\logs\stdout.log" startupTimeLimit="3600" />
<handlers> <handlers>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified" /> <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified" />
</handlers> </handlers>
<aspNetCore processPath=".\TestSites.exe" arguments="" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="true" />
</system.webServer> </system.webServer>
</configuration> </configuration>