From ec11d1e067476e82462667501930f5e0a86dc09f Mon Sep 17 00:00:00 2001
From: Filipp Pavlov <filipp@ccpgames.com>
Date: Mon, 24 Aug 2026 11:19:06 +0000
Subject: [PATCH 1/2] Switch to using v145 as the default compiler for Windows

---
 .teamcity/Windows/Project.kt | 16 +++++++++-------
 CMakePresets.json            | 20 ++++++++++----------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/.teamcity/Windows/Project.kt b/.teamcity/Windows/Project.kt
index 10d7da5..d3dbc9c 100644
--- a/.teamcity/Windows/Project.kt
+++ b/.teamcity/Windows/Project.kt
@@ -38,7 +38,7 @@ object Project : Project({
 })
 
 
-class CarbonBuildWindows(buildName: String, configType: String, preset: String) : BuildType({
+class CarbonBuildWindows(buildName: String, configType: String, preset: String, vsDevBatSwitches: String = "-arch=x64 -vcvars_ver=14.51") : BuildType({
     id(buildName.toId())
     this.name = buildName
 
@@ -48,7 +48,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String)
         param("env.GIT_TAG_HASH_OVERRIDE", "")
         param("github_checkout_folder", "github")
         param("env.CTEST_JUNIT_OUTPUT_FILE", "ctest_results.xml")
-        param("VS_DEV_BAT_SWITCHES", "-arch=x64 -vcvars_ver=14.1")
+        param("VS_DEV_BAT_SWITCHES", vsDevBatSwitches)
         param("env.CMAKE_BUILD_TARGETS", "all")
         param("env.CMAKE_INSTALL_PREFIX", ".build-artifact")
         param("env.CMAKE_CONFIG_TYPE", configType)
@@ -209,11 +209,13 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String)
                 authType = token {
                     token = "%GITHUB_CARBON_PAT%"
                 }
-                filterAuthorRole = PullRequests.GitHubRoleFilter.MEMBER
+                // Constrain PR triggers to compatible refs so as to avoid erroneous triggers
                 filterTargetBranch = """
-                +:refs/heads/*
-                -:refs/heads/release/1.x
+                    +:refs/heads/main
+                    +:refs/heads/release/*.x
+                    -:refs/heads/release/1.x
                 """.trimIndent()
+                filterAuthorRole = PullRequests.GitHubRoleFilter.MEMBER
             }
         }
         commitStatusPublisher {
@@ -236,7 +238,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String)
             failBuild = true
         }
         sshAgent {
-            teamcitySshKey = "ccpgames-carbon"
+            teamcitySshKey = "ccpgames-evetech GitHub"
         }
         provideAwsCredentials {
             awsConnectionId = "Carbon_AwsVcpkgBinaryCacheServiceAccount"
@@ -246,4 +248,4 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String)
     requirements {
         startsWith("teamcity.agent.jvm.os.name", "Windows Server")
     }
-})
+})
\ No newline at end of file
diff --git a/CMakePresets.json b/CMakePresets.json
index c848838..b63a433 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -43,7 +43,7 @@
       "name": "x64-windows",
       "inherits": "windows",
       "cacheVariables": {
-        "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake"
+        "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-145-carbon.cmake"
       },
       "hidden": true
     },
@@ -70,8 +70,8 @@
       "inherits": "x64-windows",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Internal",
-        "VCPKG_TARGET_TRIPLET": "x64-windows-internal",
-        "VCPKG_HOST_TRIPLET": "x64-windows-internal"
+        "VCPKG_TARGET_TRIPLET": "x64-windows-145-internal",
+        "VCPKG_HOST_TRIPLET": "x64-windows-145-internal"
       }
     },
     {
@@ -79,8 +79,8 @@
       "inherits": "x64-windows",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Release",
-        "VCPKG_TARGET_TRIPLET": "x64-windows-release",
-        "VCPKG_HOST_TRIPLET": "x64-windows-release"
+        "VCPKG_TARGET_TRIPLET": "x64-windows-145-release",
+        "VCPKG_HOST_TRIPLET": "x64-windows-145-release"
       }
     },
     {
@@ -88,8 +88,8 @@
       "inherits": "x64-windows",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
-        "VCPKG_TARGET_TRIPLET": "x64-windows-debug",
-        "VCPKG_HOST_TRIPLET": "x64-windows-debug"
+        "VCPKG_TARGET_TRIPLET": "x64-windows-145-debug",
+        "VCPKG_HOST_TRIPLET": "x64-windows-145-debug"
       }
     },
     {
@@ -97,8 +97,8 @@
       "inherits": "x64-windows",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "TrinityDev",
-        "VCPKG_TARGET_TRIPLET": "x64-windows-trinitydev",
-        "VCPKG_HOST_TRIPLET": "x64-windows-trinitydev"
+        "VCPKG_TARGET_TRIPLET": "x64-windows-145-trinitydev",
+        "VCPKG_HOST_TRIPLET": "x64-windows-145-trinitydev"
       }
     },
     {
@@ -174,4 +174,4 @@
       }
     }
   ]
-}
+}
\ No newline at end of file

From 838985b2d06ad861bb85312eec8bf7d6fd7a0428 Mon Sep 17 00:00:00 2001
From: Filipp Pavlov <filipp@ccpgames.com>
Date: Mon, 24 Aug 2026 13:51:12 +0000
Subject: [PATCH 2/2] Update carbonengine/vcpkg-registry

---
 vendor/github.com/carbonengine/vcpkg-registry | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/github.com/carbonengine/vcpkg-registry b/vendor/github.com/carbonengine/vcpkg-registry
index bcc6d14..9e6fcd1 160000
--- a/vendor/github.com/carbonengine/vcpkg-registry
+++ b/vendor/github.com/carbonengine/vcpkg-registry
@@ -1 +1 @@
-Subproject commit bcc6d146b99547f6654310495730e4cbba9ca7c3
+Subproject commit 9e6fcd1d95a468715e67e3b59fe3ed33658437de