From 8b45bb419c4c6371378318e043badcc4789535d7 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Thu, 21 May 2026 15:51:56 -0700 Subject: [PATCH] Bump patch version from 13.3.5 to 13.3.6 + backport release-version build tag * Bumps PatchVersion in eng/Versions.props from 5 to 6. * Updates Aspire.AppHost.Sdk version (13.3.5 -> 13.3.6) in tests/Shared/RepoTesting/Aspire.RepoTesting.targets. * Updates all Aspire.* PackageVersion entries (13.3.5 -> 13.3.6) in tests/Shared/RepoTesting/Directory.Packages.Helix.props. * Backports the small azure-pipelines.yml change from main (subset of PRs #17150 / #17236) that emits a 'release-version - ' AzDO build tag from the computeVersion step. The release-publish pipeline uses this tag to auto-derive ReleaseVersion at queue time. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- eng/Versions.props | 2 +- eng/pipelines/azure-pipelines.yml | 10 ++ .../RepoTesting/Aspire.RepoTesting.targets | 4 +- .../Directory.Packages.Helix.props | 142 +++++++++--------- 4 files changed, 84 insertions(+), 74 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index a9a08670fa3..a7315559562 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 13 3 - 5 + 6 $(MajorVersion).$(MinorVersion).$(PatchVersion) preview.1 net8.0 diff --git a/eng/pipelines/azure-pipelines.yml b/eng/pipelines/azure-pipelines.yml index 9657ce37517..6236639a1fb 100644 --- a/eng/pipelines/azure-pipelines.yml +++ b/eng/pipelines/azure-pipelines.yml @@ -369,6 +369,16 @@ extends: Write-Host "Detected Aspire version: $version (from $($nupkg.Name))" Write-Host "##vso[task.setvariable variable=aspireVersion;isOutput=true]$version" + + # Tag the build so the release pipeline can auto-derive ReleaseVersion + # without operators retyping it. The 'release-version - ' prefix avoids + # collisions with other custom build tags (e.g., 1ES compliance tags), + # and the tag is visible in the AzDO source-build picker so operators + # can verify the version at queue time. The format intentionally mirrors + # the ' - '-separated 'BAR ID - ' tag style: AzDO's 1ES PT request + # validator rejects ':' in tag names because the tag becomes part of the + # URL path of the addbuildtag REST call. + Write-Host "##vso[build.addbuildtag]release-version - $version" name: computeVersion displayName: 🟣Compute Aspire version from nupkg diff --git a/tests/Shared/RepoTesting/Aspire.RepoTesting.targets b/tests/Shared/RepoTesting/Aspire.RepoTesting.targets index 678b1c058f6..2075402539a 100644 --- a/tests/Shared/RepoTesting/Aspire.RepoTesting.targets +++ b/tests/Shared/RepoTesting/Aspire.RepoTesting.targets @@ -33,7 +33,7 @@ `AspireProjectOrPackageReference` - maps to projects in `src/` or `src/Components/` --> - + @@ -165,6 +165,6 @@ $(MajorVersion).$(MinorVersion).$(PatchVersion) - + diff --git a/tests/Shared/RepoTesting/Directory.Packages.Helix.props b/tests/Shared/RepoTesting/Directory.Packages.Helix.props index b10dcf7cd59..0df1fdcda29 100644 --- a/tests/Shared/RepoTesting/Directory.Packages.Helix.props +++ b/tests/Shared/RepoTesting/Directory.Packages.Helix.props @@ -3,81 +3,81 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + +