Skip to content

Only set path in x64 mac installer when installing on x64 - #59210

Merged
ericstj merged 7 commits into
dotnet:mainfrom
ericstj:macPathX64
Sep 17, 2021
Merged

Only set path in x64 mac installer when installing on x64#59210
ericstj merged 7 commits into
dotnet:mainfrom
ericstj:macPathX64

Conversation

@ericstj

Copy link
Copy Markdown
Member

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

I find it odd that both the host and hostfxfr write to path today. We could fix that if folks can say definitively if it is redundant. For now I unified the duplicate scripts (one was missing a bugifx to ensure paths.d existed).

If we decide to have these scripts write to /etc/dotnet/install_location we might want to change how we calculate "installer arch" and do that by applying a template at build time. I'm waiting to hear if we need to set that.

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

Copy link
Copy Markdown
MemberAuthor

@richlander let me know that he'd like us to write /etc/dotnet/install_location. So I think I'll do that here. As a result I'll refactor this PR to do both the path work and the writing to install_location.

@ericstjericstj added the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Sep 16, 2021
@ericstj

Copy link
Copy Markdown
MemberAuthor

@jkoritzinsky or @vitek-karas do either of you know why we would need the postinstall script in both host and hostfxr? Do those ever get deployed seperately?

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.
Comment threadsrc/installer/pkg/sfx/installers/osx_scripts/host-x64/postinstall Outdated
Also refactor script to use a template so that we don't need to fork the script.
Comment threadsrc/installer/pkg/sfx/installers/dotnet-host.proj Outdated
ericstjand others added 2 commits September 16, 2021 21:44
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
@ericstjericstj removed the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Sep 17, 2021
@ericstj

Copy link
Copy Markdown
MemberAuthor

Since this commit was significantly changed since first approval, can I get a re-review? We'd like to get this in and ported back to 6.0.

@ericstj
ericstj merged commit 095808b into dotnet:mainSep 17, 2021
ericstj added a commit to ericstj/runtime that referenced this pull request Sep 18, 2021
* 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 <3840695+am11@users.noreply.github.com>
* Refine uname regular expressions
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
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 <3840695+am11@users.noreply.github.com>
* Refine uname regular expressions
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
* Updating dependencies from https://github.com/dotnet/arcade build 20210917.3
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
@ghostghost locked as resolved and limited conversation to collaborators Nov 3, 2021
Sign up for freeto 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.

5 participants

@ericstj@jkoritzinsky@am11@vitek-karas@sfoslund