Merge branch 'release/2.1' into release/2.2

.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

.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 }}
+    buildDirectory: ${{ parameters.buildDirectory }}

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
     }