Skip to content

Retarget DOTNETHOME when installing x64 on ARM64 #58669

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 1 commit into from
Sep 8, 2021

Conversation

ericstj
Copy link
Member

@ericstj ericstj commented Sep 3, 2021

Replaces #58059

@ericstj ericstj added the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Sep 3, 2021
@am11
Copy link
Member

am11 commented Sep 4, 2021

Could it be renamed to something like DOTNET_BASEDIR? Otherwise, this DOTNETHOME (directory name) and the existing DOTNET_HOME (well-documented environment variable pointing to base dir) can cause ambiguity in certain contexts.

@ericstj
Copy link
Member Author

ericstj commented Sep 7, 2021

Could it be renamed to something like DOTNET_BASEDIR

This is not a new identifier. This a pre-existing directory identifier and public property exposed by the MSI installers. Changing it is breaking. All these changes do is detect when x64 is being installed on ARM64, and the user hasn't specified DOTNETHOME, redirect to an x64 subfolder. See dotnet/arcade#7785

@ericstj ericstj removed the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Sep 7, 2021
@ericstj
Copy link
Member Author

ericstj commented Sep 7, 2021

Ok reviewers, this should be ready to review now. #58681 brought the arcade changes over that enable this. I'd like to get this in ASAP so we have 7.0 builds to smoke test on ARM64, then we can request the port for this to 6.0. Thanks!

@ericstj ericstj merged commit dcfe5bf into dotnet:main Sep 8, 2021
Copy link
Member

@hoyosjs hoyosjs left a comment

Choose a reason for hiding this comment

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

LGTM

ericstj added a commit to ericstj/runtime that referenced this pull request Sep 18, 2021
Anipik pushed a commit that referenced this pull request Sep 20, 2021
* Retarget DOTNETHOME when installing x64 on ARM64 (#58669)

* Only set path in x64 mac installer when installing on x64 (#59210)

* Only set path in x64 mac installer when installing on x64

In other words don't set the path for x64 installer on ARM64

* Remove postinstall script from hostfxr

There should be no need for both the host and hostfxr to set the path to dotnet.

Since the host installs dotnet, it should be the only package responsible for this.

* Make postinstall set install_location on mac

Also refactor script to use a template so that we don't need to fork the script.

* fix some syntax errors in script

* Update src/installer/pkg/sfx/installers/dotnet-host.proj

Co-authored-by: Adeel Mujahid <[email protected]>

* Refine uname regular expressions

Co-authored-by: Adeel Mujahid <[email protected]>

* Updating dependencies from https://github.com/dotnet/arcade build 20210917.3

Co-authored-by: Adeel Mujahid <[email protected]>
@ghost ghost locked as resolved and limited conversation to collaborators Oct 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants