Do not remove penimc_cor3.dll from build#18438
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) |
|
/backport to release/v7.3.0 |
|
@adityapatwardhan backporting to release/v7.3.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Do not remove `penimc_cor3.dll` from build
Applying: Fix wix file
Using index info to reconstruct a base tree...
M assets/wix/files.wxs
Falling back to patching base and 3-way merge...
Auto-merging assets/wix/files.wxs
CONFLICT (content): Merge conflict in assets/wix/files.wxs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Fix wix file
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 128Please backport manually! |
|
🎉 Handy links: |
|
🎉 Handy links: |
|
🎉 Handy links: |
PR Summary
Fix #18414
Do not remove penimc_cor3.dll from the build as it blocks WPF scenarios.
PR Context
PR Checklist
.h,.cpp,.cs,.ps1and.psm1files have the correct copyright headerWIP:or[ WIP ]to the beginning of the title (theWIPbot will keep its status check atPendingwhile the prefix is present) and remove the prefix when the PR is ready.(which runs in a different PS Host).