Use WIX_NATIVE_MACHINE to detect native architecture of target machine#8000
Merged
ericstj merged 2 commits intodotnet:mainfrom Oct 6, 2021
Merged
Use WIX_NATIVE_MACHINE to detect native architecture of target machine#8000ericstj merged 2 commits intodotnet:mainfrom
ericstj merged 2 commits intodotnet:mainfrom
Conversation
d5ef365 to
d4c46b2
Compare
joeloff
reviewed
Oct 6, 2021
| https://docs.microsoft.com/en-us/windows/win32/sysinfo/image-file-machine-constants --> | ||
| <?if $(var.Platform)~=x86?> | ||
| <?define InstallerArchitecture="X86"?> | ||
| <?define InstallerNativeMachine=332?> |
Member
There was a problem hiding this comment.
We should probably define these constants so that everyone can use them eventually. For now we do have the link, but something like <?define NativeMachine_ARM64=43620?> in a shared include or lib would be nice for 7.0
Member
Author
There was a problem hiding this comment.
I'm doing that in installer where we need all the values in the bundle. Here we need the value for a single arch.
Yeah consolidating more would be nice.
joeloff
approved these changes
Oct 6, 2021
Member
Author
|
Manually tested this in dotnet/runtime by building host. x64 install This will require that dotnet/runtime#59500 be merged before runtime can ingest this change. |
Member
Author
|
/backport to release/6.0 |
ericstj
added a commit
to ericstj/arcade
that referenced
this pull request
Oct 6, 2021
dotnet#8000) * Use WIX_NATIVE_MACHINE to detect native architecture of target machine * Reference WIX_NATIVE_MACHINE property
Member
Author
|
Here's this working on an ARM64 machine. 👍 |
1 task
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
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.
This leverages the feature I added to Wix which reads the native architecture from the recent feature:
wixtoolset/wix3@75699d8