Skip to content
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.

Sign up for GitHub

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

Add support for multi-arch install locations #53763

Merged
merged 23 commits into from
Jun 23, 2021
Merged

Add support for multi-arch install locations #53763

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
89c6a26
Add support for multiple architectures inside install_locations
May 28, 2021
fd767f1
Fix traces
Jun 1, 2021
1de63dc
Add install_location tests
Jun 1, 2021
48be319
Message printed to stderr
Jun 2, 2021
f1a2b7d
Set arch specific DOTNET_ROOT env var
Jun 2, 2021
7fe0238
Inline pal::to_lower/upper
Jun 3, 2021
e40c618
Update tests
Jun 4, 2021
98814ea
Update tests
Jun 5, 2021
3a40dfd
Sort usings
Jun 5, 2021
e1d55c9
PR Feedback
Jun 7, 2021
9602d92
Fix trace
Jun 7, 2021
c1b7af2
Fail if DOTNET_ROOT_ARCH is defined but path doesn't exist
Jun 7, 2021
104357c
PR feedback
Jun 8, 2021
3280fff
Fallback to DOTNET_ROOT on win32
Jun 8, 2021
8236390
Add tests with really long install location path
Jun 10, 2021
190bc43
Fix tests
Jun 10, 2021
bbc05c8
Make consistent use of str assign
Jun 14, 2021
e5b18e5
PR feedback
Jun 17, 2021
53edd07
Fix unix pal
Jun 17, 2021
c9ad207
Test
Jun 17, 2021
6ae64aa
Remove nonsense string
Jun 17, 2021
a04b846
Put optional arguments last
Jun 18, 2021
2402b61
Pass RID
Jun 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove nonsense string
  • Loading branch information
Mateo Torres Ruiz committed Jun 22, 2021
commit 6ae64aa63cda4964b2961180a7f08fcf06df665d
2 changes: 1 addition & 1 deletion src/installer/tests/HostActivation.Tests/MultiArchInstallLocation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public void InstallLocationFile_ArchSpecificLocationIsPickedFirst()
registeredInstallLocationOverride.SetInstallLocation(new (string, string)[] {
(string.Empty, path1),
(arch1, path1),
(arch2, path2)EnvironmentVariable_IfNoArchSpecificEnvVarIsFoundDotnetR
(arch2, path2)
});

Command.Create(appExe)
Expand Down