[release/v7.4] Add rebuild branch support with conditional MSIX signing#26418
Merged
TravisEz13 merged 2 commits intoPowerShell:release/v7.4from Nov 11, 2025
Merged
Conversation
…26415) Co-authored-by: Copilot <[email protected]>
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR backports rebuild branch support from master to the release/v7.4 branch. The changes enable rebuild branches (e.g., rebuild/v7.4.13-rebuild.5) to be treated as preview builds, skipping LTS package generation and MSIX signing where appropriate.
Key changes:
- Adds a new
rebuild-branch-check.ymltemplate to detect rebuild branches via regex pattern matching - Updates package build templates to skip LTS package generation for rebuild branches
- Implements conditional MSIX signing based on the
OfficialBuildparameter - Modifies
channelSelection.ymlto force preview mode for rebuild branches
Reviewed Changes
Copilot reviewed 9 out of 9 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
.pipelines/templates/rebuild-branch-check.yml |
New template that detects rebuild branches and sets an output variable |
.pipelines/templates/windows-package-build.yml |
Integrates rebuild branch check to skip LTS packages |
.pipelines/templates/linux-package-build.yml |
Integrates rebuild branch check to skip LTS packages |
.pipelines/templates/mac-package-build.yml |
Integrates rebuild branch check to skip LTS packages |
.pipelines/templates/channelSelection.yml |
Forces preview mode for rebuild branches with duplicated regex check |
.pipelines/templates/package-create-msix.yml |
Adds conditional MSIX signing and improved XML handling with namespace manager |
.pipelines/PowerShell-Packages-Official.yml |
Passes OfficialBuild parameter to MSIX template |
.pipelines/PowerShell-Coordinated_Packages-Official.yml |
Integrates rebuild branch check for coordinated builds |
.pipelines/EV2Specs/ServiceGroupRoot/Shell/Run/Run.ps1 |
Prevents LTS package publication for rebuild versions |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
…lease/v7.4/26415-8b7e493dd
TravisEz13
added
the
CL-BuildPackaging
adityapatwardhan
approved these changes
Nov 11, 2025
5 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of #26415 to release/v7.4
Triggered by @TravisEz13 on behalf of @TravisEz13
Original CL Label: CL-BuildPackaging
/cc @PowerShell/powershell-maintainers
Impact
Tooling Impact
Adds rebuild branch support with conditional MSIX signing. This allows rebuild branches (e.g.,
rebuild/v7.4.13-rebuild.5) to be treated as preview builds and skip LTS package generation and MSIX signing appropriately.Regression
This is a new feature to support rebuild branches.
Testing
Verified by:
Risk
High risk due to changes across multiple pipeline templates affecting build, packaging, and release processes. However, changes only activate for rebuild branches (detected via branch naming pattern) and should not affect normal release or preview builds.
Merge Conflicts
Multiple files had conflicts during cherry-pick due to differences in code patterns between master and release/v7.4:
.pipelines/templates/channelSelection.ymlConflict: Metadata path difference
Root Cause: release/v7.4 uses
$repoRoot/tools/metadata.jsonwhile master uses/PowerShell/tools/metadata.jsonResolution: Used release branch path (``) to maintain consistency with release/v7.4 codebase
Conflict: Variable name
**Root Cause**: Line hadduplicated instead of reading bothandResolution: Fixed to properly read both
.LTSRelease.Latestand.StableRelease.Latest.pipelines/templates/linux-package-build.ymlConflict: LTS package check pattern
Root Cause: release/v7.4 uses
-eq 'True'comparison while master uses boolean-andResolution: Combined both patterns:
(.LTSRelease.Package -eq 'True') -and -notto maintain release branch's string comparison while adding rebuild branch check.pipelines/templates/mac-package-build.ymlConflict: Same LTS package check pattern as linux
Resolution: Applied same combined pattern as linux-package-build.yml
.pipelines/templates/package-create-msix.ymlConflict: XML node selection approach
Root Cause: release/v7.4 used simpler XPath (
//AppStoreName[@_locID]) andInnerTextmodification, while master uses namespace manager andSetAttributeResolution: Accepted master's namespace manager approach as it's more robust for handling XML with default namespaces
.pipelines/templates/windows-package-build.ymlConflict: Same LTS package check pattern as other package builds
Resolution: Applied same combined pattern:
(.LTSRelease.Package -eq 'True') -and -notAll conflicts resolved by preserving release/v7.4 code patterns where possible while integrating the new rebuild branch detection logic from the PR.