[release/9.0] Add registry search for upgrade policy keys#15048
Merged
mmitche merged 4 commits intorelease/9.0from Sep 16, 2024
Merged
[release/9.0] Add registry search for upgrade policy keys#15048mmitche merged 4 commits intorelease/9.0from
mmitche merged 4 commits intorelease/9.0from
Conversation
NikolaMilosavljevic
approved these changes
Sep 5, 2024
joeloff
added
servicing-approved
Member
|
Setting to servicing approved as per email conversation |
This was referenced Sep 19, 2024
Member
|
/backport to main |
Contributor
Author
Contributor
Author
|
@joeloff backporting to main failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Add RegistrySearch for Windows Installer
Applying: Remove unnecessary include (breaks SDK)
Applying: Bump WiX package/zip version
Applying: Update WiX package version
Using index info to reconstruct a base tree...
M Directory.Packages.props
Falling back to patching base and 3-way merge...
Auto-merging Directory.Packages.props
CONFLICT (content): Merge conflict in Directory.Packages.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0004 Update WiX package version
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Contributor
Author
|
@joeloff an error occurred while backporting to main, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
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
3 participants
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 #14975 to release/9.0
Description
Add registry search operations to Windows installer bundles. The search operation will check for a global and version specific registry key. The version specific key takes precedence when present.
This is related to a customer request and part of a larger change. This PR only includes infrastructure changes to support changes in the Windows installer bundles.
Risk
Low, this change only adds detection for the key, nothing will currently act on its value.
Testing
Additional testing will be done once all the pieces are in place across runtime, desktop, sdk, ASP.NET to verify all the installers.