[release/6.0] Use WIX_NATIVE_MACHINE to detect native architecture of target machine#37335
Merged
Merged
Conversation
ghost
added
the
area-infrastructure
dougbu
approved these changes
Oct 6, 2021
Contributor
|
Thanks for updating the description @ericstj. I ignored that bit given the |
Contributor
|
/fyi I linked this PR to #37290 and enabled auto-squash and merge. |
Member
I don't consider this change tell-mode. The update to the wix dependency was tell, but this is a change to the product installers which I am taking through ask process. |
dougbu
added
Servicing-consider
|
Hi @github-actions[bot]. Please make sure you've updated the PR description to use the Shiproom Template. Also, make sure this PR is not marked as a draft and is ready-to-merge. To learn more about how to prepare a servicing PR click here. |
Contributor
Fine w/ me. I updated the labels to reflect this. |
Contributor
|
Also disabled auto-merge until we hear from @SteveMCarroll |
Contributor
|
Helix failed due to a known flaky test for 6.0. @HaoK has already fixed this in main so just re-running the test. |
dougbu
added
Servicing-approved
Contributor
|
Approved in email. Re-enabling auto-squishiness. |
ericstj
added a commit
to ericstj/aspnetcore
that referenced
this pull request
Oct 8, 2021
… target machine (dotnet#37335) * Use WIX_NATIVE_MACHINE to detect native architecture of target machine * Reference WIX_NATIVE_MACHINE property Final bit to resolve what I'm tracking in dotnet#37290 Co-authored-by: Eric StJohn <ericstj@microsoft.com>
ericstj
added a commit
to ericstj/aspnetcore
that referenced
this pull request
Oct 8, 2021
… target machine (dotnet#37335) * Use WIX_NATIVE_MACHINE to detect native architecture of target machine * Reference WIX_NATIVE_MACHINE property Final bit to resolve what I'm tracking in dotnet#37290 Co-authored-by: Eric StJohn <ericstj@microsoft.com>
dougbu
added a commit
that referenced
this pull request
Oct 11, 2021
* [release/6.0-rc2] Retarget DOTNETHOME when installing x64 on ARM64 (#36695) * Retarget DOTNETHOME when installing x64 on ARM64 * Make platform comparison case insenstive * Address feedback * Install x64 registry keys to different path on ARM64 machine Co-authored-by: Eric StJohn <ericstj@microsoft.com> * Update WiX to signed build (#36865) - #12078 * Update wix to 1.0.0-v3.14.0.5722 (#37329) Co-authored-by: Eric StJohn <ericstj@microsoft.com> * [release/6.0] Use WIX_NATIVE_MACHINE to detect native architecture of target machine (#37335) * Use WIX_NATIVE_MACHINE to detect native architecture of target machine * Reference WIX_NATIVE_MACHINE property Final bit to resolve what I'm tracking in #37290 Co-authored-by: Eric StJohn <ericstj@microsoft.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com>
dougbu
added a commit
that referenced
this pull request
Oct 11, 2021
* [release/6.0-rc2] Retarget DOTNETHOME when installing x64 on ARM64 (#36695) * Retarget DOTNETHOME when installing x64 on ARM64 * Make platform comparison case insenstive * Address feedback * Install x64 registry keys to different path on ARM64 machine Co-authored-by: Eric StJohn <ericstj@microsoft.com> * Update WiX to signed build (#36865) - #12078 * Update wix to 1.0.0-v3.14.0.5722 (#37329) Co-authored-by: Eric StJohn <ericstj@microsoft.com> * [release/6.0] Use WIX_NATIVE_MACHINE to detect native architecture of target machine (#37335) * Use WIX_NATIVE_MACHINE to detect native architecture of target machine * Reference WIX_NATIVE_MACHINE property Final bit to resolve what I'm tracking in #37290 Co-authored-by: Eric StJohn <ericstj@microsoft.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com>
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 #37318 to release/6.0
/cc @ericstj
Customer Impact
Reliably detect machine architecture
Testing
Manually built and consumed changes, built installer in runtime and tested to validate behavior.
Risk
Low - we don't expect this to break anything, but it requires coordination across repositories and adds a new component to the installers including a custom action DLL which we didn't previously use.