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-12 16:59:57 -07:00
parent 9a50ceb41b 007e3b6b51
commit 86c31c5dc3
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/ApplicationDeployer.cs
View File

@ -56,6 +56,11 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
+ $" --framework {DeploymentParameters.TargetFramework}" + $" --framework {DeploymentParameters.TargetFramework}"
+ $" --configuration {DeploymentParameters.Configuration}"; + $" --configuration {DeploymentParameters.Configuration}";
// Workaround for:
// Publish fails on app with project reference to netstandard2.0 class library
// https://github.com/dotnet/cli/issues/6843
parameters += " --no-restore";
if (DeploymentParameters.ApplicationType == ApplicationType.Standalone) if (DeploymentParameters.ApplicationType == ApplicationType.Standalone)
{ {
parameters += $" --runtime {GetRuntimeIdentifier()}"; parameters += $" --runtime {GetRuntimeIdentifier()}";