Merge branch 'master' of https://github.com/Microsoft/vcpkg into patch-vs2013

# Conflicts:
#	toolsrc/include/vcpkg/vcpkgpaths.h
#	toolsrc/src/vcpkg/vcpkgpaths.cpp

1 files changed, 0 insertions, 107 deletions

diff --git a/toolsrc/include/vcpkg_System.h b/toolsrc/include/vcpkg_System.h
deleted file mode 100644
index 65f80ae6d..000000000
--- a/toolsrc/include/vcpkg_System.h
+++ /dev/null
@@ -1,107 +0,0 @@
-#pragma once
-
-#include "filesystem_fs.h"
-#include "vcpkg_Strings.h"
-#include "vcpkg_optional.h"
-#include <Windows.h>
-
-namespace vcpkg::System
-{
-    tm get_current_date_time();
-
-    fs::path get_exe_path_of_current_process();
-
-    struct ExitCodeAndOutput
-    {
-        int exit_code;
-        std::string output;
-    };
-
-    int cmd_execute_clean(const CWStringView cmd_line);
-
-    int cmd_execute(const CWStringView cmd_line);
-
-    ExitCodeAndOutput cmd_execute_and_capture_output(const CWStringView cmd_line);
-
-    std::wstring create_powershell_script_cmd(const fs::path& script_path, const CWStringView args = Strings::WEMPTY);
-
-    enum class Color
-    {
-        success = 10,
-        error = 12,
-        warning = 14,
-    };
-
-    void println();
-    void print(const CStringView message);
-    void println(const CStringView message);
-    void print(const Color c, const CStringView message);
-    void println(const Color c, const CStringView message);
-
-    template<class Arg1, class... Args>
-    void print(const char* messageTemplate, const Arg1& messageArg1, const Args&... messageArgs)
-    {
-        return System::print(Strings::format(messageTemplate, messageArg1, messageArgs...));
-    }
-
-    template<class Arg1, class... Args>
-    void print(const Color c, const char* messageTemplate, const Arg1& messageArg1, const Args&... messageArgs)
-    {
-        return System::print(c, Strings::format(messageTemplate, messageArg1, messageArgs...));
-    }
-
-    template<class Arg1, class... Args>
-    void println(const char* messageTemplate, const Arg1& messageArg1, const Args&... messageArgs)
-    {
-        return System::println(Strings::format(messageTemplate, messageArg1, messageArgs...));
-    }
-
-    template<class Arg1, class... Args>
-    void println(const Color c, const char* messageTemplate, const Arg1& messageArg1, const Args&... messageArgs)
-    {
-        return System::println(c, Strings::format(messageTemplate, messageArg1, messageArgs...));
-    }
-
-    Optional<std::wstring> get_environment_variable(const CWStringView varname) noexcept;
-
-    Optional<std::wstring> get_registry_string(HKEY base, const CWStringView subkey, const CWStringView valuename);
-
-    enum class CPUArchitecture
-    {
-        X86,
-        X64,
-        ARM,
-        ARM64,
-    };
-
-    Optional<CPUArchitecture> to_cpu_architecture(CStringView arch);
-
-    CPUArchitecture get_host_processor();
-
-    std::vector<CPUArchitecture> get_supported_host_architectures();
-
-    const fs::path& get_program_files_32_bit();
-
-    const fs::path& get_program_files_platform_bitness();
-}
-
-namespace vcpkg::Debug
-{
-    void println(const CStringView message);
-    void println(const System::Color c, const CStringView message);
-
-    template<class Arg1, class... Args>
-    void println(const char* messageTemplate, const Arg1& messageArg1, const Args&... messageArgs)
-    {
-        return Debug::println(Strings::format(messageTemplate, messageArg1, messageArgs...));
-    }
-
-    template<class Arg1, class... Args>
-    void println(const System::Color c,
-                 const char* messageTemplate,
-                 const Arg1& messageArg1,
-                 const Args&... messageArgs)
-    {
-        return Debug::println(c, Strings::format(messageTemplate, messageArg1, messageArgs...));
-    }
-}