@@ -94,12 +94,22 @@ jobs:
94
94
${{ if ne(parameters.poolName, '') }} :
95
95
name : ${{ parameters.poolName }}
96
96
${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Windows')) }} :
97
- ${{ if or( eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest') ) }} :
97
+ ${{ if eq(variables['System.TeamProject'], 'public') }} :
98
98
name : NetCorePublic-Int-Pool
99
- queue : BuildPool.Windows.10.Amd64.VS2019.BT.Open
100
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }} :
99
+ ${{ if ne(parameters.isTestingJob, true) }} :
100
+ # Visual Studio Build Tools
101
+ queue : BuildPool.Windows.10.Amd64.VS2019.BT.Open
102
+ ${{ if eq(parameters.isTestingJob, true) }} :
103
+ # Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
104
+ queue : BuildPool.Windows.10.Amd64.VS2019.Open
105
+ ${{ if eq(variables['System.TeamProject'], 'internal') }} :
101
106
name : NetCoreInternal-Int-Pool
102
- queue : BuildPool.Windows.10.Amd64.VS2019.BT
107
+ ${{ if ne(parameters.isTestingJob, true) }} :
108
+ # Visual Studio Build Tools
109
+ queue : BuildPool.Windows.10.Amd64.VS2019.BT
110
+ ${{ if eq(parameters.isTestingJob, true) }} :
111
+ # Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
112
+ queue : BuildPool.Windows.10.Amd64.VS2019
103
113
variables :
104
114
AgentOsName : ${{ parameters.agentOs }}
105
115
ASPNETCORE_TEST_LOG_MAXPATH : " 200" # Keep test log file name length low enough for artifact zipping
@@ -112,10 +122,13 @@ jobs:
112
122
TeamName : AspNetCore
113
123
${{ if eq(parameters.agentOs, 'Windows') }} :
114
124
JAVA_HOME : $(Agent.BuildDirectory)\.tools\jdk
115
- ${{ if or(ne(parameters.codeSign, ' true' ), ne(variables['System.TeamProject'], 'internal')) }} :
125
+ ${{ if or(ne(parameters.codeSign, true), ne(variables['System.TeamProject'], 'internal')) }} :
116
126
_SignType : ' '
117
- ${{ if and(eq(parameters.codeSign, 'true'), eq(variables['System.TeamProject'], 'internal')) }} :
118
- _SignType : real
127
+ ${{ if and(eq(parameters.codeSign, true), eq(variables['System.TeamProject'], 'internal')) }} :
128
+ ${{ if ne(variables['Build.Reason'], 'PullRequest') }} :
129
+ _SignType : real
130
+ ${{ if eq(variables['Build.Reason'], 'PullRequest') }} :
131
+ _SignType : test
119
132
${{ insert }} : ${{ parameters.variables }}
120
133
steps :
121
134
- checkout : self
@@ -131,11 +144,11 @@ jobs:
131
144
Write-Host "##vso[task.prependpath]$env:JAVA_HOME\bin"
132
145
133
146
displayName: Install JDK 11
134
- - powershell : |
135
- Write-Host "##vso[task.setvariable variable=SeleniumProcessTrackingFolder]$(BuildDirectory)\obj\selenium\"
136
- ./eng/scripts/InstallGoogleChrome.ps1
137
-
138
- displayName: Install Chrome
147
+ - ${{ if eq(parameters.isTestingJob, true) }} :
148
+ - powershell : |
149
+ Write-Host "##vso[task.setvariable variable=SeleniumProcessTrackingFolder]$(BuildDirectory)\obj\selenium\"
150
+ ./eng/scripts/InstallGoogleChrome.ps1
151
+ displayName: Install Chrome
139
152
- ${{ if and(eq(variables['System.TeamProject'], 'internal'), eq(parameters.agentOs, 'Windows'), eq(parameters.codeSign, 'true')) }} :
140
153
- task : MicroBuildSigningPlugin@1
141
154
displayName : Install MicroBuild Signing plugin
0 commit comments