Skip to content

[release/6.0.1xx] Arch-independent support for dotnet run#20102

Merged
agocke merged 1 commit intodotnet:release/6.0.1xxfrom
agocke:backport-19860
Aug 31, 2021
Merged

[release/6.0.1xx] Arch-independent support for dotnet run#20102
agocke merged 1 commit intodotnet:release/6.0.1xxfrom
agocke:backport-19860

Conversation

@agocke
Copy link
Member

@agocke agocke commented Aug 25, 2021

Backport of #19860

Description

dotnet run sets DOTNET_ROOT, but it needs to pick the appropriate location based on the target architecture

Testing

Unit tests, manual verification

Risk

Low

…using `dotnet run` (dotnet#19860)

* Check that dotnet arch and app's arch match before setting DOTNET_ROOT

* Check RuntimeIdentifier prop

* Use new DOTNET_ROOT format
Update tests

* Remove spaces in prop
Allow test asset copy

* Update test

* Update how we retrieve enum value name
Keep behavior if there is no host to retrieve target arch from

* Update Program.cs

* Use ToUpperInvariant

* Set ProcessArchitecture as targetArchitecture might be null

(cherry picked from commit 36e9be0)
@ghost ghost added the Area-External label Aug 25, 2021
@agocke agocke requested a review from mateoatr August 25, 2021 16:40
@agocke agocke merged commit 4114ca1 into dotnet:release/6.0.1xx Aug 31, 2021
@agocke agocke deleted the backport-19860 branch August 31, 2021 17:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants