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.
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
Make mariner packages Framework dependent #17151
Conversation
This PR has Quantification details
Why proper sizing of changes matters
Optimal pull request sizes drive a better predictable PR flow as they strike a
What can I do to optimize my changes
How to interpret the change counts in git diff output
Was this comment helpful? 👍 :ok_hand: :thumbsdown: (Email) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
needs more stability before backport decision can be made. |
🎉 Handy links: |
/backport to release/v7.2.5 |
Started backporting to release/v7.2.5: https://github.com/PowerShell/PowerShell/actions/runs/2374309753
|
@TravisEz13 backporting to release/v7.2.5 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Add package mapping for mariner
Applying: make mariner ready to run
Applying: add fixdep rpm
Using index info to reconstruct a base tree...
M tools/packaging/packaging.psm1
Falling back to patching base and 3-way merge...
Auto-merging tools/packaging/packaging.psm1
CONFLICT (content): Merge conflict in tools/packaging/packaging.psm1
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 add fixdep rpm
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
/backport to release/v7.2.5 |
Started backporting to release/v7.2.5: https://github.com/PowerShell/PowerShell/actions/runs/2380365803
|
PR Summary
PR Context
PR Checklist
.h
,.cpp
,.cs
,.ps1
and.psm1
files have the correct copyright headerWIP:
or[ WIP ]
to the beginning of the title (theWIP
bot will keep its status check atPending
while the prefix is present) and remove the prefix when the PR is ready.(which runs in a different PS Host).