[vcpkg] Merge the vcpkg metadata uploader into the vcpkg binary (#13421)

author: Billy O'Neal <bion@microsoft.com> 2020-09-11 13:52:18 -0700
committer: GitHub <noreply@github.com> 2020-09-11 13:52:18 -0700
commit: 6b97dbfce2159e40d71fb69b1fe05c822c43aa90 (patch)
tree: befe679c8d5cb8df85be798dccb2b770cfcda2f9
parent: 0896bb867b61cc35dd3d1850171b92bd2a32cf67 (diff)
download: vcpkg-6b97dbfce2159e40d71fb69b1fe05c822c43aa90.tar.gz
vcpkg-6b97dbfce2159e40d71fb69b1fe05c822c43aa90.zip
21 files changed, 512 insertions, 1392 deletions
diff --git a/docs/tool-maintainers/layout.md b/docs/tool-maintainers/layout.md
index 9779b0434..ca9fa5c6a 100644
--- a/docs/tool-maintainers/layout.md
+++ b/docs/tool-maintainers/layout.md
@@ -36,16 +36,6 @@ We have six files in this directory -- one `.clang-format` file, one
       the IDE.
     - `vcpkg.sln`: The solution file is how one opens the project in the VS IDE.
 
-### `vcpkg`, `vcpkglib`, `vcpkgmetricsuploader`, and `vcpkgtest`
-
-These four contain exactly one `<name>.vcxproj` and one
-`<name>.vcxproj.filters`. The `<name>.vcxproj` file contains the source files
-and the `<name>.vcxproj.filters` contains information on how Visual Studio
-should lay out the project's source files in the IDE's project view.
-
-`vcpkgtest` should not be touched. It's likely that it will be deleted soon. If
-you want to test your code, use the cmake build system.
-
 ## Source Files
 
 If you're modifying the project, it's likely that these are the directories that
@@ -72,8 +62,7 @@ There are three directories:
 ### `src`
 
 The source files live here. `pch.cpp` is the source file for the
-[precompiled header]; `vcpkg.cpp` is where the `vcpkg` binary lives; and
-`vcpkgmetricsuploader.cpp` is where the metrics uploader lives.
+[precompiled header]; `vcpkg.cpp` is where the `vcpkg` binary lives.
 
 The interesting files live in the `vcpkg` and `vcpkg-test` directories. In
 `vcpkg`, you have the implementation for the interfaces that live in
diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1
index 0d87d6ee8..5e750df38 100644
--- a/scripts/bootstrap.ps1
+++ b/scripts/bootstrap.ps1
@@ -379,7 +379,7 @@ $arguments = (
 "/verbosity:minimal",
 "/m",
 "/nologo",
-"`"$vcpkgBootstrapPath\dirs.proj`"") -join " "
+"`"$vcpkgBootstrapPath\vcpkg.vcxproj`"") -join " "
 
 function vcpkgInvokeCommandClean()
 {
@@ -432,9 +432,4 @@ Write-Verbose "Placing vcpkg.exe in the correct location"
 
 Copy-Item "$vcpkgReleaseDir\vcpkg.exe" "$vcpkgRootDir\vcpkg.exe"
 
-if (-not $disableMetrics)
-{
-    Copy-Item "$vcpkgReleaseDir\vcpkgmetricsuploader.exe" "$vcpkgRootDir\scripts\vcpkgmetricsuploader.exe"
-}
-
 Remove-Item "$vcpkgReleaseDir" -Force -Recurse -ErrorAction SilentlyContinue
diff --git a/toolsrc/CMakeLists.txt b/toolsrc/CMakeLists.txt
index aa54a791b..35f30b057 100644
--- a/toolsrc/CMakeLists.txt
+++ b/toolsrc/CMakeLists.txt
@@ -38,8 +38,6 @@ file(GLOB VCPKGLIB_BASE_INCLUDES CONFIGURE_DEPENDS include/vcpkg/base/*.h includ
 
 set(VCPKG_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/vcpkg.cpp)
 
-set(VCPKGMETRICSUPLOADER_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/vcpkgmetricsuploader.cpp)
-
 file(GLOB VCPKG_TEST_SOURCES CONFIGURE_DEPENDS src/vcpkg-test/*.cpp)
 file(GLOB VCPKG_TEST_INCLUDES CONFIGURE_DEPENDS include/vcpkg-test/*.h)
 
@@ -116,14 +114,6 @@ add_executable(vcpkg ${VCPKG_SOURCES})
 target_link_libraries(vcpkg PRIVATE vcpkglib)
 vcpkg_target_add_warning_options(vcpkg)
 
-# === Target: vcpkgmetricsuploader ===
-
-if(WIN32 AND NOT VCPKG_DISABLE_METRICS)
-    add_executable(vcpkgmetricsuploader WIN32 ${VCPKGMETRICSUPLOADER_SOURCES})
-    target_link_libraries(vcpkgmetricsuploader PRIVATE vcpkglib)
-    vcpkg_target_add_warning_options(vcpkgmetricsuploader)
-endif()
-
 # === Target: vcpkg-test ===
 
 if (BUILD_TESTING)
@@ -164,7 +154,6 @@ if(CLANG_FORMAT)
         COMMAND ${CLANG_FORMAT} -i -verbose ${VCPKGLIB_INCLUDES}
 
         COMMAND ${CLANG_FORMAT} -i -verbose ${VCPKG_SOURCES}
-        COMMAND ${CLANG_FORMAT} -i -verbose ${VCPKGMETRICSUPLOADER_SOURCES}
 
         COMMAND ${CLANG_FORMAT} -i -verbose ${VCPKG_TEST_SOURCES}
         COMMAND ${CLANG_FORMAT} -i -verbose ${VCPKG_TEST_INCLUDES}
diff --git a/toolsrc/include/vcpkg/base/system.process.h b/toolsrc/include/vcpkg/base/system.process.h
index 4bbcba717..e81bcfed7 100644
--- a/toolsrc/include/vcpkg/base/system.process.h
+++ b/toolsrc/include/vcpkg/base/system.process.h
@@ -66,7 +66,7 @@ namespace vcpkg::System
 #if defined(_WIN32)
     Environment cmd_execute_modify_env(const ZStringView cmd_line, const Environment& env = {});
 
-    void cmd_execute_no_wait(const StringView cmd_line);
+    void cmd_execute_background(const StringView cmd_line);
 #endif
 
     ExitCodeAndOutput cmd_execute_and_capture_output(const ZStringView cmd_line, const Environment& env = {});
diff --git a/toolsrc/include/vcpkg/commands.upload-metrics.h b/toolsrc/include/vcpkg/commands.upload-metrics.h
new file mode 100644
index 000000000..dcd855ffb
--- /dev/null
+++ b/toolsrc/include/vcpkg/commands.upload-metrics.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#if !VCPKG_DISABLE_METRICS && defined(_WIN32)
+#define VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND 1
+#else
+#define VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND 0
+#endif // !VCPKG_DISABLE_METRICS && defined(_WIN32)
+
+#if VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND
+
+#include <vcpkg/commands.interface.h>
+
+namespace vcpkg::Commands::UploadMetrics
+{
+    extern const CommandStructure COMMAND_STRUCTURE;
+    struct UploadMetricsCommand : BasicCommand
+    {
+        virtual void perform_and_exit(const VcpkgCmdArguments& args, Files::Filesystem& fs) const override;
+    };
+}
+
+#endif // VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND
diff --git a/toolsrc/src/vcpkg-test/commands.cpp b/toolsrc/src/vcpkg-test/commands.cpp
index 2c3779877..c19fd30ea 100644
--- a/toolsrc/src/vcpkg-test/commands.cpp
+++ b/toolsrc/src/vcpkg-test/commands.cpp
@@ -2,68 +2,80 @@
 
 #include <vcpkg/commands.contact.h>
 #include <vcpkg/commands.h>
+#include <vcpkg/commands.upload-metrics.h>
 #include <vcpkg/commands.version.h>
 
+#include <stddef.h>
+
 using namespace vcpkg;
 
-TEST_CASE ("test commands are constructible", "[commands]")
+namespace
 {
-    Commands::Contact::ContactCommand contact{};
-    Commands::Version::VersionCommand version{};
-}
+    template<class CommandListT, size_t ExpectedCount>
+    void check_all_commands(const CommandListT& actual_commands, const char* const (&expected_commands)[ExpectedCount])
+    {
+        CHECK(actual_commands.size() == ExpectedCount); // makes sure this test is updated if we add a command
+        for (const char* expected_command : expected_commands)
+        {
+            CHECK(Commands::find(StringView{expected_command, strlen(expected_command)}, actual_commands) != nullptr);
+        }
+
+        CHECK(Commands::find("x-never-will-exist", actual_commands) == nullptr);
+    }
+} // unnamed namespace
+
+// clang-format tries to wrap the following lists inappropriately
 
+// clang-format off
 TEST_CASE ("get_available_basic_commands works", "[commands]")
 {
-    auto commands_list = Commands::get_available_basic_commands();
-    CHECK(commands_list.size() == 2);
-    CHECK(Commands::find("version", commands_list) != nullptr);
-    CHECK(Commands::find("contact", commands_list) != nullptr);
-    CHECK(Commands::find("aang", commands_list) == nullptr);
+    check_all_commands(Commands::get_available_basic_commands(), {
+        "contact",
+        "version",
+#if VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND
+        "x-upload-metrics",
+#endif // VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND
+        });
 }
 
 TEST_CASE ("get_available_paths_commands works", "[commands]")
 {
-    auto commands_list = Commands::get_available_paths_commands();
-    CHECK(commands_list.size() == 19);
-
-    CHECK(Commands::find("/?", commands_list) != nullptr);
-    CHECK(Commands::find("help", commands_list) != nullptr);
-    CHECK(Commands::find("search", commands_list) != nullptr);
-    CHECK(Commands::find("list", commands_list) != nullptr);
-    CHECK(Commands::find("integrate", commands_list) != nullptr);
-    CHECK(Commands::find("owns", commands_list) != nullptr);
-    CHECK(Commands::find("update", commands_list) != nullptr);
-    CHECK(Commands::find("edit", commands_list) != nullptr);
-    CHECK(Commands::find("create", commands_list) != nullptr);
-    CHECK(Commands::find("cache", commands_list) != nullptr);
-    CHECK(Commands::find("portsdiff", commands_list) != nullptr);
-    CHECK(Commands::find("autocomplete", commands_list) != nullptr);
-    CHECK(Commands::find("hash", commands_list) != nullptr);
-    CHECK(Commands::find("fetch", commands_list) != nullptr);
-    CHECK(Commands::find("x-ci-clean", commands_list) != nullptr);
-    CHECK(Commands::find("x-history", commands_list) != nullptr);
-    CHECK(Commands::find("x-package-info", commands_list) != nullptr);
-    CHECK(Commands::find("x-vsinstances", commands_list) != nullptr);
-    CHECK(Commands::find("x-format-manifest", commands_list) != nullptr);
-
-    CHECK(Commands::find("korra", commands_list) == nullptr);
+    check_all_commands(Commands::get_available_paths_commands(), {
+        "/?",
+        "help",
+        "search",
+        "list",
+        "integrate",
+        "owns",
+        "update",
+        "edit",
+        "create",
+        "cache",
+        "portsdiff",
+        "autocomplete",
+        "hash",
+        "fetch",
+        "x-ci-clean",
+        "x-history",
+        "x-package-info",
+        "x-vsinstances",
+        "x-format-manifest",
+        });
 }
 
 TEST_CASE ("get_available_commands_type_a works", "[commands]")
 {
-    auto commands_list = Commands::get_available_triplet_commands();
-    CHECK(commands_list.size() == 10);
-
-    CHECK(Commands::find("install", commands_list) != nullptr);
-    CHECK(Commands::find("x-set-installed", commands_list) != nullptr);
-    CHECK(Commands::find("ci", commands_list) != nullptr);
-    CHECK(Commands::find("remove", commands_list) != nullptr);
-    CHECK(Commands::find("upgrade", commands_list) != nullptr);
-    CHECK(Commands::find("build", commands_list) != nullptr);
-    CHECK(Commands::find("env", commands_list) != nullptr);
-    CHECK(Commands::find("build-external", commands_list) != nullptr);
-    CHECK(Commands::find("export", commands_list) != nullptr);
-    CHECK(Commands::find("depend-info", commands_list) != nullptr);
-
-    CHECK(Commands::find("mai", commands_list) == nullptr);
+    check_all_commands(Commands::get_available_triplet_commands(), {
+        "install",
+        "x-set-installed",
+        "ci",
+        "remove",
+        "upgrade",
+        "build",
+        "env",
+        "build-external",
+        "export",
+        "depend-info",
+        });
 }
+// clang-format on
diff --git a/toolsrc/src/vcpkg/base/system.process.cpp b/toolsrc/src/vcpkg/base/system.process.cpp
index c78838caf..a0cdf0365 100644
--- a/toolsrc/src/vcpkg/base/system.process.cpp
+++ b/toolsrc/src/vcpkg/base/system.process.cpp
@@ -462,13 +462,15 @@ namespace vcpkg
             return GetLastError();
     }
 
-    static ExpectedT<ProcessInfo, unsigned long> windows_create_process(const StringView cmd_line,
-                                                                        const Environment& env,
-                                                                        DWORD dwCreationFlags) noexcept
+    static ExpectedT<ProcessInfo, unsigned long> windows_create_windowless_process(const StringView cmd_line,
+                                                                                   const Environment& env,
+                                                                                   DWORD dwCreationFlags) noexcept
     {
         STARTUPINFOW startup_info;
         memset(&startup_info, 0, sizeof(STARTUPINFOW));
         startup_info.cb = sizeof(STARTUPINFOW);
+        startup_info.dwFlags = STARTF_USESHOWWINDOW;
+        startup_info.wShowWindow = SW_HIDE;
 
         return windows_create_process(cmd_line, env, dwCreationFlags, startup_info);
     }
@@ -543,17 +545,18 @@ namespace vcpkg
 #endif
 
 #if defined(_WIN32)
-    void System::cmd_execute_no_wait(StringView cmd_line)
+    void System::cmd_execute_background(StringView cmd_line)
     {
         auto timer = Chrono::ElapsedTimer::create_started();
 
-        auto process_info = windows_create_process(cmd_line, {}, DETACHED_PROCESS | CREATE_BREAKAWAY_FROM_JOB);
+        auto process_info = windows_create_windowless_process(
+            cmd_line, {}, CREATE_NEW_CONSOLE | CREATE_NO_WINDOW | CREATE_BREAKAWAY_FROM_JOB);
         if (!process_info.get())
         {
-            Debug::print("cmd_execute_no_wait() failed with error code ", process_info.error(), "\n");
+            Debug::print("cmd_execute_background() failed with error code ", process_info.error(), "\n");
         }
 
-        Debug::print("cmd_execute_no_wait() took ", static_cast<int>(timer.microseconds()), " us\n");
+        Debug::print("cmd_execute_background() took ", static_cast<int>(timer.microseconds()), " us\n");
     }
 
     Environment System::cmd_execute_modify_env(const ZStringView cmd_line, const Environment& env)
@@ -597,7 +600,7 @@ namespace vcpkg
 #if defined(_WIN32)
         using vcpkg::g_ctrl_c_state;
         g_ctrl_c_state.transition_to_spawn_process();
-        auto proc_info = windows_create_process(cmd_line, env, 0);
+        auto proc_info = windows_create_windowless_process(cmd_line, env, 0);
         auto long_exit_code = [&]() -> unsigned long {
             if (auto p = proc_info.get())
                 return p->wait();
diff --git a/toolsrc/src/vcpkg/commands.cpp b/toolsrc/src/vcpkg/commands.cpp
index 466cc11c0..d01e1973e 100644
--- a/toolsrc/src/vcpkg/commands.cpp
+++ b/toolsrc/src/vcpkg/commands.cpp
@@ -24,6 +24,7 @@
 #include <vcpkg/commands.search.h>
 #include <vcpkg/commands.setinstalled.h>
 #include <vcpkg/commands.upgrade.h>
+#include <vcpkg/commands.upload-metrics.h>
 #include <vcpkg/commands.version.h>
 #include <vcpkg/commands.xvsinstances.h>
 #include <vcpkg/export.h>
@@ -38,9 +39,16 @@ namespace vcpkg::Commands
     {
         static const Version::VersionCommand version{};
         static const Contact::ContactCommand contact{};
+#if VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND
+        static const UploadMetrics::UploadMetricsCommand upload_metrics{};
+#endif // VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND
+
         static std::vector<PackageNameAndFunction<const BasicCommand*>> t = {
             {"version", &version},
             {"contact", &contact},
+#if VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND
+            {"x-upload-metrics", &upload_metrics},
+#endif // VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND
         };
         return t;
     }
diff --git a/toolsrc/src/vcpkg/commands.edit.cpp b/toolsrc/src/vcpkg/commands.edit.cpp
index 7ee74eae0..8dbebc4e5 100644
--- a/toolsrc/src/vcpkg/commands.edit.cpp
+++ b/toolsrc/src/vcpkg/commands.edit.cpp
@@ -259,7 +259,8 @@ namespace vcpkg::Commands::Edit
 #ifdef _WIN32
         if (editor_exe == "Code.exe" || editor_exe == "Code - Insiders.exe")
         {
-            System::cmd_execute_no_wait(Strings::concat("cmd /c \"", cmd_line, " <NUL\""));
+            // note that we are invoking cmd silently but Code.exe is relaunched from there
+            System::cmd_execute_background(Strings::concat("cmd /c \"", cmd_line, " <NUL\""));
             Checks::exit_success(VCPKG_LINE_INFO);
         }
 #endif
diff --git a/toolsrc/src/vcpkg/commands.upload-metrics.cpp b/toolsrc/src/vcpkg/commands.upload-metrics.cpp
new file mode 100644
index 000000000..6ac7cfcb6
--- /dev/null
+++ b/toolsrc/src/vcpkg/commands.upload-metrics.cpp
@@ -0,0 +1,29 @@
+#include <vcpkg/commands.upload-metrics.h>
+
+#if VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND
+#include <vcpkg/base/checks.h>
+#include <vcpkg/base/files.h>
+
+#include <vcpkg/metrics.h>
+#include <vcpkg/vcpkgcmdarguments.h>
+
+using namespace vcpkg;
+
+namespace vcpkg::Commands::UploadMetrics
+{
+    const CommandStructure COMMAND_STRUCTURE = {
+        create_example_string("x-upload-metrics metrics.txt"),
+        1,
+        1,
+    };
+
+    void UploadMetricsCommand::perform_and_exit(const VcpkgCmdArguments& args, Files::Filesystem& fs) const
+    {
+        (void)args.parse_arguments(COMMAND_STRUCTURE);
+        const auto& payload_path = args.command_arguments[0];
+        auto payload = fs.read_contents(payload_path).value_or_exit(VCPKG_LINE_INFO);
+        Metrics::g_metrics.lock()->upload(payload);
+        Checks::exit_success(VCPKG_LINE_INFO);
+    }
+}
+#endif // VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND
diff --git a/toolsrc/src/vcpkg/metrics.cpp b/toolsrc/src/vcpkg/metrics.cpp
index 019b3a9c2..241531df3 100644
--- a/toolsrc/src/vcpkg/metrics.cpp
+++ b/toolsrc/src/vcpkg/metrics.cpp
@@ -491,44 +491,31 @@ namespace vcpkg::Metrics
 
         const fs::path temp_folder_path = fs::path(temp_folder) / "vcpkg";
         const fs::path temp_folder_path_exe =
-            temp_folder_path / Strings::format("vcpkgmetricsuploader-%s.exe", Commands::Version::base_version());
+            temp_folder_path / Strings::format("vcpkg-%s.exe", Commands::Version::base_version());
 #endif
 
-#if defined(_WIN32)
-
-        const fs::path exe_path = [&fs]() -> fs::path {
-            auto vcpkgdir = System::get_exe_path_of_current_process().parent_path();
-            auto path = vcpkgdir / "vcpkgmetricsuploader.exe";
-            if (fs.exists(path)) return path;
-
-            path = vcpkgdir / "scripts" / "vcpkgmetricsuploader.exe";
-            if (fs.exists(path)) return path;
-
-            return "";
-        }();
-
         std::error_code ec;
+#if defined(_WIN32)
         fs.create_directories(temp_folder_path, ec);
         if (ec) return;
-        fs.copy_file(exe_path, temp_folder_path_exe, fs::copy_options::skip_existing, ec);
+        fs.copy_file(
+            System::get_exe_path_of_current_process(), temp_folder_path_exe, fs::copy_options::skip_existing, ec);
         if (ec) return;
 #else
         if (!fs.exists("/tmp")) return;
         const fs::path temp_folder_path = "/tmp/vcpkg";
-        std::error_code ec;
-        fs.create_directory(temp_folder_path, ec);
-        // ignore error
-        ec.clear();
+        fs.create_directory(temp_folder_path, ignore_errors);
 #endif
         const fs::path vcpkg_metrics_txt_path = temp_folder_path / ("vcpkg" + generate_random_UUID() + ".txt");
         fs.write_contents(vcpkg_metrics_txt_path, payload, ec);
         if (ec) return;
 
 #if defined(_WIN32)
-        const std::string cmd_line = Strings::format("cmd /c \"start \"vcpkgmetricsuploader.exe\" \"%s\" \"%s\"\"",
-                                                     fs::u8string(temp_folder_path_exe),
-                                                     fs::u8string(vcpkg_metrics_txt_path));
-        System::cmd_execute_no_wait(cmd_line);
+        System::CmdLineBuilder builder;
+        builder.path_arg(temp_folder_path_exe);
+        builder.string_arg("x-upload-metrics");
+        builder.path_arg(vcpkg_metrics_txt_path);
+        System::cmd_execute_background(builder.extract());
 #else
         auto escaped_path = Strings::escape_string(fs::u8string(vcpkg_metrics_txt_path), '\'', '\\');
         const std::string cmd_line = Strings::format(
diff --git a/toolsrc/src/vcpkgmetricsuploader.cpp b/toolsrc/src/vcpkgmetricsuploader.cpp
deleted file mode 100644
index 800ffb5d2..000000000
--- a/toolsrc/src/vcpkgmetricsuploader.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <vcpkg/base/system_headers.h>
-
-#include <vcpkg/base/checks.h>
-#include <vcpkg/base/files.h>
-
-#include <vcpkg/metrics.h>
-
-#include <shellapi.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;
-}
diff --git a/toolsrc/windows-bootstrap/dirs.proj b/toolsrc/windows-bootstrap/dirs.proj
deleted file mode 100644
index 960374bff..000000000
--- a/toolsrc/windows-bootstrap/dirs.proj
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectFile Include="vcpkglib\vcpkglib.vcxproj"/>
-    <ProjectFile Include="vcpkg\vcpkg.vcxproj"/>
-    <ProjectFile Include="vcpkgmetricsuploader\vcpkgmetricsuploader.vcxproj" Condition="'$(DISABLE_METRICS)'!='1'"/>
-  </ItemGroup>
-
-  <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
-
-  <Target Name="Build">
-    <MSBuild Projects="@(ProjectFile)" Properties="SolutionDir=$(SolutionDir)" Targets="Build"/>
-  </Target>
-
-  <Target Name="Clean">
-    <MSBuild Projects="@(ProjectFile)" Properties="SolutionDir=$(SolutionDir)" Targets="Clean"/>
-  </Target>
-</Project>
-\ No newline at end of file
diff --git a/toolsrc/windows-bootstrap/vcpkg.props b/toolsrc/windows-bootstrap/vcpkg.props
deleted file mode 100644
index 1d9478660..000000000
--- a/toolsrc/windows-bootstrap/vcpkg.props
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="latest" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <PlatformToolset Condition="'$(PlatformToolset)'==''">$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <Choose>
-    <When Condition="'$(PlatformToolset)' == 'v140'">
-      <PropertyGroup>
-          <VcpkgUseStdFilesystem>0</VcpkgUseStdFilesystem>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup>
-          <VcpkgUseStdFilesystem>1</VcpkgUseStdFilesystem>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>VCPKG_USE_STD_FILESYSTEM=$(VcpkgUseStdFilesystem);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-</Project>
diff --git a/toolsrc/windows-bootstrap/vcpkg.vcxproj b/toolsrc/windows-bootstrap/vcpkg.vcxproj
new file mode 100644
index 000000000..259d1a330
--- /dev/null
+++ b/toolsrc/windows-bootstrap/vcpkg.vcxproj
@@ -0,0 +1,367 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{34671B80-54F9-46F5-8310-AC429C11D4FB}</ProjectGuid>
+    <RootNamespace>vcpkg</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup>
+    <PlatformToolset Condition="'$(PlatformToolset)'==''">$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Choose>
+    <When Condition="'$(PlatformToolset)' == 'v140'">
+      <PropertyGroup>
+          <VcpkgUseStdFilesystem>0</VcpkgUseStdFilesystem>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+          <VcpkgUseStdFilesystem>1</VcpkgUseStdFilesystem>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>VCPKG_USE_STD_FILESYSTEM=$(VcpkgUseStdFilesystem);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup>
+    <DISABLE_METRICS Condition="'$(DISABLE_METRICS)' == ''">0</DISABLE_METRICS>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <IntDir>$(SolutionDir)msbuild.x86.debug\$(ProjectName)\</IntDir>
+    <OutDir>$(SolutionDir)msbuild.x86.debug\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)msbuild.x86.release\</OutDir>
+    <IntDir>$(SolutionDir)msbuild.x86.release\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IntDir>$(SolutionDir)msbuild.x64.debug\$(ProjectName)\</IntDir>
+    <OutDir>$(SolutionDir)msbuild.x64.debug\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <IntDir>$(SolutionDir)msbuild.x64.release\$(ProjectName)\</IntDir>
+    <OutDir>$(SolutionDir)msbuild.x64.release\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>..\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>VCPKG_DISABLE_METRICS=$(DISABLE_METRICS);VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <MinimalRebuild>false</MinimalRebuild>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>winhttp.lib;version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>..\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>VCPKG_DISABLE_METRICS=$(DISABLE_METRICS);VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <MinimalRebuild>false</MinimalRebuild>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>winhttp.lib;version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>..\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>VCPKG_DISABLE_METRICS=$(DISABLE_METRICS);VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_MBCS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>winhttp.lib;version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>..\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>VCPKG_DISABLE_METRICS=$(DISABLE_METRICS);VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_MBCS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>winhttp.lib;version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\include\pch.h" />
+    <ClInclude Include="..\include\vcpkg\archives.h" />
+    <ClInclude Include="..\include\vcpkg\base\cache.h" />
+    <ClInclude Include="..\include\vcpkg\base\checks.h" />
+    <ClInclude Include="..\include\vcpkg\base\chrono.h" />
+    <ClInclude Include="..\include\vcpkg\base\cofffilereader.h" />
+    <ClInclude Include="..\include\vcpkg\base\cstringview.h" />
+    <ClInclude Include="..\include\vcpkg\base\downloads.h" />
+    <ClInclude Include="..\include\vcpkg\base\enums.h" />
+    <ClInclude Include="..\include\vcpkg\base\expected.h" />
+    <ClInclude Include="..\include\vcpkg\base\files.h" />
+    <ClInclude Include="..\include\vcpkg\base\graphs.h" />
+    <ClInclude Include="..\include\vcpkg\base\hash.h" />
+    <ClInclude Include="..\include\vcpkg\base\ignore_errors.h" />
+    <ClInclude Include="..\include\vcpkg\base\json.h" />
+    <ClInclude Include="..\include\vcpkg\base\lazy.h" />
+    <ClInclude Include="..\include\vcpkg\base\lineinfo.h" />
+    <ClInclude Include="..\include\vcpkg\base\machinetype.h" />
+    <ClInclude Include="..\include\vcpkg\base\parse.h" />
+    <ClInclude Include="..\include\vcpkg\base\pragmas.h" />
+    <ClInclude Include="..\include\vcpkg\base\optional.h" />
+    <ClInclude Include="..\include\vcpkg\base\sortedvector.h" />
+    <ClInclude Include="..\include\vcpkg\base\span.h" />
+    <ClInclude Include="..\include\vcpkg\base\stringliteral.h" />
+    <ClInclude Include="..\include\vcpkg\base\stringrange.h" />
+    <ClInclude Include="..\include\vcpkg\base\strings.h" />
+    <ClInclude Include="..\include\vcpkg\base\stringview.h" />
+    <ClInclude Include="..\include\vcpkg\base\system.debug.h" />
+    <ClInclude Include="..\include\vcpkg\base\system.h" />
+    <ClInclude Include="..\include\vcpkg\base\system.print.h" />
+    <ClInclude Include="..\include\vcpkg\base\system.process.h" />
+    <ClInclude Include="..\include\vcpkg\base\unicode.h" />
+    <ClInclude Include="..\include\vcpkg\base\util.h" />
+    <ClInclude Include="..\include\vcpkg\base\view.h" />
+    <ClInclude Include="..\include\vcpkg\base\zstringview.h" />
+    <ClInclude Include="..\include\vcpkg\binarycaching.h" />
+    <ClInclude Include="..\include\vcpkg\binaryparagraph.h" />
+    <ClInclude Include="..\include\vcpkg\build.h" />
+    <ClInclude Include="..\include\vcpkg\buildenvironment.h" />
+    <ClInclude Include="..\include\vcpkg\cmakevars.h" />
+    <ClInclude Include="..\include\vcpkg\commands.h" />
+    <ClInclude Include="..\include\vcpkg\commands.autocomplete.h" />
+    <ClInclude Include="..\include\vcpkg\commands.buildexternal.h" />
+    <ClInclude Include="..\include\vcpkg\commands.cache.h" />
+    <ClInclude Include="..\include\vcpkg\commands.ci.h" />
+    <ClInclude Include="..\include\vcpkg\commands.ciclean.h" />
+    <ClInclude Include="..\include\vcpkg\commands.contact.h" />
+    <ClInclude Include="..\include\vcpkg\commands.create.h" />
+    <ClInclude Include="..\include\vcpkg\commands.dependinfo.h" />
+    <ClInclude Include="..\include\vcpkg\commands.edit.h" />
+    <ClInclude Include="..\include\vcpkg\commands.env.h" />
+    <ClInclude Include="..\include\vcpkg\commands.fetch.h" />
+    <ClInclude Include="..\include\vcpkg\commands.format-manifest.h" />
+    <ClInclude Include="..\include\vcpkg\commands.hash.h" />
+    <ClInclude Include="..\include\vcpkg\commands.info.h" />
+    <ClInclude Include="..\include\vcpkg\commands.integrate.h" />
+    <ClInclude Include="..\include\vcpkg\commands.interface.h" />
+    <ClInclude Include="..\include\vcpkg\commands.list.h" />
+    <ClInclude Include="..\include\vcpkg\commands.owns.h" />
+    <ClInclude Include="..\include\vcpkg\commands.porthistory.h" />
+    <ClInclude Include="..\include\vcpkg\commands.portsdiff.h" />
+    <ClInclude Include="..\include\vcpkg\commands.search.h" />
+    <ClInclude Include="..\include\vcpkg\commands.setinstalled.h" />
+    <ClInclude Include="..\include\vcpkg\commands.upgrade.h" />
+    <ClInclude Include="..\include\vcpkg\commands.version.h" />
+    <ClInclude Include="..\include\vcpkg\commands.xvsinstances.h" />
+    <ClInclude Include="..\include\vcpkg\dependencies.h" />
+    <ClInclude Include="..\include\vcpkg\export.chocolatey.h" />
+    <ClInclude Include="..\include\vcpkg\export.h" />
+    <ClInclude Include="..\include\vcpkg\export.ifw.h" />
+    <ClInclude Include="..\include\vcpkg\export.prefab.h" />
+    <ClInclude Include="..\include\vcpkg\globalstate.h" />
+    <ClInclude Include="..\include\vcpkg\help.h" />
+    <ClInclude Include="..\include\vcpkg\input.h" />
+    <ClInclude Include="..\include\vcpkg\install.h" />
+    <ClInclude Include="..\include\vcpkg\platform-expression.h" />
+    <ClInclude Include="..\include\vcpkg\metrics.h" />
+    <ClInclude Include="..\include\vcpkg\packagespec.h" />
+    <ClInclude Include="..\include\vcpkg\paragraphparser.h" />
+    <ClInclude Include="..\include\vcpkg\paragraphs.h" />
+    <ClInclude Include="..\include\vcpkg\portfileprovider.h" />
+    <ClInclude Include="..\include\vcpkg\postbuildlint.h" />
+    <ClInclude Include="..\include\vcpkg\postbuildlint.buildtype.h" />
+    <ClInclude Include="..\include\vcpkg\registries.h" />
+    <ClInclude Include="..\include\vcpkg\remove.h" />
+    <ClInclude Include="..\include\vcpkg\sourceparagraph.h" />
+    <ClInclude Include="..\include\vcpkg\statusparagraph.h" />
+    <ClInclude Include="..\include\vcpkg\statusparagraphs.h" />
+    <ClInclude Include="..\include\vcpkg\textrowcol.h" />
+    <ClInclude Include="..\include\vcpkg\tools.h" />
+    <ClInclude Include="..\include\vcpkg\triplet.h" />
+    <ClInclude Include="..\include\vcpkg\update.h" />
+    <ClInclude Include="..\include\vcpkg\userconfig.h" />
+    <ClInclude Include="..\include\vcpkg\vcpkgcmdarguments.h" />
+    <ClInclude Include="..\include\vcpkg\vcpkglib.h" />
+    <ClInclude Include="..\include\vcpkg\vcpkgpaths.h" />
+    <ClInclude Include="..\include\vcpkg\versiont.h" />
+    <ClInclude Include="..\include\vcpkg\visualstudio.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\pch.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\src\vcpkg\archives.cpp" />
+    <ClCompile Include="..\src\vcpkg\base\checks.cpp" />
+    <ClCompile Include="..\src\vcpkg\base\chrono.cpp" />
+    <ClCompile Include="..\src\vcpkg\base\cofffilereader.cpp" />
+    <ClCompile Include="..\src\vcpkg\base\downloads.cpp" />
+    <ClCompile Include="..\src\vcpkg\base\enums.cpp" />
+    <ClCompile Include="..\src\vcpkg\base\files.cpp" />
+    <ClCompile Include="..\src\vcpkg\base\hash.cpp" />
+    <ClCompile Include="..\src\vcpkg\base\json.cpp" />
+    <ClCompile Include="..\src\vcpkg\base\machinetype.cpp" />
+    <ClCompile Include="..\src\vcpkg\base\parse.cpp" />
+    <ClCompile Include="..\src\vcpkg\base\strings.cpp" />
+    <ClCompile Include="..\src\vcpkg\base\stringview.cpp" />
+    <ClCompile Include="..\src\vcpkg\base\system.cpp" />
+    <ClCompile Include="..\src\vcpkg\base\system.print.cpp" />
+    <ClCompile Include="..\src\vcpkg\base\system.process.cpp" />
+    <ClCompile Include="..\src\vcpkg\base\unicode.cpp" />
+    <ClCompile Include="..\src\vcpkg\binarycaching.cpp" />
+    <ClCompile Include="..\src\vcpkg\binaryparagraph.cpp" />
+    <ClCompile Include="..\src\vcpkg\build.cpp" />
+    <ClCompile Include="..\src\vcpkg\buildenvironment.cpp" />
+    <ClCompile Include="..\src\vcpkg\cmakevars.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.autocomplete.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.buildexternal.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.cache.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.ci.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.ciclean.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.contact.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.create.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.dependinfo.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.edit.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.env.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.fetch.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.format-manifest.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.hash.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.info.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.integrate.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.list.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.owns.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.porthistory.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.portsdiff.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.search.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.setinstalled.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.upgrade.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.upload-metrics.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.version.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.xvsinstances.cpp" />
+    <ClCompile Include="..\src\vcpkg\configuration.cpp" />
+    <ClCompile Include="..\src\vcpkg\dependencies.cpp" />
+    <ClCompile Include="..\src\vcpkg\export.cpp" />
+    <ClCompile Include="..\src\vcpkg\export.chocolatey.cpp" />
+    <ClCompile Include="..\src\vcpkg\export.ifw.cpp" />
+    <ClCompile Include="..\src\vcpkg\export.prefab.cpp" />
+    <ClCompile Include="..\src\vcpkg\globalstate.cpp" />
+    <ClCompile Include="..\src\vcpkg\help.cpp" />
+    <ClCompile Include="..\src\vcpkg\input.cpp" />
+    <ClCompile Include="..\src\vcpkg\install.cpp" />
+    <ClCompile Include="..\src\vcpkg\platform-expression.cpp" />
+    <ClCompile Include="..\src\vcpkg\metrics.cpp" />
+    <ClCompile Include="..\src\vcpkg\packagespec.cpp" />
+    <ClCompile Include="..\src\vcpkg\paragraphs.cpp" />
+    <ClCompile Include="..\src\vcpkg\portfileprovider.cpp" />
+    <ClCompile Include="..\src\vcpkg\postbuildlint.buildtype.cpp" />
+    <ClCompile Include="..\src\vcpkg\postbuildlint.cpp" />
+    <ClCompile Include="..\src\vcpkg\registries.cpp" />
+    <ClCompile Include="..\src\vcpkg\remove.cpp" />
+    <ClCompile Include="..\src\vcpkg\sourceparagraph.cpp" />
+    <ClCompile Include="..\src\vcpkg\statusparagraph.cpp" />
+    <ClCompile Include="..\src\vcpkg\statusparagraphs.cpp" />
+    <ClCompile Include="..\src\vcpkg\tools.cpp" />
+    <ClCompile Include="..\src\vcpkg\triplet.cpp" />
+    <ClCompile Include="..\src\vcpkg\update.cpp" />
+    <ClCompile Include="..\src\vcpkg\userconfig.cpp" />
+    <ClCompile Include="..\src\vcpkg\vcpkgcmdarguments.cpp" />
+    <ClCompile Include="..\src\vcpkg\vcpkglib.cpp" />
+    <ClCompile Include="..\src\vcpkg\vcpkgpaths.cpp" />
+    <ClCompile Include="..\src\vcpkg\versiont.cpp" />
+    <ClCompile Include="..\src\vcpkg\visualstudio.cpp" />
+    <ClCompile Include="..\src\vcpkg.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="..\VERSION.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/toolsrc/windows-bootstrap/vcpkg/vcpkg.vcxproj b/toolsrc/windows-bootstrap/vcpkg/vcpkg.vcxproj
deleted file mode 100644
index 244173ca5..000000000
--- a/toolsrc/windows-bootstrap/vcpkg/vcpkg.vcxproj
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{34671B80-54F9-46F5-8310-AC429C11D4FB}</ProjectGuid>
-    <RootNamespace>vcpkg</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(MSBuildThisFileDirectory)..\vcpkg.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IntDir>$(SolutionDir)msbuild.x86.debug\$(ProjectName)\</IntDir>
-    <OutDir>$(SolutionDir)msbuild.x86.debug\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)msbuild.x86.release\</OutDir>
-    <IntDir>$(SolutionDir)msbuild.x86.release\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IntDir>$(SolutionDir)msbuild.x64.debug\$(ProjectName)\</IntDir>
-    <OutDir>$(SolutionDir)msbuild.x64.debug\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IntDir>$(SolutionDir)msbuild.x64.release\$(ProjectName)\</IntDir>
-    <OutDir>$(SolutionDir)msbuild.x64.release\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>winhttp.lib;version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>winhttp.lib;version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_MBCS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>winhttp.lib;version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_MBCS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>winhttp.lib;version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\vcpkglib\vcpkglib.vcxproj">
-      <Project>{b98c92b7-2874-4537-9d46-d14e5c237f04}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\vcpkg.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="..\..\VERSION.txt" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/toolsrc/windows-bootstrap/vcpkg/vcpkg.vcxproj.filters b/toolsrc/windows-bootstrap/vcpkg/vcpkg.vcxproj.filters
deleted file mode 100644
index 3710939ca..000000000
--- a/toolsrc/windows-bootstrap/vcpkg/vcpkg.vcxproj.filters
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\vcpkg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="..\..\VERSION.txt">
-      <Filter>Source Files</Filter>
-    </Text>
-  </ItemGroup>
-</Project>
-\ No newline at end of file
diff --git a/toolsrc/windows-bootstrap/vcpkglib/vcpkglib.vcxproj b/toolsrc/windows-bootstrap/vcpkglib/vcpkglib.vcxproj
deleted file mode 100644
index 240b0115b..000000000
--- a/toolsrc/windows-bootstrap/vcpkglib/vcpkglib.vcxproj
+++ /dev/null
@@ -1,333 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B98C92B7-2874-4537-9D46-D14E5C237F04}</ProjectGuid>
-    <RootNamespace>vcpkglib</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(MSBuildThisFileDirectory)..\vcpkg.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup>
-    <DISABLE_METRICS Condition="'$(DISABLE_METRICS)' == ''">0</DISABLE_METRICS>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IntDir>$(SolutionDir)msbuild.x86.debug\$(ProjectName)\</IntDir>
-    <OutDir>$(SolutionDir)msbuild.x86.debug\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)msbuild.x86.release\</OutDir>
-    <IntDir>$(SolutionDir)msbuild.x86.release\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IntDir>$(SolutionDir)msbuild.x64.debug\$(ProjectName)\</IntDir>
-    <OutDir>$(SolutionDir)msbuild.x64.debug\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IntDir>$(SolutionDir)msbuild.x64.release\$(ProjectName)\</IntDir>
-    <OutDir>$(SolutionDir)msbuild.x64.release\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>VCPKG_DISABLE_METRICS=$(DISABLE_METRICS);VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>VCPKG_DISABLE_METRICS=$(DISABLE_METRICS);VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>VCPKG_DISABLE_METRICS=$(DISABLE_METRICS);VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>VCPKG_DISABLE_METRICS=$(DISABLE_METRICS);VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\pch.h" />
-    <ClInclude Include="..\..\include\vcpkg\archives.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\cache.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\checks.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\chrono.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\cofffilereader.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\cstringview.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\downloads.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\enums.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\expected.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\files.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\graphs.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\hash.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\ignore_errors.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\json.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\lazy.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\lineinfo.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\machinetype.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\parse.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\pragmas.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\optional.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\sortedvector.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\span.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\stringliteral.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\stringrange.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\strings.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\stringview.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\system.debug.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\system.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\system.print.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\system.process.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\unicode.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\util.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\view.h" />
-    <ClInclude Include="..\..\include\vcpkg\base\zstringview.h" />
-    <ClInclude Include="..\..\include\vcpkg\binarycaching.h" />
-    <ClInclude Include="..\..\include\vcpkg\binaryparagraph.h" />
-    <ClInclude Include="..\..\include\vcpkg\build.h" />
-    <ClInclude Include="..\..\include\vcpkg\buildenvironment.h" />
-    <ClInclude Include="..\..\include\vcpkg\cmakevars.h" />
-    <ClInclude Include="..\..\include\vcpkg\commands.h" />
-    <ClInclude Include="..\..\include\vcpkg\commands.autocomplete.h" />
-    <ClInclude Include="..\..\include\vcpkg\commands.buildexternal.h" />
-    <ClInclude Include="..\..\include\vcpkg\commands.cache.h" />
-    <ClInclude Include="..\..\include\vcpkg\commands.ci.h" />
-    <ClInclude Include="..\..\include\vcpkg\commands.ciclean.h" />
-    <ClInclude Include="..\..\include\vcpkg\commands.contact.h" />
-    <ClInclude Include="..\..\include\vcpkg\commands.create.h" />
-    <ClInclude Include="..\..\include\vcpkg\commands.dependinfo.h" />
-    <ClInclude Include="..\..\include\vcpkg\commands.edit.h" />
-    <ClInclude Include="..\..\include\vcpkg\commands.env.h" />
-    <ClInclude Include="..\..\include\vcpkg\commands.fetch.h" />
-    <ClInclude Include="..\..\include\vcpkg\commands.format-manifest.h" />
-    <ClInclude Include="..\..\include\vcpkg\commands.hash.h" />
-    <ClInclude Include="..\..\include\vcpkg\commands.info.h" />
-    <ClInclude Include="..\..\include\vcpkg\commands.integrate.h" />
-    <ClInclude Include="..\..\include\vcpkg\commands.interface.h" />
-    <ClInclude Include="..\..\include\vcpkg\commands.list.h" />
-    <ClInclude Include="..\..\include\vcpkg\commands.owns.h" />
-    <ClInclude Include="..\..\include\vcpkg\commands.porthistory.h" />
-    <ClInclude Include="..\..\include\vcpkg\commands.portsdiff.h" />
-    <ClInclude Include="..\..\include\vcpkg\commands.search.h" />
-    <ClInclude Include="..\..\include\vcpkg\commands.setinstalled.h" />
-    <ClInclude Include="..\..\include\vcpkg\commands.upgrade.h" />
-    <ClInclude Include="..\..\include\vcpkg\commands.version.h" />
-    <ClInclude Include="..\..\include\vcpkg\commands.xvsinstances.h" />
-    <ClInclude Include="..\..\include\vcpkg\dependencies.h" />
-    <ClInclude Include="..\..\include\vcpkg\export.chocolatey.h" />
-    <ClInclude Include="..\..\include\vcpkg\export.h" />
-    <ClInclude Include="..\..\include\vcpkg\export.ifw.h" />
-    <ClInclude Include="..\..\include\vcpkg\export.prefab.h" />
-    <ClInclude Include="..\..\include\vcpkg\globalstate.h" />
-    <ClInclude Include="..\..\include\vcpkg\help.h" />
-    <ClInclude Include="..\..\include\vcpkg\input.h" />
-    <ClInclude Include="..\..\include\vcpkg\install.h" />
-    <ClInclude Include="..\..\include\vcpkg\platform-expression.h" />
-    <ClInclude Include="..\..\include\vcpkg\metrics.h" />
-    <ClInclude Include="..\..\include\vcpkg\packagespec.h" />
-    <ClInclude Include="..\..\include\vcpkg\paragraphparser.h" />
-    <ClInclude Include="..\..\include\vcpkg\paragraphs.h" />
-    <ClInclude Include="..\..\include\vcpkg\portfileprovider.h" />
-    <ClInclude Include="..\..\include\vcpkg\postbuildlint.h" />
-    <ClInclude Include="..\..\include\vcpkg\postbuildlint.buildtype.h" />
-    <ClInclude Include="..\..\include\vcpkg\registries.h" />
-    <ClInclude Include="..\..\include\vcpkg\remove.h" />
-    <ClInclude Include="..\..\include\vcpkg\sourceparagraph.h" />
-    <ClInclude Include="..\..\include\vcpkg\statusparagraph.h" />
-    <ClInclude Include="..\..\include\vcpkg\statusparagraphs.h" />
-    <ClInclude Include="..\..\include\vcpkg\textrowcol.h" />
-    <ClInclude Include="..\..\include\vcpkg\tools.h" />
-    <ClInclude Include="..\..\include\vcpkg\triplet.h" />
-    <ClInclude Include="..\..\include\vcpkg\update.h" />
-    <ClInclude Include="..\..\include\vcpkg\userconfig.h" />
-    <ClInclude Include="..\..\include\vcpkg\vcpkgcmdarguments.h" />
-    <ClInclude Include="..\..\include\vcpkg\vcpkglib.h" />
-    <ClInclude Include="..\..\include\vcpkg\vcpkgpaths.h" />
-    <ClInclude Include="..\..\include\vcpkg\versiont.h" />
-    <ClInclude Include="..\..\include\vcpkg\visualstudio.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\pch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\archives.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\base\checks.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\base\chrono.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\base\cofffilereader.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\base\downloads.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\base\enums.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\base\files.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\base\hash.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\base\json.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\base\machinetype.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\base\parse.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\base\strings.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\base\stringview.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\base\system.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\base\system.print.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\base\system.process.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\base\unicode.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\binarycaching.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\binaryparagraph.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\build.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\buildenvironment.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\cmakevars.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\commands.autocomplete.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\commands.buildexternal.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\commands.cache.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\commands.ci.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\commands.ciclean.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\commands.contact.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\commands.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\commands.create.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\commands.dependinfo.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\commands.edit.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\commands.env.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\commands.fetch.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\commands.format-manifest.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\commands.hash.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\commands.info.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\commands.integrate.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\commands.list.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\commands.owns.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\commands.porthistory.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\commands.portsdiff.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\commands.search.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\commands.setinstalled.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\commands.upgrade.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\commands.version.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\commands.xvsinstances.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\configuration.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\dependencies.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\export.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\export.chocolatey.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\export.ifw.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\export.prefab.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\globalstate.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\help.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\input.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\install.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\platform-expression.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\metrics.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\packagespec.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\paragraphs.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\portfileprovider.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\postbuildlint.buildtype.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\postbuildlint.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\registries.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\remove.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\sourceparagraph.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\statusparagraph.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\statusparagraphs.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\tools.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\triplet.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\update.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\userconfig.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\vcpkgcmdarguments.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\vcpkglib.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\vcpkgpaths.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\versiont.cpp" />
-    <ClCompile Include="..\..\src\vcpkg\visualstudio.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/toolsrc/windows-bootstrap/vcpkglib/vcpkglib.vcxproj.filters b/toolsrc/windows-bootstrap/vcpkglib/vcpkglib.vcxproj.filters
deleted file mode 100644
index f1772fa5f..000000000
--- a/toolsrc/windows-bootstrap/vcpkglib/vcpkglib.vcxproj.filters
+++ /dev/null
@@ -1,540 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="Header Files\vcpkg">
-      <UniqueIdentifier>{69f6b6e6-5ac4-4419-a256-b8a6b0392720}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\vcpkg\base">
-      <UniqueIdentifier>{4a229410-0d09-4dab-953b-f434d6483f96}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\vcpkg">
-      <UniqueIdentifier>{75592043-ab63-4905-beee-568a6ab8bf93}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\vcpkg\base">
-      <UniqueIdentifier>{fa1f10e7-58d2-4f7c-ac26-a979baa70061}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\pch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\binaryparagraph.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\build.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\commands.autocomplete.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\commands.buildexternal.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\commands.cache.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\commands.ci.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\commands.ciclean.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\commands.contact.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\commands.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\commands.create.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\commands.dependinfo.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\commands.edit.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\commands.env.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\commands.fetch.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\commands.format-manifest.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\commands.hash.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\commands.integrate.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\commands.list.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\commands.owns.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\commands.portsdiff.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\commands.search.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\commands.setinstalled.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\commands.version.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\dependencies.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\export.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\export.chocolatey.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\export.ifw.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\globalstate.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\help.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\input.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\install.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\platform-expression.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\metrics.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\packagespec.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\paragraphparseresult.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\paragraphs.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\postbuildlint.buildtype.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\postbuildlint.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\remove.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\sourceparagraph.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\statusparagraph.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\statusparagraphs.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\triplet.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\update.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\vcpkgcmdarguments.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\vcpkglib.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\vcpkgpaths.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\versiont.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\base\checks.cpp">
-      <Filter>Source Files\vcpkg\base</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\base\chrono.cpp">
-      <Filter>Source Files\vcpkg\base</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\base\cofffilereader.cpp">
-      <Filter>Source Files\vcpkg\base</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\base\enums.cpp">
-      <Filter>Source Files\vcpkg\base</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\base\files.cpp">
-      <Filter>Source Files\vcpkg\base</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\base\machinetype.cpp">
-      <Filter>Source Files\vcpkg\base</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\base\parse.cpp">
-      <Filter>Source Files\vcpkg\base</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\base\strings.cpp">
-      <Filter>Source Files\vcpkg\base</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\base\system.cpp">
-      <Filter>Source Files\vcpkg\base</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\userconfig.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\commands.upgrade.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\archives.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\visualstudio.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\tools.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\base\hash.cpp">
-      <Filter>Source Files\vcpkg\base</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\base\downloads.cpp">
-      <Filter>Source Files\vcpkg\base</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\commands.xvsinstances.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\base\stringview.cpp">
-      <Filter>Source Files\vcpkg\base</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\base\system.print.cpp">
-      <Filter>Source Files\vcpkg\base</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\commands.porthistory.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\cmakevars.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\portfileprovider.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\base\system.process.cpp">
-      <Filter>Source Files\vcpkg\base</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\binarycaching.cpp">
-      <Filter>Source Files\vcpkg</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\base\json.cpp">
-      <Filter>Source Files\vcpkg\base</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\vcpkg\base\unicode.cpp">
-      <Filter>Source Files\vcpkg\base</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\pch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\base\files.h">
-      <Filter>Header Files\vcpkg\base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\base\checks.h">
-      <Filter>Header Files\vcpkg\base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\base\chrono.h">
-      <Filter>Header Files\vcpkg\base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\base\cofffilereader.h">
-      <Filter>Header Files\vcpkg\base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\base\cstringview.h">
-      <Filter>Header Files\vcpkg\base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\base\enums.h">
-      <Filter>Header Files\vcpkg\base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\base\expected.h">
-      <Filter>Header Files\vcpkg\base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\base\graphs.h">
-      <Filter>Header Files\vcpkg\base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\base\lazy.h">
-      <Filter>Header Files\vcpkg\base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\base\lineinfo.h">
-      <Filter>Header Files\vcpkg\base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\base\machinetype.h">
-      <Filter>Header Files\vcpkg\base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\base\optional.h">
-      <Filter>Header Files\vcpkg\base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\base\sortedvector.h">
-      <Filter>Header Files\vcpkg\base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\base\span.h">
-      <Filter>Header Files\vcpkg\base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\base\strings.h">
-      <Filter>Header Files\vcpkg\base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\base\system.h">
-      <Filter>Header Files\vcpkg\base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\base\util.h">
-      <Filter>Header Files\vcpkg\base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\binaryparagraph.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\build.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\commands.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\commands.autocomplete.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\commands.buildexternal.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\commands.cache.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\commands.ci.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\commands.ciclean.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\commands.contact.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\commands.create.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\commands.dependinfo.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\commands.edit.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\commands.env.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\commands.fetch.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\commands.format-manifest.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\commands.hash.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\commands.integrate.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\commands.interface.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\commands.list.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\commands.owns.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\commands.porthistory.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\commands.portsdiff.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\commands.search.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\commands.setinstalled.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\commands.upgrade.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\commands.version.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\commands.xvsinstances.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\dependencies.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\export.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\globalstate.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\help.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\input.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\install.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\metrics.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\packagespec.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\paragraphparseresult.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\paragraphs.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\base\parse.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\postbuildlint.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\remove.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\sourceparagraph.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\statusparagraph.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\statusparagraphs.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\triplet.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\update.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\vcpkgcmdarguments.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\vcpkglib.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\vcpkgpaths.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\versiont.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\postbuildlint.buildtype.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\export.ifw.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\userconfig.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\base\stringliteral.h">
-      <Filter>Header Files\vcpkg\base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\archives.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\visualstudio.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\base\stringrange.h">
-      <Filter>Header Files\vcpkg\base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\base\cache.h">
-      <Filter>Header Files\vcpkg\base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\tools.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\base\hash.h">
-      <Filter>Header Files\vcpkg\base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\base\downloads.h">
-      <Filter>Header Files\vcpkg\base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\base\stringview.h">
-      <Filter>Header Files\vcpkg\base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\base\system.debug.h">
-      <Filter>Header Files\vcpkg\base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\base\system.print.h">
-      <Filter>Header Files\vcpkg\base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\base\system.process.h">
-      <Filter>Header Files\vcpkg\base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\base\view.h">
-      <Filter>Header Files\vcpkg\base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\base\pragmas.h">
-      <Filter>Header Files\vcpkg\base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\base\zstringview.h">
-      <Filter>Header Files\vcpkg\base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\cmakevars.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\export.chocolatey.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\platform-expression.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\paragraphparser.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\portfileprovider.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\textrowcol.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\binarycaching.h">
-      <Filter>Header Files\vcpkg</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\base\json.h">
-      <Filter>Header Files\vcpkg\base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\vcpkg\base\unicode.h">
-      <Filter>Header Files\vcpkg\base</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
diff --git a/toolsrc/windows-bootstrap/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj b/toolsrc/windows-bootstrap/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj
deleted file mode 100644
index 8413922ce..000000000
--- a/toolsrc/windows-bootstrap/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{7D6FDEEB-B299-4A23-85EE-F67C4DED47BE}</ProjectGuid>
-    <RootNamespace>vcpkgmetricsuploader</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(MSBuildThisFileDirectory)..\vcpkg.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IntDir>$(SolutionDir)msbuild.x86.debug\$(ProjectName)\</IntDir>
-    <OutDir>$(SolutionDir)msbuild.x86.debug\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)msbuild.x86.release\</OutDir>
-    <IntDir>$(SolutionDir)msbuild.x86.release\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IntDir>$(SolutionDir)msbuild.x64.debug\$(ProjectName)\</IntDir>
-    <OutDir>$(SolutionDir)msbuild.x64.debug\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IntDir>$(SolutionDir)msbuild.x64.release\$(ProjectName)\</IntDir>
-    <OutDir>$(SolutionDir)msbuild.x64.release\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>winhttp.lib;version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>winhttp.lib;version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_MBCS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>winhttp.lib;version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_MBCS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>winhttp.lib;version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\vcpkgmetricsuploader.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\vcpkglib\vcpkglib.vcxproj">
-      <Project>{b98c92b7-2874-4537-9d46-d14e5c237f04}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/toolsrc/windows-bootstrap/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj.filters b/toolsrc/windows-bootstrap/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj.filters
deleted file mode 100644
index d103d50c2..000000000
--- a/toolsrc/windows-bootstrap/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\vcpkgmetricsuploader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
-\ No newline at end of file
author	Billy O'Neal <bion@microsoft.com>	2020-09-11 13:52:18 -0700
committer	GitHub <noreply@github.com>	2020-09-11 13:52:18 -0700
commit	6b97dbfce2159e40d71fb69b1fe05c822c43aa90 (patch)
tree	befe679c8d5cb8df85be798dccb2b770cfcda2f9
parent	0896bb867b61cc35dd3d1850171b92bd2a32cf67 (diff)
download	vcpkg-6b97dbfce2159e40d71fb69b1fe05c822c43aa90.tar.gz vcpkg-6b97dbfce2159e40d71fb69b1fe05c822c43aa90.zip