[release/6.0] x64 on arm64 fixes #7906
Merged
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
* Adding detection and retargeting of DOTNETHOME When x64 is installed on non-x64 machine, place in an x64 subdirectory. * Remove test value of dotnet folder * Fix ProgramFilesFolder preprocessor variable usage * Refactor Set_DOTNETHOME_x64 into a single shared source file * Add CA ID for INSTALLING_IN_EMULATION. * Define Platform consistently * Move workload registration to platform specific * Refactor INSTALLING_IN_EMULATION property Don't need to use a registry search since environment of the MSIServer process can be read (TBD pending reccomendation from MSI team). Also make property work for any architecture, in case we wish to use it more generically (EG: to condition PATH entry in host installer). * Make platform comparison case insensitive * Respond to feedback
The bundle was passing in a hardcoded DOTNETHOME value unconditionally to MSIs in the chain. This value doesn't have the redirection we're adding to the MSI. We can't add that redirection in the bundle, since Burn doesn't have conditional variables. It can only set variables as a result of a search to either the value of the search (if successful) or 1/0.
* Adding x64 emulation support for pkg installers * PR feedback * PR feedback
ericstj
requested review from
jkoritzinsky,
joeloff,
NikolaMilosavljevic and
sfoslund
sfoslund
approved these changes
Sep 17, 2021
joeloff
approved these changes
Sep 17, 2021
|
Waiting to add #7913 to this PR. |
* Update mac x64 installer script arch detection * Add comments to x64 machine detection script
ericstj
added
servicing-approved
|
(approved over email) Looks like I can't merge arcade release changes. @mmitche @markwilkie? |
|
(please merge commit, no squash) |
|
The repo is setup to not accept merge commits (only squash). Want me to do that? |
|
nm - I just temporarily turned on merge commits and did it. (they're back off now) |
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.
Installer work to support x64 on arm64. This is a cherry-pick of all relevant arcade changes.
This work will require additional changes in Runtime, ASPNETCore, and Installer to achieve the desired side-by-side characteristics of x64 installed on ARM64.
Customer Impact
Customers want to install our x64 product on arm64 machines in order to run x64 targeted applications.
Testing
We have tested the Windows - runtime consumption of these in main and confirmed it produces installers which behave as we expect. We have tested the changes in isolation as well. It is difficult to test the full end-to-end due to 7.0 not having coherent builds and these changes spanning many repos to realize full end-to-end.
Risk
Low - as designed these changes should not impact existing working scenarios. The risk here is that we have a bug that accidentally impacts those scenarios. We've tried to mitigate that through testing consumption in main. We'll also mitigate by testing bits out of RC2 branches as soon as these changes flow.