Fix the conflict resolution error in 7.6.5 branch - #27820
Merged
Dongbo Wang (daxian-dbw) merged 1 commit intoAug 11, 2026
Conversation
Dongbo Wang (daxian-dbw)
requested review from
a team and
Justin Chung (jshigetomi)
as code owners
August 11, 2026 18:42
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes a release-branch packaging pipeline conflict-resolution error introduced by the backport in #27798 by aligning the Windows packaging/signing templates with the updated min-size and fxdependent package-type handling.
Changes:
- Update the Windows signing template to copy signed
.zipartifacts when fxdependent/min-size package types are selected. - Normalize YAML formatting/indentation in Windows
sign.ymlandpackage.ymlto resolve parsing/conflict artifacts.
Reviewed changes
Copilot reviewed 1 out of 2 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
.pipelines/templates/packaging/windows/sign.yml |
Adds logic to locate/copy signed zip packages for fxdependent/min-size and fixes YAML formatting around env. |
.pipelines/templates/packaging/windows/package.yml |
Fixes YAML formatting around env on the final “List artifacts” step. |
💡 Add a code-review agent skill for context-aware, tailored reviews. Learn more in the docs.
Aditya Patwardhan (adityapatwardhan)
approved these changes
Aug 11, 2026
Dongbo Wang (daxian-dbw)
merged commit Aug 11, 2026
b1beb00
into
PowerShell:release/v7.6.5
34 of 35 checks passed
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.
PR Summary
Fix the conflict resolution error caused by #27798 in 7.6.5 branch.