Fix Windows GHA build

Author: asfernandes

.github/workflows/main.yml

@@ -205,7 +205,7 @@ jobs:
       - name: Configure CMake
         shell: cmd
         run: |
-          copy CMakeUserPresets.json.windows.template CMakeUserPresets.json
+          copy CMakeUserPresets.json.windows-vs2026.template CMakeUserPresets.json
           cmake --preset default
 
       - name: Upload vcpkg failure logs

.github/workflows/pull-request.yml

@@ -196,7 +196,7 @@ jobs:
       - name: Configure CMake
         shell: cmd
         run: |
-          copy CMakeUserPresets.json.windows.template CMakeUserPresets.json
+          copy CMakeUserPresets.json.windows-vs2026.template CMakeUserPresets.json
           cmake --preset default
 
       - name: Upload vcpkg failure logs
@@ -215,8 +215,6 @@ jobs:
       - name: Run tests
         shell: cmd
         run: |
-          set ISC_USER=sysdba
-          set ISC_PASSWORD=masterkey
           ctest --preset default --output-on-failure -j8
 
   build-macos:

CMakePresets.json

@@ -51,6 +51,21 @@
         "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake",
         "VCPKG_ROOT": "${sourceDir}/vcpkg"
       }
+    },
+    {
+      "name": "windows-vs2026",
+      "displayName": "Windows (Visual Studio 2026)",
+      "description": "Multi-config build with the Visual Studio 18 2026 generator",
+      "generator": "Visual Studio 18 2026",
+      "architecture": {
+        "value": "x64",
+        "strategy": "external"
+      },
+      "binaryDir": "${sourceDir}/build",
+      "cacheVariables": {
+        "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake",
+        "VCPKG_ROOT": "${sourceDir}/vcpkg"
+      }
     }
   ],
   "buildPresets": [
@@ -71,6 +86,16 @@
       "name": "windows-vs2022-release",
       "configurePreset": "windows-vs2022",
       "configuration": "Release"
+    },
+    {
+      "name": "windows-vs2026-debug",
+      "configurePreset": "windows-vs2026",
+      "configuration": "Debug"
+    },
+    {
+      "name": "windows-vs2026-release",
+      "configurePreset": "windows-vs2026",
+      "configuration": "Release"
     }
   ],
   "testPresets": [
@@ -91,6 +116,16 @@
       "name": "windows-vs2022-release",
       "configurePreset": "windows-vs2022",
       "configuration": "Release"
+    },
+    {
+      "name": "windows-vs2026-debug",
+      "configurePreset": "windows-vs2026",
+      "configuration": "Debug"
+    },
+    {
+      "name": "windows-vs2026-release",
+      "configurePreset": "windows-vs2026",
+      "configuration": "Release"
     }
   ]
 }

CMakeUserPresets.json.windows.template …UserPresets.json.windows-vs2022.templateCMakeUserPresets.json.windows.template renamed to CMakeUserPresets.json.windows-vs2022.template CMakeUserPresets.json.windows.template renamed to CMakeUserPresets.json.windows-vs2022.template

@@ -24,8 +24,8 @@
       ],
       "environment": {
         "FBCPP_TEST_SERVER": "localhost",
-		"ISC_USER": "sysdba",
-		"ISC_PASSWORD": "masterkey"
+        "ISC_USER": "sysdba",
+        "ISC_PASSWORD": "masterkey"
       }
     }
   ]

CMakeUserPresets.json.windows-vs2026.template

@@ -0,0 +1,32 @@
+{
+  "version": 3,
+  "configurePresets": [
+    {
+      "name": "default",
+      "inherits": [
+        "windows-vs2026"
+      ]
+    }
+  ],
+  "buildPresets": [
+    {
+      "name": "default",
+      "inherits": [
+        "windows-vs2026-debug"
+      ]
+    }
+  ],
+  "testPresets": [
+    {
+      "name": "default",
+      "inherits": [
+        "windows-vs2026-debug"
+      ],
+      "environment": {
+        "FBCPP_TEST_SERVER": "localhost",
+        "ISC_USER": "sysdba",
+        "ISC_PASSWORD": "masterkey"
+      }
+    }
+  ]
+}

README.md

@@ -108,7 +108,8 @@ The default features are:
 This project uses CMake presets (`CMakePresets.json`) and vcpkg for dependency management.
 
 Copy the appropriate `CMakeUserPresets.json.<platform>.template` file to `CMakeUserPresets.json` to set environment
-variables for tests and define the default preset.
+variables for tests and define the default preset. On Windows, use either `CMakeUserPresets.json.windows-vs2022.template`
+or `CMakeUserPresets.json.windows-vs2026.template`.
 
 ```bash
 # Configure