Merge branch 'release/2.1' into release/2.2

This commit is contained in:
John Luo 2019-06-07 14:21:57 -07:00
commit 5a698ae534
1 changed files with 1 additions and 1 deletions

View File

@ -91,6 +91,7 @@ jobs:
BuildScriptArgs: ${{ parameters.buildArgs }}
BuildConfiguration: ${{ parameters.configuration }}
BuildDirectory: ${{ parameters.buildDirectory }}
TeamName: AspNetCore
${{ if eq(parameters.agentOs, 'Windows') }}:
JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk
${{ if eq(parameters.agentOs, 'Linux') }}:
@ -98,7 +99,6 @@ jobs:
${{ if or(ne(parameters.codeSign, 'true'), ne(variables['System.TeamProject'], 'internal'), in(variables['Build.Reason'], 'PullRequest')) }}:
_SignType:
${{ if and(eq(parameters.codeSign, 'true'), eq(variables['System.TeamProject'], 'internal'), notin(variables['Build.Reason'], 'PullRequest')) }}:
TeamName: AspNetCore
_SignType: real
${{ insert }}: ${{ parameters.variables }}
steps: