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

Merge remote-tracking branch 'origin/rel/2.0.0-preview2' into dev

This commit is contained in:
Mike Harder 2017-06-13 10:40:19 -07:00
parent 86c31c5dc3 78877b6ba2
commit 3763aba85c
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/SelfHostDeployer.cs
View File

@ -96,7 +96,14 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
var targetFramework = DeploymentParameters.TargetFramework ?? (DeploymentParameters.RuntimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.0"); var targetFramework = DeploymentParameters.TargetFramework ?? (DeploymentParameters.RuntimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.0");
executableName = DotnetCommandName; executableName = DotnetCommandName;
executableArgs = $"run --framework {targetFramework} {DotnetArgumentSeparator}"; executableArgs = $"run --framework {targetFramework}";
// Workaround for:
// Publish fails on app with project reference to netstandard2.0 class library
// https://github.com/dotnet/cli/issues/6843
executableArgs += " --no-restore";
executableArgs += $" {DotnetArgumentSeparator}";
} }
executableArgs += $" --server.urls {hintUrl} " executableArgs += $" --server.urls {hintUrl} "