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-05-06 17:25:13 -07:00
parent 4cad0a2f01 3337c288c7
commit 06e23558d2
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.AspNetCore.Server.Testing/Common/DeploymentParameters.cs
View File

@ -69,6 +69,8 @@ namespace Microsoft.AspNetCore.Server.Testing
public string ApplicationPath { get; set; } public string ApplicationPath { get; set; }
public string TargetFramework { get; set; }
/// <summary> /// <summary>
/// To publish the application before deployment. /// To publish the application before deployment.
/// </summary> /// </summary>
@ -76,8 +78,6 @@ namespace Microsoft.AspNetCore.Server.Testing
public ApplicationType ApplicationType { get; set; } public ApplicationType ApplicationType { get; set; }
public string PublishTargetFramework { get; set; }
public string PublishedApplicationRootPath { get; set; } public string PublishedApplicationRootPath { get; set; }
/// <summary> /// <summary>

4
src/Microsoft.AspNetCore.Server.Testing/Deployers/ApplicationDeployer.cs
View File

@ -40,7 +40,7 @@ namespace Microsoft.AspNetCore.Server.Testing
protected void DotnetPublish(string publishRoot = null) protected void DotnetPublish(string publishRoot = null)
{ {
if (string.IsNullOrEmpty(DeploymentParameters.PublishTargetFramework)) if (string.IsNullOrEmpty(DeploymentParameters.TargetFramework))
{ {
throw new Exception($"A target framework must be specified in the deployment parameters for applications that require publishing before deployment"); throw new Exception($"A target framework must be specified in the deployment parameters for applications that require publishing before deployment");
} }
@ -49,7 +49,7 @@ namespace Microsoft.AspNetCore.Server.Testing
var parameters = $"publish \"{DeploymentParameters.ApplicationPath}\"" var parameters = $"publish \"{DeploymentParameters.ApplicationPath}\""
+ $" -o \"{DeploymentParameters.PublishedApplicationRootPath}\"" + $" -o \"{DeploymentParameters.PublishedApplicationRootPath}\""
+ $" --framework {DeploymentParameters.PublishTargetFramework}"; + $" --framework {DeploymentParameters.TargetFramework}";
Logger.LogInformation($"Executing command {DotnetCommandName} {parameters}"); Logger.LogInformation($"Executing command {DotnetCommandName} {parameters}");

4
src/Microsoft.AspNetCore.Server.Testing/Deployers/SelfHostDeployer.cs
View File

@ -74,8 +74,10 @@ namespace Microsoft.AspNetCore.Server.Testing
} }
else else
{ {
var targetFramework = DeploymentParameters.TargetFramework ?? (DeploymentParameters.RuntimeFlavor == RuntimeFlavor.Clr ? "net451" : "netcoreapp1.0");
executableName = DotnetCommandName; executableName = DotnetCommandName;
executableArgs = $"run -p \"{DeploymentParameters.ApplicationPath}\" {DotnetArgumentSeparator}"; executableArgs = $"run -p \"{DeploymentParameters.ApplicationPath}\" --framework {targetFramework} {DotnetArgumentSeparator}";
} }
executableArgs += $" --server.urls {uri} " executableArgs += $" --server.urls {uri} "