From 925b64efd2210e04568dfd5a33473e86a6d618a9 Mon Sep 17 00:00:00 2001
From: Billy O'Neal <bion@microsoft.com>
Date: Fri, 22 Jan 2021 11:10:27 -0800
Subject: Restore x-upload-metrics command accidentally disabled by removing
 VCPKG_DISABLE_METRICS (#15810)

* Restore x-upload-metrics command accidentally disabled by removing VCPKG_DISABLE_METRICS in https://github.com/microsoft/vcpkg/pull/15470

* Didn't save a file.
---
 toolsrc/src/vcpkg-test/commands.cpp           | 4 ++--
 toolsrc/src/vcpkg/commands.cpp                | 8 ++++----
 toolsrc/src/vcpkg/commands.upload-metrics.cpp | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'toolsrc/src')

diff --git a/toolsrc/src/vcpkg-test/commands.cpp b/toolsrc/src/vcpkg-test/commands.cpp
index e417505ad..1a582beb3 100644
--- a/toolsrc/src/vcpkg-test/commands.cpp
+++ b/toolsrc/src/vcpkg-test/commands.cpp
@@ -32,9 +32,9 @@ TEST_CASE ("get_available_basic_commands works", "[commands]")
     check_all_commands(Commands::get_available_basic_commands(), {
         "contact",
         "version",
-#if VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND
+#if defined(_WIN32)
         "x-upload-metrics",
-#endif // VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND
+#endif // defined(_WIN32)
         });
 }
 
diff --git a/toolsrc/src/vcpkg/commands.cpp b/toolsrc/src/vcpkg/commands.cpp
index 19b5bdcde..386aedf58 100644
--- a/toolsrc/src/vcpkg/commands.cpp
+++ b/toolsrc/src/vcpkg/commands.cpp
@@ -41,16 +41,16 @@ namespace vcpkg::Commands
     {
         static const Version::VersionCommand version{};
         static const Contact::ContactCommand contact{};
-#if VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND
+#if defined(_WIN32)
         static const UploadMetrics::UploadMetricsCommand upload_metrics{};
-#endif // VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND
+#endif // defined(_WIN32)
 
         static std::vector<PackageNameAndFunction<const BasicCommand*>> t = {
             {"version", &version},
             {"contact", &contact},
-#if VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND
+#if defined(_WIN32)
             {"x-upload-metrics", &upload_metrics},
-#endif // VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND
+#endif // defined(_WIN32)
         };
         return t;
     }
diff --git a/toolsrc/src/vcpkg/commands.upload-metrics.cpp b/toolsrc/src/vcpkg/commands.upload-metrics.cpp
index 6ac7cfcb6..acf5a5377 100644
--- a/toolsrc/src/vcpkg/commands.upload-metrics.cpp
+++ b/toolsrc/src/vcpkg/commands.upload-metrics.cpp
@@ -1,6 +1,6 @@
 #include <vcpkg/commands.upload-metrics.h>
 
-#if VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND
+#if defined(_WIN32)
 #include <vcpkg/base/checks.h>
 #include <vcpkg/base/files.h>
 
@@ -26,4 +26,4 @@ namespace vcpkg::Commands::UploadMetrics
         Checks::exit_success(VCPKG_LINE_INFO);
     }
 }
-#endif // VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND
+#endif // defined(_WIN32)
-- 
cgit v1.2.3