Skip to content

Backport pipeline configuration fixes from PRs #32781 and #32803#32806

Closed
Copilot wants to merge 3 commits intorelease/10.0.1xxfrom
copilot/backport-32781-32803
Closed

Backport pipeline configuration fixes from PRs #32781 and #32803#32806
Copilot wants to merge 3 commits intorelease/10.0.1xxfrom
copilot/backport-32781-32803

Conversation

Copy link
Contributor

Copilot AI commented Nov 21, 2025

Note

Are you waiting for the changes in this PR to be merged?
It would be very helpful if you could test the resulting artifacts from this PR and let us know in a comment if this change resolves your issue. Thank you!

Description of Change

Backports pipeline configuration improvements and storage token cleanup to improve CI/CD reliability, with adjustments for the target branch's authentication requirements.

Pipeline Variable Consolidation:

  • Simplified _OfficialBuildIdArgs to empty string for public builds
  • Changed build definition checks from Build.Reason to explicit Build.DefinitionName matching
  • Removed _InternalBuildArgs variable (no longer needed)

Variable Group Cleanup:

  • Removed DotNetBuilds storage account read tokens from ci-official.yml (redundant - dotnetbuilds-internal-container-read-token-base64 provided via provision step)
  • Kept DotNetBuilds storage account read tokens in common/variables.yml (provides dotnetbuilds-internal-container-read-token variable required by handlers.yml and build steps for internal feed access)
  • Removed DotNetBuilds storage account read tokens from maui-release-internal.yml
  • Moved MAUI variable group outside conditional scope for consistent availability

Feed URL Update:

  • Changed DotNetFeedUrl from https://dotnetbuilds.blob.core.windows.net/public to https://ci.dot.net/public
  • Fixed spacing in PrivateSdk property

Helix Configuration:

Issues Fixed

Backport of: #32781, #32803

Note: This backport differs from the original PRs by retaining the DotNetBuilds storage account read tokens variable group in common/variables.yml. This is necessary for the target branch to maintain authentication for internal Azure DevOps feeds accessed during build steps.

Original prompt

Can you backport #32781 and #32803 to the branch I've selected here


💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.

Co-authored-by: PureWeen <5375137+PureWeen@users.noreply.github.com>
Copilot AI changed the title [WIP] Backport changes from PR 32781 and 32803 Backport pipeline configuration fixes from PRs #32781 and #32803 Nov 21, 2025
Copilot AI requested a review from PureWeen November 21, 2025 18:41
@PureWeen PureWeen marked this pull request as ready for review November 21, 2025 19:21
Copilot AI review requested due to automatic review settings November 21, 2025 19:21
@PureWeen
Copy link
Member

/azp run

@azure-pipelines
Copy link

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR backports critical pipeline configuration improvements from PRs #32781 and #32803 to enhance CI/CD reliability by consolidating variables, cleaning up storage token references, and updating feed URLs.

Key Changes:

  • Simplified _OfficialBuildIdArgs to empty string for public builds while maintaining full configuration for official internal builds
  • Removed redundant DotNetBuilds storage account read tokens variable group across all pipeline files (token now provided via provision step)
  • Changed from Build.Reason checks to explicit Build.DefinitionName matching for more precise build definition identification

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated no comments.

Show a summary per file
File Description
src/DotNet/DotNet.csproj Updated DotNetFeedUrl from blob storage to ci.dot.net endpoint and corrected spacing in PrivateSdk property
eng/pipelines/maui-release-internal.yml Removed DotNetBuilds storage account read tokens variable group
eng/pipelines/common/variables.yml Removed _InternalBuildArgs variable, moved MAUI variable group outside conditional scope for consistent availability, and removed DotNetBuilds storage tokens
eng/pipelines/ci-official.yml Removed DotNetBuilds storage account read tokens variable group (token now provided via provision step at line 102)
eng/pipelines/arcade/variables.yml Simplified _OfficialBuildIdArgs to empty string for public builds, changed build checks from Build.Reason to explicit Build.DefinitionName matching for dotnet-maui and dotnet-maui-build pipelines

The dotnetbuilds-internal-container-read-token variable from this group is needed by handlers.yml and other build steps for accessing internal feeds.

Co-authored-by: PureWeen <5375137+PureWeen@users.noreply.github.com>
@PureWeen
Copy link
Member

/azp run

@azure-pipelines
Copy link

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

@dotnet dotnet deleted a comment from Copilot AI Nov 22, 2025
@PureWeen PureWeen closed this Nov 24, 2025
@github-actions github-actions bot locked and limited conversation to collaborators Dec 25, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants