Skip to content

Added extra probing_paths to relative app directory #54261

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

Closed
matheusbach wants to merge 4 commits into from
Closed

Added extra probing_paths to relative app directory #54261

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e54dd33
bug fix
matheusbach Jun 16, 2021
38ca7de
Merge branch 'dotnet:main' into main
matheusbach Jun 18, 2021
199b591
Merge branch 'dotnet:main' into main
matheusbach Jun 19, 2021
a451f11
Added relative probing paths as secondary option
matheusbach Jun 19, 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
12 changes: 11 additions & 1 deletion src/native/corehost/runtime_config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,15 @@ bool runtime_config_t::parse_opts(const json_parser_t::value_t& opts)
const auto& probe_paths = opts_obj.FindMember(_X("additionalProbingPaths"));
if (probe_paths != opts_obj.MemberEnd())
{
pal::string_t base_path = get_directory(m_path).c_str();

if (probe_paths->value.IsString())
{
m_probe_paths.insert(m_probe_paths.begin(), probe_paths->value.GetString());
pal::string_t full_path = base_path;
append_path(&full_path, probe_paths->value.GetString());

m_probe_paths.push_front(full_path.c_str());
m_probe_paths.push_front(probe_paths->value.GetString());
}
else if (probe_paths->value.IsArray())
{
Expand All @@ -126,6 +132,10 @@ bool runtime_config_t::parse_opts(const json_parser_t::value_t& opts)

for (; begin != end; begin++)
{
pal::string_t full_path = base_path;
append_path(&full_path, begin->GetString());

m_probe_paths.push_front(full_path.c_str());
m_probe_paths.push_front(begin->GetString());
}
}
Expand Down