From 970403a7c9d2c76ef687a4526fde09c71dfb5cef Mon Sep 17 00:00:00 2001
From: Jan Wassenberg <janwas@google.com>
Date: Thu, 11 Jun 2026 00:45:33 -0700
Subject: [PATCH] Fix Windows build: shell was passing 3 instead of 3.5 to
 CMake, update version

PiperOrigin-RevId: 930346184
---
 .github/workflows/build.yml | 8 +++++++-
 CMakePresets.json           | 8 ++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a900d17e..ee5b9bd5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -58,6 +58,12 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y ${{ matrix.cc }} ${{ matrix.cxx }}
 
+      - name: Setup CMake
+        if: runner.os == 'Windows'
+        uses: jwlawson/actions-setup-cmake@v2
+        with:
+          cmake-version: '4.2'
+
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2
 
@@ -70,7 +76,7 @@ jobs:
           -D CMAKE_CXX_COMPILER=${{ matrix.cxx || '' }}
           -D CMAKE_C_COMPILER_LAUNCHER=ccache
           -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
-          -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+          -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
           ${{ matrix.cc == 'gcc-15' && '-DCMAKE_CXX_FLAGS=-Wno-error=missing-declarations -Wno-error=missing-field-initializers' || '' }}
 
       - name: Build
diff --git a/CMakePresets.json b/CMakePresets.json
index c321b637..38d2141c 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -23,8 +23,8 @@
         "name": "windows",
         "inherits": "__defaults__",
         "displayName": "Windows",
-        "description": "Visual Studio 2022 with Clang/LLVM frontend",
-        "generator": "Visual Studio 17 2022",
+        "description": "Visual Studio 2026 with Clang/LLVM frontend",
+        "generator": "Visual Studio 18 2026",
         "toolset": "ClangCL",
         "cacheVariables": {
           "CMAKE_POLICY_VERSION_MINIMUM": "3.5"
@@ -39,8 +39,8 @@
         "name": "windows-dll",
         "inherits": "__defaults__",
         "displayName": "Windows DLL",
-        "description": "Visual Studio 2022 with Clang/LLVM frontend (DLL build)",
-        "generator": "Visual Studio 17 2022",
+        "description": "Visual Studio 2026 with Clang/LLVM frontend (DLL build)",
+        "generator": "Visual Studio 18 2026",
         "toolset": "ClangCL",
         "condition": {
           "type": "equals",