Skip to content

Restore OfficialBuildId for proper CI versioning #33209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jfversluis wants to merge 4 commits into
base: main
Choose a base branch
from
+12 −8
Open

Restore OfficialBuildId for proper CI versioning #33209

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c091b6
Restore default OfficialBuildId for proper versioning
jfversluis Dec 18, 2025
79911a2
Fix typo: _BuildOfficalId -> _BuildOfficialId
jfversluis Dec 18, 2025
5dcc9e1
Enable full versioning for PR builds
jfversluis Dec 18, 2025
8548976
Include PR number in package version for PR builds
jfversluis Dec 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eng/pipelines/arcade/variables.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/ci-official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/common/sdk-insertion.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'))
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/common/variables.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/handlers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
Loading