Skip to content
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

[ci] Set OfficialBuildId when building asset manifests #23102

Merged
merged 1 commit into from
Jun 21, 2024
Merged

[ci] Set OfficialBuildId when building asset manifests #23102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions eng/pipelines/common/sdk-insertion.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ jobs:
projects: $(Build.SourcesDirectory)\src\Workload\Microsoft.Maui.Sdk\Microsoft.Maui.Sdk.csproj
arguments: >-
-t:PushManifestToBuildAssetRegistry
-p:OfficialBuildId=$(_BuildOfficalId)
-p:BuildAssetRegistryToken=$(MaestroAccessToken)
-p:OutputPath=$(Build.StagingDirectory)\nuget-signed\
-v:n -bl:$(Build.StagingDirectory)\binlogs\push-bar-manifest.binlog
Expand Down
2 changes: 2 additions & 0 deletions eng/pipelines/common/variables.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
variables:
- name: BuildVersion
value: $[counter('buildversion-counter', 5000)]
- name: _BuildOfficalId
value: $[ format('{0}.{1}', format('{0:yyyyMMdd}', pipeline.startTime), counter(format('{0:yyyyMMdd}', pipeline.startTime), 1) )]
- name: NUGET_VERSION
value: 6.4.0
- name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
Expand Down
4 changes: 1 addition & 3 deletions eng/pipelines/maui-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,7 @@ extends:
value: $(Build.SourcesDirectory)/build.cmd -ci
- name: _BuildConfig
value: Release
- name: _BuildOfficalId
value: $[ format('{0}.{1}', format('{0:yyyyMMdd}', pipeline.startTime), counter(format('{0:yyyyMMdd}', pipeline.startTime), 1) )]


steps:
- template: /eng/pipelines/common/pack.yml@self
parameters:
Expand Down
6 changes: 4 additions & 2 deletions src/Workload/Shared/Maestro.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,17 @@
AssetManifestPath="$(AssetManifestPath)"
PublishingVersion="3" />

<Message Text="BAR manifest version: $(PackageReferenceVersion)" />

<MSBuild
Targets="Restore"
Projects="$(PkgMicrosoft_DotNet_Arcade_Sdk)\tools\SdkTasks\PublishBuildAssets.proj"
Properties="Configuration=$(Configuration);RepoRoot=$(MauiRootDirectory);VersionPrefix=$(Version)"
Properties="Configuration=$(Configuration);RepoRoot=$(MauiRootDirectory);VersionPrefix=$(PackageReferenceVersion)"
/>

<MSBuild
Projects="$(PkgMicrosoft_DotNet_Arcade_Sdk)\tools\SdkTasks\PublishBuildAssets.proj"
Properties="Configuration=$(Configuration);RepoRoot=$(MauiRootDirectory);VersionPrefix=$(Version);ManifestsPath=$(ArtifactsLogDir)AssetManifest;MaestroApiEndpoint=https://maestro.dot.net"
Properties="Configuration=$(Configuration);RepoRoot=$(MauiRootDirectory);VersionPrefix=$(PackageReferenceVersion);ManifestsPath=$(ArtifactsLogDir)AssetManifest;MaestroApiEndpoint=https://maestro.dot.net"
/>
</Target>

Expand Down
Loading