mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #2422 from schellap/fxr-pol

Browse source 
CoreHost.exe hostpolicy should be picked sxs
This commit is contained in:
Senthil 2016-04-12 11:15:13 -07:00
commit 1a0b9bba98
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/corehost/cli/fxr/fx_muxer.cpp
View file

@ -381,9 +381,18 @@ int fx_muxer_t::read_config_and_execute(
} }
else else
{ {
trace::verbose(_X("Executing as a standalone app as per config file [%s]"), config_file.c_str());
pal::string_t impl_dir; pal::string_t impl_dir;
if (!hostpolicy_exists_in_svc(&impl_dir)) trace::verbose(_X("Executing as a standalone app as per config file [%s]"), config_file.c_str());
if (mode == host_mode_t::standalone)
{
pal::string_t svc_dir;
impl_dir = hostpolicy_exists_in_svc(&svc_dir) ? svc_dir : own_dir;
}
else if (mode == host_mode_t::split_fx)
{
impl_dir = own_dir;
}
else if (mode == host_mode_t::muxer)
{ {
impl_dir = get_directory(app_or_deps); impl_dir = get_directory(app_or_deps);
} }