Revert "Merge pull request #3020 from schellap/deps-clean"

This reverts commit d307537eb8, reversing
changes made to 54ab5b8385.

build_projects/dotnet-cli-build/CompileTargets.cs

@@ -396,8 +396,7 @@ namespace Microsoft.DotNet.Cli.Build
             File.Copy(Path.Combine(Dirs.CorehostLocked, $"{Constants.DynamicLibPrefix}hostfxr{Constants.DynamicLibSuffix}"), Path.Combine(outputDir, $"{Constants.DynamicLibPrefix}hostfxr{Constants.DynamicLibSuffix}"), overwrite: true);
             File.Copy(Path.Combine(Dirs.CorehostLatest, $"{Constants.DynamicLibPrefix}hostpolicy{Constants.DynamicLibSuffix}"), Path.Combine(outputDir, $"{Constants.DynamicLibPrefix}hostpolicy{Constants.DynamicLibSuffix}"), overwrite: true);
 
-            var binaryToCorehostifyRelDir = Path.Combine("runtimes", "any", "native");
+            var binaryToCorehostifyOutDir = Path.Combine(outputDir, "runtimes", "any", "native");
-            var binaryToCorehostifyOutDir = Path.Combine(outputDir, binaryToCorehostifyRelDir);
             // Corehostify binaries
             foreach (var binaryToCorehostify in BinariesForCoreHost)
             {
@@ -408,13 +407,7 @@ namespace Microsoft.DotNet.Cli.Build
                     File.Delete(Path.Combine(binaryToCorehostifyOutDir, $"{binaryToCorehostify}.exe"));
                     File.Copy(compilersDeps, Path.Combine(outputDir, binaryToCorehostify + ".deps.json"));
                     File.Copy(compilersRuntimeConfig, Path.Combine(outputDir, binaryToCorehostify + ".runtimeconfig.json"));
-                    var binaryToCoreHostifyDeps = Path.Combine(outputDir, binaryToCorehostify + ".deps.json");
+                    ChangeEntryPointLibraryName(Path.Combine(outputDir, binaryToCorehostify + ".deps.json"), binaryToCorehostify);
-                    ChangeEntryPointLibraryName(binaryToCoreHostifyDeps, binaryToCorehostify);
-                    foreach (var binaryToRemove in new string[] { "csc", "vbc" })
-                    {
-                        var assetPath = Path.Combine(binaryToCorehostifyRelDir, $"{binaryToRemove}.exe").Replace(Path.DirectorySeparatorChar, '/');
-                        RemoveAssetFromDepsPackages(binaryToCoreHostifyDeps, "runtimeTargets", assetPath);
-                    }
                 }
                 catch (Exception ex)
                 {
@@ -437,40 +430,6 @@ namespace Microsoft.DotNet.Cli.Build
             return c.Success();
         }
 
-        private static void RemoveAssetFromDepsPackages(string depsFile, string sectionName, string assetPath)
-        {
-            JToken deps;
-            using (var file = File.OpenText(depsFile))
-            using (JsonTextReader reader = new JsonTextReader(file))
-            {
-                deps = JObject.ReadFrom(reader);
-            }
-
-            foreach (JProperty target in deps["targets"])
-            {
-                foreach (JProperty pv in target.Value.Children<JProperty>())
-                {
-                    var section = pv.Value[sectionName];
-                    if (section != null)
-                    {
-                        foreach (JProperty relPath in section)
-                        {
-                            if (assetPath.Equals(relPath.Name))
-                            {
-                                relPath.Remove();
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-            using (var file = File.CreateText(depsFile))
-            using (var writer = new JsonTextWriter(file) { Formatting = Formatting.Indented })
-            {
-                deps.WriteTo(writer);
-            }
-        }
-
         private static void ChangeEntryPointLibraryName(string depsFile, string newName)
         {
             JToken deps;

src/corehost/cli/deps_format.cpp

@@ -349,10 +349,8 @@ bool deps_json_t::has_package(const pal::string_t& name, const pal::string_t& ve
 //
 bool deps_json_t::load(bool portable, const pal::string_t& deps_path, const rid_fallback_graph_t& rid_fallback_graph)
 {
-    m_file_exists = pal::file_exists(deps_path);
-
     // If file doesn't exist, then assume parsed.
-    if (!m_file_exists)
+    if (!pal::file_exists(deps_path))
     {
         trace::verbose(_X("Could not locate the dependencies manifest file [%s]. Some libraries may fail to resolve."), deps_path.c_str());
         return true;

src/corehost/cli/deps_format.h

@@ -28,7 +28,6 @@ class deps_json_t
 public:
     deps_json_t()
         : m_valid(false)
-        , m_file_exists(false)
         , m_coreclr_index(-1)
         , m_hostpolicy_index(-1)
     {
@@ -63,11 +62,6 @@ public:
         return m_hostpolicy_index >= 0;
     }
 
-    bool exists()
-    {
-        return m_file_exists;
-    }
-
     const deps_entry_t& get_coreclr_entry()
     {
         assert(has_coreclr_entry());
@@ -115,7 +109,6 @@ private:
     rid_fallback_graph_t m_rid_fallback_graph;
     int m_coreclr_index;
     int m_hostpolicy_index;
-    bool m_file_exists;
     bool m_valid;
 };
 

src/corehost/cli/deps_resolver.cpp

@@ -330,95 +330,89 @@ bool deps_resolver_t::probe_entry_in_configs(const deps_entry_t& entry, pal::str
     return false;
 }
 
-/**
+// -----------------------------------------------------------------------------
- * Probe helper for a deps entry. Lookup all probe configurations and then
+// Resolve coreclr directory from the deps file.
- * lookup in the directory where the deps file is present. For app dirs,
+//
- *     1. RID specific entries are present in the package relative structure.
+// Description:
- *     2. Non-RID entries are present in the directory path.
+//    Look for CoreCLR from the dependency list in the package cache and then
- */
+//    the packages directory.
-bool deps_resolver_t::probe_deps_entry(const deps_entry_t& entry, const pal::string_t& deps_dir, pal::string_t* candidate)
+//
+pal::string_t deps_resolver_t::resolve_coreclr_dir()
 {
-    if (probe_entry_in_configs(entry, candidate))
+    trace::verbose(_X("--- Resolving CoreCLR directory ---"));
-    {
-        return true;
-    }
-    if (entry.is_rid_specific && entry.to_rel_path(deps_dir, candidate))
-    {
-        return true;
-    }
-    if (!entry.is_rid_specific && entry.to_dir_path(deps_dir, candidate))
-    {
-        return true;
-    }
-    return false;
-}
 
-/**
+    auto process_coreclr = [&]
- * Helper for obtaining CoreCLR from a given deps file and the deps file's directory.
+        (bool is_portable, const pal::string_t& deps_dir, deps_json_t* deps) -> pal::string_t
- */
-bool deps_resolver_t::get_coreclr_dir_from_deps(const pal::string_t& deps_dir, deps_json_t* deps, pal::string_t* candidate)
-{
-    if (!deps->has_coreclr_entry())
     {
-        return false;
+        pal::string_t candidate;
-    }
 
-    pal::string_t coreclr;
+        if (deps->has_coreclr_entry())
-    if (probe_deps_entry(deps->get_coreclr_entry(), deps_dir, &coreclr))
+        {
-    {
+            const deps_entry_t& entry = deps->get_coreclr_entry();
-        *candidate = get_directory(coreclr);
+            if (probe_entry_in_configs(entry, &candidate))
-        return true;
+            {
-    }
+                return get_directory(candidate);
+            }
+            else if (entry.is_rid_specific && entry.to_rel_path(deps_dir, &candidate))
+            {
+                return get_directory(candidate);
+            }
+        }
+        else
+        {
+            trace::verbose(_X("Deps has no CoreCLR entry."));
+        }
 
-    return false;
+        // App/FX main dir or standalone app dir.
-}
+        trace::verbose(_X("Probing for CoreCLR in deps directory=[%s]"), deps_dir.c_str());
+        if (coreclr_exists_in_dir(deps_dir))
+        {
+            return deps_dir;
+        }
 
+        return pal::string_t();
+    };
 
-/**
- * Probe for coreclr relative to the app and then from the framework root.
- * If deps does not exist, then just use the app base.
- */
-bool deps_resolver_t::resolve_coreclr_dir(pal::string_t* clr_dir)
-{
     trace::info(_X("-- Starting CoreCLR Probe from app deps.json"));
-
+    pal::string_t clr_dir = process_coreclr(m_portable, m_app_dir, m_deps.get());
-    if (get_coreclr_dir_from_deps(m_app_dir, m_deps.get(), clr_dir))
+    if (clr_dir.empty() && m_portable)
-    {
-        return true;
-    }
-
-    if (m_portable)
     {
         trace::info(_X("-- Starting CoreCLR Probe from FX deps.json"));
-        if (get_coreclr_dir_from_deps(m_fx_dir, m_fx_deps.get(), clr_dir))
+        clr_dir = process_coreclr(false, m_fx_dir, m_fx_deps.get());
-        {
-            return true;
-        }
     }
-
+    if (!clr_dir.empty())
-    if (!m_deps->exists())
     {
-        if (coreclr_exists_in_dir(m_app_dir))
+        return clr_dir;
-        {
-            *clr_dir = m_app_dir;
-            return true;
-        }   
     }
 
-    return false;
+    // Use platform-specific search algorithm
+    pal::string_t install_dir;
+    if (pal::find_coreclr(&install_dir))
+    {
+        return install_dir;
+    }
+
+    return pal::string_t();
 }
 
-/**
+void deps_resolver_t::resolve_tpa_list(
- *  Resovle the TPA assembly locations
+        const pal::string_t& clr_dir,
- */
-bool deps_resolver_t::resolve_tpa_list(
         pal::string_t* output,
         std::unordered_set<pal::string_t>* breadcrumb)
 {
     const std::vector<deps_entry_t> empty(0);
+
+    // Obtain the local assemblies in the app dir.
+    get_dir_assemblies(m_app_dir, _X("local"), &m_local_assemblies);
+    if (m_portable)
+    {
+        // For portable also obtain FX dir assemblies.
+        get_dir_assemblies(m_fx_dir, _X("fx"), &m_fx_assemblies);
+    }
+
     std::unordered_set<pal::string_t> items;
 
-    auto process_entry = [&](const pal::string_t& deps_dir, deps_json_t* deps, const deps_entry_t& entry) -> bool
+    auto process_entry = [&](const pal::string_t& deps_dir, deps_json_t* deps, const dir_assemblies_t& dir_assemblies, const deps_entry_t& entry)
     {
         if (entry.is_serviceable)
         {
@@ -427,81 +421,81 @@ bool deps_resolver_t::resolve_tpa_list(
         }
         if (items.count(entry.asset_name))
         {
-            return true;
+            return;
         }
-        // Ignore placeholders
-        if (ends_with(entry.relative_path, _X("/_._"), false))
-        {
-            return true;
-        }
-
         pal::string_t candidate;
 
         trace::info(_X("Processing TPA for deps entry [%s, %s, %s]"), entry.library_name.c_str(), entry.library_version.c_str(), entry.relative_path.c_str());
 
-        if (probe_deps_entry(entry, deps_dir, &candidate))
+        // Try to probe from the shared locations.
+        if (probe_entry_in_configs(entry, &candidate))
         {
             add_tpa_asset(entry.asset_name, candidate, &items, output);
         }
-        // Leave the mscorlib error handling to the CoreCLR -- this is because apps might choose to use mscorlib.ni.dll
+        // The rid asset should be picked up from app relative subpath.
-        // and delete mscorlib.dll and vice-versa.
+        else if (entry.is_rid_specific && entry.to_rel_path(deps_dir, &candidate))
-        else if (entry.asset_name != _X("mscorlib"))
         {
-            trace::error(_X("Error: assembly specified in the dependencies manifest was not found -- package: '%s', version: '%s', path: '%s'"), 
+            add_tpa_asset(entry.asset_name, candidate, &items, output);
-                entry.library_name.c_str(), entry.library_version.c_str(), entry.relative_path.c_str());
+        }
-            return false;
+        // The rid-less asset should be picked up from the app base.
+        else if (dir_assemblies.count(entry.asset_name))
+        {
+            add_tpa_asset(entry.asset_name, dir_assemblies.find(entry.asset_name)->second, &items, output);
+        }
+        else
+        {
+            // FIXME: Consider this error as a fail fast?
+            trace::warning(_X("Could not resolve path to assembly: [%s, %s, %s]"), entry.library_name.c_str(), entry.library_version.c_str(), entry.relative_path.c_str());
         }
-
-        return true;
     };
-
+    
-    // First add managed assembly to the TPA.
-    // TODO: Remove: the deps should contain the managed DLL.
-    // Workaround for: csc.deps.json doesn't have the csc.dll
-    pal::string_t managed_app_asset = get_filename_without_ext(m_managed_app);
-    add_tpa_asset(managed_app_asset, m_managed_app, &items, output);
-
     const auto& deps_entries = m_deps->get_entries(deps_entry_t::asset_types::runtime);
-    for (const auto& entry : deps_entries)
+    std::for_each(deps_entries.begin(), deps_entries.end(), [&](const deps_entry_t& entry) {
-    {
+        process_entry(m_app_dir, m_deps.get(), m_local_assemblies, entry);
-        if (!process_entry(m_app_dir, m_deps.get(), entry))
+    });
-        {
-            return false;
-        }
-    }
 
     // Finally, if the deps file wasn't present or has missing entries, then
     // add the app local assemblies to the TPA.
-    if (!m_deps->exists())
+    for (const auto& kv : m_local_assemblies)
     {
-        dir_assemblies_t local_assemblies;
+        add_tpa_asset(kv.first, kv.second, &items, output);
-
-        // Obtain the local assemblies in the app dir.
-        get_dir_assemblies(m_app_dir, _X("local"), &local_assemblies);
-        for (const auto& kv : local_assemblies)
-        {
-            add_tpa_asset(kv.first, kv.second, &items, output);
-        }
     }
 
-    // Probe FX deps entries after app assemblies are added.
     const auto& fx_entries = m_portable ? m_fx_deps->get_entries(deps_entry_t::asset_types::runtime) : empty;
-    for (const auto& entry : fx_entries)
+    std::for_each(fx_entries.begin(), fx_entries.end(), [&](const deps_entry_t& entry) {
-    {
+        process_entry(m_fx_dir, m_fx_deps.get(), m_fx_assemblies, entry);
-        if (!process_entry(m_fx_dir, m_fx_deps.get(), entry))
+    });
-        {
-            return false;
-        }
-    }
 
-    return true;
+    for (const auto& kv : m_fx_assemblies)
+    {
+        add_tpa_asset(kv.first, kv.second, &items, output);
+    }
 }
 
-/**
+// -----------------------------------------------------------------------------
- *  Resolve native and culture assembly directories based on "asset_type" parameter.
+// Resolve the directories order for resources/native lookup
- */
+//
-bool deps_resolver_t::resolve_probe_dirs(
+// Description:
+//    This general purpose function specifies priority order of directory lookup
+//    for both native images and resources specific resource images. Lookup for
+//    resources assemblies is done by looking up two levels above from the file
+//    path. Lookup for native images is done by looking up one level from the
+//    file path.
+//
+//  Parameters:
+//     asset_type        - The type of the asset that needs lookup, currently
+//                         supports "resources" and "native"
+//     app_dir           - The application local directory
+//     package_dir       - The directory path to where packages are restored
+//     package_cache_dir - The directory path to secondary cache for packages
+//     clr_dir           - The directory where the host loads the CLR
+//
+//  Returns:
+//     output - Pointer to a string that will hold the resolved lookup dirs
+//
+void deps_resolver_t::resolve_probe_dirs(
         deps_entry_t::asset_types asset_type,
+        const pal::string_t& clr_dir,
         pal::string_t* output,
         std::unordered_set<pal::string_t>* breadcrumb)
 {
@@ -517,16 +511,10 @@ bool deps_resolver_t::resolve_probe_dirs(
     std::function<pal::string_t(const pal::string_t&)> native = [] (const pal::string_t& str) {
         return get_directory(str);
     };
-    // Action for post processing the resolved path
     std::function<pal::string_t(const pal::string_t&)>& action = is_resources ? resources : native;
-
-    // Set for de-duplication
     std::unordered_set<pal::string_t> items;
-
     pal::string_t core_servicing = m_core_servicing;
     pal::realpath(&core_servicing);
-
-    // Filter out non-serviced assets so the paths can be added after servicing paths.
     pal::string_t non_serviced;
 
     std::vector<deps_entry_t> empty(0);
@@ -535,80 +523,85 @@ bool deps_resolver_t::resolve_probe_dirs(
 
     pal::string_t candidate;
 
-    auto add_package_cache_entry = [&](const deps_entry_t& entry, const pal::string_t& deps_dir) -> bool
+    bool track_api_sets = true;
+    auto add_package_cache_entry = [&](const deps_entry_t& entry)
     {
         if (entry.is_serviceable)
         {
             breadcrumb->insert(entry.library_name + _X(",") + entry.library_version);
             breadcrumb->insert(entry.library_name);
         }
-        if (items.count(entry.asset_name))
-        {
-            return true;
-        }
-        // Ignore placeholders
-        if (ends_with(entry.relative_path, _X("/_._"), false))
-        {
-            return true;
-        }
 
-        trace::verbose(_X("Processing native/culture for deps entry [%s, %s, %s]"), 
+        if (probe_entry_in_configs(entry, &candidate))
-            entry.library_name.c_str(), entry.library_version.c_str(), entry.relative_path.c_str());
-
-        if (probe_deps_entry(entry, deps_dir, &candidate))
         {
-            add_unique_path(asset_type, action(candidate), &items, output, &non_serviced, core_servicing);
+            // For standalone apps, on win7, coreclr needs ApiSets which has to be in the DLL search path.
-        }
+            const pal::string_t result_dir = action(candidate);
-        else
-        {
-            // For standalone apps, dotnet.exe will be renamed. Do not use the full package name
-            // because of rid-fallback could happen (ex: CentOS falling back to RHEL)
-            if (ends_with(entry.library_name, _X(".Microsoft.NETCore.DotNetHost"), false) && entry.asset_name == _X("dotnet"))
-            {
-                trace::warning(_X("Warning: assembly specified in the dependencies manifest was not found -- package: '%s', version: '%s', path: '%s'"), 
-                    entry.library_name.c_str(), entry.library_version.c_str(), entry.relative_path.c_str());
-                return true;
-            }
-            trace::error(_X("Error: assembly specified in the dependencies manifest was not found -- package: '%s', version: '%s', path: '%s'"), 
-                entry.library_name.c_str(), entry.library_version.c_str(), entry.relative_path.c_str());
-            return false;
-        }
 
-        if (m_api_set_paths.empty() && pal::need_api_sets() &&
+            if (track_api_sets && pal::need_api_sets() &&
                 ends_with(entry.library_name, _X("Microsoft.NETCore.Windows.ApiSets"), false))
-        {
+            {
-            m_api_set_paths.insert(action(candidate));
+                // For standalone and portable apps, get the ApiSets DLL directory,
-        }
+                // as they could come from servicing or other probe paths.
+                // Note: in portable apps, the API set would come from FX deps
+                // which is actually a standalone deps (rid specific API set).
+                // If the portable app relied on its version of API sets, then
+                // the rid selection fallback would have already been performed
+                // by the host (deps_format.cpp)
+                m_api_set_paths.insert(result_dir);
+            }
 
-        return true;
+            add_unique_path(asset_type, result_dir, &items, output, &non_serviced, core_servicing);
+        }
     };
+    std::for_each(entries.begin(), entries.end(), add_package_cache_entry);
+    track_api_sets = m_api_set_paths.empty();
+    std::for_each(fx_entries.begin(), fx_entries.end(), add_package_cache_entry);
+    track_api_sets = m_api_set_paths.empty();
 
-    for (const auto& entry : entries)
+    // For portable rid specific assets, the app relative directory must be used.
+    if (m_portable)
     {
-        if (!add_package_cache_entry(entry, m_app_dir))
+        std::for_each(entries.begin(), entries.end(), [&](const deps_entry_t& entry)
         {
-            return false;
+            if (entry.is_rid_specific && entry.asset_type == asset_type && entry.to_rel_path(m_app_dir, &candidate))
-        }
+            {
+                add_unique_path(asset_type, action(candidate), &items, output, &non_serviced, core_servicing);
+            }
+
+            // App called out an explicit API set dependency.
+            if (track_api_sets && entry.is_rid_specific && pal::need_api_sets() &&
+                ends_with(entry.library_name, _X("Microsoft.NETCore.Windows.ApiSets"), false))
+            {
+                m_api_set_paths.insert(action(candidate));
+            }
+        });
     }
 
-    // If the deps file is missing add known locations.
+    track_api_sets = m_api_set_paths.empty();
-    if (!m_deps->exists())
+
+    // App local path
+    add_unique_path(asset_type, m_app_dir, &items, output, &non_serviced, core_servicing);
+
+    // If API sets is not found (i.e., empty) in the probe paths above:
+    // 1. For standalone app, do nothing as all are sxs.
+    // 2. For portable app, add FX dir.
+
+    // FX path if present
+    if (!m_fx_dir.empty())
     {
-        // App local path
+        // For portable apps, if we didn't find api sets in probe paths
-        add_unique_path(asset_type, m_app_dir, &items, output, &non_serviced, core_servicing);
+        // add the FX directory.
-    }
+        if (track_api_sets && pal::need_api_sets())
-    
-    for (const auto& entry : fx_entries)
-    {
-        if (!add_package_cache_entry(entry, m_fx_dir))
         {
-            return false;
+            m_api_set_paths.insert(m_fx_dir);
         }
+        add_unique_path(asset_type, m_fx_dir, &items, output, &non_serviced, core_servicing);
     }
 
+    // CLR path
+    add_unique_path(asset_type, clr_dir, &items, output, &non_serviced, core_servicing);
+
     output->append(non_serviced);
-
-    return true;
 }
 
 
@@ -624,19 +617,10 @@ bool deps_resolver_t::resolve_probe_dirs(
 //                         resolved path ordering.
 //
 //
-bool deps_resolver_t::resolve_probe_paths(probe_paths_t* probe_paths, std::unordered_set<pal::string_t>* breadcrumb)
+bool deps_resolver_t::resolve_probe_paths(const pal::string_t& clr_dir, probe_paths_t* probe_paths, std::unordered_set<pal::string_t>* breadcrumb)
 {
-    if (!resolve_tpa_list(&probe_paths->tpa, breadcrumb))
+    resolve_tpa_list(clr_dir, &probe_paths->tpa, breadcrumb);
-    {
+    resolve_probe_dirs(deps_entry_t::asset_types::native, clr_dir, &probe_paths->native, breadcrumb);
-        return false;
+    resolve_probe_dirs(deps_entry_t::asset_types::resources, clr_dir, &probe_paths->resources, breadcrumb);
-    }
-    if (!resolve_probe_dirs(deps_entry_t::asset_types::native, &probe_paths->native, breadcrumb))
-    {
-        return false;
-    }
-    if (!resolve_probe_dirs(deps_entry_t::asset_types::resources, &probe_paths->resources, breadcrumb))
-    {
-        return false;
-    }
     return true;
 }

src/corehost/cli/deps_resolver.h

@@ -27,7 +27,6 @@ public:
     deps_resolver_t(const hostpolicy_init_t& init, const arguments_t& args)
         : m_fx_dir(init.fx_dir)
         , m_app_dir(args.app_dir)
-        , m_managed_app(args.managed_application)
         , m_coreclr_index(-1)
         , m_portable(init.is_portable)
         , m_deps(nullptr)
@@ -59,11 +58,6 @@ public:
             errors->assign(_X("An error occurred while parsing ") + m_deps_file);
             return false;
         }
-        if (m_portable && !m_fx_deps->exists())
-        {
-            errors->assign(_X("A fatal error was encountered, missing dependencies manifest at: ") + m_fx_deps_file);
-            return false;
-        }
         if (m_portable && !m_fx_deps->is_valid())
         {
             errors->assign(_X("An error occurred while parsing ") + m_fx_deps_file);
@@ -79,12 +73,11 @@ public:
     void setup_additional_probes(const std::vector<pal::string_t>& probe_paths);
 
     bool resolve_probe_paths(
+      const pal::string_t& clr_dir,
       probe_paths_t* probe_paths,
       std::unordered_set<pal::string_t>* breadcrumb);
 
-    bool get_coreclr_dir_from_deps(const pal::string_t& deps_dir, deps_json_t* deps, pal::string_t* candidate);
+    pal::string_t resolve_coreclr_dir();
-
-    bool resolve_coreclr_dir(pal::string_t* clr_dir);
 
     const pal::string_t& get_fx_deps_file() const
     {
@@ -111,13 +104,15 @@ private:
     }
 
     // Resolve order for TPA lookup.
-    bool resolve_tpa_list(
+    void resolve_tpa_list(
+        const pal::string_t& clr_dir,
         pal::string_t* output,
         std::unordered_set<pal::string_t>* breadcrumb);
 
     // Resolve order for culture and native DLL lookup.
-    bool resolve_probe_dirs(
+    void resolve_probe_dirs(
         deps_entry_t::asset_types asset_type,
+        const pal::string_t& clr_dir,
         pal::string_t* output,
         std::unordered_set<pal::string_t>* breadcrumb);
 
@@ -127,12 +122,6 @@ private:
         const pal::string_t& dir_name,
         std::unordered_map<pal::string_t, pal::string_t>* dir_assemblies);
 
-    // Probe entry in probe configurations and deps dir.
-    bool probe_deps_entry(
-        const deps_entry_t& entry,
-        const pal::string_t& deps_dir,
-        pal::string_t* candidate);
-
     // Probe entry in probe configurations.
     bool probe_entry_in_configs(
         const deps_entry_t& entry,
@@ -154,15 +143,14 @@ private:
     // Map of simple name -> full path of local/fx assemblies populated
     // in priority order of their extensions.
     typedef std::unordered_map<pal::string_t, pal::string_t> dir_assemblies_t;
+    dir_assemblies_t m_local_assemblies;
+    dir_assemblies_t m_fx_assemblies;
 
     std::unordered_map<pal::string_t, pal::string_t> m_patch_roll_forward_cache;
     std::unordered_map<pal::string_t, pal::string_t> m_prerelease_roll_forward_cache;
 
     pal::string_t m_package_cache;
 
-    // The managed application the dependencies are being resolved for.
-    pal::string_t m_managed_app;
-
     // Servicing root, could be empty on platforms that don't support or when errors occur.
     pal::string_t m_core_servicing;
 

src/corehost/cli/fxr/fx_muxer.cpp

@@ -85,9 +85,9 @@ pal::string_t resolve_hostpolicy_version_from_deps(const pal::string_t& deps_jso
         const auto& json = root.as_object();
         const auto& libraries = json.at(_X("libraries")).as_object();
 
-        // Look up the root package instead of the "runtime" package because we can't do a full rid resolution.
+        // Walk through the libraries section and check any library that starts with:
-        // i.e., look for "Microsoft.NETCore.DotNetHostPolicy/" followed by version.
+        // "runtime.win7-x64.Microsoft.NETCore.DotNetHostPolicy/" followed by version.
-        pal::string_t prefix = _X("Microsoft.NETCore.DotNetHostPolicy/");
+        pal::string_t prefix = _STRINGIFY(HOST_POLICY_PKG_NAME) + pal::string_t(_X("/"));
         for (const auto& library : libraries)
         {
             if (starts_with(library.first, prefix, false))

src/corehost/cli/hostpolicy.cpp

@@ -27,8 +27,8 @@ int run(const arguments_t& args)
         return StatusCode::ResolverInitFailure;
     }
 
-    pal::string_t clr_path;
+    pal::string_t clr_path = resolver.resolve_coreclr_dir();
-    if (!resolver.resolve_coreclr_dir(&clr_path) || clr_path.empty() || !pal::realpath(&clr_path))
+    if (clr_path.empty() || !pal::realpath(&clr_path))
     {
         trace::error(_X("Could not resolve CoreCLR path. For more details, enable tracing by setting COREHOST_TRACE environment variable to 1"));;
         return StatusCode::CoreClrResolveFailure;
@@ -49,7 +49,7 @@ int run(const arguments_t& args)
     breadcrumbs.insert(policy_name + _X(",") + policy_version);
 
     probe_paths_t probe_paths;
-    if (!resolver.resolve_probe_paths(&probe_paths, &breadcrumbs))
+    if (!resolver.resolve_probe_paths(clr_path, &probe_paths, &breadcrumbs))
     {
         return StatusCode::ResolverResolveFailure;
     }