@@ -52,7 +52,7 @@ parameters:
5252 condition : ' '
5353 # jobName: '' - use agentOs by default.
5454 # jobDisplayName: '' - use agentOs by default.
55- artifacts : []
55+ artifacts : []
5656 buildDirectory : ' '
5757 buildScript : ' '
5858 installTar : true
8080 enableMicrobuild : true
8181 enablePublishBuildAssets : true
8282 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)
8484 enableTelemetry : true
8585 helixRepo : dotnet/aspnetcore
8686 helixType : build.product/
@@ -116,12 +116,13 @@ jobs:
116116 - BuildScriptArgs : ${{ parameters.buildArgs }}
117117 - _BuildConfig : ${{ parameters.configuration }}
118118 - 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)
121124 - DOTNET_SKIP_FIRST_TIME_EXPERIENCE : true
122125 - TeamName : AspNetCore
123- - ${{ if and(eq(parameters.installJdk, 'true'), eq(parameters.agentOs, 'Windows')) }} :
124- - JAVA_HOME : $(Agent.BuildDirectory)\.tools\jdk\win-x64
125126 - ${{ if or(ne(parameters.codeSign, true), ne(variables['System.TeamProject'], 'internal')) }} :
126127 - _SignType : ' '
127128 - ${{ if and(eq(parameters.codeSign, true), eq(variables['System.TeamProject'], 'internal')) }} :
@@ -164,6 +165,12 @@ jobs:
164165 - ${{ if and(eq(parameters.installTar, 'true'), eq(parameters.agentOs, 'Windows')) }} :
165166 - powershell : ./eng/scripts/InstallTar.ps1
166167 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
167174
168175 - ${{ parameters.beforeBuild }}
169176
@@ -191,10 +198,10 @@ jobs:
191198 - ${{ if eq(parameters.steps, '')}} :
192199 - ${{ if eq(parameters.buildScript, '') }} :
193200 - ${{ 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)
195202 displayName : Run build.cmd
196203 - ${{ 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)
198205 displayName : Run build.sh
199206 - ${{ if ne(parameters.buildScript, '') }} :
200207 - script : $(BuildScript) -ci -nobl -Configuration $(BuildConfiguration) $(BuildScriptArgs)
@@ -232,29 +239,15 @@ jobs:
232239 condition : and(or(succeeded(), eq('${{ artifact.publishOnError }}', 'true')), or(eq(variables['system.pullrequest.isfork'], false), eq('${{ artifact.includeForks }}', 'true')))
233240 continueOnError : true
234241 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 }}
239243 ${{ if eq(artifact.name, '') }} :
240244 artifactName : artifacts-$(AgentOsName)-$(BuildConfiguration)
241245 ${{ if ne(artifact.name, '') }} :
242246 artifactName : ${{ artifact.name }}
243247 artifactType : Container
244248 parallel : true
245249
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')) }} :
258251 - task : PublishTestResults@2
259252 displayName : Publish js test results
260253 condition : always()
@@ -263,12 +256,3 @@ jobs:
263256 testResultsFiles : ' **/artifacts/log/**/*.junit.xml'
264257 buildConfiguration : $(BuildConfiguration)
265258 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