From 1e3409e759160c66db84e87d88de3d1b46d9a724 Mon Sep 17 00:00:00 2001 From: ccptoebeans Date: Mon, 9 Nov 2026 14:30:09 +0000 Subject: [PATCH 1/2] Upgrade version of python to 3.12.16 --- trinity/CMakeLists.txt | 1 + vcpkg-configuration.json | 5 +++-- vcpkg.json | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/trinity/CMakeLists.txt b/trinity/CMakeLists.txt index 749f5c35c..48e193da5 100644 --- a/trinity/CMakeLists.txt +++ b/trinity/CMakeLists.txt @@ -2140,6 +2140,7 @@ endif() if(BUILD_TESTING) find_package(GTest CONFIG REQUIRED) find_package(Python3 COMPONENTS Interpreter REQUIRED) + include(GoogleTest) # Find exefile tool, which is used to run the tests if (DEFINED CMAKE_BUILD_TYPE AND NOT CMAKE_BUILD_TYPE MATCHES "Release") diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index 99f324bb1..4581a7949 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -1,14 +1,14 @@ { "default-registry": { "kind": "git", - "baseline": "242ac6932a9cd2607332969129e9572516f28d65", + "baseline": "afa249f12f52ed8a3b919f195495ba8b330288d1", "repository": "https://github.com/microsoft/vcpkg.git" }, "registries": [ { "kind": "git", "repository": "https://github.com/carbonengine/vcpkg-registry.git", - "baseline": "a83134805f3fa07da6a6add87c4b250d9778bfd1", + "baseline": "853ee39d8b2ff4264ef24fa01434e4cbea108ee5", "packages": [ "python3", "carbon-*", @@ -16,6 +16,7 @@ "greenlet", "ccp-debug-info", "crashpad", + "directx-dxc", "zlib", "re2c", "amd-fidelityfx", diff --git a/vcpkg.json b/vcpkg.json index 952265d73..9a2875ff9 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -55,7 +55,7 @@ }, { "name": "carbon-blue", - "version>=": "6.2.0" + "version>=": "6.3.1" }, { "name": "carbon-math", @@ -104,7 +104,7 @@ }, { "name": "directx-dxc", - "version>=": "2023-03-01#2", + "version>=": "2026-05-27", "platform": "windows & x64" } ] @@ -115,7 +115,7 @@ "dependencies": [ { "name": "directx-dxc", - "version>=": "2023-03-01#2" + "version>=": "2026-05-27" }, { "name": "fxc", @@ -142,7 +142,7 @@ "dependencies": [ { "name": "directx-dxc", - "version>=": "2023-03-01#2" + "version>=": "2026-05-27" }, { "name": "fxc", From 9c03cd292bfcb65fa093c4e40946c6a78a81a3ac Mon Sep 17 00:00:00 2001 From: ccptoebeans <> Date: Mon, 9 Nov 2026 15:58:34 +0000 Subject: [PATCH 2/2] Upgrade verison pins to those in latest carbon-port --- vcpkg.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vcpkg.json b/vcpkg.json index 9a2875ff9..4906001b2 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -193,8 +193,8 @@ }, "overrides": [ { - "name": "openssl", - "version": "1.1.1k#8" + "name": "imgui", + "version": "1.91.9" }, { "name": "libpng",