diff --git a/docs/tool-maintainers/layout.md b/docs/tool-maintainers/layout.md index 9779b0434a..ca9fa5c6ae 100644 --- a/docs/tool-maintainers/layout.md +++ b/docs/tool-maintainers/layout.md @@ -36,16 +36,6 @@ We have six files in this directory -- one `.clang-format` file, one the IDE. - `vcpkg.sln`: The solution file is how one opens the project in the VS IDE. -### `vcpkg`, `vcpkglib`, `vcpkgmetricsuploader`, and `vcpkgtest` - -These four contain exactly one `.vcxproj` and one -`.vcxproj.filters`. The `.vcxproj` file contains the source files -and the `.vcxproj.filters` contains information on how Visual Studio -should lay out the project's source files in the IDE's project view. - -`vcpkgtest` should not be touched. It's likely that it will be deleted soon. If -you want to test your code, use the cmake build system. - ## Source Files If you're modifying the project, it's likely that these are the directories that @@ -72,8 +62,7 @@ There are three directories: ### `src` The source files live here. `pch.cpp` is the source file for the -[precompiled header]; `vcpkg.cpp` is where the `vcpkg` binary lives; and -`vcpkgmetricsuploader.cpp` is where the metrics uploader lives. +[precompiled header]; `vcpkg.cpp` is where the `vcpkg` binary lives. The interesting files live in the `vcpkg` and `vcpkg-test` directories. In `vcpkg`, you have the implementation for the interfaces that live in diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 0d87d6ee89..5e750df38a 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -379,7 +379,7 @@ $arguments = ( "/verbosity:minimal", "/m", "/nologo", -"`"$vcpkgBootstrapPath\dirs.proj`"") -join " " +"`"$vcpkgBootstrapPath\vcpkg.vcxproj`"") -join " " function vcpkgInvokeCommandClean() { @@ -432,9 +432,4 @@ Write-Verbose "Placing vcpkg.exe in the correct location" Copy-Item "$vcpkgReleaseDir\vcpkg.exe" "$vcpkgRootDir\vcpkg.exe" -if (-not $disableMetrics) -{ - Copy-Item "$vcpkgReleaseDir\vcpkgmetricsuploader.exe" "$vcpkgRootDir\scripts\vcpkgmetricsuploader.exe" -} - Remove-Item "$vcpkgReleaseDir" -Force -Recurse -ErrorAction SilentlyContinue diff --git a/toolsrc/CMakeLists.txt b/toolsrc/CMakeLists.txt index aa54a791b5..35f30b0573 100644 --- a/toolsrc/CMakeLists.txt +++ b/toolsrc/CMakeLists.txt @@ -38,8 +38,6 @@ file(GLOB VCPKGLIB_BASE_INCLUDES CONFIGURE_DEPENDS include/vcpkg/base/*.h includ set(VCPKG_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/vcpkg.cpp) -set(VCPKGMETRICSUPLOADER_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/vcpkgmetricsuploader.cpp) - file(GLOB VCPKG_TEST_SOURCES CONFIGURE_DEPENDS src/vcpkg-test/*.cpp) file(GLOB VCPKG_TEST_INCLUDES CONFIGURE_DEPENDS include/vcpkg-test/*.h) @@ -116,14 +114,6 @@ add_executable(vcpkg ${VCPKG_SOURCES}) target_link_libraries(vcpkg PRIVATE vcpkglib) vcpkg_target_add_warning_options(vcpkg) -# === Target: vcpkgmetricsuploader === - -if(WIN32 AND NOT VCPKG_DISABLE_METRICS) - add_executable(vcpkgmetricsuploader WIN32 ${VCPKGMETRICSUPLOADER_SOURCES}) - target_link_libraries(vcpkgmetricsuploader PRIVATE vcpkglib) - vcpkg_target_add_warning_options(vcpkgmetricsuploader) -endif() - # === Target: vcpkg-test === if (BUILD_TESTING) @@ -164,7 +154,6 @@ if(CLANG_FORMAT) COMMAND ${CLANG_FORMAT} -i -verbose ${VCPKGLIB_INCLUDES} COMMAND ${CLANG_FORMAT} -i -verbose ${VCPKG_SOURCES} - COMMAND ${CLANG_FORMAT} -i -verbose ${VCPKGMETRICSUPLOADER_SOURCES} COMMAND ${CLANG_FORMAT} -i -verbose ${VCPKG_TEST_SOURCES} COMMAND ${CLANG_FORMAT} -i -verbose ${VCPKG_TEST_INCLUDES} diff --git a/toolsrc/include/vcpkg/base/system.process.h b/toolsrc/include/vcpkg/base/system.process.h index 4bbcba7179..e81bcfed78 100644 --- a/toolsrc/include/vcpkg/base/system.process.h +++ b/toolsrc/include/vcpkg/base/system.process.h @@ -66,7 +66,7 @@ namespace vcpkg::System #if defined(_WIN32) Environment cmd_execute_modify_env(const ZStringView cmd_line, const Environment& env = {}); - void cmd_execute_no_wait(const StringView cmd_line); + void cmd_execute_background(const StringView cmd_line); #endif ExitCodeAndOutput cmd_execute_and_capture_output(const ZStringView cmd_line, const Environment& env = {}); diff --git a/toolsrc/include/vcpkg/commands.upload-metrics.h b/toolsrc/include/vcpkg/commands.upload-metrics.h new file mode 100644 index 0000000000..dcd855ffba --- /dev/null +++ b/toolsrc/include/vcpkg/commands.upload-metrics.h @@ -0,0 +1,22 @@ +#pragma once + +#if !VCPKG_DISABLE_METRICS && defined(_WIN32) +#define VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND 1 +#else +#define VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND 0 +#endif // !VCPKG_DISABLE_METRICS && defined(_WIN32) + +#if VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND + +#include + +namespace vcpkg::Commands::UploadMetrics +{ + extern const CommandStructure COMMAND_STRUCTURE; + struct UploadMetricsCommand : BasicCommand + { + virtual void perform_and_exit(const VcpkgCmdArguments& args, Files::Filesystem& fs) const override; + }; +} + +#endif // VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND diff --git a/toolsrc/src/vcpkg-test/commands.cpp b/toolsrc/src/vcpkg-test/commands.cpp index 2c37798770..c19fd30ea6 100644 --- a/toolsrc/src/vcpkg-test/commands.cpp +++ b/toolsrc/src/vcpkg-test/commands.cpp @@ -2,68 +2,80 @@ #include #include +#include #include +#include + using namespace vcpkg; -TEST_CASE ("test commands are constructible", "[commands]") +namespace { - Commands::Contact::ContactCommand contact{}; - Commands::Version::VersionCommand version{}; -} + template + void check_all_commands(const CommandListT& actual_commands, const char* const (&expected_commands)[ExpectedCount]) + { + CHECK(actual_commands.size() == ExpectedCount); // makes sure this test is updated if we add a command + for (const char* expected_command : expected_commands) + { + CHECK(Commands::find(StringView{expected_command, strlen(expected_command)}, actual_commands) != nullptr); + } + CHECK(Commands::find("x-never-will-exist", actual_commands) == nullptr); + } +} // unnamed namespace + +// clang-format tries to wrap the following lists inappropriately + +// clang-format off TEST_CASE ("get_available_basic_commands works", "[commands]") { - auto commands_list = Commands::get_available_basic_commands(); - CHECK(commands_list.size() == 2); - CHECK(Commands::find("version", commands_list) != nullptr); - CHECK(Commands::find("contact", commands_list) != nullptr); - CHECK(Commands::find("aang", commands_list) == nullptr); + check_all_commands(Commands::get_available_basic_commands(), { + "contact", + "version", +#if VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND + "x-upload-metrics", +#endif // VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND + }); } TEST_CASE ("get_available_paths_commands works", "[commands]") { - auto commands_list = Commands::get_available_paths_commands(); - CHECK(commands_list.size() == 19); - - CHECK(Commands::find("/?", commands_list) != nullptr); - CHECK(Commands::find("help", commands_list) != nullptr); - CHECK(Commands::find("search", commands_list) != nullptr); - CHECK(Commands::find("list", commands_list) != nullptr); - CHECK(Commands::find("integrate", commands_list) != nullptr); - CHECK(Commands::find("owns", commands_list) != nullptr); - CHECK(Commands::find("update", commands_list) != nullptr); - CHECK(Commands::find("edit", commands_list) != nullptr); - CHECK(Commands::find("create", commands_list) != nullptr); - CHECK(Commands::find("cache", commands_list) != nullptr); - CHECK(Commands::find("portsdiff", commands_list) != nullptr); - CHECK(Commands::find("autocomplete", commands_list) != nullptr); - CHECK(Commands::find("hash", commands_list) != nullptr); - CHECK(Commands::find("fetch", commands_list) != nullptr); - CHECK(Commands::find("x-ci-clean", commands_list) != nullptr); - CHECK(Commands::find("x-history", commands_list) != nullptr); - CHECK(Commands::find("x-package-info", commands_list) != nullptr); - CHECK(Commands::find("x-vsinstances", commands_list) != nullptr); - CHECK(Commands::find("x-format-manifest", commands_list) != nullptr); - - CHECK(Commands::find("korra", commands_list) == nullptr); + check_all_commands(Commands::get_available_paths_commands(), { + "/?", + "help", + "search", + "list", + "integrate", + "owns", + "update", + "edit", + "create", + "cache", + "portsdiff", + "autocomplete", + "hash", + "fetch", + "x-ci-clean", + "x-history", + "x-package-info", + "x-vsinstances", + "x-format-manifest", + }); } TEST_CASE ("get_available_commands_type_a works", "[commands]") { - auto commands_list = Commands::get_available_triplet_commands(); - CHECK(commands_list.size() == 10); - - CHECK(Commands::find("install", commands_list) != nullptr); - CHECK(Commands::find("x-set-installed", commands_list) != nullptr); - CHECK(Commands::find("ci", commands_list) != nullptr); - CHECK(Commands::find("remove", commands_list) != nullptr); - CHECK(Commands::find("upgrade", commands_list) != nullptr); - CHECK(Commands::find("build", commands_list) != nullptr); - CHECK(Commands::find("env", commands_list) != nullptr); - CHECK(Commands::find("build-external", commands_list) != nullptr); - CHECK(Commands::find("export", commands_list) != nullptr); - CHECK(Commands::find("depend-info", commands_list) != nullptr); - - CHECK(Commands::find("mai", commands_list) == nullptr); + check_all_commands(Commands::get_available_triplet_commands(), { + "install", + "x-set-installed", + "ci", + "remove", + "upgrade", + "build", + "env", + "build-external", + "export", + "depend-info", + }); } +// clang-format on diff --git a/toolsrc/src/vcpkg/base/system.process.cpp b/toolsrc/src/vcpkg/base/system.process.cpp index c78838caf3..a0cdf0365c 100644 --- a/toolsrc/src/vcpkg/base/system.process.cpp +++ b/toolsrc/src/vcpkg/base/system.process.cpp @@ -462,13 +462,15 @@ namespace vcpkg return GetLastError(); } - static ExpectedT windows_create_process(const StringView cmd_line, - const Environment& env, - DWORD dwCreationFlags) noexcept + static ExpectedT windows_create_windowless_process(const StringView cmd_line, + const Environment& env, + DWORD dwCreationFlags) noexcept { STARTUPINFOW startup_info; memset(&startup_info, 0, sizeof(STARTUPINFOW)); startup_info.cb = sizeof(STARTUPINFOW); + startup_info.dwFlags = STARTF_USESHOWWINDOW; + startup_info.wShowWindow = SW_HIDE; return windows_create_process(cmd_line, env, dwCreationFlags, startup_info); } @@ -543,17 +545,18 @@ namespace vcpkg #endif #if defined(_WIN32) - void System::cmd_execute_no_wait(StringView cmd_line) + void System::cmd_execute_background(StringView cmd_line) { auto timer = Chrono::ElapsedTimer::create_started(); - auto process_info = windows_create_process(cmd_line, {}, DETACHED_PROCESS | CREATE_BREAKAWAY_FROM_JOB); + auto process_info = windows_create_windowless_process( + cmd_line, {}, CREATE_NEW_CONSOLE | CREATE_NO_WINDOW | CREATE_BREAKAWAY_FROM_JOB); if (!process_info.get()) { - Debug::print("cmd_execute_no_wait() failed with error code ", process_info.error(), "\n"); + Debug::print("cmd_execute_background() failed with error code ", process_info.error(), "\n"); } - Debug::print("cmd_execute_no_wait() took ", static_cast(timer.microseconds()), " us\n"); + Debug::print("cmd_execute_background() took ", static_cast(timer.microseconds()), " us\n"); } Environment System::cmd_execute_modify_env(const ZStringView cmd_line, const Environment& env) @@ -597,7 +600,7 @@ namespace vcpkg #if defined(_WIN32) using vcpkg::g_ctrl_c_state; g_ctrl_c_state.transition_to_spawn_process(); - auto proc_info = windows_create_process(cmd_line, env, 0); + auto proc_info = windows_create_windowless_process(cmd_line, env, 0); auto long_exit_code = [&]() -> unsigned long { if (auto p = proc_info.get()) return p->wait(); diff --git a/toolsrc/src/vcpkg/commands.cpp b/toolsrc/src/vcpkg/commands.cpp index 466cc11c07..d01e1973e9 100644 --- a/toolsrc/src/vcpkg/commands.cpp +++ b/toolsrc/src/vcpkg/commands.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -38,9 +39,16 @@ namespace vcpkg::Commands { static const Version::VersionCommand version{}; static const Contact::ContactCommand contact{}; +#if VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND + static const UploadMetrics::UploadMetricsCommand upload_metrics{}; +#endif // VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND + static std::vector> t = { {"version", &version}, {"contact", &contact}, +#if VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND + {"x-upload-metrics", &upload_metrics}, +#endif // VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND }; return t; } diff --git a/toolsrc/src/vcpkg/commands.edit.cpp b/toolsrc/src/vcpkg/commands.edit.cpp index 7ee74eae09..8dbebc4e59 100644 --- a/toolsrc/src/vcpkg/commands.edit.cpp +++ b/toolsrc/src/vcpkg/commands.edit.cpp @@ -259,7 +259,8 @@ namespace vcpkg::Commands::Edit #ifdef _WIN32 if (editor_exe == "Code.exe" || editor_exe == "Code - Insiders.exe") { - System::cmd_execute_no_wait(Strings::concat("cmd /c \"", cmd_line, " + +#if VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND +#include +#include + +#include +#include + +using namespace vcpkg; + +namespace vcpkg::Commands::UploadMetrics +{ + const CommandStructure COMMAND_STRUCTURE = { + create_example_string("x-upload-metrics metrics.txt"), + 1, + 1, + }; + + void UploadMetricsCommand::perform_and_exit(const VcpkgCmdArguments& args, Files::Filesystem& fs) const + { + (void)args.parse_arguments(COMMAND_STRUCTURE); + const auto& payload_path = args.command_arguments[0]; + auto payload = fs.read_contents(payload_path).value_or_exit(VCPKG_LINE_INFO); + Metrics::g_metrics.lock()->upload(payload); + Checks::exit_success(VCPKG_LINE_INFO); + } +} +#endif // VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND diff --git a/toolsrc/src/vcpkg/metrics.cpp b/toolsrc/src/vcpkg/metrics.cpp index 019b3a9c26..241531df38 100644 --- a/toolsrc/src/vcpkg/metrics.cpp +++ b/toolsrc/src/vcpkg/metrics.cpp @@ -491,44 +491,31 @@ namespace vcpkg::Metrics const fs::path temp_folder_path = fs::path(temp_folder) / "vcpkg"; const fs::path temp_folder_path_exe = - temp_folder_path / Strings::format("vcpkgmetricsuploader-%s.exe", Commands::Version::base_version()); + temp_folder_path / Strings::format("vcpkg-%s.exe", Commands::Version::base_version()); #endif -#if defined(_WIN32) - - const fs::path exe_path = [&fs]() -> fs::path { - auto vcpkgdir = System::get_exe_path_of_current_process().parent_path(); - auto path = vcpkgdir / "vcpkgmetricsuploader.exe"; - if (fs.exists(path)) return path; - - path = vcpkgdir / "scripts" / "vcpkgmetricsuploader.exe"; - if (fs.exists(path)) return path; - - return ""; - }(); - std::error_code ec; +#if defined(_WIN32) fs.create_directories(temp_folder_path, ec); if (ec) return; - fs.copy_file(exe_path, temp_folder_path_exe, fs::copy_options::skip_existing, ec); + fs.copy_file( + System::get_exe_path_of_current_process(), temp_folder_path_exe, fs::copy_options::skip_existing, ec); if (ec) return; #else if (!fs.exists("/tmp")) return; const fs::path temp_folder_path = "/tmp/vcpkg"; - std::error_code ec; - fs.create_directory(temp_folder_path, ec); - // ignore error - ec.clear(); + fs.create_directory(temp_folder_path, ignore_errors); #endif const fs::path vcpkg_metrics_txt_path = temp_folder_path / ("vcpkg" + generate_random_UUID() + ".txt"); fs.write_contents(vcpkg_metrics_txt_path, payload, ec); if (ec) return; #if defined(_WIN32) - const std::string cmd_line = Strings::format("cmd /c \"start \"vcpkgmetricsuploader.exe\" \"%s\" \"%s\"\"", - fs::u8string(temp_folder_path_exe), - fs::u8string(vcpkg_metrics_txt_path)); - System::cmd_execute_no_wait(cmd_line); + System::CmdLineBuilder builder; + builder.path_arg(temp_folder_path_exe); + builder.string_arg("x-upload-metrics"); + builder.path_arg(vcpkg_metrics_txt_path); + System::cmd_execute_background(builder.extract()); #else auto escaped_path = Strings::escape_string(fs::u8string(vcpkg_metrics_txt_path), '\'', '\\'); const std::string cmd_line = Strings::format( diff --git a/toolsrc/src/vcpkgmetricsuploader.cpp b/toolsrc/src/vcpkgmetricsuploader.cpp deleted file mode 100644 index 800ffb5d21..0000000000 --- a/toolsrc/src/vcpkgmetricsuploader.cpp +++ /dev/null @@ -1,22 +0,0 @@ -#include - -#include -#include - -#include - -#include - -using namespace vcpkg; - -int WINAPI WinMain(_In_ HINSTANCE, _In_opt_ HINSTANCE, _In_ LPSTR, _In_ int) -{ - int argCount; - LPWSTR* szArgList = CommandLineToArgvW(GetCommandLineW(), &argCount); - - Checks::check_exit(VCPKG_LINE_INFO, argCount == 2, "Requires exactly one argument, the path to the payload file"); - auto v = Files::get_real_filesystem().read_contents(szArgList[1]).value_or_exit(VCPKG_LINE_INFO); - Metrics::g_metrics.lock()->upload(v); - LocalFree(szArgList); - return 0; -} diff --git a/toolsrc/windows-bootstrap/dirs.proj b/toolsrc/windows-bootstrap/dirs.proj deleted file mode 100644 index 960374bffd..0000000000 --- a/toolsrc/windows-bootstrap/dirs.proj +++ /dev/null @@ -1,20 +0,0 @@ - - - $(MSBuildThisFileDirectory) - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/toolsrc/windows-bootstrap/vcpkg.props b/toolsrc/windows-bootstrap/vcpkg.props deleted file mode 100644 index 1d94786608..0000000000 --- a/toolsrc/windows-bootstrap/vcpkg.props +++ /dev/null @@ -1,23 +0,0 @@ - - - - $(DefaultPlatformToolset) - - - - - 0 - - - - - 1 - - - - - - VCPKG_USE_STD_FILESYSTEM=$(VcpkgUseStdFilesystem);%(PreprocessorDefinitions) - - - diff --git a/toolsrc/windows-bootstrap/vcpkg.vcxproj b/toolsrc/windows-bootstrap/vcpkg.vcxproj new file mode 100644 index 0000000000..259d1a3302 --- /dev/null +++ b/toolsrc/windows-bootstrap/vcpkg.vcxproj @@ -0,0 +1,367 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + {34671B80-54F9-46F5-8310-AC429C11D4FB} + vcpkg + + + + $(DefaultPlatformToolset) + + + + + 0 + + + + + 1 + + + + + + VCPKG_USE_STD_FILESYSTEM=$(VcpkgUseStdFilesystem);%(PreprocessorDefinitions) + + + + Application + true + MultiByte + + + Application + false + true + MultiByte + + + Application + true + MultiByte + + + Application + false + true + MultiByte + + + 0 + + + + + + + + + $(SolutionDir)msbuild.x86.debug\$(ProjectName)\ + $(SolutionDir)msbuild.x86.debug\ + + + $(SolutionDir)msbuild.x86.release\ + $(SolutionDir)msbuild.x86.release\$(ProjectName)\ + + + $(SolutionDir)msbuild.x64.debug\$(ProjectName)\ + $(SolutionDir)msbuild.x64.debug\ + + + $(SolutionDir)msbuild.x64.release\$(ProjectName)\ + $(SolutionDir)msbuild.x64.release\ + + + + Level4 + Disabled + true + ..\include + VCPKG_DISABLE_METRICS=$(DISABLE_METRICS);VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;%(PreprocessorDefinitions) + /std:c++latest %(AdditionalOptions) + true + false + Use + pch.h + pch.h + + + winhttp.lib;version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Bcrypt.lib;%(AdditionalDependencies) + + + + + Level4 + Disabled + true + ..\include + VCPKG_DISABLE_METRICS=$(DISABLE_METRICS);VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;%(PreprocessorDefinitions) + /std:c++latest %(AdditionalOptions) + true + false + Use + pch.h + pch.h + + + winhttp.lib;version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Bcrypt.lib;%(AdditionalDependencies) + + + + + Level3 + MaxSpeed + true + true + true + ..\include + VCPKG_DISABLE_METRICS=$(DISABLE_METRICS);VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;NDEBUG;%(PreprocessorDefinitions) + _MBCS;NDEBUG;%(PreprocessorDefinitions) + /std:c++latest %(AdditionalOptions) + true + Use + pch.h + pch.h + + + true + true + winhttp.lib;version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Bcrypt.lib;%(AdditionalDependencies) + + + + + Level3 + MaxSpeed + true + true + true + ..\include + VCPKG_DISABLE_METRICS=$(DISABLE_METRICS);VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;NDEBUG;%(PreprocessorDefinitions) + _MBCS;NDEBUG;%(PreprocessorDefinitions) + /std:c++latest %(AdditionalOptions) + true + Use + pch.h + pch.h + + + true + true + winhttp.lib;version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Bcrypt.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/toolsrc/windows-bootstrap/vcpkg/vcpkg.vcxproj b/toolsrc/windows-bootstrap/vcpkg/vcpkg.vcxproj deleted file mode 100644 index 244173ca51..0000000000 --- a/toolsrc/windows-bootstrap/vcpkg/vcpkg.vcxproj +++ /dev/null @@ -1,149 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {34671B80-54F9-46F5-8310-AC429C11D4FB} - vcpkg - - - - - Application - true - MultiByte - - - Application - false - true - MultiByte - - - Application - true - MultiByte - - - Application - false - true - MultiByte - - - - - - - - - $(SolutionDir)msbuild.x86.debug\$(ProjectName)\ - $(SolutionDir)msbuild.x86.debug\ - - - $(SolutionDir)msbuild.x86.release\ - $(SolutionDir)msbuild.x86.release\$(ProjectName)\ - - - $(SolutionDir)msbuild.x64.debug\$(ProjectName)\ - $(SolutionDir)msbuild.x64.debug\ - - - $(SolutionDir)msbuild.x64.release\$(ProjectName)\ - $(SolutionDir)msbuild.x64.release\ - - - - Level4 - Disabled - true - ..\..\include - /std:c++latest %(AdditionalOptions) - true - false - - - winhttp.lib;version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Bcrypt.lib;%(AdditionalDependencies) - - - - - Level4 - Disabled - true - ..\..\include - /std:c++latest %(AdditionalOptions) - true - false - - - winhttp.lib;version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Bcrypt.lib;%(AdditionalDependencies) - - - - - Level3 - MaxSpeed - true - true - true - ..\..\include - _MBCS;NDEBUG;%(PreprocessorDefinitions) - /std:c++latest %(AdditionalOptions) - true - - - true - true - winhttp.lib;version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Bcrypt.lib;%(AdditionalDependencies) - - - - - Level3 - MaxSpeed - true - true - true - ..\..\include - _MBCS;NDEBUG;%(PreprocessorDefinitions) - /std:c++latest %(AdditionalOptions) - true - - - true - true - winhttp.lib;version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Bcrypt.lib;%(AdditionalDependencies) - - - - - {b98c92b7-2874-4537-9d46-d14e5c237f04} - - - - - - - - - - - - diff --git a/toolsrc/windows-bootstrap/vcpkg/vcpkg.vcxproj.filters b/toolsrc/windows-bootstrap/vcpkg/vcpkg.vcxproj.filters deleted file mode 100644 index 3710939ca9..0000000000 --- a/toolsrc/windows-bootstrap/vcpkg/vcpkg.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - - - Source Files - - - \ No newline at end of file diff --git a/toolsrc/windows-bootstrap/vcpkglib/vcpkglib.vcxproj b/toolsrc/windows-bootstrap/vcpkglib/vcpkglib.vcxproj deleted file mode 100644 index 240b0115bc..0000000000 --- a/toolsrc/windows-bootstrap/vcpkglib/vcpkglib.vcxproj +++ /dev/null @@ -1,333 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {B98C92B7-2874-4537-9D46-D14E5C237F04} - vcpkglib - - - - - StaticLibrary - true - MultiByte - - - StaticLibrary - false - true - MultiByte - - - StaticLibrary - true - MultiByte - - - StaticLibrary - false - true - MultiByte - - - 0 - - - - - - - - - $(SolutionDir)msbuild.x86.debug\$(ProjectName)\ - $(SolutionDir)msbuild.x86.debug\ - - - $(SolutionDir)msbuild.x86.release\ - $(SolutionDir)msbuild.x86.release\$(ProjectName)\ - - - $(SolutionDir)msbuild.x64.debug\$(ProjectName)\ - $(SolutionDir)msbuild.x64.debug\ - - - $(SolutionDir)msbuild.x64.release\$(ProjectName)\ - $(SolutionDir)msbuild.x64.release\ - - - - Level4 - Disabled - true - ..\..\include - VCPKG_DISABLE_METRICS=$(DISABLE_METRICS);VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;%(PreprocessorDefinitions) - /std:c++latest %(AdditionalOptions) - true - Use - pch.h - pch.h - false - - - - - Level4 - Disabled - true - ..\..\include - VCPKG_DISABLE_METRICS=$(DISABLE_METRICS);VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;%(PreprocessorDefinitions) - /std:c++latest %(AdditionalOptions) - true - Use - pch.h - pch.h - false - - - - - Level3 - MaxSpeed - true - true - true - ..\..\include - VCPKG_DISABLE_METRICS=$(DISABLE_METRICS);VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;NDEBUG;%(PreprocessorDefinitions) - /std:c++latest %(AdditionalOptions) - true - Use - pch.h - pch.h - - - true - true - - - - - Level3 - MaxSpeed - true - true - true - ..\..\include - VCPKG_DISABLE_METRICS=$(DISABLE_METRICS);VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;NDEBUG;%(PreprocessorDefinitions) - /std:c++latest %(AdditionalOptions) - true - Use - pch.h - pch.h - - - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/toolsrc/windows-bootstrap/vcpkglib/vcpkglib.vcxproj.filters b/toolsrc/windows-bootstrap/vcpkglib/vcpkglib.vcxproj.filters deleted file mode 100644 index f1772fa5f8..0000000000 --- a/toolsrc/windows-bootstrap/vcpkglib/vcpkglib.vcxproj.filters +++ /dev/null @@ -1,540 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {69f6b6e6-5ac4-4419-a256-b8a6b0392720} - - - {4a229410-0d09-4dab-953b-f434d6483f96} - - - {75592043-ab63-4905-beee-568a6ab8bf93} - - - {fa1f10e7-58d2-4f7c-ac26-a979baa70061} - - - - - Source Files - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg\base - - - Source Files\vcpkg\base - - - Source Files\vcpkg\base - - - Source Files\vcpkg\base - - - Source Files\vcpkg\base - - - Source Files\vcpkg\base - - - Source Files\vcpkg\base - - - Source Files\vcpkg\base - - - Source Files\vcpkg\base - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg\base - - - Source Files\vcpkg\base - - - Source Files\vcpkg - - - Source Files\vcpkg\base - - - Source Files\vcpkg\base - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg - - - Source Files\vcpkg\base - - - Source Files\vcpkg - - - Source Files\vcpkg\base - - - Source Files\vcpkg\base - - - - - Header Files - - - Header Files\vcpkg\base - - - Header Files\vcpkg\base - - - Header Files\vcpkg\base - - - Header Files\vcpkg\base - - - Header Files\vcpkg\base - - - Header Files\vcpkg\base - - - Header Files\vcpkg\base - - - Header Files\vcpkg\base - - - Header Files\vcpkg\base - - - Header Files\vcpkg\base - - - Header Files\vcpkg\base - - - Header Files\vcpkg\base - - - Header Files\vcpkg\base - - - Header Files\vcpkg\base - - - Header Files\vcpkg\base - - - Header Files\vcpkg\base - - - Header Files\vcpkg\base - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg\base - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg\base - - - Header Files\vcpkg\base - - - Header Files\vcpkg - - - Header Files\vcpkg\base - - - Header Files\vcpkg\base - - - Header Files\vcpkg\base - - - Header Files\vcpkg\base - - - Header Files\vcpkg\base - - - Header Files\vcpkg\base - - - Header Files\vcpkg\base - - - Header Files\vcpkg\base - - - Header Files\vcpkg\base - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg - - - Header Files\vcpkg\base - - - Header Files\vcpkg\base - - - diff --git a/toolsrc/windows-bootstrap/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj b/toolsrc/windows-bootstrap/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj deleted file mode 100644 index 8413922cec..0000000000 --- a/toolsrc/windows-bootstrap/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj +++ /dev/null @@ -1,146 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {7D6FDEEB-B299-4A23-85EE-F67C4DED47BE} - vcpkgmetricsuploader - - - - - Application - true - MultiByte - - - Application - false - true - MultiByte - - - Application - true - MultiByte - - - Application - false - true - MultiByte - - - - - - - - - $(SolutionDir)msbuild.x86.debug\$(ProjectName)\ - $(SolutionDir)msbuild.x86.debug\ - - - $(SolutionDir)msbuild.x86.release\ - $(SolutionDir)msbuild.x86.release\$(ProjectName)\ - - - $(SolutionDir)msbuild.x64.debug\$(ProjectName)\ - $(SolutionDir)msbuild.x64.debug\ - - - $(SolutionDir)msbuild.x64.release\$(ProjectName)\ - $(SolutionDir)msbuild.x64.release\ - - - - Level4 - Disabled - true - ..\..\include - /std:c++latest %(AdditionalOptions) - true - false - - - winhttp.lib;version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Bcrypt.lib;%(AdditionalDependencies) - - - - - Level4 - Disabled - true - ..\..\include - /std:c++latest %(AdditionalOptions) - true - false - - - winhttp.lib;version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Bcrypt.lib;%(AdditionalDependencies) - - - - - Level3 - MaxSpeed - true - true - true - ..\..\include - _MBCS;NDEBUG;%(PreprocessorDefinitions) - /std:c++latest %(AdditionalOptions) - true - - - true - true - winhttp.lib;version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Bcrypt.lib;%(AdditionalDependencies) - - - - - Level3 - MaxSpeed - true - true - true - ..\..\include - _MBCS;NDEBUG;%(PreprocessorDefinitions) - /std:c++latest %(AdditionalOptions) - true - - - true - true - winhttp.lib;version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Bcrypt.lib;%(AdditionalDependencies) - - - - - - - - {b98c92b7-2874-4537-9d46-d14e5c237f04} - - - - - - diff --git a/toolsrc/windows-bootstrap/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj.filters b/toolsrc/windows-bootstrap/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj.filters deleted file mode 100644 index d103d50c26..0000000000 --- a/toolsrc/windows-bootstrap/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - \ No newline at end of file