Merge branch 'master' into master

1 files changed, 22 insertions, 2 deletions

diff --git a/toolsrc/src/commands_version.cpp b/toolsrc/src/commands_version.cpp
index a521b2567..4789e2409 100644
--- a/toolsrc/src/commands_version.cpp
+++ b/toolsrc/src/commands_version.cpp
@@ -1,16 +1,36 @@
 #include "pch.h"
 #include "vcpkg_Commands.h"
 #include "vcpkg_System.h"
-#include "vcpkg_info.h"
+#include "metrics.h"
+
+#define STRINGIFY(...) #__VA_ARGS__
+#define MACRO_TO_STRING(X) STRINGIFY(X)
+
+#define VCPKG_VERSION_AS_STRING MACRO_TO_STRING(VCPKG_VERSION)
 
 namespace vcpkg::Commands::Version
 {
+    const std::string& version()
+    {
+        static const std::string s_version =
+#include "../VERSION.txt"
+
+            + std::string(VCPKG_VERSION_AS_STRING)
+#ifndef NDEBUG
+            + std::string("-debug")
+#endif
+            + std::string(GetCompiledMetricsEnabled() ? "" : "-external");
+        return s_version;
+    }
+
     void perform_and_exit(const vcpkg_cmd_arguments& args)
     {
         args.check_exact_arg_count(0);
+        args.check_and_get_optional_command_arguments({});
+
         System::println("Vcpkg package management program version %s\n"
                         "\n"
-                        "See LICENSE.txt for license information.", Info::version()
+                        "See LICENSE.txt for license information.", version()
         );
         exit(EXIT_SUCCESS);
     }