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, 20 insertions, 0 deletions

diff --git a/toolsrc/src/vcpkgmetricsuploader.cpp b/toolsrc/src/vcpkgmetricsuploader.cpp
new file mode 100644
index 000000000..2239fe750
--- /dev/null
+++ b/toolsrc/src/vcpkgmetricsuploader.cpp
@@ -0,0 +1,20 @@
+#include <vcpkg/metrics.h>
+
+#include <vcpkg/base/checks.h>
+#include <vcpkg/base/files.h>
+
+#include <Windows.h>
+
+using namespace vcpkg;
+
+int WINAPI WinMain(_In_ HINSTANCE, _In_opt_ HINSTANCE, _In_ LPSTR, _In_ int)
+{
+    int argCount;
+    LPWSTR* szArgList = CommandLineToArgvW(GetCommandLineW(), &argCount);
+
+    Checks::check_exit(VCPKG_LINE_INFO, argCount == 2, "Requires exactly one argument, the path to the payload file");
+    auto v = Files::get_real_filesystem().read_contents(szArgList[1]).value_or_exit(VCPKG_LINE_INFO);
+    Metrics::g_metrics.lock()->upload(v);
+    LocalFree(szArgList);
+    return 0;
+}