Add registry search for upgrade policy keys #20035
Closed
Conversation
This file contains 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
MiYanni
reviewed
Aug 21, 2024
| @@ -324,9 +324,12 @@ | |||
| </ItemGroup> | |||
| <PropertyGroup> | |||
| <LatestTemplateMsiInstallerFile>@(LatestTemplateInstallerComponent->'%(MSIInstallerFile)')</LatestTemplateMsiInstallerFile> | |||
|
|
|||
| <UpgradePoliciesSrcPath>$(PkgMicrosoft_DotNet_Build_Tasks_Installers)\build\wix\bundle\upgradePolicies.wxs</UpgradePoliciesSrcPath> | |||
There was a problem hiding this comment.
Does the package reference have GeneratePathProperty="true" to allow for PkgMicrosoft_DotNet_Build_Tasks_Installers to exist?
|
/backport to release/8.0.1xx |
|
/backport to release/8.0.4xx |
|
/backport to release/8.0.1xx |
|
Started backporting to release/8.0.1xx: https://github.com/dotnet/installer/actions/runs/10724523117 |
|
@joeloff backporting to release/8.0.1xx failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Add registry search for upgrade policy keys
Using index info to reconstruct a base tree...
M src/redist/targets/GenerateMSIs.targets
M src/redist/targets/packaging/windows/clisdk/bundle.wxs
M src/redist/targets/packaging/windows/clisdk/generatebundle.ps1
Falling back to patching base and 3-way merge...
Auto-merging src/redist/targets/packaging/windows/clisdk/generatebundle.ps1
Auto-merging src/redist/targets/packaging/windows/clisdk/bundle.wxs
Auto-merging src/redist/targets/GenerateMSIs.targets
CONFLICT (content): Merge conflict in src/redist/targets/GenerateMSIs.targets
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 0001 Add registry search for upgrade policy keys
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@joeloff an error occurred while backporting to release/8.0.1xx, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
MiYanni
approved these changes
Sep 5, 2024
nagilson
approved these changes
Sep 5, 2024
|
Not taking this for 6.0 |
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.
Description
Add registry search operations to SDK 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. The change depends on changes in Arcade (dotnet/arcade#14975).
NB: This PR will not build until the Arcade change is merged and flowed to the SDK.
Unlike the runtime and desktop runtime, the SDK needs to explicitly pull in the additional source file.
Risk
Low, this change only adds detection for the key, nothing will currently act on its value.
Testing
Verified against a private build of SDK. Log excerpt below. The test machine contained only the global key, hence why the existence check returns 0 for the version specific key.