|
|
@@ -52,7 +52,7 @@ parameters:
|
|
|
condition: ''
|
|
|
# jobName: '' - use agentOs by default.
|
|
|
# jobDisplayName: '' - use agentOs by default.
|
|
|
- artifacts: []
|
|
|
+ artifacts: []
|
|
|
buildDirectory: ''
|
|
|
buildScript: ''
|
|
|
installTar: true
|
|
|
@@ -80,7 +80,7 @@ jobs:
|
|
|
enableMicrobuild: true
|
|
|
enablePublishBuildAssets: true
|
|
|
enablePublishUsingPipelines: ${{ variables._PublishUsingPipelines }}
|
|
|
- enablePublishTestResults: true # publish test results to AzDO (populates AzDO Tests tab)
|
|
|
+ enablePublishTestResults: ${{ eq(parameters.isTestingJob, 'true') }} # publish test results to AzDO (populates AzDO Tests tab)
|
|
|
enableTelemetry: true
|
|
|
helixRepo: dotnet/aspnetcore
|
|
|
helixType: build.product/
|
|
|
@@ -116,12 +116,13 @@ jobs:
|
|
|
- BuildScriptArgs: ${{ parameters.buildArgs }}
|
|
|
- _BuildConfig: ${{ parameters.configuration }}
|
|
|
- BuildConfiguration: ${{ parameters.configuration }}
|
|
|
- - BuildDirectory: ${{ parameters.buildDirectory }}
|
|
|
- - DOTNET_CLI_HOME: $(Agent.BuildDirectory)
|
|
|
+ - ${{ if eq(parameters.buildDirectory, '') }}:
|
|
|
+ - BuildDirectory: $(System.DefaultWorkingDirectory)
|
|
|
+ - ${{ if ne(parameters.buildDirectory, '') }}:
|
|
|
+ - BuildDirectory: ${{ parameters.buildDirectory }}
|
|
|
+ - DOTNET_CLI_HOME: $(System.DefaultWorkingDirectory)
|
|
|
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
|
|
|
- TeamName: AspNetCore
|
|
|
- - ${{ if and(eq(parameters.installJdk, 'true'), eq(parameters.agentOs, 'Windows')) }}:
|
|
|
- - JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk\win-x64
|
|
|
- ${{ if or(ne(parameters.codeSign, true), ne(variables['System.TeamProject'], 'internal')) }}:
|
|
|
- _SignType: ''
|
|
|
- ${{ if and(eq(parameters.codeSign, true), eq(variables['System.TeamProject'], 'internal')) }}:
|
|
|
@@ -164,6 +165,12 @@ jobs:
|
|
|
- ${{ if and(eq(parameters.installTar, 'true'), eq(parameters.agentOs, 'Windows')) }}:
|
|
|
- powershell: ./eng/scripts/InstallTar.ps1
|
|
|
displayName: Find or install Tar
|
|
|
+ - ${{ if eq(parameters.agentOs, 'Windows') }}:
|
|
|
+ - powershell: Write-Host "##vso[task.prependpath]$(DOTNET_CLI_HOME)\.dotnet\tools"
|
|
|
+ displayName: Add dotnet tools to path
|
|
|
+ - ${{ if ne(parameters.agentOs, 'Windows') }}:
|
|
|
+ - script: echo "##vso[task.prependpath]$(DOTNET_CLI_HOME)/.dotnet/tools"
|
|
|
+ displayName: Add dotnet tools to path
|
|
|
|
|
|
- ${{ parameters.beforeBuild }}
|
|
|
|
|
|
@@ -191,10 +198,10 @@ jobs:
|
|
|
- ${{ if eq(parameters.steps, '')}}:
|
|
|
- ${{ if eq(parameters.buildScript, '') }}:
|
|
|
- ${{ if eq(parameters.agentOs, 'Windows') }}:
|
|
|
- - script: .\$(BuildDirectory)\build.cmd -ci -nobl -Configuration $(BuildConfiguration) $(BuildScriptArgs) /p:DotNetSignType=$(_SignType)
|
|
|
+ - script: $(BuildDirectory)\build.cmd -ci -nobl -Configuration $(BuildConfiguration) $(BuildScriptArgs) /p:DotNetSignType=$(_SignType)
|
|
|
displayName: Run build.cmd
|
|
|
- ${{ if ne(parameters.agentOs, 'Windows') }}:
|
|
|
- - script: ./$(BuildDirectory)/build.sh --ci --nobl --configuration $(BuildConfiguration) $(BuildScriptArgs)
|
|
|
+ - script: $(BuildDirectory)/build.sh --ci --nobl --configuration $(BuildConfiguration) $(BuildScriptArgs)
|
|
|
displayName: Run build.sh
|
|
|
- ${{ if ne(parameters.buildScript, '') }}:
|
|
|
- script: $(BuildScript) -ci -nobl -Configuration $(BuildConfiguration) $(BuildScriptArgs)
|
|
|
@@ -232,10 +239,7 @@ jobs:
|
|
|
condition: and(or(succeeded(), eq('${{ artifact.publishOnError }}', 'true')), or(eq(variables['system.pullrequest.isfork'], false), eq('${{ artifact.includeForks }}', 'true')))
|
|
|
continueOnError: true
|
|
|
inputs:
|
|
|
- ${{ if eq(parameters.buildDirectory, '') }}:
|
|
|
- pathtoPublish: ${{ artifact.path }}
|
|
|
- ${{ if ne(parameters.buildDirectory, '') }}:
|
|
|
- pathtoPublish: ${{ parameters.buildDirectory }}\${{ artifact.path }}
|
|
|
+ pathtoPublish: $(BuildDirectory)/${{ artifact.path }}
|
|
|
${{ if eq(artifact.name, '') }}:
|
|
|
artifactName: artifacts-$(AgentOsName)-$(BuildConfiguration)
|
|
|
${{ if ne(artifact.name, '') }}:
|
|
|
@@ -243,18 +247,7 @@ jobs:
|
|
|
artifactType: Container
|
|
|
parallel: true
|
|
|
|
|
|
- - ${{ if eq(parameters.isTestingJob, true) }}:
|
|
|
- - task: PublishTestResults@2
|
|
|
- displayName: Publish VSTest test results
|
|
|
- condition: always()
|
|
|
- continueOnError: true
|
|
|
- inputs:
|
|
|
- testRunTitle: $(AgentOsName)-$(BuildConfiguration)
|
|
|
- testRunner: vstest
|
|
|
- testResultsFiles: '**/artifacts/**/*.trx'
|
|
|
- mergeTestResults: true
|
|
|
- buildConfiguration: $(BuildConfiguration)
|
|
|
- buildPlatform: $(AgentOsName)
|
|
|
+ - ${{ if and(eq(parameters.isTestingJob, true), ne(parameters.jobName, 'Windows_Templates_Test')) }}:
|
|
|
- task: PublishTestResults@2
|
|
|
displayName: Publish js test results
|
|
|
condition: always()
|
|
|
@@ -263,12 +256,3 @@ jobs:
|
|
|
testResultsFiles: '**/artifacts/log/**/*.junit.xml'
|
|
|
buildConfiguration: $(BuildConfiguration)
|
|
|
buildPlatform: $(AgentOsName)
|
|
|
- - task: PublishTestResults@2
|
|
|
- displayName: Publish Java test results
|
|
|
- condition: always()
|
|
|
- inputs:
|
|
|
- testRunner: junit
|
|
|
- testResultsFiles: '**/TEST-junit-jupiter.xml'
|
|
|
- buildConfiguration: $(BuildConfiguration)
|
|
|
- buildPlatform: $(AgentOsName)
|
|
|
- mergeTestResults: true
|