Skip to content

[release/5.0] Backport x64 on ARM64 installer changes #37407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 11, 2021

Conversation

ericstj
Copy link
Member

@ericstj ericstj commented Oct 8, 2021

Clean port of all the x64 on ARM64 changes made in 6.0 for 5.0 servicing

6.0 changes:

github-actions bot and others added 4 commits October 8, 2021 12:52
…otnet#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 <[email protected]>
… 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 <[email protected]>
@ericstj ericstj added the Servicing-consider Shiproom approval is required for the issue label Oct 8, 2021
@ericstj ericstj self-assigned this Oct 8, 2021
@ericstj ericstj requested review from Pilchie and a team as code owners October 8, 2021 20:02
@ghost ghost added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Oct 8, 2021
@ghost
Copy link

ghost commented Oct 8, 2021

Hi @ericstj. 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.

Copy link
Contributor

@dougbu dougbu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This all looks very familiar😀 Have changes here and for 'release/3.1' been servicing approved for 5.0.12 and 3.1.21❔

@ericstj
Copy link
Member Author

ericstj commented Oct 8, 2021

Have changes here and for 'release/3.1' been servicing approved for 5.0.12 and 3.1.21❔

Not yet, thus the servicing-consider tag. We plan to send mail to tactics once we have all the PRs ready across all repos.

@ericstj ericstj added Servicing-approved Shiproom has approved the issue and removed Servicing-consider Shiproom approval is required for the issue labels Oct 11, 2021
@ericstj
Copy link
Member Author

ericstj commented Oct 11, 2021

This was approved over email. @dotnet/aspnet-build can you help me merge?

@dougbu dougbu merged commit b3238fb into dotnet:release/5.0 Oct 11, 2021
@dougbu
Copy link
Contributor

dougbu commented Oct 11, 2021

@dotnet/aspnet-build can you help me merge?

No problem. Thanks for all your work in this area @ericstj

@BrennanConroy BrennanConroy added this to the 5.0.12 milestone Oct 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Servicing-approved Shiproom has approved the issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants