[vcpkg] Significantly reduce usage of powershell. Reduce console font switching bug

3 files changed, 5 insertions, 2 deletions

diff --git a/toolsrc/include/vcpkg/base/system.h b/toolsrc/include/vcpkg/base/system.h
index 0d089276f..cf9c78868 100644
--- a/toolsrc/include/vcpkg/base/system.h
+++ b/toolsrc/include/vcpkg/base/system.h
@@ -47,6 +47,7 @@ namespace vcpkg::System
 
     ExitCodeAndOutput cmd_execute_and_capture_output(const CStringView cmd_line);
 
+#if defined(_WIN32)
     void powershell_execute(const std::string& title,
                             const fs::path& script_path,
                             const std::vector<PowershellParameter>& parameters = {});
@@ -54,6 +55,7 @@ namespace vcpkg::System
     std::string powershell_execute_and_capture_output(const std::string& title,
                                                       const fs::path& script_path,
                                                       const std::vector<PowershellParameter>& parameters = {});
+#endif
 
     enum class Color
     {
diff --git a/toolsrc/include/vcpkg/commands.h b/toolsrc/include/vcpkg/commands.h
index 6d29b7960..708151dce 100644
--- a/toolsrc/include/vcpkg/commands.h
+++ b/toolsrc/include/vcpkg/commands.h
@@ -132,14 +132,14 @@ namespace vcpkg::Commands
     namespace Hash
     {
         std::string get_string_hash(const std::string& s, const std::string& hash_type);
-        std::string get_file_hash(const VcpkgPaths& paths, const fs::path& path, const std::string& hash_type);
+        std::string get_file_hash(const Files::Filesystem& fs, const fs::path& path, const std::string& hash_type);
 
         void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
     }
 
     namespace Fetch
     {
-        std::vector<Toolset> find_toolset_instances(const VcpkgPaths& paths);
+        std::vector<Toolset> find_toolset_instances_prefered_first(const VcpkgPaths& paths);
         fs::path get_tool_path(const VcpkgPaths& paths, const std::string& tool);
         void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
     }
diff --git a/toolsrc/include/vcpkg/vcpkgpaths.h b/toolsrc/include/vcpkg/vcpkgpaths.h
index 9c8f2911a..a3c90fd33 100644
--- a/toolsrc/include/vcpkg/vcpkgpaths.h
+++ b/toolsrc/include/vcpkg/vcpkgpaths.h
@@ -66,6 +66,7 @@ namespace vcpkg
         fs::path triplets;
         fs::path scripts;
 
+        fs::path tools;
         fs::path buildsystems;
         fs::path buildsystems_msbuild_targets;