|
6 | 6 | # jobDisplayName: string
|
7 | 7 | # The friendly job name to display in the UI. Defaults to the name of the OS.
|
8 | 8 | # poolName: string
|
9 |
| -# The name of the VSTS agent queue to use. |
| 9 | +# The name of the Azure DevOps agent pool to use. |
10 | 10 | # agentOs: string
|
11 | 11 | # Used in templates to define variables which are OS specific. Typically from the set { Windows, Linux, macOS }
|
12 | 12 | # buildArgs: string
|
@@ -77,10 +77,10 @@ jobs:
|
77 | 77 | ${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Linux')) }}:
|
78 | 78 | vmImage: ubuntu-16.04
|
79 | 79 | ${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Windows')) }}:
|
80 |
| - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: |
| 80 | + ${{ if eq(variables['System.TeamProject'], 'public') }}: |
81 | 81 | name: NetCorePublic-Int-Pool
|
82 | 82 | queue: BuildPool.Windows.10.Amd64.VS2017.Open
|
83 |
| - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: |
| 83 | + ${{ if ne(variables['System.TeamProject'], 'public') }}: |
84 | 84 | name: NetCoreInternal-Int-Pool
|
85 | 85 | queue: BuildPool.Windows.10.Amd64.VS2017
|
86 | 86 | variables:
|
|
93 | 93 | BuildDirectory: ${{ parameters.buildDirectory }}
|
94 | 94 | ${{ if eq(parameters.agentOs, 'Windows') }}:
|
95 | 95 | JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk
|
96 |
| - ${{ if or(ne(parameters.codeSign, 'true'), ne(variables['System.TeamProject'], 'internal')) }}: |
| 96 | + ${{ if or(ne(parameters.codeSign, 'true'), ne(variables['System.TeamProject'], 'internal'), in(variables['Build.Reason'], 'PullRequest')) }}: |
97 | 97 | _SignType:
|
98 |
| - ${{ if and(eq(parameters.codeSign, 'true'), eq(variables['System.TeamProject'], 'internal')) }}: |
| 98 | + ${{ if and(eq(parameters.codeSign, 'true'), eq(variables['System.TeamProject'], 'internal'), notin(variables['Build.Reason'], 'PullRequest')) }}: |
99 | 99 | TeamName: AspNetCore
|
100 | 100 | _SignType: real
|
101 | 101 | ${{ insert }}: ${{ parameters.variables }}
|
|
0 commit comments