Introduce vcpkg_info.h/cpp

1 files changed, 4 insertions, 3 deletions

diff --git a/toolsrc/src/main.cpp b/toolsrc/src/main.cpp
index 22c45e5ab..70527ca1d 100644
--- a/toolsrc/src/main.cpp
+++ b/toolsrc/src/main.cpp
@@ -13,6 +13,7 @@
 #include "vcpkg_System.h"
 #include "vcpkg_Input.h"
 #include "Paragraphs.h"
+#include "vcpkg_info.h"
 
 using namespace vcpkg;
 
@@ -192,7 +193,7 @@ int wmain(const int argc, const wchar_t* const* const argv)
             Flush();
         });
 
-    TrackProperty("version", version());
+    TrackProperty("version", Info::version());
 
     const std::string trimmed_command_line = trim_path_from_command_line(Strings::utf16_to_utf8(GetCommandLineW()));
     TrackProperty("cmdline", trimmed_command_line);
@@ -234,10 +235,10 @@ int wmain(const int argc, const wchar_t* const* const argv)
     std::cerr
         << "vcpkg.exe has crashed.\n"
         << "Please send an email to:\n"
-        << "    vcpkg@microsoft.com\n"
+        << "    " << Info::email() << "\n"
         << "containing a brief summary of what you were trying to do and the following data blob:\n"
         << "\n"
-        << "Version=" << version() << "\n"
+        << "Version=" << Info::version() << "\n"
         << "EXCEPTION='" << exc_msg << "'\n"
         << "CMD=\n";
     for (int x = 0; x < argc; ++x)