@@ -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
@@ -121,12 +121,13 @@ jobs:
121121 - BuildScriptArgs : ${{ parameters.buildArgs }}
122122 - _BuildConfig : ${{ parameters.configuration }}
123123 - BuildConfiguration : ${{ parameters.configuration }}
124- - BuildDirectory : ${{ parameters.buildDirectory }}
125- - DOTNET_CLI_HOME : $(Agent.BuildDirectory)
124+ - ${{ if eq(parameters.buildDirectory, '') }} :
125+ - BuildDirectory : $(System.DefaultWorkingDirectory)
126+ - ${{ if ne(parameters.buildDirectory, '') }} :
127+ - BuildDirectory : ${{ parameters.buildDirectory }}
128+ - DOTNET_CLI_HOME : $(System.DefaultWorkingDirectory)
126129 - DOTNET_SKIP_FIRST_TIME_EXPERIENCE : true
127130 - TeamName : AspNetCore
128- - ${{ if and(eq(parameters.installJdk, 'true'), eq(parameters.agentOs, 'Windows')) }} :
129- - JAVA_HOME : $(Agent.BuildDirectory)\.tools\jdk\win-x64
130131 - ${{ if or(ne(parameters.codeSign, true), ne(variables['System.TeamProject'], 'internal')) }} :
131132 - _SignType : ' '
132133 - ${{ if and(eq(parameters.codeSign, true), eq(variables['System.TeamProject'], 'internal')) }} :
@@ -169,6 +170,12 @@ jobs:
169170 - ${{ if and(eq(parameters.installTar, 'true'), eq(parameters.agentOs, 'Windows')) }} :
170171 - powershell : ./eng/scripts/InstallTar.ps1
171172 displayName : Find or install Tar
173+ - ${{ if eq(parameters.agentOs, 'Windows') }} :
174+ - powershell : Write-Host "##vso[task.prependpath]$(DOTNET_CLI_HOME)\.dotnet\tools"
175+ displayName : Add dotnet tools '$(DOTNET_CLI_HOME)\.dotnet\tools' to path
176+ - ${{ if ne(parameters.agentOs, 'Windows') }} :
177+ - script : echo "##vso[task.prependpath]$(DOTNET_CLI_HOME)/.dotnet/tools"
178+ displayName : Add dotnet tools '$(DOTNET_CLI_HOME)/.dotnet/tools' to path
172179
173180 - ${{ parameters.beforeBuild }}
174181
@@ -196,10 +203,10 @@ jobs:
196203 - ${{ if eq(parameters.steps, '')}} :
197204 - ${{ if eq(parameters.buildScript, '') }} :
198205 - ${{ if eq(parameters.agentOs, 'Windows') }} :
199- - script : .\ $(BuildDirectory)\build.cmd -ci /p:DotNetSignType=$(_SignType) -Configuration $(BuildConfiguration) $(BuildScriptArgs)
206+ - script : $(BuildDirectory)\build.cmd -ci /p:DotNetSignType=$(_SignType) -Configuration $(BuildConfiguration) $(BuildScriptArgs)
200207 displayName : Run build.cmd
201208 - ${{ if ne(parameters.agentOs, 'Windows') }} :
202- - script : ./ $(BuildDirectory)/build.sh -ci -configuration $(BuildConfiguration) $(BuildScriptArgs)
209+ - script : $(BuildDirectory)/build.sh -ci -configuration $(BuildConfiguration) $(BuildScriptArgs)
203210 displayName : Run build.sh
204211 - ${{ if ne(parameters.buildScript, '') }} :
205212 - script : $(BuildScript) -Configuration $(BuildConfiguration) $(BuildScriptArgs)
@@ -237,10 +244,7 @@ jobs:
237244 condition : and(or(succeeded(), eq('${{ artifact.publishOnError }}', 'true')), or(eq(variables['system.pullrequest.isfork'], false), eq('${{ artifact.includeForks }}', 'true')))
238245 continueOnError : true
239246 inputs :
240- ${{ if eq(parameters.buildDirectory, '') }} :
241- pathtoPublish : ${{ artifact.path }}
242- ${{ if ne(parameters.buildDirectory, '') }} :
243- pathtoPublish : ${{ parameters.buildDirectory }}\${{ artifact.path }}
247+ pathtoPublish : $(BuildDirectory)\${{ artifact.path }}
244248 ${{ if eq(artifact.name, '') }} :
245249 artifactName : artifacts-$(AgentOsName)-$(BuildConfiguration)
246250 ${{ if ne(artifact.name, '') }} :
0 commit comments