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

fix nginx deployer (#998) 

* fix nginx deployer

* pr feedback
This commit is contained in:
Andrew Stanton-Nurse 2017-03-30 15:31:07 -07:00 committed by GitHub
parent 7774ed50fa
commit b4b671556a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/NginxDeployer.cs
View File

@ -29,16 +29,18 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
using (Logger.BeginScope("Deploy")) using (Logger.BeginScope("Deploy"))
{ {
_configFile = Path.GetTempFileName(); _configFile = Path.GetTempFileName();
var uri = new Uri(DeploymentParameters.ApplicationBaseUriHint); var uri = string.IsNullOrEmpty(DeploymentParameters.ApplicationBaseUriHint) ?
TestUriHelper.BuildTestUri() :
new Uri(DeploymentParameters.ApplicationBaseUriHint);
var redirectUri = $"http://localhost:{TestUriHelper.GetNextPort()}"; var redirectUri = TestUriHelper.BuildTestUri();
if (DeploymentParameters.PublishApplicationBeforeDeployment) if (DeploymentParameters.PublishApplicationBeforeDeployment)
{ {
DotnetPublish(); DotnetPublish();
} }
var (appUri, exitToken) = await StartSelfHostAsync(new Uri(redirectUri)); var (appUri, exitToken) = await StartSelfHostAsync(redirectUri);
SetupNginx(appUri.ToString(), uri); SetupNginx(appUri.ToString(), uri);