Merge branch 'master' of http://github.com/Microsoft/vcpkg

9 files changed, 47 insertions, 16 deletions

diff --git a/toolsrc/include/BuildInfo.h b/toolsrc/include/BuildInfo.h
index 9f872385e..49811d521 100644
--- a/toolsrc/include/BuildInfo.h
+++ b/toolsrc/include/BuildInfo.h
@@ -104,7 +104,7 @@ namespace vcpkg { namespace PostBuildLint
 
         OutdatedDynamicCrt() = delete;
 
-        const std::regex crt_regex() const;
+        std::regex crt_regex() const;
         const std::string& toString() const;
 
     private:
diff --git a/toolsrc/include/coff_file_reader.h b/toolsrc/include/coff_file_reader.h
index 1a9a071ef..edf6910a5 100644
--- a/toolsrc/include/coff_file_reader.h
+++ b/toolsrc/include/coff_file_reader.h
@@ -15,7 +15,7 @@ namespace vcpkg {namespace COFFFileReader
         std::vector<MachineType> machine_types;
     };
 
-    dll_info read_dll(const fs::path path);
+    dll_info read_dll(const fs::path& path);
 
-    lib_info read_lib(const fs::path path);
+    lib_info read_lib(const fs::path& path);
 }}
diff --git a/toolsrc/include/metrics.h b/toolsrc/include/metrics.h
index 52662cd97..a0f4fc61d 100644
--- a/toolsrc/include/metrics.h
+++ b/toolsrc/include/metrics.h
@@ -13,6 +13,7 @@ namespace vcpkg
     void TrackProperty(const std::string& name, const std::string& value);
     void TrackProperty(const std::string& name, const std::wstring& value);
     bool GetCompiledMetricsEnabled();
+    std::wstring GetSQMUser();
 
     void Upload(const std::string& payload);
     void Flush();
diff --git a/toolsrc/include/vcpkg_Commands.h b/toolsrc/include/vcpkg_Commands.h
index 8272929a7..fd427fd40 100644
--- a/toolsrc/include/vcpkg_Commands.h
+++ b/toolsrc/include/vcpkg_Commands.h
@@ -8,8 +8,8 @@ namespace vcpkg
     extern const char*const INTEGRATE_COMMAND_HELPSTRING;
 
     void print_usage();
-    void print_example(const char* command_and_arguments);
-    std::string create_example_string(const char* command_and_arguments);
+    void print_example(const std::string& command_and_arguments);
+    std::string create_example_string(const std::string& command_and_arguments);
     void update_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
 
     void build_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet);
diff --git a/toolsrc/include/vcpkg_Files.h b/toolsrc/include/vcpkg_Files.h
index 8b320303d..6c9d0d365 100644
--- a/toolsrc/include/vcpkg_Files.h
+++ b/toolsrc/include/vcpkg_Files.h
@@ -10,9 +10,13 @@ namespace vcpkg {namespace Files
 
     void check_is_directory(const fs::path& dirpath);
 
-    bool has_invalid_chars_for_filesystem(const std::string s);
+    bool has_invalid_chars_for_filesystem(const std::string& s);
 
-    expected<std::string> get_contents(const fs::path& file_path) noexcept;
+    expected<std::string> read_contents(const fs::path& file_path) noexcept;
+
+    expected<std::vector<std::string>> read_all_lines(const fs::path& file_path);
+
+    void write_all_lines(const fs::path& file_path, const std::vector<std::string>& lines);
 
     fs::path find_file_recursively_up(const fs::path& starting_dir, const std::string& filename);
 
diff --git a/toolsrc/include/vcpkg_Input.h b/toolsrc/include/vcpkg_Input.h
index bbf3adfbf..5ce90e3b9 100644
--- a/toolsrc/include/vcpkg_Input.h
+++ b/toolsrc/include/vcpkg_Input.h
@@ -5,9 +5,9 @@
 
 namespace vcpkg {namespace Input
 {
-    package_spec check_and_get_package_spec(const std::string& package_spec_as_string, const triplet& default_target_triplet, const char* example_text);
+    package_spec check_and_get_package_spec(const std::string& package_spec_as_string, const triplet& default_target_triplet, const std::string& example_text);
 
-    std::vector<package_spec> check_and_get_package_specs(const std::vector<std::string>& package_specs_as_strings, const triplet& default_target_triplet, const char* example_text);
+    std::vector<package_spec> check_and_get_package_specs(const std::vector<std::string>& package_specs_as_strings, const triplet& default_target_triplet, const std::string& example_text);
 
     void check_triplet(const triplet& t, const vcpkg_paths& paths);
 
diff --git a/toolsrc/include/vcpkg_Strings.h b/toolsrc/include/vcpkg_Strings.h
index 859da5658..a117a1a81 100644
--- a/toolsrc/include/vcpkg_Strings.h
+++ b/toolsrc/include/vcpkg_Strings.h
@@ -69,4 +69,10 @@ namespace vcpkg {namespace Strings
     std::string ascii_to_lowercase(const std::string& input);
 
     std::string join(const std::vector<std::string>& v, const std::string& delimiter);
+
+    void trim(std::string* s);
+
+    std::string trimmed(const std::string& s);
+
+    void trim_all_and_remove_whitespace_strings(std::vector<std::string>* strings);
 }}
diff --git a/toolsrc/include/vcpkg_System.h b/toolsrc/include/vcpkg_System.h
index e059bde0a..1101c9b27 100644
--- a/toolsrc/include/vcpkg_System.h
+++ b/toolsrc/include/vcpkg_System.h
@@ -36,8 +36,28 @@ namespace vcpkg {namespace System
 
     void print(const char* message);
     void println(const char* message);
-    void print(color c, const char* message);
-    void println(color c, const char* message);
+    void print(const color c, const char* message);
+    void println(const color c, const char* message);
+
+    inline void print(const std::string& message)
+    {
+        return print(message.c_str());
+    }
+
+    inline void println(const std::string& message)
+    {
+        return println(message.c_str());
+    }
+
+    inline void print(const color c, const std::string& message)
+    {
+        return print(c, message.c_str());
+    }
+
+    inline void println(const color c, const std::string& message)
+    {
+        return println(c, message.c_str());
+    }
 
     template <class...Args>
     void print(const char* messageTemplate, const Args&... messageArgs)
@@ -46,7 +66,7 @@ namespace vcpkg {namespace System
     }
 
     template <class...Args>
-    void print(color c, const char* messageTemplate, const Args&... messageArgs)
+    void print(const color c, const char* messageTemplate, const Args&... messageArgs)
     {
         return print(c, Strings::format(messageTemplate, messageArgs...).c_str());
     }
@@ -58,7 +78,7 @@ namespace vcpkg {namespace System
     }
 
     template <class...Args>
-    void println(color c, const char* messageTemplate, const Args&... messageArgs)
+    void println(const color c, const char* messageTemplate, const Args&... messageArgs)
     {
         return println(c, Strings::format(messageTemplate, messageArgs...).c_str());
     }
diff --git a/toolsrc/include/vcpkg_cmd_arguments.h b/toolsrc/include/vcpkg_cmd_arguments.h
index 95feb4814..2194e6d2c 100644
--- a/toolsrc/include/vcpkg_cmd_arguments.h
+++ b/toolsrc/include/vcpkg_cmd_arguments.h
@@ -24,11 +24,11 @@ namespace vcpkg
         std::unordered_set<std::string> check_and_get_optional_command_arguments(const std::vector<std::string>& valid_options) const;
 
         void check_max_arg_count(const size_t expected_arg_count) const;
-        void check_max_arg_count(const size_t expected_arg_count, const char* example_text) const;
+        void check_max_arg_count(const size_t expected_arg_count, const std::string& example_text) const;
         void check_min_arg_count(const size_t expected_arg_count) const;
-        void check_min_arg_count(const size_t expected_arg_count, const char* example_text) const;
+        void check_min_arg_count(const size_t expected_arg_count, const std::string& example_text) const;
         void check_exact_arg_count(const size_t expected_arg_count) const;
-        void check_exact_arg_count(const size_t expected_arg_count, const char* example_text) const;
+        void check_exact_arg_count(const size_t expected_arg_count, const std::string& example_text) const;
 
     private:
         std::unordered_set<std::string> optional_command_arguments;