diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index 42c603e93f..df7f08f57d 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -51,7 +51,6 @@ parameters: codeSign: false variables: {} dependsOn: '' - # buildSteps: ''- don't define an empty object default because there is no way in template expression yet to check "if isEmpty(parameters.buildSteps)" # jobName: '' - use agentOs by default. # jobDisplayName: '' - use agentOs by default. # matrix: {} - don't define an empty object default because there is no way in template expression yet to check "if isEmpty(parameters.matrix)" @@ -59,7 +58,6 @@ parameters: publish: true path: 'artifacts/' buildDirectory: '' - buildSteps: [] jobs: - job: ${{ coalesce(parameters.jobName, parameters.agentOs) }} @@ -112,10 +110,10 @@ jobs: signType: $(_SignType) zipSources: false - ${{ parameters.beforeBuild }} - - ${{ if eq(parameters.agentOs, 'Windows')}}: + - ${{ if eq(parameters.agentOs, 'Windows') }}: - script: .\$(BuildDirectory)\build.cmd -ci /p:SignType=$(_SignType) /p:Configuration=$(BuildConfiguration) $(BuildScriptArgs) displayName: Run build.cmd - - ${{ if ne(parameters.agentOs, 'Windows')}}: + - ${{ if ne(parameters.agentOs, 'Windows') }}: - script: ./$(BuildDirectory)/build.sh -ci -p:Configuration=$(BuildConfiguration) $(BuildScriptArgs) displayName: Run build.sh - task: PublishTestResults@2 diff --git a/.azure/pipelines/project-ci.yml b/.azure/pipelines/project-ci.yml index fd0f20f20b..c08991dfc4 100644 --- a/.azure/pipelines/project-ci.yml +++ b/.azure/pipelines/project-ci.yml @@ -15,6 +15,7 @@ # This build definition is enabled for code signing. (Only applies to Windows) # buildDirectory: string # Specifies what directory to run build.sh/cmd + parameters: buildArgs: '' beforeBuild: [] @@ -27,6 +28,7 @@ parameters: Debug: BuildConfiguration: Debug buildDirectory: '' + jobs: - template: jobs/default-build.yml parameters: @@ -55,4 +57,4 @@ jobs: beforeBuild: ${{ parameters.beforeBuild }} afterBuild: ${{ parameters.afterBuild }} variables: ${{ parameters.variables }} - buildDirectory: ${{ parameters.buildDirectory }} \ No newline at end of file + buildDirectory: ${{ parameters.buildDirectory }} diff --git a/src/Installers/Windows/build.ps1 b/src/Installers/Windows/build.ps1 index c6493b84c2..f8df1c7192 100644 --- a/src/Installers/Windows/build.ps1 +++ b/src/Installers/Windows/build.ps1 @@ -13,6 +13,7 @@ param( [Alias("x64")] [string]$Runtime64Zip, [string]$BuildNumber = 't000', + [switch]$IsFinalBuild, [string]$SignType = '', [string]$PackageVersionPropsUrl = $null, [string]$AccessTokenSuffix = $null, @@ -89,6 +90,7 @@ try { "-p:Configuration=$Configuration" ` "-p:BuildNumber=$BuildNumber" ` "-p:SignType=$SignType" ` + "-p:IsFinalBuild=$IsFinalBuild" ` "-bl:$repoRoot/artifacts/logs/installers.msbuild.binlog" ` @msbuildArgs }