Move Environment:: functions into vcpkg_paths. Remove Environment.h/cpp

2 files changed, 8 insertions, 15 deletions

diff --git a/toolsrc/include/vcpkg_Environment.h b/toolsrc/include/vcpkg_Environment.h
deleted file mode 100644
index 32ab28391..000000000
--- a/toolsrc/include/vcpkg_Environment.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-#include "vcpkg_paths.h"
-
-namespace vcpkg::Environment
-{
-    const fs::path& get_dumpbin_exe(const vcpkg_paths& paths);
-
-    struct vcvarsall_and_platform_toolset
-    {
-        fs::path path;
-        std::wstring platform_toolset;
-    };
-
-    const vcvarsall_and_platform_toolset& get_vcvarsall_bat(const vcpkg_paths& paths);
-}
diff --git a/toolsrc/include/vcpkg_paths.h b/toolsrc/include/vcpkg_paths.h
index ae91a8e2f..9577abd01 100644
--- a/toolsrc/include/vcpkg_paths.h
+++ b/toolsrc/include/vcpkg_paths.h
@@ -7,6 +7,12 @@
 
 namespace vcpkg
 {
+    struct vcvarsall_and_platform_toolset
+    {
+        fs::path path;
+        std::wstring platform_toolset;
+    };
+
     struct vcpkg_paths
     {
         static expected<vcpkg_paths> create(const fs::path& vcpkg_root_dir);
@@ -40,6 +46,8 @@ namespace vcpkg
         const fs::path& get_cmake_exe() const;
         const fs::path& get_git_exe() const;
         const fs::path& get_nuget_exe() const;
+        const fs::path& get_dumpbin_exe() const;
+        const vcvarsall_and_platform_toolset& get_vcvarsall_bat() const;
 
     private:
         lazy<fs::path> cmake_exe;