[vcpkg] Fix vs2015 build (#12789)

* move windows bootstrap directory * fix paths * actually fix the build * fix path
author: nicole mazzuca <mazzucan@outlook.com> 2020-08-06 17:04:47 -0700
committer: GitHub <noreply@github.com> 2020-08-06 17:04:47 -0700
commit: 40c8aab459f6692f68daa0ef431b80ca7ab364c1 (patch)
tree: d49c575bd7be93b2522293e5d54a7ce743b08355 /toolsrc
parent: 61c055a6fcfee2a7e764997bb2478adf49db6edf (diff)
download: vcpkg-40c8aab459f6692f68daa0ef431b80ca7ab364c1.tar.gz
vcpkg-40c8aab459f6692f68daa0ef431b80ca7ab364c1.zip
14 files changed, 572 insertions, 877 deletions
diff --git a/toolsrc/include/vcpkg/base/stringview.h b/toolsrc/include/vcpkg/base/stringview.h
index 4f39e9103..405142c36 100644
--- a/toolsrc/include/vcpkg/base/stringview.h
+++ b/toolsrc/include/vcpkg/base/stringview.h
@@ -37,8 +37,8 @@ namespace vcpkg
         constexpr const char* begin() const { return m_ptr; }
         constexpr const char* end() const { return m_ptr + m_size; }
 
-        constexpr std::reverse_iterator<const char*> rbegin() const { return std::make_reverse_iterator(end()); }
-        constexpr std::reverse_iterator<const char*> rend() const { return std::make_reverse_iterator(begin()); }
+        std::reverse_iterator<const char*> rbegin() const { return std::make_reverse_iterator(end()); }
+        std::reverse_iterator<const char*> rend() const { return std::make_reverse_iterator(begin()); }
 
         constexpr const char* data() const { return m_ptr; }
         constexpr size_t size() const { return m_size; }
diff --git a/toolsrc/src/vcpkg/sourceparagraph.cpp b/toolsrc/src/vcpkg/sourceparagraph.cpp
index 8b16d0846..7bd560c8a 100644
--- a/toolsrc/src/vcpkg/sourceparagraph.cpp
+++ b/toolsrc/src/vcpkg/sourceparagraph.cpp
@@ -839,7 +839,7 @@ namespace vcpkg
         constexpr static StringLiteral FEATURES = "features";
         constexpr static StringLiteral DEFAULT_FEATURES = "default-features";
         constexpr static StringLiteral PLATFORM = "platform";
-        constexpr static StringView KNOWN_FIELDS[] = {NAME, FEATURES, DEFAULT_FEATURES, PLATFORM};
+        const static StringView KNOWN_FIELDS[4]; // not constexpr in MSVC 2015
 
         Optional<Dependency> visit_string(Json::Reader&, StringView, StringView sv)
         {
@@ -889,6 +889,7 @@ namespace vcpkg
             return dep;
         }
     };
+    const StringView DependencyField::KNOWN_FIELDS[] = {NAME, FEATURES, DEFAULT_FEATURES, PLATFORM};
 
     struct FeatureField : Json::VisitorCrtpBase<FeatureField>
     {
@@ -898,7 +899,7 @@ namespace vcpkg
         constexpr static StringLiteral NAME = "name";
         constexpr static StringLiteral DESCRIPTION = "description";
         constexpr static StringLiteral DEPENDENCIES = "dependencies";
-        constexpr static StringView KNOWN_FIELDS[] = {NAME, DESCRIPTION, DEPENDENCIES};
+        const static StringView KNOWN_FIELDS[3]; // Not constexpr in MSVC 2015
 
         Optional<std::unique_ptr<FeatureParagraph>> visit_object(Json::Reader& r, StringView, const Json::Object& obj)
         {
@@ -930,6 +931,7 @@ namespace vcpkg
             return std::move(feature);
         }
     };
+    const StringView FeatureField::KNOWN_FIELDS[] = {NAME, DESCRIPTION, DEPENDENCIES};
 
     Parse::ParseExpected<SourceControlFile> SourceControlFile::parse_manifest_file(const fs::path& path_to_manifest,
                                                                                    const Json::Object& manifest)
diff --git a/toolsrc/vcpkg.sln b/toolsrc/vcpkg.sln
deleted file mode 100644
index 7f51e701f..000000000
--- a/toolsrc/vcpkg.sln
+++ /dev/null
@@ -1,105 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vcpkg", "vcpkg\vcpkg.vcxproj", "{34671B80-54F9-46F5-8310-AC429C11D4FB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vcpkglib", "vcpkglib\vcpkglib.vcxproj", "{B98C92B7-2874-4537-9D46-D14E5C237F04}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vcpkgmetricsuploader", "vcpkgmetricsuploader\vcpkgmetricsuploader.vcxproj", "{7D6FDEEB-B299-4A23-85EE-F67C4DED47BE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vcpkgtest", "vcpkgtest\vcpkgtest.vcxproj", "{F27B8DB0-1279-4AF8-A2E3-1D49C4F0220D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{F5893B21-EA71-4432-84D6-5FB0E0461A2A}"
-	ProjectSection(SolutionItems) = preProject
-		..\scripts\bootstrap.ps1 = ..\scripts\bootstrap.ps1
-		..\scripts\get_triplet_environment.cmake = ..\scripts\get_triplet_environment.cmake
-		..\scripts\internalCI.ps1 = ..\scripts\internalCI.ps1
-		..\scripts\ports.cmake = ..\scripts\ports.cmake
-		..\scripts\vcpkgTools.xml = ..\scripts\vcpkgTools.xml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cmake", "cmake", "{A0122231-04D5-420B-81CA-7960946E5E65}"
-	ProjectSection(SolutionItems) = preProject
-		..\scripts\cmake\vcpkg_acquire_msys.cmake = ..\scripts\cmake\vcpkg_acquire_msys.cmake
-		..\scripts\cmake\vcpkg_apply_patches.cmake = ..\scripts\cmake\vcpkg_apply_patches.cmake
-		..\scripts\cmake\vcpkg_build_cmake.cmake = ..\scripts\cmake\vcpkg_build_cmake.cmake
-		..\scripts\cmake\vcpkg_build_msbuild.cmake = ..\scripts\cmake\vcpkg_build_msbuild.cmake
-		..\scripts\cmake\vcpkg_build_qmake.cmake = ..\scripts\cmake\vcpkg_build_qmake.cmake
-		..\scripts\cmake\vcpkg_common_functions.cmake = ..\scripts\cmake\vcpkg_common_functions.cmake
-		..\scripts\cmake\vcpkg_configure_cmake.cmake = ..\scripts\cmake\vcpkg_configure_cmake.cmake
-		..\scripts\cmake\vcpkg_configure_meson.cmake = ..\scripts\cmake\vcpkg_configure_meson.cmake
-		..\scripts\cmake\vcpkg_configure_qmake.cmake = ..\scripts\cmake\vcpkg_configure_qmake.cmake
-		..\scripts\cmake\vcpkg_copy_pdbs.cmake = ..\scripts\cmake\vcpkg_copy_pdbs.cmake
-		..\scripts\cmake\vcpkg_copy_tool_dependencies.cmake = ..\scripts\cmake\vcpkg_copy_tool_dependencies.cmake
-		..\scripts\cmake\vcpkg_download_distfile.cmake = ..\scripts\cmake\vcpkg_download_distfile.cmake
-		..\scripts\cmake\vcpkg_execute_required_process.cmake = ..\scripts\cmake\vcpkg_execute_required_process.cmake
-		..\scripts\cmake\vcpkg_execute_required_process_repeat.cmake = ..\scripts\cmake\vcpkg_execute_required_process_repeat.cmake
-		..\scripts\cmake\vcpkg_extract_source_archive.cmake = ..\scripts\cmake\vcpkg_extract_source_archive.cmake
-		..\scripts\cmake\vcpkg_find_acquire_program.cmake = ..\scripts\cmake\vcpkg_find_acquire_program.cmake
-		..\scripts\cmake\vcpkg_fixup_cmake_targets.cmake = ..\scripts\cmake\vcpkg_fixup_cmake_targets.cmake
-		..\scripts\cmake\vcpkg_from_bitbucket.cmake = ..\scripts\cmake\vcpkg_from_bitbucket.cmake
-		..\scripts\cmake\vcpkg_from_github.cmake = ..\scripts\cmake\vcpkg_from_github.cmake
-		..\scripts\cmake\vcpkg_get_program_files_platform_bitness.cmake = ..\scripts\cmake\vcpkg_get_program_files_platform_bitness.cmake
-		..\scripts\cmake\vcpkg_get_windows_sdk.cmake = ..\scripts\cmake\vcpkg_get_windows_sdk.cmake
-		..\scripts\cmake\vcpkg_install_cmake.cmake = ..\scripts\cmake\vcpkg_install_cmake.cmake
-		..\scripts\cmake\vcpkg_install_meson.cmake = ..\scripts\cmake\vcpkg_install_meson.cmake
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BCE555DF-F471-4ACC-98E5-76CBE8E8F79E}"
-	ProjectSection(SolutionItems) = preProject
-		vcpkg.natvis = vcpkg.natvis
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{34671B80-54F9-46F5-8310-AC429C11D4FB}.Debug|x64.ActiveCfg = Debug|x64
-		{34671B80-54F9-46F5-8310-AC429C11D4FB}.Debug|x64.Build.0 = Debug|x64
-		{34671B80-54F9-46F5-8310-AC429C11D4FB}.Debug|x86.ActiveCfg = Debug|Win32
-		{34671B80-54F9-46F5-8310-AC429C11D4FB}.Debug|x86.Build.0 = Debug|Win32
-		{34671B80-54F9-46F5-8310-AC429C11D4FB}.Release|x64.ActiveCfg = Release|x64
-		{34671B80-54F9-46F5-8310-AC429C11D4FB}.Release|x64.Build.0 = Release|x64
-		{34671B80-54F9-46F5-8310-AC429C11D4FB}.Release|x86.ActiveCfg = Release|Win32
-		{34671B80-54F9-46F5-8310-AC429C11D4FB}.Release|x86.Build.0 = Release|Win32
-		{B98C92B7-2874-4537-9D46-D14E5C237F04}.Debug|x64.ActiveCfg = Debug|x64
-		{B98C92B7-2874-4537-9D46-D14E5C237F04}.Debug|x64.Build.0 = Debug|x64
-		{B98C92B7-2874-4537-9D46-D14E5C237F04}.Debug|x86.ActiveCfg = Debug|Win32
-		{B98C92B7-2874-4537-9D46-D14E5C237F04}.Debug|x86.Build.0 = Debug|Win32
-		{B98C92B7-2874-4537-9D46-D14E5C237F04}.Release|x64.ActiveCfg = Release|x64
-		{B98C92B7-2874-4537-9D46-D14E5C237F04}.Release|x64.Build.0 = Release|x64
-		{B98C92B7-2874-4537-9D46-D14E5C237F04}.Release|x86.ActiveCfg = Release|Win32
-		{B98C92B7-2874-4537-9D46-D14E5C237F04}.Release|x86.Build.0 = Release|Win32
-		{7D6FDEEB-B299-4A23-85EE-F67C4DED47BE}.Debug|x64.ActiveCfg = Debug|x64
-		{7D6FDEEB-B299-4A23-85EE-F67C4DED47BE}.Debug|x64.Build.0 = Debug|x64
-		{7D6FDEEB-B299-4A23-85EE-F67C4DED47BE}.Debug|x86.ActiveCfg = Debug|Win32
-		{7D6FDEEB-B299-4A23-85EE-F67C4DED47BE}.Debug|x86.Build.0 = Debug|Win32
-		{7D6FDEEB-B299-4A23-85EE-F67C4DED47BE}.Release|x64.ActiveCfg = Release|x64
-		{7D6FDEEB-B299-4A23-85EE-F67C4DED47BE}.Release|x64.Build.0 = Release|x64
-		{7D6FDEEB-B299-4A23-85EE-F67C4DED47BE}.Release|x86.ActiveCfg = Release|Win32
-		{7D6FDEEB-B299-4A23-85EE-F67C4DED47BE}.Release|x86.Build.0 = Release|Win32
-		{F27B8DB0-1279-4AF8-A2E3-1D49C4F0220D}.Debug|x64.ActiveCfg = Debug|x64
-		{F27B8DB0-1279-4AF8-A2E3-1D49C4F0220D}.Debug|x64.Build.0 = Debug|x64
-		{F27B8DB0-1279-4AF8-A2E3-1D49C4F0220D}.Debug|x86.ActiveCfg = Debug|Win32
-		{F27B8DB0-1279-4AF8-A2E3-1D49C4F0220D}.Debug|x86.Build.0 = Debug|Win32
-		{F27B8DB0-1279-4AF8-A2E3-1D49C4F0220D}.Release|x64.ActiveCfg = Release|x64
-		{F27B8DB0-1279-4AF8-A2E3-1D49C4F0220D}.Release|x64.Build.0 = Release|x64
-		{F27B8DB0-1279-4AF8-A2E3-1D49C4F0220D}.Release|x86.ActiveCfg = Release|Win32
-		{F27B8DB0-1279-4AF8-A2E3-1D49C4F0220D}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{A0122231-04D5-420B-81CA-7960946E5E65} = {F5893B21-EA71-4432-84D6-5FB0E0461A2A}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {DEDCC7AF-0FE6-4387-9FFE-495D6C1AEE1B}
-	EndGlobalSection
-EndGlobal
diff --git a/toolsrc/vcpkglib/vcpkglib.vcxproj b/toolsrc/vcpkglib/vcpkglib.vcxproj
deleted file mode 100644
index c0adbd3a0..000000000
--- a/toolsrc/vcpkglib/vcpkglib.vcxproj
+++ /dev/null
@@ -1,327 +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>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.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>
-      <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>
-      <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>
-    </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>
-    </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.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\paragraphparseresult.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\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.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\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\paragraphparseresult.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\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/vcpkgtest/vcpkgtest.vcxproj b/toolsrc/vcpkgtest/vcpkgtest.vcxproj
deleted file mode 100644
index 07e10e1a4..000000000
--- a/toolsrc/vcpkgtest/vcpkgtest.vcxproj
+++ /dev/null
@@ -1,189 +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>
-  <ItemGroup>
-    <ClCompile Include="..\src\vcpkg-test\arguments.cpp" />
-    <ClCompile Include="..\src\vcpkg-test\catch.cpp" />
-    <ClCompile Include="..\src\vcpkg-test\chrono.cpp" />
-    <ClCompile Include="..\src\vcpkg-test\dependencies.cpp" />
-    <ClCompile Include="..\src\vcpkg-test\files.cpp" />
-    <ClCompile Include="..\src\vcpkg-test\mockcmakevarsprovider.cpp" />
-    <ClCompile Include="..\src\vcpkg-test\paragraph.cpp" />
-    <ClCompile Include="..\src\vcpkg-test\plan.cpp" />
-    <ClCompile Include="..\src\vcpkg-test\specifier.cpp" />
-    <ClCompile Include="..\src\vcpkg-test\statusparagraphs.cpp" />
-    <ClCompile Include="..\src\vcpkg-test\strings.cpp" />
-    <ClCompile Include="..\src\vcpkg-test\update.cpp" />
-    <ClCompile Include="..\src\vcpkg-test\util.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\vcpkglib\vcpkglib.vcxproj">
-      <Project>{b98c92b7-2874-4537-9d46-d14e5c237f04}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\include\catch2\catch.hpp" />
-    <ClInclude Include="..\include\vcpkg-test\mockcmakevarprovider.h" />
-    <ClInclude Include="..\include\vcpkg-test\util.h" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F27B8DB0-1279-4AF8-A2E3-1D49C4F0220D}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>vcpkgtest</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <UseOfMfc>false</UseOfMfc>
-  </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>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;$(VCInstallDir)UnitTest\include;$(VsInstallRoot)\VC\Auxiliary\VS\UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <UseFullPaths>true</UseFullPaths>
-      <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;$(VsInstallRoot)\VC\Auxiliary\VS\UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>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>
-      <AdditionalIncludeDirectories>..\include;$(VCInstallDir)UnitTest\include;$(VsInstallRoot)\VC\Auxiliary\VS\UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <UseFullPaths>true</UseFullPaths>
-      <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;$(VsInstallRoot)\VC\Auxiliary\VS\UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>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>
-      <AdditionalIncludeDirectories>..\include;$(VCInstallDir)UnitTest\include;$(VsInstallRoot)\VC\Auxiliary\VS\UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <UseFullPaths>true</UseFullPaths>
-      <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;$(VsInstallRoot)\VC\Auxiliary\VS\UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>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>
-      <AdditionalIncludeDirectories>..\include;$(VCInstallDir)UnitTest\include;$(VsInstallRoot)\VC\Auxiliary\VS\UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <UseFullPaths>true</UseFullPaths>
-      <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;$(VsInstallRoot)\VC\Auxiliary\VS\UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>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>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/toolsrc/vcpkgtest/vcpkgtest.vcxproj.filters b/toolsrc/vcpkgtest/vcpkgtest.vcxproj.filters
deleted file mode 100644
index 481fe3b6e..000000000
--- a/toolsrc/vcpkgtest/vcpkgtest.vcxproj.filters
+++ /dev/null
@@ -1,69 +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-test\arguments.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\vcpkg-test\catch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\vcpkg-test\chrono.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\vcpkg-test\dependencies.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\vcpkg-test\paragraph.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\vcpkg-test\plan.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\vcpkg-test\specifier.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\vcpkg-test\statusparagraphs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\vcpkg-test\update.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\vcpkg-test\util.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\vcpkg-test\files.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\vcpkg-test\strings.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\vcpkg-test\mockcmakevarsprovider.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\include\vcpkg-test\util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\catch2\catch.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\vcpkg-test\mockcmakevarprovider.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
-\ No newline at end of file
diff --git a/toolsrc/dirs.proj b/toolsrc/windows-bootstrap/dirs.proj
index 960374bff..960374bff 100644
--- a/toolsrc/dirs.proj
+++ b/toolsrc/windows-bootstrap/dirs.proj
diff --git a/toolsrc/windows-bootstrap/vcpkg.sln b/toolsrc/windows-bootstrap/vcpkg.sln
new file mode 100644
index 000000000..51dc3649e
--- /dev/null
+++ b/toolsrc/windows-bootstrap/vcpkg.sln
@@ -0,0 +1,56 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30330.147
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vcpkg", "vcpkg\vcpkg.vcxproj", "{34671B80-54F9-46F5-8310-AC429C11D4FB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vcpkglib", "vcpkglib\vcpkglib.vcxproj", "{B98C92B7-2874-4537-9D46-D14E5C237F04}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vcpkgmetricsuploader", "vcpkgmetricsuploader\vcpkgmetricsuploader.vcxproj", "{7D6FDEEB-B299-4A23-85EE-F67C4DED47BE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E4FAF582-0DB7-4CF5-BAE0-E2D38C48593B}"
+	ProjectSection(SolutionItems) = preProject
+		..\vcpkg.natvis = ..\vcpkg.natvis
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{34671B80-54F9-46F5-8310-AC429C11D4FB}.Debug|x64.ActiveCfg = Debug|x64
+		{34671B80-54F9-46F5-8310-AC429C11D4FB}.Debug|x64.Build.0 = Debug|x64
+		{34671B80-54F9-46F5-8310-AC429C11D4FB}.Debug|x86.ActiveCfg = Debug|Win32
+		{34671B80-54F9-46F5-8310-AC429C11D4FB}.Debug|x86.Build.0 = Debug|Win32
+		{34671B80-54F9-46F5-8310-AC429C11D4FB}.Release|x64.ActiveCfg = Release|x64
+		{34671B80-54F9-46F5-8310-AC429C11D4FB}.Release|x64.Build.0 = Release|x64
+		{34671B80-54F9-46F5-8310-AC429C11D4FB}.Release|x86.ActiveCfg = Release|Win32
+		{34671B80-54F9-46F5-8310-AC429C11D4FB}.Release|x86.Build.0 = Release|Win32
+		{B98C92B7-2874-4537-9D46-D14E5C237F04}.Debug|x64.ActiveCfg = Debug|x64
+		{B98C92B7-2874-4537-9D46-D14E5C237F04}.Debug|x64.Build.0 = Debug|x64
+		{B98C92B7-2874-4537-9D46-D14E5C237F04}.Debug|x86.ActiveCfg = Debug|Win32
+		{B98C92B7-2874-4537-9D46-D14E5C237F04}.Debug|x86.Build.0 = Debug|Win32
+		{B98C92B7-2874-4537-9D46-D14E5C237F04}.Release|x64.ActiveCfg = Release|x64
+		{B98C92B7-2874-4537-9D46-D14E5C237F04}.Release|x64.Build.0 = Release|x64
+		{B98C92B7-2874-4537-9D46-D14E5C237F04}.Release|x86.ActiveCfg = Release|Win32
+		{B98C92B7-2874-4537-9D46-D14E5C237F04}.Release|x86.Build.0 = Release|Win32
+		{7D6FDEEB-B299-4A23-85EE-F67C4DED47BE}.Debug|x64.ActiveCfg = Debug|x64
+		{7D6FDEEB-B299-4A23-85EE-F67C4DED47BE}.Debug|x64.Build.0 = Debug|x64
+		{7D6FDEEB-B299-4A23-85EE-F67C4DED47BE}.Debug|x86.ActiveCfg = Debug|Win32
+		{7D6FDEEB-B299-4A23-85EE-F67C4DED47BE}.Debug|x86.Build.0 = Debug|Win32
+		{7D6FDEEB-B299-4A23-85EE-F67C4DED47BE}.Release|x64.ActiveCfg = Release|x64
+		{7D6FDEEB-B299-4A23-85EE-F67C4DED47BE}.Release|x64.Build.0 = Release|x64
+		{7D6FDEEB-B299-4A23-85EE-F67C4DED47BE}.Release|x86.ActiveCfg = Release|Win32
+		{7D6FDEEB-B299-4A23-85EE-F67C4DED47BE}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {030760DE-1214-461B-B241-39608AD6FB66}
+	EndGlobalSection
+EndGlobal
diff --git a/toolsrc/vcpkg/vcpkg.vcxproj b/toolsrc/windows-bootstrap/vcpkg/vcpkg.vcxproj
index 917cd3b9c..b6229d9a3 100644
--- a/toolsrc/vcpkg/vcpkg.vcxproj
+++ b/toolsrc/windows-bootstrap/vcpkg/vcpkg.vcxproj
@@ -74,7 +74,7 @@
       <WarningLevel>Level4</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
       <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
@@ -88,7 +88,7 @@
       <WarningLevel>Level4</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
       <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
@@ -104,7 +104,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_MBCS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -122,7 +122,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_MBCS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -139,10 +139,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\vcpkg.cpp" />
+    <ClCompile Include="..\..\src\vcpkg.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <Text Include="..\VERSION.txt" />
+    <Text Include="..\..\VERSION.txt" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/toolsrc/vcpkg/vcpkg.vcxproj.filters b/toolsrc/windows-bootstrap/vcpkg/vcpkg.vcxproj.filters
index 3821d89b3..3710939ca 100644
--- a/toolsrc/vcpkg/vcpkg.vcxproj.filters
+++ b/toolsrc/windows-bootstrap/vcpkg/vcpkg.vcxproj.filters
@@ -15,12 +15,12 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\vcpkg.cpp">
+    <ClCompile Include="..\..\src\vcpkg.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <Text Include="..\VERSION.txt">
+    <Text Include="..\..\VERSION.txt">
       <Filter>Source Files</Filter>
     </Text>
   </ItemGroup>
diff --git a/toolsrc/windows-bootstrap/vcpkglib/vcpkglib.vcxproj b/toolsrc/windows-bootstrap/vcpkglib/vcpkglib.vcxproj
new file mode 100644
index 000000000..cd98c2256
--- /dev/null
+++ b/toolsrc/windows-bootstrap/vcpkglib/vcpkglib.vcxproj
@@ -0,0 +1,327 @@
+<?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>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.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>
+      <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>
+      <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>
+    </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>
+    </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.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\paragraphparseresult.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\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.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\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\paragraphparseresult.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\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/vcpkglib/vcpkglib.vcxproj.filters b/toolsrc/windows-bootstrap/vcpkglib/vcpkglib.vcxproj.filters
index f13461b6b..f1772fa5f 100644
--- a/toolsrc/vcpkglib/vcpkglib.vcxproj.filters
+++ b/toolsrc/windows-bootstrap/vcpkglib/vcpkglib.vcxproj.filters
@@ -27,513 +27,513 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\pch.cpp">
+    <ClCompile Include="..\..\src\pch.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\binaryparagraph.cpp">
+    <ClCompile Include="..\..\src\vcpkg\binaryparagraph.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\build.cpp">
+    <ClCompile Include="..\..\src\vcpkg\build.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\commands.autocomplete.cpp">
+    <ClCompile Include="..\..\src\vcpkg\commands.autocomplete.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\commands.buildexternal.cpp">
+    <ClCompile Include="..\..\src\vcpkg\commands.buildexternal.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\commands.cache.cpp">
+    <ClCompile Include="..\..\src\vcpkg\commands.cache.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\commands.ci.cpp">
+    <ClCompile Include="..\..\src\vcpkg\commands.ci.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\commands.ciclean.cpp">
+    <ClCompile Include="..\..\src\vcpkg\commands.ciclean.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\commands.contact.cpp">
+    <ClCompile Include="..\..\src\vcpkg\commands.contact.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\commands.cpp">
+    <ClCompile Include="..\..\src\vcpkg\commands.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\commands.create.cpp">
+    <ClCompile Include="..\..\src\vcpkg\commands.create.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\commands.dependinfo.cpp">
+    <ClCompile Include="..\..\src\vcpkg\commands.dependinfo.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\commands.edit.cpp">
+    <ClCompile Include="..\..\src\vcpkg\commands.edit.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\commands.env.cpp">
+    <ClCompile Include="..\..\src\vcpkg\commands.env.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\commands.fetch.cpp">
+    <ClCompile Include="..\..\src\vcpkg\commands.fetch.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\commands.format-manifest.cpp">
+    <ClCompile Include="..\..\src\vcpkg\commands.format-manifest.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\commands.hash.cpp">
+    <ClCompile Include="..\..\src\vcpkg\commands.hash.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\commands.integrate.cpp">
+    <ClCompile Include="..\..\src\vcpkg\commands.integrate.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\commands.list.cpp">
+    <ClCompile Include="..\..\src\vcpkg\commands.list.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\commands.owns.cpp">
+    <ClCompile Include="..\..\src\vcpkg\commands.owns.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\commands.portsdiff.cpp">
+    <ClCompile Include="..\..\src\vcpkg\commands.portsdiff.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\commands.search.cpp">
+    <ClCompile Include="..\..\src\vcpkg\commands.search.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\commands.setinstalled.cpp">
+    <ClCompile Include="..\..\src\vcpkg\commands.setinstalled.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\commands.version.cpp">
+    <ClCompile Include="..\..\src\vcpkg\commands.version.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\dependencies.cpp">
+    <ClCompile Include="..\..\src\vcpkg\dependencies.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\export.cpp">
+    <ClCompile Include="..\..\src\vcpkg\export.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\export.chocolatey.cpp">
+    <ClCompile Include="..\..\src\vcpkg\export.chocolatey.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\export.ifw.cpp">
+    <ClCompile Include="..\..\src\vcpkg\export.ifw.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\globalstate.cpp">
+    <ClCompile Include="..\..\src\vcpkg\globalstate.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\help.cpp">
+    <ClCompile Include="..\..\src\vcpkg\help.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\input.cpp">
+    <ClCompile Include="..\..\src\vcpkg\input.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\install.cpp">
+    <ClCompile Include="..\..\src\vcpkg\install.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\platform-expression.cpp">
+    <ClCompile Include="..\..\src\vcpkg\platform-expression.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\metrics.cpp">
+    <ClCompile Include="..\..\src\vcpkg\metrics.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\packagespec.cpp">
+    <ClCompile Include="..\..\src\vcpkg\packagespec.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\paragraphparseresult.cpp">
+    <ClCompile Include="..\..\src\vcpkg\paragraphparseresult.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\paragraphs.cpp">
+    <ClCompile Include="..\..\src\vcpkg\paragraphs.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\postbuildlint.buildtype.cpp">
+    <ClCompile Include="..\..\src\vcpkg\postbuildlint.buildtype.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\postbuildlint.cpp">
+    <ClCompile Include="..\..\src\vcpkg\postbuildlint.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\remove.cpp">
+    <ClCompile Include="..\..\src\vcpkg\remove.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\sourceparagraph.cpp">
+    <ClCompile Include="..\..\src\vcpkg\sourceparagraph.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\statusparagraph.cpp">
+    <ClCompile Include="..\..\src\vcpkg\statusparagraph.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\statusparagraphs.cpp">
+    <ClCompile Include="..\..\src\vcpkg\statusparagraphs.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\triplet.cpp">
+    <ClCompile Include="..\..\src\vcpkg\triplet.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\update.cpp">
+    <ClCompile Include="..\..\src\vcpkg\update.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\vcpkgcmdarguments.cpp">
+    <ClCompile Include="..\..\src\vcpkg\vcpkgcmdarguments.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\vcpkglib.cpp">
+    <ClCompile Include="..\..\src\vcpkg\vcpkglib.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\vcpkgpaths.cpp">
+    <ClCompile Include="..\..\src\vcpkg\vcpkgpaths.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\versiont.cpp">
+    <ClCompile Include="..\..\src\vcpkg\versiont.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\base\checks.cpp">
+    <ClCompile Include="..\..\src\vcpkg\base\checks.cpp">
       <Filter>Source Files\vcpkg\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\base\chrono.cpp">
+    <ClCompile Include="..\..\src\vcpkg\base\chrono.cpp">
       <Filter>Source Files\vcpkg\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\base\cofffilereader.cpp">
+    <ClCompile Include="..\..\src\vcpkg\base\cofffilereader.cpp">
       <Filter>Source Files\vcpkg\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\base\enums.cpp">
+    <ClCompile Include="..\..\src\vcpkg\base\enums.cpp">
       <Filter>Source Files\vcpkg\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\base\files.cpp">
+    <ClCompile Include="..\..\src\vcpkg\base\files.cpp">
       <Filter>Source Files\vcpkg\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\base\machinetype.cpp">
+    <ClCompile Include="..\..\src\vcpkg\base\machinetype.cpp">
       <Filter>Source Files\vcpkg\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\base\parse.cpp">
+    <ClCompile Include="..\..\src\vcpkg\base\parse.cpp">
       <Filter>Source Files\vcpkg\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\base\strings.cpp">
+    <ClCompile Include="..\..\src\vcpkg\base\strings.cpp">
       <Filter>Source Files\vcpkg\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\base\system.cpp">
+    <ClCompile Include="..\..\src\vcpkg\base\system.cpp">
       <Filter>Source Files\vcpkg\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\userconfig.cpp">
+    <ClCompile Include="..\..\src\vcpkg\userconfig.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\commands.upgrade.cpp">
+    <ClCompile Include="..\..\src\vcpkg\commands.upgrade.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\archives.cpp">
+    <ClCompile Include="..\..\src\vcpkg\archives.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\visualstudio.cpp">
+    <ClCompile Include="..\..\src\vcpkg\visualstudio.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\tools.cpp">
+    <ClCompile Include="..\..\src\vcpkg\tools.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\base\hash.cpp">
+    <ClCompile Include="..\..\src\vcpkg\base\hash.cpp">
       <Filter>Source Files\vcpkg\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\base\downloads.cpp">
+    <ClCompile Include="..\..\src\vcpkg\base\downloads.cpp">
       <Filter>Source Files\vcpkg\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\commands.xvsinstances.cpp">
+    <ClCompile Include="..\..\src\vcpkg\commands.xvsinstances.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\base\stringview.cpp">
+    <ClCompile Include="..\..\src\vcpkg\base\stringview.cpp">
       <Filter>Source Files\vcpkg\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\base\system.print.cpp">
+    <ClCompile Include="..\..\src\vcpkg\base\system.print.cpp">
       <Filter>Source Files\vcpkg\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\commands.porthistory.cpp">
+    <ClCompile Include="..\..\src\vcpkg\commands.porthistory.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\cmakevars.cpp">
+    <ClCompile Include="..\..\src\vcpkg\cmakevars.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\portfileprovider.cpp">
+    <ClCompile Include="..\..\src\vcpkg\portfileprovider.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\base\system.process.cpp">
+    <ClCompile Include="..\..\src\vcpkg\base\system.process.cpp">
       <Filter>Source Files\vcpkg\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\binarycaching.cpp">
+    <ClCompile Include="..\..\src\vcpkg\binarycaching.cpp">
       <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\base\json.cpp">
+    <ClCompile Include="..\..\src\vcpkg\base\json.cpp">
       <Filter>Source Files\vcpkg\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg\base\unicode.cpp">
+    <ClCompile Include="..\..\src\vcpkg\base\unicode.cpp">
       <Filter>Source Files\vcpkg\base</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\include\pch.h">
+    <ClInclude Include="..\..\include\pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\base\files.h">
+    <ClInclude Include="..\..\include\vcpkg\base\files.h">
       <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\base\checks.h">
+    <ClInclude Include="..\..\include\vcpkg\base\checks.h">
       <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\base\chrono.h">
+    <ClInclude Include="..\..\include\vcpkg\base\chrono.h">
       <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\base\cofffilereader.h">
+    <ClInclude Include="..\..\include\vcpkg\base\cofffilereader.h">
       <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\base\cstringview.h">
+    <ClInclude Include="..\..\include\vcpkg\base\cstringview.h">
       <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\base\enums.h">
+    <ClInclude Include="..\..\include\vcpkg\base\enums.h">
       <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\base\expected.h">
+    <ClInclude Include="..\..\include\vcpkg\base\expected.h">
       <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\base\graphs.h">
+    <ClInclude Include="..\..\include\vcpkg\base\graphs.h">
       <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\base\lazy.h">
+    <ClInclude Include="..\..\include\vcpkg\base\lazy.h">
       <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\base\lineinfo.h">
+    <ClInclude Include="..\..\include\vcpkg\base\lineinfo.h">
       <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\base\machinetype.h">
+    <ClInclude Include="..\..\include\vcpkg\base\machinetype.h">
       <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\base\optional.h">
+    <ClInclude Include="..\..\include\vcpkg\base\optional.h">
       <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\base\sortedvector.h">
+    <ClInclude Include="..\..\include\vcpkg\base\sortedvector.h">
       <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\base\span.h">
+    <ClInclude Include="..\..\include\vcpkg\base\span.h">
       <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\base\strings.h">
+    <ClInclude Include="..\..\include\vcpkg\base\strings.h">
       <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\base\system.h">
+    <ClInclude Include="..\..\include\vcpkg\base\system.h">
       <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\base\util.h">
+    <ClInclude Include="..\..\include\vcpkg\base\util.h">
       <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\binaryparagraph.h">
+    <ClInclude Include="..\..\include\vcpkg\binaryparagraph.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\build.h">
+    <ClInclude Include="..\..\include\vcpkg\build.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\commands.h">
+    <ClInclude Include="..\..\include\vcpkg\commands.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\commands.autocomplete.h">
+    <ClInclude Include="..\..\include\vcpkg\commands.autocomplete.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\commands.buildexternal.h">
+    <ClInclude Include="..\..\include\vcpkg\commands.buildexternal.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\commands.cache.h">
+    <ClInclude Include="..\..\include\vcpkg\commands.cache.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\commands.ci.h">
+    <ClInclude Include="..\..\include\vcpkg\commands.ci.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\commands.ciclean.h">
+    <ClInclude Include="..\..\include\vcpkg\commands.ciclean.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\commands.contact.h">
+    <ClInclude Include="..\..\include\vcpkg\commands.contact.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\commands.create.h">
+    <ClInclude Include="..\..\include\vcpkg\commands.create.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\commands.dependinfo.h">
+    <ClInclude Include="..\..\include\vcpkg\commands.dependinfo.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\commands.edit.h">
+    <ClInclude Include="..\..\include\vcpkg\commands.edit.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\commands.env.h">
+    <ClInclude Include="..\..\include\vcpkg\commands.env.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\commands.fetch.h">
+    <ClInclude Include="..\..\include\vcpkg\commands.fetch.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\commands.format-manifest.h">
+    <ClInclude Include="..\..\include\vcpkg\commands.format-manifest.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\commands.hash.h">
+    <ClInclude Include="..\..\include\vcpkg\commands.hash.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\commands.integrate.h">
+    <ClInclude Include="..\..\include\vcpkg\commands.integrate.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\commands.interface.h">
+    <ClInclude Include="..\..\include\vcpkg\commands.interface.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\commands.list.h">
+    <ClInclude Include="..\..\include\vcpkg\commands.list.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\commands.owns.h">
+    <ClInclude Include="..\..\include\vcpkg\commands.owns.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\commands.porthistory.h">
+    <ClInclude Include="..\..\include\vcpkg\commands.porthistory.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\commands.portsdiff.h">
+    <ClInclude Include="..\..\include\vcpkg\commands.portsdiff.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\commands.search.h">
+    <ClInclude Include="..\..\include\vcpkg\commands.search.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\commands.setinstalled.h">
+    <ClInclude Include="..\..\include\vcpkg\commands.setinstalled.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\commands.upgrade.h">
+    <ClInclude Include="..\..\include\vcpkg\commands.upgrade.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\commands.version.h">
+    <ClInclude Include="..\..\include\vcpkg\commands.version.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\commands.xvsinstances.h">
+    <ClInclude Include="..\..\include\vcpkg\commands.xvsinstances.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\dependencies.h">
+    <ClInclude Include="..\..\include\vcpkg\dependencies.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\export.h">
+    <ClInclude Include="..\..\include\vcpkg\export.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\globalstate.h">
+    <ClInclude Include="..\..\include\vcpkg\globalstate.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\help.h">
+    <ClInclude Include="..\..\include\vcpkg\help.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\input.h">
+    <ClInclude Include="..\..\include\vcpkg\input.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\install.h">
+    <ClInclude Include="..\..\include\vcpkg\install.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\metrics.h">
+    <ClInclude Include="..\..\include\vcpkg\metrics.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\packagespec.h">
+    <ClInclude Include="..\..\include\vcpkg\packagespec.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\paragraphparseresult.h">
+    <ClInclude Include="..\..\include\vcpkg\paragraphparseresult.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\paragraphs.h">
+    <ClInclude Include="..\..\include\vcpkg\paragraphs.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\base\parse.h">
+    <ClInclude Include="..\..\include\vcpkg\base\parse.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\postbuildlint.h">
+    <ClInclude Include="..\..\include\vcpkg\postbuildlint.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\remove.h">
+    <ClInclude Include="..\..\include\vcpkg\remove.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\sourceparagraph.h">
+    <ClInclude Include="..\..\include\vcpkg\sourceparagraph.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\statusparagraph.h">
+    <ClInclude Include="..\..\include\vcpkg\statusparagraph.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\statusparagraphs.h">
+    <ClInclude Include="..\..\include\vcpkg\statusparagraphs.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\triplet.h">
+    <ClInclude Include="..\..\include\vcpkg\triplet.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\update.h">
+    <ClInclude Include="..\..\include\vcpkg\update.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\vcpkgcmdarguments.h">
+    <ClInclude Include="..\..\include\vcpkg\vcpkgcmdarguments.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\vcpkglib.h">
+    <ClInclude Include="..\..\include\vcpkg\vcpkglib.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\vcpkgpaths.h">
+    <ClInclude Include="..\..\include\vcpkg\vcpkgpaths.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\versiont.h">
+    <ClInclude Include="..\..\include\vcpkg\versiont.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\postbuildlint.buildtype.h">
+    <ClInclude Include="..\..\include\vcpkg\postbuildlint.buildtype.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\export.ifw.h">
+    <ClInclude Include="..\..\include\vcpkg\export.ifw.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\userconfig.h">
+    <ClInclude Include="..\..\include\vcpkg\userconfig.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\base\stringliteral.h">
+    <ClInclude Include="..\..\include\vcpkg\base\stringliteral.h">
       <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\archives.h">
+    <ClInclude Include="..\..\include\vcpkg\archives.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\visualstudio.h">
+    <ClInclude Include="..\..\include\vcpkg\visualstudio.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\base\stringrange.h">
+    <ClInclude Include="..\..\include\vcpkg\base\stringrange.h">
       <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\base\cache.h">
+    <ClInclude Include="..\..\include\vcpkg\base\cache.h">
       <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\tools.h">
+    <ClInclude Include="..\..\include\vcpkg\tools.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\base\hash.h">
+    <ClInclude Include="..\..\include\vcpkg\base\hash.h">
       <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\base\downloads.h">
+    <ClInclude Include="..\..\include\vcpkg\base\downloads.h">
       <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\base\stringview.h">
+    <ClInclude Include="..\..\include\vcpkg\base\stringview.h">
       <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\base\system.debug.h">
+    <ClInclude Include="..\..\include\vcpkg\base\system.debug.h">
       <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\base\system.print.h">
+    <ClInclude Include="..\..\include\vcpkg\base\system.print.h">
       <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\base\system.process.h">
+    <ClInclude Include="..\..\include\vcpkg\base\system.process.h">
       <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\base\view.h">
+    <ClInclude Include="..\..\include\vcpkg\base\view.h">
       <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\base\pragmas.h">
+    <ClInclude Include="..\..\include\vcpkg\base\pragmas.h">
       <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\base\zstringview.h">
+    <ClInclude Include="..\..\include\vcpkg\base\zstringview.h">
       <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\cmakevars.h">
+    <ClInclude Include="..\..\include\vcpkg\cmakevars.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\export.chocolatey.h">
+    <ClInclude Include="..\..\include\vcpkg\export.chocolatey.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\platform-expression.h">
+    <ClInclude Include="..\..\include\vcpkg\platform-expression.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\paragraphparser.h">
+    <ClInclude Include="..\..\include\vcpkg\paragraphparser.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\portfileprovider.h">
+    <ClInclude Include="..\..\include\vcpkg\portfileprovider.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\textrowcol.h">
+    <ClInclude Include="..\..\include\vcpkg\textrowcol.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\binarycaching.h">
+    <ClInclude Include="..\..\include\vcpkg\binarycaching.h">
       <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\base\json.h">
+    <ClInclude Include="..\..\include\vcpkg\base\json.h">
       <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg\base\unicode.h">
+    <ClInclude Include="..\..\include\vcpkg\base\unicode.h">
       <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj b/toolsrc/windows-bootstrap/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj
index 9e2e8c08a..027ef1917 100644
--- a/toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj
+++ b/toolsrc/windows-bootstrap/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj
@@ -74,7 +74,7 @@
       <WarningLevel>Level4</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
       <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
@@ -88,7 +88,7 @@
       <WarningLevel>Level4</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
       <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
@@ -104,7 +104,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_MBCS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -122,7 +122,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_MBCS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -134,7 +134,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\vcpkgmetricsuploader.cpp" />
+    <ClCompile Include="..\..\src\vcpkgmetricsuploader.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\vcpkglib\vcpkglib.vcxproj">
diff --git a/toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj.filters b/toolsrc/windows-bootstrap/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj.filters
index ad56c0c72..d103d50c2 100644
--- a/toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj.filters
+++ b/toolsrc/windows-bootstrap/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj.filters
@@ -15,7 +15,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\vcpkgmetricsuploader.cpp">
+    <ClCompile Include="..\..\src\vcpkgmetricsuploader.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
author	nicole mazzuca <mazzucan@outlook.com>	2020-08-06 17:04:47 -0700
committer	GitHub <noreply@github.com>	2020-08-06 17:04:47 -0700
commit	40c8aab459f6692f68daa0ef431b80ca7ab364c1 (patch)
tree	d49c575bd7be93b2522293e5d54a7ce743b08355 /toolsrc
parent	61c055a6fcfee2a7e764997bb2478adf49db6edf (diff)
download	vcpkg-40c8aab459f6692f68daa0ef431b80ca7ab364c1.tar.gz vcpkg-40c8aab459f6692f68daa0ef431b80ca7ab364c1.zip