Improve error messages around calling powershell scripts

3 files changed, 48 insertions, 31 deletions

diff --git a/toolsrc/include/vcpkg/base/system.h b/toolsrc/include/vcpkg/base/system.h
index a696bf3ae..9f2d91435 100644
--- a/toolsrc/include/vcpkg/base/system.h
+++ b/toolsrc/include/vcpkg/base/system.h
@@ -22,7 +22,9 @@ namespace vcpkg::System
 
     ExitCodeAndOutput cmd_execute_and_capture_output(const CStringView cmd_line);
 
-    ExitCodeAndOutput powershell_execute_and_capture_output(const fs::path& script_path, const CStringView args = "");
+    std::string powershell_execute_and_capture_output(const std::string& title,
+                                                      const fs::path& script_path,
+                                                      const CStringView args = "");
 
     enum class Color
     {
diff --git a/toolsrc/src/vcpkg/base/system.cpp b/toolsrc/src/vcpkg/base/system.cpp
index a1bc9daf6..47096ed63 100644
--- a/toolsrc/src/vcpkg/base/system.cpp
+++ b/toolsrc/src/vcpkg/base/system.cpp
@@ -3,6 +3,7 @@
 #include <vcpkg/base/checks.h>
 #include <vcpkg/base/system.h>
 #include <vcpkg/globalstate.h>
+#include <vcpkg/metrics.h>
 
 #include <time.h>
 
@@ -269,7 +270,9 @@ namespace vcpkg::System
 #endif
     }
 
-    ExitCodeAndOutput powershell_execute_and_capture_output(const fs::path& script_path, const CStringView args)
+    std::string powershell_execute_and_capture_output(const std::string& title,
+                                                      const fs::path& script_path,
+                                                      const CStringView args)
     {
         // TODO: switch out ExecutionPolicy Bypass with "Remove Mark Of The Web" code and restore RemoteSigned
         const std::string cmd = Strings::format(
@@ -277,6 +280,27 @@ namespace vcpkg::System
 
         auto rc = System::cmd_execute_and_capture_output(cmd);
 
+        if (rc.exit_code)
+        {
+            System::println(Color::error,
+                            "%s\n"
+                            "Could not run:\n"
+                            "    '%s'\n"
+                            "Error message was:\n"
+                            "    %s",
+                            title,
+                            script_path.generic_string(),
+                            rc.output);
+
+            {
+                auto locked_metrics = Metrics::g_metrics.lock();
+                locked_metrics->track_property("error", "powershell script failed");
+                locked_metrics->track_property("title", title);
+            }
+
+            Checks::exit_with_code(VCPKG_LINE_INFO, rc.exit_code);
+        }
+
         // Remove newline from all output.
         // Powershell returns newlines when it hits the column count of the console.
         // For example, this is 80 in cmd on Windows 7. If the expected output is longer than 80 lines, we get
@@ -285,7 +309,7 @@ namespace vcpkg::System
         // and then strip all newlines here.
         rc.output = Strings::replace_all(std::move(rc.output), "\n", "");
 
-        return rc;
+        return rc.output;
     }
 
     void println() { putchar('\n'); }
diff --git a/toolsrc/src/vcpkg/vcpkgpaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp
index c17b029c0..a553f4199 100644
--- a/toolsrc/src/vcpkg/vcpkgpaths.cpp
+++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp
@@ -91,26 +91,13 @@ namespace vcpkg
                         tool_name,
                         version_as_string);
         const fs::path script = scripts_folder / "fetchDependency.ps1";
-        const System::ExitCodeAndOutput rc =
-            System::powershell_execute_and_capture_output(script, Strings::format("-Dependency %s", tool_name));
-        if (rc.exit_code)
-        {
-            System::println(System::Color::error,
-                            "Launching powershell failed or was denied when trying to fetch %s version %s.\n"
-                            "(No sufficient installed version was found)",
-                            tool_name,
-                            version_as_string);
-            {
-                auto locked_metrics = Metrics::g_metrics.lock();
-                locked_metrics->track_property("error", "powershell install failed");
-                locked_metrics->track_property("dependency", tool_name);
-            }
-            Checks::exit_with_code(VCPKG_LINE_INFO, rc.exit_code);
-        }
+        const std::string title = "Fetching %s version %s (No sufficient installed version was found)";
+        const std::string output =
+            System::powershell_execute_and_capture_output(title, script, Strings::format("-Dependency %s", tool_name));
 
-        const std::vector<std::string> dependency_path = keep_data_lines(rc.output);
+        const std::vector<std::string> dependency_path = keep_data_lines(output);
         Checks::check_exit(
-            VCPKG_LINE_INFO, dependency_path.size() == 1, "Expected dependency path, but got %s", rc.output);
+            VCPKG_LINE_INFO, dependency_path.size() == 1, "Expected dependency path, but got %s", output);
 
         const fs::path actual_downloaded_path = Strings::trim(std::string{dependency_path.at(0)});
         std::error_code ec;
@@ -344,17 +331,21 @@ namespace vcpkg
     static std::vector<VisualStudioInstance> get_visual_studio_instances(const VcpkgPaths& paths)
     {
         const fs::path script = paths.scripts / "findVisualStudioInstallationInstances.ps1";
-        const System::ExitCodeAndOutput ec_data = System::powershell_execute_and_capture_output(script);
-        Checks::check_exit(
-            VCPKG_LINE_INFO, ec_data.exit_code == 0, "Could not run script to detect Visual Studio instances");
+        const std::string output =
+            System::powershell_execute_and_capture_output("Detecting Visual Studio instances", script);
 
-        const std::vector<std::string> instances_as_strings = keep_data_lines(ec_data.output);
+        const std::vector<std::string> instances_as_strings = keep_data_lines(output);
         Checks::check_exit(VCPKG_LINE_INFO,
                            !instances_as_strings.empty(),
-                           "Could not detect any Visual Studio instances. Powershell returned: %s\n",
-                           ec_data.output);
-
-        std::vector<VisualStudioInstance> output;
+                           "Could not detect any Visual Studio instances.\n"
+                           "Powershell script:\n"
+                           "    %s\n"
+                           "returned:\n"
+                           "%s",
+                           script.generic_string(),
+                           output);
+
+        std::vector<VisualStudioInstance> instances;
         for (const std::string& instance_as_string : instances_as_strings)
         {
             const std::vector<std::string> split = Strings::split(instance_as_string, "::");
@@ -364,10 +355,10 @@ namespace vcpkg
                                "Expected: PreferenceWeight::ReleaseType::Version::PathToVisualStudio\n"
                                "Actual  : %s\n",
                                instance_as_string);
-            output.push_back({split.at(3), split.at(2), split.at(1), split.at(0)});
+            instances.push_back({split.at(3), split.at(2), split.at(1), split.at(0)});
         }
 
-        return output;
+        return instances;
     }
 
     static std::vector<Toolset> find_toolset_instances(const VcpkgPaths& paths)