@@ -52,7 +52,7 @@ parameters:
52
52
condition : ' '
53
53
# jobName: '' - use agentOs by default.
54
54
# jobDisplayName: '' - use agentOs by default.
55
- artifacts : []
55
+ artifacts : []
56
56
buildDirectory : ' '
57
57
buildScript : ' '
58
58
installTar : true
80
80
enableMicrobuild : true
81
81
enablePublishBuildAssets : true
82
82
enablePublishUsingPipelines : ${{ variables._PublishUsingPipelines }}
83
- enablePublishTestResults : true # publish test results to AzDO (populates AzDO Tests tab)
83
+ enablePublishTestResults : ${{ eq(parameters.isTestingJob, ' true') }} # publish test results to AzDO (populates AzDO Tests tab)
84
84
enableTelemetry : true
85
85
helixRepo : dotnet/aspnetcore
86
86
helixType : build.product/
@@ -116,12 +116,13 @@ jobs:
116
116
- BuildScriptArgs : ${{ parameters.buildArgs }}
117
117
- _BuildConfig : ${{ parameters.configuration }}
118
118
- BuildConfiguration : ${{ parameters.configuration }}
119
- - BuildDirectory : ${{ parameters.buildDirectory }}
120
- - DOTNET_CLI_HOME : $(Agent.BuildDirectory)
119
+ - ${{ if eq(parameters.buildDirectory, '') }} :
120
+ - BuildDirectory : $(System.DefaultWorkingDirectory)
121
+ - ${{ if ne(parameters.buildDirectory, '') }} :
122
+ - BuildDirectory : ${{ parameters.buildDirectory }}
123
+ - DOTNET_CLI_HOME : $(System.DefaultWorkingDirectory)
121
124
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE : true
122
125
- TeamName : AspNetCore
123
- - ${{ if and(eq(parameters.installJdk, 'true'), eq(parameters.agentOs, 'Windows')) }} :
124
- - JAVA_HOME : $(Agent.BuildDirectory)\.tools\jdk\win-x64
125
126
- ${{ if or(ne(parameters.codeSign, true), ne(variables['System.TeamProject'], 'internal')) }} :
126
127
- _SignType : ' '
127
128
- ${{ if and(eq(parameters.codeSign, true), eq(variables['System.TeamProject'], 'internal')) }} :
@@ -164,6 +165,12 @@ jobs:
164
165
- ${{ if and(eq(parameters.installTar, 'true'), eq(parameters.agentOs, 'Windows')) }} :
165
166
- powershell : ./eng/scripts/InstallTar.ps1
166
167
displayName : Find or install Tar
168
+ - ${{ if eq(parameters.agentOs, 'Windows') }} :
169
+ - powershell : Write-Host "##vso[task.prependpath]$(DOTNET_CLI_HOME)\.dotnet\tools"
170
+ displayName : Add dotnet tools to path
171
+ - ${{ if ne(parameters.agentOs, 'Windows') }} :
172
+ - script : echo "##vso[task.prependpath]$(DOTNET_CLI_HOME)/.dotnet/tools"
173
+ displayName : Add dotnet tools to path
167
174
168
175
- ${{ parameters.beforeBuild }}
169
176
@@ -191,10 +198,10 @@ jobs:
191
198
- ${{ if eq(parameters.steps, '')}} :
192
199
- ${{ if eq(parameters.buildScript, '') }} :
193
200
- ${{ if eq(parameters.agentOs, 'Windows') }} :
194
- - script : .\ $(BuildDirectory)\build.cmd -ci -nobl -Configuration $(BuildConfiguration) $(BuildScriptArgs) /p:DotNetSignType=$(_SignType)
201
+ - script : $(BuildDirectory)\build.cmd -ci -nobl -Configuration $(BuildConfiguration) $(BuildScriptArgs) /p:DotNetSignType=$(_SignType)
195
202
displayName : Run build.cmd
196
203
- ${{ if ne(parameters.agentOs, 'Windows') }} :
197
- - script : ./ $(BuildDirectory)/build.sh --ci --nobl --configuration $(BuildConfiguration) $(BuildScriptArgs)
204
+ - script : $(BuildDirectory)/build.sh --ci --nobl --configuration $(BuildConfiguration) $(BuildScriptArgs)
198
205
displayName : Run build.sh
199
206
- ${{ if ne(parameters.buildScript, '') }} :
200
207
- script : $(BuildScript) -ci -nobl -Configuration $(BuildConfiguration) $(BuildScriptArgs)
@@ -232,29 +239,15 @@ jobs:
232
239
condition : and(or(succeeded(), eq('${{ artifact.publishOnError }}', 'true')), or(eq(variables['system.pullrequest.isfork'], false), eq('${{ artifact.includeForks }}', 'true')))
233
240
continueOnError : true
234
241
inputs :
235
- ${{ if eq(parameters.buildDirectory, '') }} :
236
- pathtoPublish : ${{ artifact.path }}
237
- ${{ if ne(parameters.buildDirectory, '') }} :
238
- pathtoPublish : ${{ parameters.buildDirectory }}\${{ artifact.path }}
242
+ pathtoPublish : $(BuildDirectory)/${{ artifact.path }}
239
243
${{ if eq(artifact.name, '') }} :
240
244
artifactName : artifacts-$(AgentOsName)-$(BuildConfiguration)
241
245
${{ if ne(artifact.name, '') }} :
242
246
artifactName : ${{ artifact.name }}
243
247
artifactType : Container
244
248
parallel : true
245
249
246
- - ${{ if eq(parameters.isTestingJob, true) }} :
247
- - task : PublishTestResults@2
248
- displayName : Publish VSTest test results
249
- condition : always()
250
- continueOnError : true
251
- inputs :
252
- testRunTitle : $(AgentOsName)-$(BuildConfiguration)
253
- testRunner : vstest
254
- testResultsFiles : ' **/artifacts/**/*.trx'
255
- mergeTestResults : true
256
- buildConfiguration : $(BuildConfiguration)
257
- buildPlatform : $(AgentOsName)
250
+ - ${{ if and(eq(parameters.isTestingJob, true), ne(parameters.jobName, 'Windows_Templates_Test')) }} :
258
251
- task : PublishTestResults@2
259
252
displayName : Publish js test results
260
253
condition : always()
@@ -263,12 +256,3 @@ jobs:
263
256
testResultsFiles : ' **/artifacts/log/**/*.junit.xml'
264
257
buildConfiguration : $(BuildConfiguration)
265
258
buildPlatform : $(AgentOsName)
266
- - task : PublishTestResults@2
267
- displayName : Publish Java test results
268
- condition : always()
269
- inputs :
270
- testRunner : junit
271
- testResultsFiles : ' **/TEST-junit-jupiter.xml'
272
- buildConfiguration : $(BuildConfiguration)
273
- buildPlatform : $(AgentOsName)
274
- mergeTestResults : true
0 commit comments