Restore OfficialBuildId for proper CI versioning

eng/pipelines/arcade/variables.yml

@@ -20,12 +20,12 @@ variables:
   value: powershell -ExecutionPolicy ByPass -NoProfile $(Build.SourcesDirectory)\eng\common\msbuild.ps1 -ci
 - name: _msbuildMacOsCommand
   value: $(Build.SourcesDirectory)/eng/common/msbuild.sh --ci
-- name: _BuildOfficalId
+- name: _BuildOfficialId
   value: $[ format('{0}.{1}', format('{0:yyyyMMdd}', pipeline.startTime), counter(format('{0:yyyyMMdd}', pipeline.startTime), 1) )]
 - name: TreatWarningsAsErrors
   value: false
 - name: _OfficialBuildIdArgs
-  value: ''
+  value: /p:OfficialBuildId=$(_BuildOfficialId) /p:_SkipUpdateBuildNumber=true
 - name: ApiScanAppId
   value: cbde2fca-1ca1-47f7-8212-fcdf1a556eb2
 - name: ApiScanTenantId
@@ -38,12 +38,16 @@ variables:
   - name: _PublishArgs
     value: ''
   - name: _OfficialBuildIdArgs
-    value: ''
+    value: /p:OfficialBuildId=$(_BuildOfficialId) /p:_SkipUpdateBuildNumber=true
   # needed for signing
   - name: _SignType
     value: test
   - name: _SignArgs
     value: '/p:DotNetSignType=$(_SignType) /p:TeamName=$(TeamName)'
+# PR builds get a distinct version label
+- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+  - name: _OfficialBuildIdArgs
+    value: /p:OfficialBuildId=$(_BuildOfficialId) /p:_SkipUpdateBuildNumber=true /p:PreReleaseVersionLabel=ci.pr$(System.PullRequest.PullRequestNumber)
 # Set up non-PR build from internal project
 - ${{ if or(eq(variables['Build.DefinitionName'], 'dotnet-maui'), eq(variables['Build.DefinitionName'], 'dotnet-maui-build')) }}:
   # needed for darc (dependency flow) publishing

eng/pipelines/ci-official.yml

@@ -81,7 +81,7 @@ extends:
         enableMicrobuild: true
         publishAssets: true
         sourceIndexParams:
-          sourceIndexBuildCommand: build.cmd -restore -build -ci /bl:$(Build.Arcade.LogsPath)sourceIndexBuild.binlog /p:OfficialBuildId=$(_BuildOfficalId) /p:_SkipUpdateBuildNumber=true
+          sourceIndexBuildCommand: build.cmd -restore -build -ci /bl:$(Build.Arcade.LogsPath)sourceIndexBuild.binlog /p:OfficialBuildId=$(_BuildOfficialId) /p:_SkipUpdateBuildNumber=true
           binlogPath: $(Build.Arcade.LogsPath)sourceIndexBuild.binlog
         prepareSteps:
         - template: /eng/pipelines/common/provision.yml@self

eng/pipelines/common/sdk-insertion.yml

@@ -73,7 +73,7 @@ jobs:
       inlineScript: >-
         dotnet build $(Build.SourcesDirectory)\src\Workload\Microsoft.Maui.Sdk\Microsoft.Maui.Sdk.csproj
         -t:PushManifestToBuildAssetRegistry
-        -p:OfficialBuildId=$(_BuildOfficalId)
+        -p:OfficialBuildId=$(_BuildOfficialId)
         -p:OutputPath=${{ parameters.nugetArtifactPath }}
         -v:n -bl:$(Build.StagingDirectory)\binlogs\push-bar-manifest.binlog
     condition: and(succeeded(), eq('${{ parameters.pushMauiPackagesToMaestro }}', 'true'))

eng/pipelines/common/variables.yml

@@ -1,7 +1,7 @@
 variables:
 - name: BuildVersion
   value: $[counter('buildversion-counter', 5000)]
-- name: _BuildOfficalId
+- name: _BuildOfficialId
   value: $[ format('{0}.{1}', format('{0:yyyyMMdd}', pipeline.startTime), counter(format('{0:yyyyMMdd}', pipeline.startTime), 1) )]
 - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
   value: true

eng/pipelines/handlers.yml

@@ -204,7 +204,7 @@ stages:
         value: $(Build.SourcesDirectory)/build.cmd -ci
       - name: _BuildConfig
         value: Release
-      - name: _BuildOfficalId
+      - name: _BuildOfficialId
         value: $[ format('{0}.{1}', format('{0:yyyyMMdd}', pipeline.startTime), counter(format('{0:yyyyMMdd}', pipeline.startTime), 1) )]
 
       steps:
@@ -221,7 +221,7 @@ stages:
           repoArtifactsPath: $(Build.Arcade.ArtifactsPath)
           repoLogPath: $(Build.Arcade.LogsPath)
           repoTestResultsPath: $(Build.Arcade.TestResultsPath)
-          officialBuildId: $(_BuildOfficalId)
+          officialBuildId: $(_BuildOfficialId)
           prepareSteps:
           - template: common/provision.yml
             parameters: