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

Merge pull request #1911 from schellap/deps-json2

Browse source 
Fix casing of shared and add DT_DIR to readdir
This commit is contained in:
Senthil 2016-03-16 15:26:04 -07:00
commit 8ab2bae472
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,7 +29,7 @@ pal::string_t fx_muxer_t::resolve_fx_dir(const pal::string_t& muxer_dir, runtime
} }
auto fx_dir = muxer_dir; auto fx_dir = muxer_dir;
append_path(&fx_dir, _X("Shared")); append_path(&fx_dir, _X("shared"));
append_path(&fx_dir, fx_name.c_str()); append_path(&fx_dir, fx_name.c_str());
// If not roll forward or if pre-release, just return. // If not roll forward or if pre-release, just return.

1
src/corehost/common/pal.unix.cpp
View file

@ -202,6 +202,7 @@ void pal::readdir(const pal::string_t& path, std::vector<pal::string_t>* list)
// We are interested in files only // We are interested in files only
switch (entry->d_type) switch (entry->d_type)
{ {
case DT_DIR:
case DT_REG: case DT_REG:
break; break;