Skip to content

Fix the conflict resolution error in 7.6.5 branch #27820

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

Merged
Dongbo Wang (daxian-dbw) merged 1 commit into from
Aug 11, 2026
Merged

Fix the conflict resolution error in 7.6.5 branch #27820

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
2 changes: 1 addition & 1 deletion .pipelines/templates/packaging/windows/package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,4 +237,4 @@ jobs:
Get-ChildItem -Path $(ob_outputDirectory) -Recurse
displayName: 'List artifacts'
env:
ob_restore_phase: true # This ensures this done in restore phase to workaround signing issue
ob_restore_phase: true # This ensures this done in restore phase to workaround signing issue
Comment thread
daxian-dbw marked this conversation as resolved.
4 changes: 3 additions & 1 deletion .pipelines/templates/packaging/windows/sign.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,8 @@ jobs:
}

if ($packageTypes -contains 'zip' -or $packageTypes -like 'fxdependent*' -or $packageTypes -like 'min-size*') {
$zipPkgNameFilter = "powershell-*.zip"
$zipPkgPath = Get-ChildItem -Path $(Pipeline.Workspace) -Filter $zipPkgNameFilter -Recurse -File | Select-Object -ExpandProperty FullName
Write-Verbose -Verbose "signed zipPkgPath: $zipPkgPath"
Comment thread
daxian-dbw marked this conversation as resolved.
Copy-Item -Path $zipPkgPath -Destination '$(ob_outputDirectory)' -Force -Verbose
}
Expand All @@ -212,4 +214,4 @@ jobs:
Get-ChildItem -Path $(ob_outputDirectory) -Recurse
displayName: 'List signed artifacts'
env:
ob_restore_phase: true
ob_restore_phase: true
Comment thread
daxian-dbw marked this conversation as resolved.
Loading