-
Notifications
You must be signed in to change notification settings - Fork 5.4k
Enable win registry install location for all architectures #54698
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
Changes from all commits
cdee2a4
d368585
1298b9c
d1035ca
1ab21b9
87ba676
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -322,27 +322,18 @@ namespace | |||||||||||||||
| } | ||||||||||||||||
| } | ||||||||||||||||
|
|
||||||||||||||||
| bool pal::get_dotnet_self_registered_config_location(pal::string_t* recv) | ||||||||||||||||
| pal::string_t pal::get_dotnet_self_registered_config_location() | ||||||||||||||||
| { | ||||||||||||||||
| #if !defined(TARGET_AMD64) && !defined(TARGET_X86) | ||||||||||||||||
| return false; | ||||||||||||||||
| #else | ||||||||||||||||
|
Comment on lines
327
to
329
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Given that you made basically no changes to existing tests - does it mean that we don't run the tests on Windows ARM32 or ARM64 at all? Or does it mean that we didn't have any tests validating the current behavior?
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Apparently the host tests don't run on arm or arm64 at all (Windows or not): runtime/eng/pipelines/installer/jobs/base-job.yml Lines 63 to 69 in fc4a427
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'll enable them on a separate PR (which should be merged before this one) -- curious if this will cause existing tests to fail.
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Fair warning - I expect enabling them may be a bit involved. I think the main reason the arm/arm64 tests are currently skipped is that the hosting tests haven't been set up to send tests to helix, so they just run on the build machine (which works fine for x64/x86). |
||||||||||||||||
| HKEY key_hive; | ||||||||||||||||
| pal::string_t sub_key; | ||||||||||||||||
| const pal::char_t* value; | ||||||||||||||||
| get_dotnet_install_location_registry_path(&key_hive, &sub_key, &value); | ||||||||||||||||
|
|
||||||||||||||||
| recv->assign((key_hive == HKEY_CURRENT_USER ? _X("HKCU\\") : _X("HKLM\\")) + sub_key + _X("\\") + value); | ||||||||||||||||
| return true; | ||||||||||||||||
| #endif | ||||||||||||||||
| return (key_hive == HKEY_CURRENT_USER ? _X("HKCU\\") : _X("HKLM\\")) + sub_key + _X("\\") + value; | ||||||||||||||||
| } | ||||||||||||||||
|
|
||||||||||||||||
| bool pal::get_dotnet_self_registered_dir(pal::string_t* recv) | ||||||||||||||||
| { | ||||||||||||||||
| #if !defined(TARGET_AMD64) && !defined(TARGET_X86) | ||||||||||||||||
| // Self-registered SDK installation directory is only supported for x64 and x86 architectures. | ||||||||||||||||
| return false; | ||||||||||||||||
| #else | ||||||||||||||||
| recv->clear(); | ||||||||||||||||
|
|
||||||||||||||||
| // ***Used only for testing*** | ||||||||||||||||
|
|
@@ -392,7 +383,6 @@ bool pal::get_dotnet_self_registered_dir(pal::string_t* recv) | |||||||||||||||
| recv->assign(buffer.data()); | ||||||||||||||||
| ::RegCloseKey(hkey); | ||||||||||||||||
| return true; | ||||||||||||||||
| #endif | ||||||||||||||||
| } | ||||||||||||||||
|
|
||||||||||||||||
| bool pal::get_global_dotnet_dirs(std::vector<pal::string_t>* dirs) | ||||||||||||||||
|
|
||||||||||||||||
Uh oh!
There was an error while loading. Please reload this page.