From ece4f6f179c1bdaa792fe49ab5d20f60da39893d Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Fri, 11 Oct 2024 15:55:42 +0200
Subject: [PATCH 001/211] wip

---
 .ci/__init__.py                 |   0
 .ci/bump_dev_version.py         |  22 ----
 .ci/jenkins/testsv2.jenkins     | 184 --------------------------------
 .github/workflows/win-tests.yml | 136 +++++++++++++++++++++++
 test/conftest.py                |   1 +
 5 files changed, 137 insertions(+), 206 deletions(-)
 delete mode 100644 .ci/__init__.py
 delete mode 100644 .ci/bump_dev_version.py
 delete mode 100644 .ci/jenkins/testsv2.jenkins
 create mode 100644 .github/workflows/win-tests.yml

diff --git a/.ci/__init__.py b/.ci/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/.ci/bump_dev_version.py b/.ci/bump_dev_version.py
deleted file mode 100644
index e3f802833ea..00000000000
--- a/.ci/bump_dev_version.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import os
-import time
-
-
-def replace_in_file(file_path, search, replace):
-    with open(file_path, "r") as handle:
-        content = handle.read()
-        if search not in content:
-            raise Exception("Incorrect development version in conans/__init__.py")
-    content = content.replace(search, replace)
-    content = content.encode("utf-8")
-    with open(file_path, "wb") as handle:
-        handle.write(content)
-
-def bump_dev():
-    vfile = os.path.join(os.path.dirname(os.path.abspath(__file__)), "../conans/__init__.py")
-    snapshot = "%s" % int(time.time())
-    replace_in_file(vfile, "-dev'", "-dev%s'" % snapshot)
-
-
-if __name__ == "__main__":
-    bump_dev()
diff --git a/.ci/jenkins/testsv2.jenkins b/.ci/jenkins/testsv2.jenkins
deleted file mode 100644
index 01bc871790c..00000000000
--- a/.ci/jenkins/testsv2.jenkins
+++ /dev/null
@@ -1,184 +0,0 @@
-def branchName = env.BRANCH_NAME
-def jobName = env.JOB_NAME
-
-void cancelPrevious() {
-    stage("Cancelling previous") {
-        def buildNumber = env.BUILD_NUMBER as int
-        if (buildNumber > 1) milestone(buildNumber - 1)
-        milestone(buildNumber)
-    }
-}
-
-String getTempFolder(String nodeName) {
-    if (nodeName == "Windows") { return "C:/J/t_v2/" }
-    return "/tmp/"
-}
-
-List<Map> getConfigurations(String moduleName, String branchName, String jobName) {
-    def configs = []
-
-    String LinuxNode
-    if (moduleName == "test/unittests" || moduleName == "test/integration") {
-        LinuxNode = "LinuxUnittests"
-    } else if (moduleName == "test/functional") {
-        LinuxNode = "LinuxFunctional"
-    }
-
-    configs.add([node: LinuxNode, pyvers: ["PY312"]])
-
-    if (branchName =~ /(^PR-.*)/) {
-        configs.add([node: LinuxNode, pyvers: ["PY38"]])
-        configs.add([node: "Windows", pyvers: ["PY38"]])
-        configs.add([node: "M2Macos", pyvers: ["PY38"]])
-    }
-    else if (jobName == "ConanNightlyv2" || branchName =~ /^release.*/) {
-        configs.add([node: LinuxNode, pyvers: ["PY36", "PY38"]])
-        configs.add([node: "Windows", pyvers: ["PY36", "PY38"]])
-        configs.add([node: "M2Macos", pyvers: ["PY36", "PY38"]])
-    }
-    else if (branchName == "develop2") {
-        configs.add([node: LinuxNode, pyvers: ["PY36", "PY38"]])
-        configs.add([node: "Windows", pyvers: ["PY36", "PY38"]])
-        configs.add([node: "M2Macos", pyvers: ["PY36", "PY38"]])
-    }
-    return configs
-}
-
-boolean shouldTestServer(String moduleName) {
-    // run conan_server --help after running functional tests
-    if (moduleName == "test/functional") {
-        return true
-    }
-    return false
-}
-
-private Closure runTests(String nodeName, String pythonVersion, String module) {
-    def ret = {
-        node(nodeName) {
-            stage("${nodeName} - ${pythonVersion}") {
-                def scmVars = checkout scm
-                def commit = scmVars["GIT_COMMIT"].substring(0, 4)
-                def workDir = getTempFolder(nodeName) + "${commit}/${pythonVersion}/"
-                def venvName = "env_${env.BUILD_NUMBER}_${pythonVersion}_${commit}"
-                def pipArguments = "--no-cache-dir --timeout 30"
-                def pipInstalls = "python -m pip install -r conans/requirements.txt ${pipArguments} && " +
-                                  "python -m pip install -r conans/requirements_server.txt ${pipArguments} && " +
-                                  "python -m pip install -r conans/requirements_dev.txt ${pipArguments} && " +
-                                  "python -m pip install meson ${pipArguments} && "
-                def conanToolInstall = "python -m pip install . && conan --version && conan --help && python --version  && "
-                def launchTests = "python -m pytest ${module} -n=4 --durations=20 -rs"
-                if (shouldTestServer(module)) {
-                    def rm = (nodeName == "Windows") ? "del" : "rm"
-                    def mv = (nodeName == "Windows") ? "move" : "mv"
-                    def conanServerToolInstall = "${rm} setup.py && ${mv} setup_server.py setup.py && python -m pip install . && conan_server --help"
-                    launchTests = launchTests + ' && ' + conanServerToolInstall
-                }
-                if (nodeName.indexOf("Linux") >= 0) {
-                    try {
-                        // we only test scons in Linux
-                        pipInstalls = pipInstalls + "python -m pip install scons ${pipArguments} && "
-                        def sourcedir = "/home/conan/"
-                        def pyenvdir = "${sourcedir}.pyenv"
-                        def launchCommand = "export PYENV_ROOT=${pyenvdir} && " +
-                                            "export PATH=\"${pyenvdir}/versions/\$${pythonVersion}/bin:${pyenvdir}/bin:\$PATH\" && " +
-                                            "pyenv global \$${pythonVersion} && " +
-                                            pipInstalls +
-                                            conanToolInstall +
-                                            launchTests
-                        sh(script: launchCommand)
-                    } finally {}
-                } else if (nodeName == "M2Macos") {
-                    def localDir = "/Users/jenkins"
-                    withEnv(["CONAN_TEST_FOLDER=${workDir}", "PY27=2.7.18", "PY36=3.6.15", "PY38=3.8.12", "PY39=3.9.10",
-                             "PYENV_ROOT=${localDir}/.pyenv", "PATH+EXTRA=${localDir}/.pyenv/shims:/usr/local/bin:/opt/homebrew/bin:/usr/bin:/bin:/usr/sbin:/sbin"]) {
-                        try {
-                            sh(script: "mkdir -p ${workDir}")
-                            def pythonLocation = "${localDir}/.pyenv/versions/\$${pythonVersion}/bin/python"
-                            def configVenv = "${pythonLocation} -m virtualenv --python ${pythonLocation} ${workDir}${venvName} && " +
-                                             "source ${workDir}${venvName}/bin/activate && python --version && "
-                            def launchCommand = configVenv + pipInstalls + conanToolInstall + launchTests
-                            sh(script: launchCommand)
-                        } finally {
-                            sh(script: "rm -rf ${workDir}")
-                        }
-                    }
-                } else if (nodeName == "Windows") {
-                    withEnv(["CONAN_TEST_FOLDER=${workDir}", "CONAN_BASH_PATH=c:/tools/msys64/usr/bin/bash",
-                             "PY27=Python27", "PY36=Python36", "PY38=Python38-64"]) {
-                        try {
-                            bat(script: "if not exist \"${workDir}\" mkdir \"${workDir}\"")
-                            def pythonLocation = "C:/%${pythonVersion}%/python.exe"
-                            def configVenv = "virtualenv --python ${pythonLocation} ${workDir}${venvName} && " +
-                                             "${workDir}${venvName}/Scripts/activate && python --version && "
-                            def launchCommand = configVenv + pipInstalls + conanToolInstall + launchTests
-                            bat(script: launchCommand)
-                        } finally {
-                            bat(script: "rd /s /q \"${workDir}\"")
-                        }
-                    }
-                }
-                cleanWs()
-            }
-        }
-    }
-    return ret
-}
-
-void runTestsModule(String moduleName, String branchName, String jobName) {
-    def configs = getConfigurations(moduleName, branchName, jobName)
-    def paralellRuns = [:]
-    configs.each { config ->
-        def testKind = moduleName.split("/").last()
-        config["pyvers"].each { pyver ->
-            paralellRuns["${testKind} - ${config['node']} - ${pyver}"] = runTests(config["node"], pyver, moduleName)
-        }
-    }
-    parallel(paralellRuns)
-}
-
-def testModules = ["test/unittests", "test/integration", "test/functional"]
-
-void deployToPypiTest() {
-    node("LinuxFunctional") {
-        try {
-            def scmVars = checkout scm
-            checkout scm
-            stage("Deploy conan to pypitesting") {
-                withCredentials([usernamePassword(credentialsId: 'PYPITEST_CONAN_CREDENTIALS', usernameVariable: 'TWINE_USERNAME', passwordVariable: 'TWINE_PASSWORD')]) {
-                    def deployConan = "python -m pip install twine && " +
-                                      "python .ci/bump_dev_version.py && " +
-                                      "rm -rf dist/ && python setup.py sdist && " +
-                                      "python -m twine upload --verbose --repository-url https://test.pypi.org/legacy/ dist/*"
-                    sh(script: deployConan)
-                }
-            }
-            stage("Deploy conan-server to pypitesting") {
-                withCredentials([usernamePassword(credentialsId: 'PYPITEST_CONAN_SERVER_CREDENTIALS', usernameVariable: 'TWINE_USERNAME', passwordVariable: 'TWINE_PASSWORD')]) {
-                    def deployServer = "rm -rf dist/ rm setup.py && mv setup_server.py setup.py && python setup.py sdist && " +
-                                      "python -m twine upload --verbose --repository-url https://test.pypi.org/legacy/ dist/*"
-                    sh(script: deployServer)
-                }
-            }
-        } finally {}
-    }
-}
-
-try {
-    cancelPrevious()
-
-    testModules.each { moduleName ->
-        runTestsModule(moduleName, branchName, jobName)
-    }
-
-    if (branchName == "develop2") {
-        deployToPypiTest()
-    }
-}
-catch(e){
-    if (branchName == "develop2") {
-        def subject = "FAILED: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]'"
-        def summary = "${subject} (${env.BUILD_URL}), Conan Branch: ${branchName}"
-        slackSend (color: '#FF0000', message: summary)
-    }
-    throw e
-}
diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
new file mode 100644
index 00000000000..c472aeaba3d
--- /dev/null
+++ b/.github/workflows/win-tests.yml
@@ -0,0 +1,136 @@
+name: Windows Tests
+
+on:
+  push:
+    branches:
+      - develop2
+      - release/*
+  pull_request:
+    branches:
+      - '*'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  testing:
+    strategy:
+      fail-fast: true
+      matrix:
+        python-version: ['3.9']
+        test-type: [unittests, integration, functional]
+
+    runs-on: windows-2019
+
+    name: Conan (${{ matrix.test-type }}) (${{ matrix.python-version }})
+
+    steps:
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Cache pip packages
+        id: cache-pip
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('conans/requirements*.txt') }}
+
+      - name: Install Python requirements
+        run: |
+          pip install --upgrade pip
+          pip install -r conans/requirements.txt
+          pip install -r conans/requirements_server.txt
+          pip install -r conans/requirements_dev.txt
+          pip install meson
+
+      - name: Install Chocolatey pacakges
+        # if: matrix.test-type == 'functional'
+        run: |
+          choco install pkgconfiglite --version 0.28
+          choco install ninja --version 1.10.2
+          choco install mingw
+          choco install bazel --version 6.3.2
+          choco install bazel --version 7.1.2
+          choco install cmake --version 3.15.7
+          choco install cmake --version 3.19.7
+          choco install cmake --version 3.23.5
+
+#      - name: Cache CMake and Bazel installations
+#        if: matrix.test-type == 'functional'
+#        id: cache-tools
+#        uses: actions/cache@v4
+#        with:
+#          path: |
+#            ~/Applications/CMake/3.15.7
+#            ~/Applications/CMake/3.19.7
+#            ~/Applications/CMake/3.23.5
+#            ~/Applications/bazel/6.3.2
+#            ~/Applications/bazel/7.1.2
+#          key: ${{ runner.os }}-conan-tools-cache
+#
+#      - name: Build CMake old versions not available for ARM
+#        if: matrix.test-type == 'functional' && steps.cache-tools.outputs.cache-hit != 'true'
+#        run: |
+#          set -e
+#          CMAKE_BUILD_VERSIONS=("3.15.7")
+#          for version in "${CMAKE_BUILD_VERSIONS[@]}"; do
+#            echo "Compiling CMake version ${version} from source for ARM..."
+#            wget -q --no-check-certificate https://cmake.org/files/v${version%.*}/cmake-${version}.tar.gz
+#            tar -xzf cmake-${version}.tar.gz
+#            cd cmake-${version}
+#            mkdir build && cd build
+#            ../bootstrap --prefix=${HOME}/Applications/CMake/${version} -- -DCMAKE_USE_OPENSSL=ON
+#            make -j$(sysctl -n hw.ncpu)
+#            make install
+#            ${HOME}/Applications/CMake/${version}/bin/cmake --version
+#            cd ../../
+#            rm -rf cmake-${version} cmake-${version}.tar.gz
+#          done
+#      - name: Install universal CMake versions
+#        if: matrix.test-type == 'functional' && steps.cache-tools.outputs.cache-hit != 'true'
+#        run: |
+#          set -e
+#          CMAKE_PRECOMP_VERSIONS=("3.19.7" "3.23.5")
+#          for version in "${CMAKE_PRECOMP_VERSIONS[@]}"; do
+#            echo "Downloading and installing precompiled universal CMake version ${version}..."
+#            wget -q --no-check-certificate https://cmake.org/files/v${version%.*}/cmake-${version}-macos-universal.tar.gz
+#            tar -xzf cmake-${version}-macos-universal.tar.gz \
+#              --exclude=CMake.app/Contents/bin/cmake-gui \
+#              --exclude=CMake.app/Contents/doc/cmake \
+#              --exclude=CMake.app/Contents/share/cmake-${version%.*}/Help \
+#              --exclude=CMake.app/Contents/share/vim
+#            mkdir -p ${HOME}/Applications/CMake/${version}
+#            cp -fR cmake-${version}-macos-universal/CMake.app/Contents/* ${HOME}/Applications/CMake/${version}
+#            ${HOME}/Applications/CMake/${version}/bin/cmake --version
+#            rm -rf cmake-${version}-macos-universal
+#            rm cmake-${version}-macos-universal.tar.gz
+#          done
+#      - name: Install Bazel versions
+#        if: matrix.test-type == 'functional' && steps.cache-tools.outputs.cache-hit != 'true'
+#        run: |
+#          set -e
+#          for version in 6.3.2 7.1.2; do
+#            mkdir -p ${HOME}/Applications/bazel/${version}
+#            wget -q -O ${HOME}/Applications/bazel/${version}/bazel https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-darwin-arm64
+#            chmod +x ${HOME}/Applications/bazel/${version}/bazel
+#          done
+#      - name: Run Tests
+#        run: |
+#          NUM_CPUS=$(sysctl -n hw.ncpu)
+#          echo "Number of CPUs available: $NUM_CPUS"
+#          if [ "${{ matrix.test-type }}" == "unittests" ]; then
+#            pytest test/unittests --durations=20 -n $NUM_CPUS
+#          elif [ "${{ matrix.test-type }}" == "integration" ]; then
+#            pytest test/integration --durations=20 -n $NUM_CPUS
+#          elif [ "${{ matrix.test-type }}" == "functional" ]; then
+#            export PATH=${HOME}/Applications/CMake/3.15.7/bin:$PATH:/usr/local/bin:/opt/homebrew/bin:/usr/bin:/bin:/usr/sbin:/sbin
+#            cmake --version
+#            pytest test/functional --durations=20 -n $NUM_CPUS
+#          fi
diff --git a/test/conftest.py b/test/conftest.py
index b9bc9ff5887..ece78bbe554 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -179,6 +179,7 @@
         "default": "system",
         "system": {
             "path": {'Darwin': f'{homebrew_root}/share/android-ndk'}
+            # 'Windows': os.getenv("ANDROID_NDK_HOME"),
         }
     },
     "qbs": {"disabled": True},

From 6ab5432f95dcc81189867c0513ef428968b7aeec Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Tue, 15 Oct 2024 11:46:30 +0200
Subject: [PATCH 002/211] Improved CMake installations. Removed some CMake
 versions

---
 .github/workflows/win-tests.yml               | 172 +++++++++---------
 test/conftest.py                              |  30 +--
 test/functional/layout/test_editable_cmake.py |   4 +-
 test/functional/tools_versions_test.py        |  16 +-
 4 files changed, 104 insertions(+), 118 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index c472aeaba3d..618f432b97d 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -50,87 +50,95 @@ jobs:
           pip install -r conans/requirements_dev.txt
           pip install meson
 
-      - name: Install Chocolatey pacakges
-        # if: matrix.test-type == 'functional'
+      - name: Install Chocolatey packages
+        if: matrix.test-type == 'functional'
         run: |
-          choco install pkgconfiglite --version 0.28
-          choco install ninja --version 1.10.2
-          choco install mingw
-          choco install bazel --version 6.3.2
-          choco install bazel --version 7.1.2
-          choco install cmake --version 3.15.7
-          choco install cmake --version 3.19.7
-          choco install cmake --version 3.23.5
+          choco install pkgconfiglite --version 0.28 -y
+          choco install ninja --version 1.10.2 -y
+          choco install mingw -y
 
-#      - name: Cache CMake and Bazel installations
-#        if: matrix.test-type == 'functional'
-#        id: cache-tools
-#        uses: actions/cache@v4
-#        with:
-#          path: |
-#            ~/Applications/CMake/3.15.7
-#            ~/Applications/CMake/3.19.7
-#            ~/Applications/CMake/3.23.5
-#            ~/Applications/bazel/6.3.2
-#            ~/Applications/bazel/7.1.2
-#          key: ${{ runner.os }}-conan-tools-cache
-#
-#      - name: Build CMake old versions not available for ARM
-#        if: matrix.test-type == 'functional' && steps.cache-tools.outputs.cache-hit != 'true'
-#        run: |
-#          set -e
-#          CMAKE_BUILD_VERSIONS=("3.15.7")
-#          for version in "${CMAKE_BUILD_VERSIONS[@]}"; do
-#            echo "Compiling CMake version ${version} from source for ARM..."
-#            wget -q --no-check-certificate https://cmake.org/files/v${version%.*}/cmake-${version}.tar.gz
-#            tar -xzf cmake-${version}.tar.gz
-#            cd cmake-${version}
-#            mkdir build && cd build
-#            ../bootstrap --prefix=${HOME}/Applications/CMake/${version} -- -DCMAKE_USE_OPENSSL=ON
-#            make -j$(sysctl -n hw.ncpu)
-#            make install
-#            ${HOME}/Applications/CMake/${version}/bin/cmake --version
-#            cd ../../
-#            rm -rf cmake-${version} cmake-${version}.tar.gz
-#          done
-#      - name: Install universal CMake versions
-#        if: matrix.test-type == 'functional' && steps.cache-tools.outputs.cache-hit != 'true'
-#        run: |
-#          set -e
-#          CMAKE_PRECOMP_VERSIONS=("3.19.7" "3.23.5")
-#          for version in "${CMAKE_PRECOMP_VERSIONS[@]}"; do
-#            echo "Downloading and installing precompiled universal CMake version ${version}..."
-#            wget -q --no-check-certificate https://cmake.org/files/v${version%.*}/cmake-${version}-macos-universal.tar.gz
-#            tar -xzf cmake-${version}-macos-universal.tar.gz \
-#              --exclude=CMake.app/Contents/bin/cmake-gui \
-#              --exclude=CMake.app/Contents/doc/cmake \
-#              --exclude=CMake.app/Contents/share/cmake-${version%.*}/Help \
-#              --exclude=CMake.app/Contents/share/vim
-#            mkdir -p ${HOME}/Applications/CMake/${version}
-#            cp -fR cmake-${version}-macos-universal/CMake.app/Contents/* ${HOME}/Applications/CMake/${version}
-#            ${HOME}/Applications/CMake/${version}/bin/cmake --version
-#            rm -rf cmake-${version}-macos-universal
-#            rm cmake-${version}-macos-universal.tar.gz
-#          done
-#      - name: Install Bazel versions
-#        if: matrix.test-type == 'functional' && steps.cache-tools.outputs.cache-hit != 'true'
-#        run: |
-#          set -e
-#          for version in 6.3.2 7.1.2; do
-#            mkdir -p ${HOME}/Applications/bazel/${version}
-#            wget -q -O ${HOME}/Applications/bazel/${version}/bazel https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-darwin-arm64
-#            chmod +x ${HOME}/Applications/bazel/${version}/bazel
-#          done
-#      - name: Run Tests
-#        run: |
-#          NUM_CPUS=$(sysctl -n hw.ncpu)
-#          echo "Number of CPUs available: $NUM_CPUS"
-#          if [ "${{ matrix.test-type }}" == "unittests" ]; then
-#            pytest test/unittests --durations=20 -n $NUM_CPUS
-#          elif [ "${{ matrix.test-type }}" == "integration" ]; then
-#            pytest test/integration --durations=20 -n $NUM_CPUS
-#          elif [ "${{ matrix.test-type }}" == "functional" ]; then
-#            export PATH=${HOME}/Applications/CMake/3.15.7/bin:$PATH:/usr/local/bin:/opt/homebrew/bin:/usr/bin:/bin:/usr/sbin:/sbin
-#            cmake --version
-#            pytest test/functional --durations=20 -n $NUM_CPUS
-#          fi
+      - name: Cache CMake and Bazel installations
+        if: matrix.test-type == 'functional'
+        id: cache-tools
+        uses: actions/cache@v4
+        with:
+          path: |
+            C:\Tools\CMake\3.15.7
+            C:\Tools\CMake\3.19.7
+            C:\Tools\CMake\3.23.5
+            C:\Tools\bazel\6.3.2
+            C:\Tools\bazel\7.1.2
+          key: ${{ runner.os }}-conan-tools-cache
+
+      - name: Build CMake old versions of CMake
+        if: matrix.test-type == 'functional' && steps.cache-tools.outputs.cache-hit != 'true'
+        run: |
+          @echo off
+          setlocal enabledelayedexpansion
+          set CMAKE_BUILD_VERSIONS=3.15.7
+          for %%v in (%CMAKE_BUILD_VERSIONS%) do (
+              echo Downloading CMake version %%v for Windows...
+              set "destination=C:\Tools\CMake\%%v"
+              if not exist "!destination!" (
+                  mkdir "!destination!"
+              )
+              for /f "tokens=1,2 delims=." %%a in ("%%v") do (
+                  set "version_major_minor=%%a.%%b"
+              )
+              set "url=https://cmake.org/files/v!version_major_minor!/cmake-%%v-win64-x64.zip"
+              curl -L -o "cmake-%%v-windows-x86_64.zip" !url!
+              tar -xf "cmake-%%v-windows-x86_64.zip" -C "!destination!"
+              del "cmake-%%v-windows-x86_64.zip"
+          )
+          endlocal
+
+      - name: Install modern CMake versions
+        if: matrix.test-type == 'functional' && steps.cache-tools.outputs.cache-hit != 'true'
+        run: |
+          @echo off
+          setlocal enabledelayedexpansion
+          set CMAKE_BUILD_VERSIONS=3.19.7 3.23.5
+          for %%v in (%CMAKE_BUILD_VERSIONS%) do (
+              echo Downloading CMake version %%v for Windows...
+              set "destination=C:\Tools\CMake\%%v"
+              if not exist "!destination!" (
+                  mkdir "!destination!"
+              )
+              for /f "tokens=1,2 delims=." %%a in ("%%v") do (
+                  set "version_major_minor=%%a.%%b"
+              )
+              set "url=https://cmake.org/files/v!version_major_minor!/cmake-%%v-windows-x86_64.zip"
+              curl -L -o "cmake-%%v-windows-x86_64.zip" !url!
+              tar -xf "cmake-%%v-windows-x86_64.zip" -C "!destination!"
+              del "cmake-%%v-windows-x86_64.zip"
+          )
+          endlocal
+      - name: Install Bazel versions
+        if: matrix.test-type == 'functional' && steps.cache-tools.outputs.cache-hit != 'true'
+        run: |
+          @echo off
+          setlocal enabledelayedexpansion
+          set BAZEL_BUILD_VERSIONS=6.3.2 7.1.2
+          for %%v in (%BAZEL_BUILD_VERSIONS%) do (
+              echo Downloading Bazel version %%v for Windows...
+              set "destination=C:\Tools\bazel\%%v"
+              if not exist "!destination!" (
+                  mkdir "!destination!"
+              )
+              set "url=https://github.com/bazelbuild/bazel/releases/download/%%v/bazel-%%v-windows-x86_64.zip"
+              curl -L -o "bazel-%%v-windows-x86_64.zip" !url!
+              tar -xf "bazel-%%v-windows-x86_64.zip" -C "!destination!"
+              del "bazel-%%v-windows-x86_64.zip"
+          )
+          endlocal
+      - name: Run Tests
+        run: |
+          NUM_CPUS=$(sysctl -n hw.ncpu)
+          echo "Number of CPUs available: $NUM_CPUS"
+          if [ "${{ matrix.test-type }}" == "unittests" ]; then
+            pytest test/unittests --durations=20 -n $NUM_CPUS
+          elif [ "${{ matrix.test-type }}" == "integration" ]; then
+            pytest test/integration --durations=20 -n $NUM_CPUS
+          elif [ "${{ matrix.test-type }}" == "functional" ]; then
+            pytest test/functional --durations=20 -n $NUM_CPUS
+          fi
diff --git a/test/conftest.py b/test/conftest.py
index ece78bbe554..16fa92369de 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -44,7 +44,7 @@
 
 MacOS_arm = all([platform.system() == "Darwin", platform.machine() == "arm64"])
 homebrew_root = "/opt/homebrew" if MacOS_arm else "/usr/local"
-
+windows_choco_root = "C:/ProgramData/chocolatey/lib/"
 
 tools_locations = {
     "clang": {"disabled": True},
@@ -58,7 +58,7 @@
         "0.28": {
             "path": {
                 # Using chocolatey in Windows -> choco install pkgconfiglite --version 0.28
-                'Windows': "C:/ProgramData/chocolatey/lib/pkgconfiglite/tools/pkg-config-lite-0.28-1/bin",
+                'Windows': f"{windows_choco_root}/pkgconfiglite/tools/pkg-config-lite-0.28-1/bin",
                 'Darwin': f"{homebrew_root}/bin",
                 'Linux': "/usr/bin"
             }
@@ -67,27 +67,17 @@
     'cmake': {
         "default": "3.15",
         "3.15": {
-            "path": {'Windows': 'C:/cmake/cmake-3.15.7-win64-x64/bin',
+            "path": {'Windows': f'C:/Tools/CMake/3.15.7/cmake-3.15.7-win64-x64/bin',
                      'Darwin': '/Users/jenkins/cmake/cmake-3.15.7/bin',
                      'Linux': '/usr/share/cmake-3.15.7/bin'}
         },
-        "3.16": {
-            "path": {'Windows': 'C:/cmake/cmake-3.16.9-win64-x64/bin',
-                     'Darwin': '/Users/jenkins/cmake/cmake-3.16.9/bin',
-                     'Linux': '/usr/share/cmake-3.16.9/bin'}
-        },
-        "3.17": {
-            "path": {'Windows': 'C:/cmake/cmake-3.17.5-win64-x64/bin',
-                     'Darwin': '/Users/jenkins/cmake/cmake-3.17.5/bin',
-                     'Linux': '/usr/share/cmake-3.17.5/bin'}
-        },
         "3.19": {
-            "path": {'Windows': 'C:/cmake/cmake-3.19.7-win64-x64/bin',
+            "path": {'Windows': f'C:/Tools/CMake/3.19.7/cmake-3.19.7-win64-x64/bin',
                      'Darwin': '/Users/jenkins/cmake/cmake-3.19.7/bin',
                      'Linux': '/usr/share/cmake-3.19.7/bin'}
         },
         "3.23": {
-            "path": {'Windows': 'C:/cmake/cmake-3.23.1-win64-x64/bin',
+            "path": {'Windows': f'C:/Tools/CMake/3.23.5/cmake-3.23.5-win64-x64/bin',
                      'Darwin': '/Users/jenkins/cmake/cmake-3.23.1/bin',
                      'Linux': "/usr/share/cmake-3.23.5/bin"}
         },
@@ -98,7 +88,7 @@
     'ninja': {
         "default": "1.10.2",
         "1.10.2": {
-            "path": {'Windows': 'C:/Tools/ninja/1.10.2'}
+            "path": {'Windows': f'{windows_choco_root}/ninja/tools'}
         }
     },
     # This is the non-msys2 mingw, which is 32 bits x86 arch
@@ -107,7 +97,7 @@
         "platform": "Windows",
         "default": "system",
         "exe": "mingw32-make",
-        "system": {"path": {'Windows': "C:/mingw"}},
+        "system": {"path": {'Windows': "C:/ProgramData/mingw64/mingw64/bin"}},
     },
     'mingw32': {
         "platform": "Windows",
@@ -132,7 +122,7 @@
         "platform": "Windows",
         "default": "system",
         "exe": "make",
-        "system": {"path": {'Windows': r"C:\msys64\usr\bin"}},
+        "system": {"path": {'Windows': "C:/msys64/usr/bin"}},
     },
     'msys2_clang64': {
         "disabled": True,
@@ -157,10 +147,10 @@
     'bazel': {
         "default": "6.3.2",
         "6.3.2": {"path": {'Linux': '/usr/share/bazel-6.3.2/bin',
-                           'Windows': 'C:/bazel-6.3.2/bin',
+                           'Windows': 'C:/Tools/bazel/6.3.2',
                            'Darwin': '/Users/jenkins/bazel-6.3.2/bin'}},
         "7.1.2": {"path": {'Linux': '/usr/share/bazel-7.1.2/bin',
-                           'Windows': 'C:/bazel-7.1.2/bin',
+                           'Windows': 'C:/Tools/bazel/7.1.2',
                            'Darwin': '/Users/jenkins/bazel-7.1.2/bin'}},
     },
     'premake': {
diff --git a/test/functional/layout/test_editable_cmake.py b/test/functional/layout/test_editable_cmake.py
index 02da2d79672..c4f254f5192 100644
--- a/test/functional/layout/test_editable_cmake.py
+++ b/test/functional/layout/test_editable_cmake.py
@@ -84,7 +84,7 @@ def test_editable_cmake_windows_folders():
 
 @pytest.mark.skipif(platform.system() != "Linux", reason="Only linux")
 @pytest.mark.parametrize("generator", [None, "Ninja", "Ninja Multi-Config"])
-@pytest.mark.tool("cmake", "3.17")
+@pytest.mark.tool("cmake", "3.19")
 def test_editable_cmake_linux(generator):
     editable_cmake(generator)
 
@@ -147,7 +147,7 @@ def test_editable_cmake_windows_exe(generator):
 
 @pytest.mark.skipif(platform.system() != "Linux", reason="Only linux")
 @pytest.mark.parametrize("generator", [None, "Ninja", "Ninja Multi-Config"])
-@pytest.mark.tool("cmake", "3.17")
+@pytest.mark.tool("cmake", "3.19")
 def test_editable_cmake_linux_exe(generator):
     editable_cmake_exe(generator)
 
diff --git a/test/functional/tools_versions_test.py b/test/functional/tools_versions_test.py
index 6e2947e380d..b79ce8c7224 100644
--- a/test/functional/tools_versions_test.py
+++ b/test/functional/tools_versions_test.py
@@ -17,18 +17,6 @@ def test_default_cmake(self):
         default_cmake_version = tools_locations["cmake"]["default"]
         assert "cmake version {}".format(default_cmake_version) in client.out
 
-    @pytest.mark.tool("cmake", "3.16")
-    def test_custom_cmake_3_16(self):
-        client = TestClient()
-        client.run_command('cmake --version')
-        assert "cmake version 3.16" in client.out
-
-    @pytest.mark.tool("cmake", "3.17")
-    def test_custom_cmake_3_17(self):
-        client = TestClient()
-        client.run_command('cmake --version')
-        assert "cmake version 3.17" in client.out
-
     @pytest.mark.tool("cmake", "3.19")
     def test_custom_cmake_3_19(self):
         client = TestClient()
@@ -36,13 +24,13 @@ def test_custom_cmake_3_19(self):
         assert "cmake version 3.19" in client.out
 
     @pytest.mark.tool("mingw64")
-    @pytest.mark.tool("cmake", "3.16")
+    @pytest.mark.tool("cmake", "3.19")
     @pytest.mark.skipif(platform.system() != "Windows",
                         reason="Mingw test")
     def test_custom_cmake_mingw64(self):
         client = TestClient()
         client.run_command('cmake --version')
-        assert "cmake version 3.16" in client.out
+        assert "cmake version 3.19" in client.out
         main = gen_function_cpp(name="main")
         cmakelist = textwrap.dedent("""
             cmake_minimum_required(VERSION 3.15)

From af284af4a09d619a3f5b2463247df4ba7f386413 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Tue, 15 Oct 2024 11:59:12 +0200
Subject: [PATCH 003/211] tests script

---
 .github/workflows/win-tests.yml | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 618f432b97d..cb4241dddd6 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -133,12 +133,15 @@ jobs:
           endlocal
       - name: Run Tests
         run: |
-          NUM_CPUS=$(sysctl -n hw.ncpu)
-          echo "Number of CPUs available: $NUM_CPUS"
-          if [ "${{ matrix.test-type }}" == "unittests" ]; then
-            pytest test/unittests --durations=20 -n $NUM_CPUS
-          elif [ "${{ matrix.test-type }}" == "integration" ]; then
-            pytest test/integration --durations=20 -n $NUM_CPUS
-          elif [ "${{ matrix.test-type }}" == "functional" ]; then
-            pytest test/functional --durations=20 -n $NUM_CPUS
-          fi
+          @echo off
+          setlocal
+          for /f "tokens=2 delims==" %%a in ('wmic cpu get NumberOfCores /value ^| find "="') do set NUM_CPUS=%%a
+          echo Number of CPUs available: %NUM_CPUS%
+          if "%{{ matrix.test-type }}%"=="unittests" (
+              pytest test/unittests --durations=20 -n %NUM_CPUS%
+          ) else if "%{{ matrix.test-type }}%"=="integration" (
+              pytest test/integration --durations=20 -n %NUM_CPUS%
+          ) else if "%{{ matrix.test-type }}%"=="functional" (
+              pytest test/functional --durations=20 -n %NUM_CPUS%
+          )
+          endlocal

From 6e5563ffee6e3bc82e4967fd630549e60e407521 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Tue, 15 Oct 2024 12:00:04 +0200
Subject: [PATCH 004/211] wip

---
 .github/workflows/win-tests.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index cb4241dddd6..11d11b90fbd 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -53,9 +53,9 @@ jobs:
       - name: Install Chocolatey packages
         if: matrix.test-type == 'functional'
         run: |
-          choco install pkgconfiglite --version 0.28 -y
-          choco install ninja --version 1.10.2 -y
-          choco install mingw -y
+          choco install pkgconfiglite --version 0.28
+          choco install ninja --version 1.10.2
+          choco install mingw
 
       - name: Cache CMake and Bazel installations
         if: matrix.test-type == 'functional'

From f5bf4967cd091e0882d513b82ed0782b4c7e88c7 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Tue, 15 Oct 2024 12:13:15 +0200
Subject: [PATCH 005/211] To powershell

---
 .github/workflows/win-tests.yml | 116 +++++++++++++++-----------------
 1 file changed, 53 insertions(+), 63 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 11d11b90fbd..3b459aae155 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -73,75 +73,65 @@ jobs:
       - name: Build CMake old versions of CMake
         if: matrix.test-type == 'functional' && steps.cache-tools.outputs.cache-hit != 'true'
         run: |
-          @echo off
-          setlocal enabledelayedexpansion
-          set CMAKE_BUILD_VERSIONS=3.15.7
-          for %%v in (%CMAKE_BUILD_VERSIONS%) do (
-              echo Downloading CMake version %%v for Windows...
-              set "destination=C:\Tools\CMake\%%v"
-              if not exist "!destination!" (
-                  mkdir "!destination!"
-              )
-              for /f "tokens=1,2 delims=." %%a in ("%%v") do (
-                  set "version_major_minor=%%a.%%b"
-              )
-              set "url=https://cmake.org/files/v!version_major_minor!/cmake-%%v-win64-x64.zip"
-              curl -L -o "cmake-%%v-windows-x86_64.zip" !url!
-              tar -xf "cmake-%%v-windows-x86_64.zip" -C "!destination!"
-              del "cmake-%%v-windows-x86_64.zip"
-          )
-          endlocal
+          CMAKE_BUILD_VERSIONS = "3.15.7"
+          foreach ($version in CMAKE_BUILD_VERSIONS) {
+            Write-Host "Downloading CMake version $version for Windows..."
+            $destination = "C:\Tools\CMake\$version"
+            if (-not (Test-Path $destination)) {
+                New-Item -Path $destination -ItemType Directory
+            }
+            $major_minor_version = ($version -split '\.')[0..1] -join '.'
+            $url = "https://cmake.org/files/v$major_minor_version/cmake-$version-win64-x64.zip"
+            $zipFile = "cmake-$version-windows-x86_64.zip"
+            Invoke-WebRequest -Uri $url -OutFile $zipFile
+            Expand-Archive -Path $zipFile -DestinationPath $destination -Force
+            Remove-Item $zipFile
+          }
 
       - name: Install modern CMake versions
         if: matrix.test-type == 'functional' && steps.cache-tools.outputs.cache-hit != 'true'
         run: |
-          @echo off
-          setlocal enabledelayedexpansion
-          set CMAKE_BUILD_VERSIONS=3.19.7 3.23.5
-          for %%v in (%CMAKE_BUILD_VERSIONS%) do (
-              echo Downloading CMake version %%v for Windows...
-              set "destination=C:\Tools\CMake\%%v"
-              if not exist "!destination!" (
-                  mkdir "!destination!"
-              )
-              for /f "tokens=1,2 delims=." %%a in ("%%v") do (
-                  set "version_major_minor=%%a.%%b"
-              )
-              set "url=https://cmake.org/files/v!version_major_minor!/cmake-%%v-windows-x86_64.zip"
-              curl -L -o "cmake-%%v-windows-x86_64.zip" !url!
-              tar -xf "cmake-%%v-windows-x86_64.zip" -C "!destination!"
-              del "cmake-%%v-windows-x86_64.zip"
-          )
-          endlocal
+          CMAKE_BUILD_VERSIONS = "3.19.7", "3.23.5"
+          foreach ($version in CMAKE_BUILD_VERSIONS) {
+            Write-Host "Downloading CMake version $version for Windows..."
+            $destination = "C:\Tools\CMake\$version"
+            if (-not (Test-Path $destination)) {
+                New-Item -Path $destination -ItemType Directory
+            }
+            $major_minor_version = ($version -split '\.')[0..1] -join '.'
+            $url = "https://cmake.org/files/v$major_minor_version/cmake-$version-windows-x86_64.zip"
+            $zipFile = "cmake-$version-windows-x86_64.zip"
+            Invoke-WebRequest -Uri $url -OutFile $zipFile
+            Expand-Archive -Path $zipFile -DestinationPath $destination -Force
+            Remove-Item $zipFile
+          }
       - name: Install Bazel versions
         if: matrix.test-type == 'functional' && steps.cache-tools.outputs.cache-hit != 'true'
         run: |
-          @echo off
-          setlocal enabledelayedexpansion
-          set BAZEL_BUILD_VERSIONS=6.3.2 7.1.2
-          for %%v in (%BAZEL_BUILD_VERSIONS%) do (
-              echo Downloading Bazel version %%v for Windows...
-              set "destination=C:\Tools\bazel\%%v"
-              if not exist "!destination!" (
-                  mkdir "!destination!"
-              )
-              set "url=https://github.com/bazelbuild/bazel/releases/download/%%v/bazel-%%v-windows-x86_64.zip"
-              curl -L -o "bazel-%%v-windows-x86_64.zip" !url!
-              tar -xf "bazel-%%v-windows-x86_64.zip" -C "!destination!"
-              del "bazel-%%v-windows-x86_64.zip"
-          )
-          endlocal
+          $BAZEL_BUILD_VERSIONS = "6.3.2", "7.1.2"
+          foreach ($version in $BAZEL_BUILD_VERSIONS) {
+              Write-Host "Downloading Bazel version $version for Windows..."
+              $destination = "C:\Tools\bazel\$version"
+              if (-not (Test-Path $destination)) {
+                  New-Item -Path $destination -ItemType Directory
+              }
+              $major_minor_version = ($version -split '\.')[0..1] -join '.'
+              $url = "https://github.com/bazelbuild/bazel/releases/download/$version/bazel-$version-windows-x86_64.zip"
+              $zipFile = "bazel-$version-windows-x86_64.zip"
+              Invoke-WebRequest -Uri $url -OutFile $zipFile
+              Expand-Archive -Path $zipFile -DestinationPath $destination -Force
+              Remove-Item $zipFile
+          }
       - name: Run Tests
         run: |
-          @echo off
-          setlocal
-          for /f "tokens=2 delims==" %%a in ('wmic cpu get NumberOfCores /value ^| find "="') do set NUM_CPUS=%%a
-          echo Number of CPUs available: %NUM_CPUS%
-          if "%{{ matrix.test-type }}%"=="unittests" (
-              pytest test/unittests --durations=20 -n %NUM_CPUS%
-          ) else if "%{{ matrix.test-type }}%"=="integration" (
-              pytest test/integration --durations=20 -n %NUM_CPUS%
-          ) else if "%{{ matrix.test-type }}%"=="functional" (
-              pytest test/functional --durations=20 -n %NUM_CPUS%
-          )
-          endlocal
+          $NUM_CPUS = (Get-WmiObject -Class Win32_Processor | Measure-Object -Property NumberOfCores -Sum).Sum
+          Write-Host "Number of CPUs available: $NUM_CPUS"
+          $matrixTestType = "{{ matrix.test-type }}"
+          if ($matrixTestType -eq "unittests") {
+              pytest test/unittests --durations=20 -n $NUM_CPUS
+          } elseif ($matrixTestType -eq "integration") {
+              pytest test/integration --durations=20 -n $NUM_CPUS
+          } elseif ($matrixTestType -eq "functional") {
+              pytest test/functional --durations=20 -n $NUM_CPUS
+          }
+

From 88715f876d1176a225925b70833125c441a76d8c Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Tue, 15 Oct 2024 12:15:57 +0200
Subject: [PATCH 006/211] To powershell

---
 .github/workflows/win-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 3b459aae155..b76440eb103 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -124,7 +124,7 @@ jobs:
           }
       - name: Run Tests
         run: |
-          $NUM_CPUS = (Get-WmiObject -Class Win32_Processor | Measure-Object -Property NumberOfCores -Sum).Sum
+          $NUM_CPUS = (Get-CimInstance -ClassName Win32_Processor | Measure-Object -Property NumberOfCores -Sum).Sum
           Write-Host "Number of CPUs available: $NUM_CPUS"
           $matrixTestType = "{{ matrix.test-type }}"
           if ($matrixTestType -eq "unittests") {

From 9de7d837623f0484c9e8459cf8ebb847fe5aa22d Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Tue, 15 Oct 2024 12:20:59 +0200
Subject: [PATCH 007/211] To powershell

---
 .github/workflows/win-tests.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index b76440eb103..21f3a691c69 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -53,9 +53,9 @@ jobs:
       - name: Install Chocolatey packages
         if: matrix.test-type == 'functional'
         run: |
-          choco install pkgconfiglite --version 0.28
-          choco install ninja --version 1.10.2
-          choco install mingw
+          choco install pkgconfiglite --version 0.28 -y --accept-license
+          choco install ninja --version 1.10.2 -y --accept-license
+          choco install mingw -y --accept-license
 
       - name: Cache CMake and Bazel installations
         if: matrix.test-type == 'functional'
@@ -73,8 +73,8 @@ jobs:
       - name: Build CMake old versions of CMake
         if: matrix.test-type == 'functional' && steps.cache-tools.outputs.cache-hit != 'true'
         run: |
-          CMAKE_BUILD_VERSIONS = "3.15.7"
-          foreach ($version in CMAKE_BUILD_VERSIONS) {
+          $CMAKE_BUILD_VERSIONS = "3.15.7"
+          foreach ($version in $CMAKE_BUILD_VERSIONS) {
             Write-Host "Downloading CMake version $version for Windows..."
             $destination = "C:\Tools\CMake\$version"
             if (-not (Test-Path $destination)) {
@@ -91,8 +91,8 @@ jobs:
       - name: Install modern CMake versions
         if: matrix.test-type == 'functional' && steps.cache-tools.outputs.cache-hit != 'true'
         run: |
-          CMAKE_BUILD_VERSIONS = "3.19.7", "3.23.5"
-          foreach ($version in CMAKE_BUILD_VERSIONS) {
+          $CMAKE_BUILD_VERSIONS = "3.19.7", "3.23.5"
+          foreach ($version in $CMAKE_BUILD_VERSIONS) {
             Write-Host "Downloading CMake version $version for Windows..."
             $destination = "C:\Tools\CMake\$version"
             if (-not (Test-Path $destination)) {
@@ -126,7 +126,7 @@ jobs:
         run: |
           $NUM_CPUS = (Get-CimInstance -ClassName Win32_Processor | Measure-Object -Property NumberOfCores -Sum).Sum
           Write-Host "Number of CPUs available: $NUM_CPUS"
-          $matrixTestType = "{{ matrix.test-type }}"
+          $matrixTestType = {{ matrix.test-type }}
           if ($matrixTestType -eq "unittests") {
               pytest test/unittests --durations=20 -n $NUM_CPUS
           } elseif ($matrixTestType -eq "integration") {

From 6e2b097249880b92795df59c542473b7fbce096b Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Tue, 15 Oct 2024 12:25:35 +0200
Subject: [PATCH 008/211] To powershell

---
 .github/workflows/win-tests.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 21f3a691c69..41c1692e244 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -126,7 +126,9 @@ jobs:
         run: |
           $NUM_CPUS = (Get-CimInstance -ClassName Win32_Processor | Measure-Object -Property NumberOfCores -Sum).Sum
           Write-Host "Number of CPUs available: $NUM_CPUS"
-          $matrixTestType = {{ matrix.test-type }}
+          $matrixTestType = "${{ matrix.test-type }}"
+          $matrixTestType2 = "{{ matrix.test-type }}"
+          Write-Host "Matrix test-type: $matrixTestType $matrixTestType2 "
           if ($matrixTestType -eq "unittests") {
               pytest test/unittests --durations=20 -n $NUM_CPUS
           } elseif ($matrixTestType -eq "integration") {

From b42dc63677ba3efea6a35c6339872aaebf07befb Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Tue, 15 Oct 2024 12:35:32 +0200
Subject: [PATCH 009/211] To powershell

---
 .github/workflows/win-tests.yml    | 10 ++++------
 test/unittests/util/output_test.py |  8 ++++----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 41c1692e244..53d522cbdd7 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -73,7 +73,7 @@ jobs:
       - name: Build CMake old versions of CMake
         if: matrix.test-type == 'functional' && steps.cache-tools.outputs.cache-hit != 'true'
         run: |
-          $CMAKE_BUILD_VERSIONS = "3.15.7"
+          $CMAKE_BUILD_VERSIONS = "3.15.7", "3.19.7"
           foreach ($version in $CMAKE_BUILD_VERSIONS) {
             Write-Host "Downloading CMake version $version for Windows..."
             $destination = "C:\Tools\CMake\$version"
@@ -91,15 +91,15 @@ jobs:
       - name: Install modern CMake versions
         if: matrix.test-type == 'functional' && steps.cache-tools.outputs.cache-hit != 'true'
         run: |
-          $CMAKE_BUILD_VERSIONS = "3.19.7", "3.23.5"
+          $CMAKE_BUILD_VERSIONS = "3.23.5"
           foreach ($version in $CMAKE_BUILD_VERSIONS) {
-            Write-Host "Downloading CMake version $version for Windows..."
             $destination = "C:\Tools\CMake\$version"
             if (-not (Test-Path $destination)) {
                 New-Item -Path $destination -ItemType Directory
             }
             $major_minor_version = ($version -split '\.')[0..1] -join '.'
-            $url = "https://cmake.org/files/v$major_minor_version/cmake-$version-windows-x86_64.zip"
+            $url = "https://cmake.org/files/v$major_minor_version/cmake-$version-windows-x86_64.zip
+            Write-Host "Downloading CMake: $url"
             $zipFile = "cmake-$version-windows-x86_64.zip"
             Invoke-WebRequest -Uri $url -OutFile $zipFile
             Expand-Archive -Path $zipFile -DestinationPath $destination -Force
@@ -127,8 +127,6 @@ jobs:
           $NUM_CPUS = (Get-CimInstance -ClassName Win32_Processor | Measure-Object -Property NumberOfCores -Sum).Sum
           Write-Host "Number of CPUs available: $NUM_CPUS"
           $matrixTestType = "${{ matrix.test-type }}"
-          $matrixTestType2 = "{{ matrix.test-type }}"
-          Write-Host "Matrix test-type: $matrixTestType $matrixTestType2 "
           if ($matrixTestType -eq "unittests") {
               pytest test/unittests --durations=20 -n $NUM_CPUS
           } elseif ($matrixTestType -eq "integration") {
diff --git a/test/unittests/util/output_test.py b/test/unittests/util/output_test.py
index adf3d74c512..4c616dd9c90 100644
--- a/test/unittests/util/output_test.py
+++ b/test/unittests/util/output_test.py
@@ -57,20 +57,20 @@ def test_unzip_output(self):
     @pytest.mark.skipif(platform.system() != "Windows", reason="Requires windows")
     def test_short_paths_unzip_output(self):
         tmp_dir = temp_folder()
-        file_path = os.path.join(tmp_dir, "src/"*40, "example.txt")
+        file_path = os.path.join(tmp_dir, "src\\"*40, "example.txt")
         save(file_path, "Hello world!")
 
         zip_path = os.path.join(tmp_dir, 'example.zip')
         zipf = zipfile.ZipFile(zip_path, 'w', zipfile.ZIP_DEFLATED)
         for root, _, files in os.walk(tmp_dir):
             for f in files:
-                zipf.write(os.path.join(root, f), os.path.join("src/"*20, f))
+                zipf.write(os.path.join(root, f), os.path.join("src\\"*20, f))
         zipf.close()
 
-        output_dir = os.path.join(tmp_dir, "dst/"*40, "output_dir")
+        output_dir = os.path.join(tmp_dir, "dst\\"*40, "output_dir")
         captured_output = RedirectedTestOutput()
         with redirect_output(captured_output):
             unzip(ConanFileMock(), zip_path, output_dir)
 
         output = captured_output.getvalue()
-        self.assertIn("ERROR: Error extract src/src", output)
+        self.assertIn("ERROR: Error extract src\\src", output)

From 69d400481b69b9fec7079ace6949986c3a81bc54 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Tue, 15 Oct 2024 12:39:13 +0200
Subject: [PATCH 010/211] To powershell

---
 .github/workflows/win-tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 53d522cbdd7..1fc15ecb9aa 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -128,9 +128,9 @@ jobs:
           Write-Host "Number of CPUs available: $NUM_CPUS"
           $matrixTestType = "${{ matrix.test-type }}"
           if ($matrixTestType -eq "unittests") {
-              pytest test/unittests --durations=20 -n $NUM_CPUS
+              Write-Host "pytest test/unittests --durations=20 -n $NUM_CPUS"
           } elseif ($matrixTestType -eq "integration") {
-              pytest test/integration --durations=20 -n $NUM_CPUS
+              Write-Host "pytest test/integration --durations=20 -n $NUM_CPUS"
           } elseif ($matrixTestType -eq "functional") {
               pytest test/functional --durations=20 -n $NUM_CPUS
           }

From b89080740b7237c57aa28b90f6cbb0827e39bb32 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Tue, 15 Oct 2024 12:44:12 +0200
Subject: [PATCH 011/211] To powershell

---
 .github/workflows/win-tests.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 1fc15ecb9aa..a3b0b9895bf 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -87,7 +87,6 @@ jobs:
             Expand-Archive -Path $zipFile -DestinationPath $destination -Force
             Remove-Item $zipFile
           }
-
       - name: Install modern CMake versions
         if: matrix.test-type == 'functional' && steps.cache-tools.outputs.cache-hit != 'true'
         run: |
@@ -98,8 +97,7 @@ jobs:
                 New-Item -Path $destination -ItemType Directory
             }
             $major_minor_version = ($version -split '\.')[0..1] -join '.'
-            $url = "https://cmake.org/files/v$major_minor_version/cmake-$version-windows-x86_64.zip
-            Write-Host "Downloading CMake: $url"
+            $url = "https://cmake.org/files/v$major_minor_version/cmake-$version-windows-x86_64.zip"
             $zipFile = "cmake-$version-windows-x86_64.zip"
             Invoke-WebRequest -Uri $url -OutFile $zipFile
             Expand-Archive -Path $zipFile -DestinationPath $destination -Force

From 38bee4306069aa544ee7ff21431415576fd88d05 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Tue, 15 Oct 2024 14:03:38 +0200
Subject: [PATCH 012/211] To powershell

---
 test/conftest.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/conftest.py b/test/conftest.py
index 16fa92369de..b8025402f4f 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -24,12 +24,12 @@
         "3.15": {},
         "3.16": {"disabled": True},
         "3.17": {"disabled": True},
-        "3.19": {"path": {"Windows": "C:/ws/cmake/cmake-3.19.7-win64-x64/bin"}},
+        "3.19": {"path": {"Windows": "C:/ws/cmake/cmake-3.19.7-windows-x86_64/bin"}},
         # To explicitly skip one tool for one version, define the path as 'skip-tests'
         # if you don't define the path for one platform it will run the test with the
         # tool in the path. For example here it will skip the test with CMake in Darwin but
         # in Linux it will run with the version found in the path if it's not specified
-        "3.23": {"path": {"Windows": "C:/ws/cmake/cmake-3.19.7-win64-x64/bin",
+        "3.23": {"path": {"Windows": "C:/ws/cmake/cmake-3.19.7-windows-x86_64/bin",
                           "Darwin": "skip-tests"}},
     },
     'ninja': {
@@ -67,17 +67,17 @@
     'cmake': {
         "default": "3.15",
         "3.15": {
-            "path": {'Windows': f'C:/Tools/CMake/3.15.7/cmake-3.15.7-win64-x64/bin',
+            "path": {'Windows': 'C:/Tools/CMake/3.15.7/cmake-3.15.7-windows-x86_64/bin',
                      'Darwin': '/Users/jenkins/cmake/cmake-3.15.7/bin',
                      'Linux': '/usr/share/cmake-3.15.7/bin'}
         },
         "3.19": {
-            "path": {'Windows': f'C:/Tools/CMake/3.19.7/cmake-3.19.7-win64-x64/bin',
+            "path": {'Windows': 'C:/Tools/CMake/3.19.7/cmake-3.19.7-windows-x86_64/bin',
                      'Darwin': '/Users/jenkins/cmake/cmake-3.19.7/bin',
                      'Linux': '/usr/share/cmake-3.19.7/bin'}
         },
         "3.23": {
-            "path": {'Windows': f'C:/Tools/CMake/3.23.5/cmake-3.23.5-win64-x64/bin',
+            "path": {'Windows': 'C:/Tools/CMake/3.23.5/cmake-3.23.5-windows-x86_64/bin',
                      'Darwin': '/Users/jenkins/cmake/cmake-3.23.1/bin',
                      'Linux': "/usr/share/cmake-3.23.5/bin"}
         },
@@ -147,10 +147,10 @@
     'bazel': {
         "default": "6.3.2",
         "6.3.2": {"path": {'Linux': '/usr/share/bazel-6.3.2/bin',
-                           'Windows': 'C:/Tools/bazel/6.3.2',
+                           'Windows': 'C:/Tools/bazel/6.3.2/bazel-6.3.2-windows-x86_64',
                            'Darwin': '/Users/jenkins/bazel-6.3.2/bin'}},
         "7.1.2": {"path": {'Linux': '/usr/share/bazel-7.1.2/bin',
-                           'Windows': 'C:/Tools/bazel/7.1.2',
+                           'Windows': 'C:/Tools/bazel/7.1.2/bazel-7.1.2-windows-x86_64',
                            'Darwin': '/Users/jenkins/bazel-7.1.2/bin'}},
     },
     'premake': {
@@ -248,7 +248,7 @@ def _get_individual_tool(name, version):
         tool_path = tool_path.replace("/", "\\") if tool_platform == "Windows" and tool_path is not None else tool_path
         # To allow to skip for a platform, we can put the path to None
         # "cmake": { "3.23": {
-        #               "path": {'Windows': 'C:/cmake/cmake-3.23.1-win64-x64/bin',
+        #               "path": {'Windows': 'C:/cmake/cmake-3.23.1-windows-x86_64/bin',
         #                        'Darwin': '/Users/jenkins/cmake/cmake-3.23.1/bin',
         #                        'Linux': None}}
         #          }

From e861cf1714f6691518286844e2a4ea32e950498c Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Tue, 15 Oct 2024 14:46:31 +0200
Subject: [PATCH 013/211] To powershell

---
 .github/workflows/win-tests.yml | 8 ++++++++
 test/conftest.py                | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index a3b0b9895bf..ad75de7a24e 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -56,6 +56,14 @@ jobs:
           choco install pkgconfiglite --version 0.28 -y --accept-license
           choco install ninja --version 1.10.2 -y --accept-license
           choco install mingw -y --accept-license
+          choco install visualstudio2017community --version 15.9.48.0 -y --accept-license --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.VC.v141.x86.x64 --add Microsoft.VisualStudio.Component.VC.v141.ATL --add Microsoft.VisualStudio.Component.VC.v141.ATLMFC
+          choco install cygwin
+          choco install cyg-get
+
+      - name: Install Cygwin extra packages
+        if: matrix.test-type == 'functional'
+        run: |
+          cyg-get automake gcc-g++ make binutils
 
       - name: Cache CMake and Bazel installations
         if: matrix.test-type == 'functional'
diff --git a/test/conftest.py b/test/conftest.py
index b8025402f4f..725ac5231bb 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -142,7 +142,7 @@
         "platform": "Windows",
         "default": "system",
         "exe": "make",
-        "system": {"path": {'Windows': "C:/cygwin64/bin"}},
+        "system": {"path": {'Windows': "C:/tools/cygwin/bin"}},
     },
     'bazel': {
         "default": "6.3.2",

From 201ba61721a070f64a49dd2b4644bd3c2c9e6092 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Tue, 15 Oct 2024 15:25:36 +0200
Subject: [PATCH 014/211] wip

---
 .github/workflows/win-tests.yml | 1 +
 test/conftest.py                | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index ad75de7a24e..973425b3cb1 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -138,6 +138,7 @@ jobs:
           } elseif ($matrixTestType -eq "integration") {
               Write-Host "pytest test/integration --durations=20 -n $NUM_CPUS"
           } elseif ($matrixTestType -eq "functional") {
+              C:\Tools\CMake\3.15.7\cmake-3.15.7-windows-x86_64\bin\cmake.exe --version
               pytest test/functional --durations=20 -n $NUM_CPUS
           }
 
diff --git a/test/conftest.py b/test/conftest.py
index 725ac5231bb..a1efa827cf2 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -142,7 +142,7 @@
         "platform": "Windows",
         "default": "system",
         "exe": "make",
-        "system": {"path": {'Windows': "C:/tools/cygwin/bin"}},
+        "system": {"path": {'Windows': "C:/tools/Cygwin/bin"}},
     },
     'bazel': {
         "default": "6.3.2",

From 60cf0edc9ef0964702de11adb6482346422ca016 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Tue, 15 Oct 2024 17:08:45 +0200
Subject: [PATCH 015/211] wip

---
 .github/workflows/win-tests.yml | 1 -
 test/conftest.py                | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 973425b3cb1..ad75de7a24e 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -138,7 +138,6 @@ jobs:
           } elseif ($matrixTestType -eq "integration") {
               Write-Host "pytest test/integration --durations=20 -n $NUM_CPUS"
           } elseif ($matrixTestType -eq "functional") {
-              C:\Tools\CMake\3.15.7\cmake-3.15.7-windows-x86_64\bin\cmake.exe --version
               pytest test/functional --durations=20 -n $NUM_CPUS
           }
 
diff --git a/test/conftest.py b/test/conftest.py
index a1efa827cf2..6c65c3719f8 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -67,12 +67,12 @@
     'cmake': {
         "default": "3.15",
         "3.15": {
-            "path": {'Windows': 'C:/Tools/CMake/3.15.7/cmake-3.15.7-windows-x86_64/bin',
+            "path": {'Windows': 'C:/Tools/CMake/3.15.7/cmake-3.15.7-win64-x64/bin',
                      'Darwin': '/Users/jenkins/cmake/cmake-3.15.7/bin',
                      'Linux': '/usr/share/cmake-3.15.7/bin'}
         },
         "3.19": {
-            "path": {'Windows': 'C:/Tools/CMake/3.19.7/cmake-3.19.7-windows-x86_64/bin',
+            "path": {'Windows': 'C:/Tools/CMake/3.19.7/cmake-3.19.7-win64-x64/bin',
                      'Darwin': '/Users/jenkins/cmake/cmake-3.19.7/bin',
                      'Linux': '/usr/share/cmake-3.19.7/bin'}
         },
@@ -147,10 +147,10 @@
     'bazel': {
         "default": "6.3.2",
         "6.3.2": {"path": {'Linux': '/usr/share/bazel-6.3.2/bin',
-                           'Windows': 'C:/Tools/bazel/6.3.2/bazel-6.3.2-windows-x86_64',
+                           'Windows': 'C:/Tools/bazel/6.3.2',
                            'Darwin': '/Users/jenkins/bazel-6.3.2/bin'}},
         "7.1.2": {"path": {'Linux': '/usr/share/bazel-7.1.2/bin',
-                           'Windows': 'C:/Tools/bazel/7.1.2/bazel-7.1.2-windows-x86_64',
+                           'Windows': 'C:/Tools/bazel/7.1.2',
                            'Darwin': '/Users/jenkins/bazel-7.1.2/bin'}},
     },
     'premake': {

From 60e83bb47d9837b7828f22a3f8f4301d15a4a507 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Tue, 15 Oct 2024 17:40:59 +0200
Subject: [PATCH 016/211] wip

---
 .github/workflows/win-tests.yml | 37 ++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index ad75de7a24e..99cea6ced0f 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -39,8 +39,28 @@ jobs:
         id: cache-pip
         uses: actions/cache@v4
         with:
-          path: ~/.cache/pip
+          path: %LocalAppData%\pip\Cache
           key: ${{ runner.os }}-pip-${{ hashFiles('conans/requirements*.txt') }}
+          restore-keys: |
+              ${{ runner.os }}-pip-
+
+      - name: Cache Chocolatey packages
+        if: matrix.test-type == 'functional'
+        uses: actions/cache@v4
+        with:
+          path: C:\ProgramData\chocolatey\lib
+          key: chocolatey-packages-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            chocolatey-packages-${{ runner.os }}-
+
+      - name: Cache Cygwin packages
+        if: matrix.test-type == 'functional'
+        uses: actions/cache@v4
+        with:
+          path: C:\cygwin64\bin
+          key: cygwin-packages-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            cygwin-packages-${{ runner.os }}-
 
       - name: Install Python requirements
         run: |
@@ -56,9 +76,9 @@ jobs:
           choco install pkgconfiglite --version 0.28 -y --accept-license
           choco install ninja --version 1.10.2 -y --accept-license
           choco install mingw -y --accept-license
-          choco install visualstudio2017community --version 15.9.48.0 -y --accept-license --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.VC.v141.x86.x64 --add Microsoft.VisualStudio.Component.VC.v141.ATL --add Microsoft.VisualStudio.Component.VC.v141.ATLMFC
-          choco install cygwin
-          choco install cyg-get
+          choco install visualstudio2017community --package-parameters "--allWorkloads --includeRecommended --includeOptional --passive --locale en-US" -y --accept-license
+          choco install cygwin -y --accept-license
+          choco install cyg-get -y --accept-license
 
       - name: Install Cygwin extra packages
         if: matrix.test-type == 'functional'
@@ -130,14 +150,11 @@ jobs:
           }
       - name: Run Tests
         run: |
-          $NUM_CPUS = (Get-CimInstance -ClassName Win32_Processor | Measure-Object -Property NumberOfCores -Sum).Sum
-          Write-Host "Number of CPUs available: $NUM_CPUS"
           $matrixTestType = "${{ matrix.test-type }}"
           if ($matrixTestType -eq "unittests") {
-              Write-Host "pytest test/unittests --durations=20 -n $NUM_CPUS"
+              Write-Host "pytest test/unittests --durations=20"
           } elseif ($matrixTestType -eq "integration") {
-              Write-Host "pytest test/integration --durations=20 -n $NUM_CPUS"
+              Write-Host "pytest test/integration --durations=20"
           } elseif ($matrixTestType -eq "functional") {
-              pytest test/functional --durations=20 -n $NUM_CPUS
+              pytest test/functional --durations=20
           }
-

From c16d23c68ccadbd55b647e52ba0c483871d63c77 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Tue, 15 Oct 2024 17:49:07 +0200
Subject: [PATCH 017/211] wip

---
 .github/workflows/win-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 99cea6ced0f..cc31a6e636b 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -39,7 +39,7 @@ jobs:
         id: cache-pip
         uses: actions/cache@v4
         with:
-          path: %LocalAppData%\pip\Cache
+          path: c:\users\runneradmin\appdata\local\pip\cache
           key: ${{ runner.os }}-pip-${{ hashFiles('conans/requirements*.txt') }}
           restore-keys: |
               ${{ runner.os }}-pip-

From faf04dc6fbc7dd0eb0f42b34dea998b48f89d8af Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Tue, 15 Oct 2024 21:02:13 +0200
Subject: [PATCH 018/211] wip

---
 .github/workflows/win-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index cc31a6e636b..5dd1678abb9 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -156,5 +156,5 @@ jobs:
           } elseif ($matrixTestType -eq "integration") {
               Write-Host "pytest test/integration --durations=20"
           } elseif ($matrixTestType -eq "functional") {
-              pytest test/functional --durations=20
+              Write-Host "pytest test/functional --durations=20"
           }

From a974cbe6062e02d7dbab8baaa0f11a9073fac6f7 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Wed, 16 Oct 2024 08:36:15 +0200
Subject: [PATCH 019/211] wip

---
 .github/workflows/win-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 5dd1678abb9..cc31a6e636b 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -156,5 +156,5 @@ jobs:
           } elseif ($matrixTestType -eq "integration") {
               Write-Host "pytest test/integration --durations=20"
           } elseif ($matrixTestType -eq "functional") {
-              Write-Host "pytest test/functional --durations=20"
+              pytest test/functional --durations=20
           }

From 20dd812dc31d42658990487ce337eeac6b12e089 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Wed, 16 Oct 2024 10:00:39 +0200
Subject: [PATCH 020/211] wip

---
 .github/workflows/win-tests.yml | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index cc31a6e636b..40377d188ea 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -36,13 +36,12 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Cache pip packages
-        id: cache-pip
         uses: actions/cache@v4
         with:
-          path: c:\users\runneradmin\appdata\local\pip\cache
-          key: ${{ runner.os }}-pip-${{ hashFiles('conans/requirements*.txt') }}
+          path: C:\Users\${{ runner.user }}\AppData\Local\pip\Cache
+          key: pip-packages-${{ runner.os }}-${{ hashFiles('conans/requirements*.txt') }}
           restore-keys: |
-              ${{ runner.os }}-pip-
+            pip-packages-${{ runner.os }}-
 
       - name: Cache Chocolatey packages
         if: matrix.test-type == 'functional'
@@ -57,8 +56,8 @@ jobs:
         if: matrix.test-type == 'functional'
         uses: actions/cache@v4
         with:
-          path: C:\cygwin64\bin
-          key: cygwin-packages-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+          path: C:\cygwin64\etc\setup
+          key: cygwin-packages-${{ runner.os }}-${{ hashFiles('installed.db') }}
           restore-keys: |
             cygwin-packages-${{ runner.os }}-
 
@@ -77,12 +76,7 @@ jobs:
           choco install ninja --version 1.10.2 -y --accept-license
           choco install mingw -y --accept-license
           choco install visualstudio2017community --package-parameters "--allWorkloads --includeRecommended --includeOptional --passive --locale en-US" -y --accept-license
-          choco install cygwin -y --accept-license
           choco install cyg-get -y --accept-license
-
-      - name: Install Cygwin extra packages
-        if: matrix.test-type == 'functional'
-        run: |
           cyg-get automake gcc-g++ make binutils
 
       - name: Cache CMake and Bazel installations

From 71ab243f80f860ad26a334e55961ed57a69e8887 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Wed, 16 Oct 2024 10:18:47 +0200
Subject: [PATCH 021/211] wip

---
 .github/workflows/win-tests.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 40377d188ea..60d2d95045e 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -76,8 +76,12 @@ jobs:
           choco install ninja --version 1.10.2 -y --accept-license
           choco install mingw -y --accept-license
           choco install visualstudio2017community --package-parameters "--allWorkloads --includeRecommended --includeOptional --passive --locale en-US" -y --accept-license
-          choco install cyg-get -y --accept-license
-          cyg-get automake gcc-g++ make binutils
+          choco install cyg-get -y --accept-license --force
+
+      - name: Install Cygwin extra packages
+        if: matrix.test-type == 'functional'
+        run: |
+          cyg-get default automake gcc-g++ make binutils
 
       - name: Cache CMake and Bazel installations
         if: matrix.test-type == 'functional'

From 83ebcaa2366cdf216b7639ed7bc38f66e606afbe Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Wed, 16 Oct 2024 10:19:12 +0200
Subject: [PATCH 022/211] wip

---
 .github/workflows/win-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 60d2d95045e..49b9313049c 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -154,5 +154,5 @@ jobs:
           } elseif ($matrixTestType -eq "integration") {
               Write-Host "pytest test/integration --durations=20"
           } elseif ($matrixTestType -eq "functional") {
-              pytest test/functional --durations=20
+              Write-Host "pytest test/functional --durations=20"
           }

From 2f1bd2adacb8cb2eef38b7ddc401784dde893727 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Wed, 16 Oct 2024 10:36:06 +0200
Subject: [PATCH 023/211] wip

---
 .github/workflows/win-tests.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 49b9313049c..b79f1339281 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -75,7 +75,8 @@ jobs:
           choco install pkgconfiglite --version 0.28 -y --accept-license
           choco install ninja --version 1.10.2 -y --accept-license
           choco install mingw -y --accept-license
-          choco install visualstudio2017community --package-parameters "--allWorkloads --includeRecommended --includeOptional --passive --locale en-US" -y --accept-license
+          choco install visualstudio2017community -y --accept-license --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.VC.v141.x86.x64 --add Microsoft.VisualStudio.Component.VC.v141.ATL --add Microsoft.VisualStudio.Component.VC.v141.ATLMFC
+          choco install cygwin
           choco install cyg-get -y --accept-license --force
 
       - name: Install Cygwin extra packages

From 169a095d6f22517d46deb96b455efd4888aa489b Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Wed, 16 Oct 2024 10:36:30 +0200
Subject: [PATCH 024/211] wip

---
 .github/workflows/win-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index b79f1339281..76eaaddccc7 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -76,7 +76,7 @@ jobs:
           choco install ninja --version 1.10.2 -y --accept-license
           choco install mingw -y --accept-license
           choco install visualstudio2017community -y --accept-license --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.VC.v141.x86.x64 --add Microsoft.VisualStudio.Component.VC.v141.ATL --add Microsoft.VisualStudio.Component.VC.v141.ATLMFC
-          choco install cygwin
+          choco install cygwin -y --accept-license
           choco install cyg-get -y --accept-license --force
 
       - name: Install Cygwin extra packages

From 83dd15a14a6dbe5ae946563db07775243f03bb4e Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Wed, 16 Oct 2024 10:50:03 +0200
Subject: [PATCH 025/211] wip

---
 .github/workflows/win-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 76eaaddccc7..c010fba2e0b 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -75,7 +75,7 @@ jobs:
           choco install pkgconfiglite --version 0.28 -y --accept-license
           choco install ninja --version 1.10.2 -y --accept-license
           choco install mingw -y --accept-license
-          choco install visualstudio2017community -y --accept-license --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.VC.v141.x86.x64 --add Microsoft.VisualStudio.Component.VC.v141.ATL --add Microsoft.VisualStudio.Component.VC.v141.ATLMFC
+          choco install visualstudio2017community -y --accept-license --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.VC.v141.x86.x64 --add Microsoft.VisualStudio.Component.VC.v141.ATL --add Microsoft.VisualStudio.Component.VC.v141.ATLMFC --force
           choco install cygwin -y --accept-license
           choco install cyg-get -y --accept-license --force
 

From d85ecebc33d5006ba96bbeaee66e52f4916f2d74 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Wed, 16 Oct 2024 11:16:17 +0200
Subject: [PATCH 026/211] wip

---
 .github/workflows/win-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index c010fba2e0b..d856c2943f3 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Cache pip packages
         uses: actions/cache@v4
         with:
-          path: C:\Users\${{ runner.user }}\AppData\Local\pip\Cache
+          path: C:\Users\runneradmin\AppData\Local\pip\Cache
           key: pip-packages-${{ runner.os }}-${{ hashFiles('conans/requirements*.txt') }}
           restore-keys: |
             pip-packages-${{ runner.os }}-

From d72114af6b234f2708b17bb03bdb37b7ca0ad680 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Wed, 16 Oct 2024 11:30:48 +0200
Subject: [PATCH 027/211] wip

---
 .github/workflows/win-tests.yml | 40 ++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index d856c2943f3..17776132796 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -38,28 +38,28 @@ jobs:
       - name: Cache pip packages
         uses: actions/cache@v4
         with:
-          path: C:\Users\runneradmin\AppData\Local\pip\Cache
+          path: C:\Users\runneradmin\AppData\Local\pip\cache
           key: pip-packages-${{ runner.os }}-${{ hashFiles('conans/requirements*.txt') }}
           restore-keys: |
             pip-packages-${{ runner.os }}-
 
-      - name: Cache Chocolatey packages
-        if: matrix.test-type == 'functional'
-        uses: actions/cache@v4
-        with:
-          path: C:\ProgramData\chocolatey\lib
-          key: chocolatey-packages-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            chocolatey-packages-${{ runner.os }}-
-
-      - name: Cache Cygwin packages
-        if: matrix.test-type == 'functional'
-        uses: actions/cache@v4
-        with:
-          path: C:\cygwin64\etc\setup
-          key: cygwin-packages-${{ runner.os }}-${{ hashFiles('installed.db') }}
-          restore-keys: |
-            cygwin-packages-${{ runner.os }}-
+#      - name: Cache Chocolatey packages
+#        if: matrix.test-type == 'functional'
+#        uses: actions/cache@v4
+#        with:
+#          path: C:\ProgramData\chocolatey\lib
+#          key: chocolatey-packages-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+#          restore-keys: |
+#            chocolatey-packages-${{ runner.os }}-
+#
+#      - name: Cache Cygwin packages
+#        if: matrix.test-type == 'functional'
+#        uses: actions/cache@v4
+#        with:
+#          path: C:\cygwin64\etc\setup
+#          key: cygwin-packages-${{ runner.os }}-${{ hashFiles('installed.db') }}
+#          restore-keys: |
+#            cygwin-packages-${{ runner.os }}-
 
       - name: Install Python requirements
         run: |
@@ -75,9 +75,9 @@ jobs:
           choco install pkgconfiglite --version 0.28 -y --accept-license
           choco install ninja --version 1.10.2 -y --accept-license
           choco install mingw -y --accept-license
-          choco install visualstudio2017community -y --accept-license --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.VC.v141.x86.x64 --add Microsoft.VisualStudio.Component.VC.v141.ATL --add Microsoft.VisualStudio.Component.VC.v141.ATLMFC --force
+          choco install visualstudio2017community -y --accept-license --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.VC.v141.x86.x64 --add Microsoft.VisualStudio.Component.VC.v141.ATL --add Microsoft.VisualStudio.Component.VC.v141.ATLMFC
           choco install cygwin -y --accept-license
-          choco install cyg-get -y --accept-license --force
+          choco install cyg-get -y --accept-license
 
       - name: Install Cygwin extra packages
         if: matrix.test-type == 'functional'

From 9e3e6e58a3ee90262913f2673f6489a12c54a497 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Wed, 16 Oct 2024 11:39:01 +0200
Subject: [PATCH 028/211] wip

---
 .github/workflows/win-tests.yml | 46 ++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 17776132796..cf82aa13470 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -43,23 +43,23 @@ jobs:
           restore-keys: |
             pip-packages-${{ runner.os }}-
 
-#      - name: Cache Chocolatey packages
-#        if: matrix.test-type == 'functional'
-#        uses: actions/cache@v4
-#        with:
-#          path: C:\ProgramData\chocolatey\lib
-#          key: chocolatey-packages-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
-#          restore-keys: |
-#            chocolatey-packages-${{ runner.os }}-
-#
-#      - name: Cache Cygwin packages
-#        if: matrix.test-type == 'functional'
-#        uses: actions/cache@v4
-#        with:
-#          path: C:\cygwin64\etc\setup
-#          key: cygwin-packages-${{ runner.os }}-${{ hashFiles('installed.db') }}
-#          restore-keys: |
-#            cygwin-packages-${{ runner.os }}-
+      - name: Cache Chocolatey packages
+        if: matrix.test-type == 'functional'
+        uses: actions/cache@v4
+        with:
+          path: C:\ProgramData\chocolatey\lib
+          key: chocolatey-packages-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            chocolatey-packages-${{ runner.os }}-
+
+      - name: Cache Cygwin packages
+        if: matrix.test-type == 'functional'
+        uses: actions/cache@v4
+        with:
+          path: C:\tools\cygwin\etc\setup
+          key: cygwin-packages-${{ runner.os }}-${{ hashFiles('installed.db') }}
+          restore-keys: |
+            cygwin-packages-${{ runner.os }}-
 
       - name: Install Python requirements
         run: |
@@ -72,12 +72,12 @@ jobs:
       - name: Install Chocolatey packages
         if: matrix.test-type == 'functional'
         run: |
-          choco install pkgconfiglite --version 0.28 -y --accept-license
-          choco install ninja --version 1.10.2 -y --accept-license
-          choco install mingw -y --accept-license
-          choco install visualstudio2017community -y --accept-license --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.VC.v141.x86.x64 --add Microsoft.VisualStudio.Component.VC.v141.ATL --add Microsoft.VisualStudio.Component.VC.v141.ATLMFC
-          choco install cygwin -y --accept-license
-          choco install cyg-get -y --accept-license
+          choco install pkgconfiglite --version 0.28
+          choco install ninja --version 1.10.2
+          choco install mingw
+          choco install visualstudio2017community --package-parameters '--allWorkloads --includeRecommended --includeOptional --passive --locale en-US'
+          choco install cygwin
+          choco install cyg-get
 
       - name: Install Cygwin extra packages
         if: matrix.test-type == 'functional'

From 541a0e5319b92264b876a1feec82f2f63ea2b587 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Wed, 16 Oct 2024 12:40:24 +0200
Subject: [PATCH 029/211] wip

---
 .github/workflows/win-tests.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index cf82aa13470..93b01896e73 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -48,7 +48,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: C:\ProgramData\chocolatey\lib
-          key: chocolatey-packages-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+          key: chocolatey-packages-${{ runner.os }}-${{ hashFiles('**/*.nuspec') }}
           restore-keys: |
             chocolatey-packages-${{ runner.os }}-
 
@@ -75,9 +75,10 @@ jobs:
           choco install pkgconfiglite --version 0.28
           choco install ninja --version 1.10.2
           choco install mingw
-          choco install visualstudio2017community --package-parameters '--allWorkloads --includeRecommended --includeOptional --passive --locale en-US'
+          choco install visualstudio2017community
+          choco install visualstudio2017-workload-nativedesktop
           choco install cygwin
-          choco install cyg-get
+          choco install cyg-get --force
 
       - name: Install Cygwin extra packages
         if: matrix.test-type == 'functional'

From 5e873fdbaa58235ea110f70cf769d98dceb89538 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Wed, 16 Oct 2024 12:56:02 +0200
Subject: [PATCH 030/211] wip

---
 .github/workflows/win-tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 93b01896e73..aada3655bd8 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -48,7 +48,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: C:\ProgramData\chocolatey\lib
-          key: chocolatey-packages-${{ runner.os }}-${{ hashFiles('**/*.nuspec') }}
+          key: chocolatey-packages-${{ runner.os }}-${{ hashFiles('*/*.nuspec') }}
           restore-keys: |
             chocolatey-packages-${{ runner.os }}-
 
@@ -75,7 +75,7 @@ jobs:
           choco install pkgconfiglite --version 0.28
           choco install ninja --version 1.10.2
           choco install mingw
-          choco install visualstudio2017community
+          choco install visualstudio2017community --force
           choco install visualstudio2017-workload-nativedesktop
           choco install cygwin
           choco install cyg-get --force

From ad18d43fe04782970bdfa21a6eefb82fb76bed57 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Wed, 16 Oct 2024 13:02:40 +0200
Subject: [PATCH 031/211] wip

---
 .github/workflows/win-tests.yml | 36 ++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index aada3655bd8..cf97137b0e6 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -43,23 +43,23 @@ jobs:
           restore-keys: |
             pip-packages-${{ runner.os }}-
 
-      - name: Cache Chocolatey packages
-        if: matrix.test-type == 'functional'
-        uses: actions/cache@v4
-        with:
-          path: C:\ProgramData\chocolatey\lib
-          key: chocolatey-packages-${{ runner.os }}-${{ hashFiles('*/*.nuspec') }}
-          restore-keys: |
-            chocolatey-packages-${{ runner.os }}-
-
-      - name: Cache Cygwin packages
-        if: matrix.test-type == 'functional'
-        uses: actions/cache@v4
-        with:
-          path: C:\tools\cygwin\etc\setup
-          key: cygwin-packages-${{ runner.os }}-${{ hashFiles('installed.db') }}
-          restore-keys: |
-            cygwin-packages-${{ runner.os }}-
+#      - name: Cache Chocolatey packages
+#        if: matrix.test-type == 'functional'
+#        uses: actions/cache@v4
+#        with:
+#          path: C:\ProgramData\chocolatey\lib
+#          key: chocolatey-packages-${{ runner.os }}-${{ hashFiles('*/*.nuspec') }}
+#          restore-keys: |
+#            chocolatey-packages-${{ runner.os }}-
+#
+#      - name: Cache Cygwin packages
+#        if: matrix.test-type == 'functional'
+#        uses: actions/cache@v4
+#        with:
+#          path: C:\tools\cygwin\etc\setup
+#          key: cygwin-packages-${{ runner.os }}-${{ hashFiles('installed.db') }}
+#          restore-keys: |
+#            cygwin-packages-${{ runner.os }}-
 
       - name: Install Python requirements
         run: |
@@ -75,7 +75,7 @@ jobs:
           choco install pkgconfiglite --version 0.28
           choco install ninja --version 1.10.2
           choco install mingw
-          choco install visualstudio2017community --force
+          choco install visualstudio2017community
           choco install visualstudio2017-workload-nativedesktop
           choco install cygwin
           choco install cyg-get --force

From 9ff75f35fd28abf7941a756166e1907a15b82fb7 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Wed, 16 Oct 2024 15:05:34 +0200
Subject: [PATCH 032/211] wip

---
 .github/workflows/win-tests.yml | 37 ++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index cf97137b0e6..cafc967fec8 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -43,23 +43,25 @@ jobs:
           restore-keys: |
             pip-packages-${{ runner.os }}-
 
-#      - name: Cache Chocolatey packages
-#        if: matrix.test-type == 'functional'
-#        uses: actions/cache@v4
-#        with:
-#          path: C:\ProgramData\chocolatey\lib
-#          key: chocolatey-packages-${{ runner.os }}-${{ hashFiles('*/*.nuspec') }}
-#          restore-keys: |
-#            chocolatey-packages-${{ runner.os }}-
-#
-#      - name: Cache Cygwin packages
-#        if: matrix.test-type == 'functional'
-#        uses: actions/cache@v4
-#        with:
-#          path: C:\tools\cygwin\etc\setup
-#          key: cygwin-packages-${{ runner.os }}-${{ hashFiles('installed.db') }}
-#          restore-keys: |
-#            cygwin-packages-${{ runner.os }}-
+      - name: Cache Chocolatey packages
+        if: matrix.test-type == 'functional'
+        uses: actions/cache@v4
+        with:
+          path: |
+            C:\ProgramData\chocolatey\lib
+            C:\ProgramData\chocolatey\bin
+          key: chocolatey-packages-${{ runner.os }}-${{ hashFiles('choco_installed_packages.lock') }}
+          restore-keys: |
+            chocolatey-packages-${{ runner.os }}-
+
+      - name: Cache Cygwin packages
+        if: matrix.test-type == 'functional'
+        uses: actions/cache@v4
+        with:
+          path: C:\tools\cygwin\bin
+          key: cygwin-packages-${{ runner.os }}-${{ hashFiles('C:\tools\cygwin\etc\setup\installed.db') }}
+          restore-keys: |
+            cygwin-packages-${{ runner.os }}-
 
       - name: Install Python requirements
         run: |
@@ -79,6 +81,7 @@ jobs:
           choco install visualstudio2017-workload-nativedesktop
           choco install cygwin
           choco install cyg-get --force
+          choco list > choco_installed_packages.lock
 
       - name: Install Cygwin extra packages
         if: matrix.test-type == 'functional'

From 42e733703fcb2750efecee89de82d932669decf7 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Wed, 16 Oct 2024 15:35:41 +0200
Subject: [PATCH 033/211] wip

---
 .github/workflows/win-tests.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index cafc967fec8..65842c5aa9a 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -59,7 +59,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: C:\tools\cygwin\bin
-          key: cygwin-packages-${{ runner.os }}-${{ hashFiles('C:\tools\cygwin\etc\setup\installed.db') }}
+          key: cygwin-packages-${{ runner.os }}-${{ hashFiles('cygwin-installed-packages.lock') }}
           restore-keys: |
             cygwin-packages-${{ runner.os }}-
 
@@ -87,6 +87,7 @@ jobs:
         if: matrix.test-type == 'functional'
         run: |
           cyg-get default automake gcc-g++ make binutils
+          Copy-Item "C:\tools\cygwin\etc\setup\installed.db" -Destination "cygwin-installed-packages.lock"
 
       - name: Cache CMake and Bazel installations
         if: matrix.test-type == 'functional'

From 165b8af492234029fcafcf19fee7a8d52c612d20 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Wed, 16 Oct 2024 15:57:44 +0200
Subject: [PATCH 034/211] wip

---
 .github/workflows/win-tests.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 65842c5aa9a..ef41cb8f857 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -48,8 +48,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: |
-            C:\ProgramData\chocolatey\lib
-            C:\ProgramData\chocolatey\bin
+            C:\ProgramData\chocolatey\.chocolatey
           key: chocolatey-packages-${{ runner.os }}-${{ hashFiles('choco_installed_packages.lock') }}
           restore-keys: |
             chocolatey-packages-${{ runner.os }}-
@@ -59,7 +58,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: C:\tools\cygwin\bin
-          key: cygwin-packages-${{ runner.os }}-${{ hashFiles('cygwin-installed-packages.lock') }}
+          key: cygwin-packages-${{ runner.os }}-${{ hashFiles('C:\tools\cygwin\etc\setup\installed.db') }}
           restore-keys: |
             cygwin-packages-${{ runner.os }}-
 
@@ -87,7 +86,6 @@ jobs:
         if: matrix.test-type == 'functional'
         run: |
           cyg-get default automake gcc-g++ make binutils
-          Copy-Item "C:\tools\cygwin\etc\setup\installed.db" -Destination "cygwin-installed-packages.lock"
 
       - name: Cache CMake and Bazel installations
         if: matrix.test-type == 'functional'

From a54ef9b8792c8fb156316dcc955f2c1c7fba6b8a Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Wed, 16 Oct 2024 16:05:38 +0200
Subject: [PATCH 035/211] wip

---
 .github/workflows/win-tests.yml | 42 ++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index ef41cb8f857..01e55df2315 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -43,24 +43,24 @@ jobs:
           restore-keys: |
             pip-packages-${{ runner.os }}-
 
-      - name: Cache Chocolatey packages
-        if: matrix.test-type == 'functional'
-        uses: actions/cache@v4
-        with:
-          path: |
-            C:\ProgramData\chocolatey\.chocolatey
-          key: chocolatey-packages-${{ runner.os }}-${{ hashFiles('choco_installed_packages.lock') }}
-          restore-keys: |
-            chocolatey-packages-${{ runner.os }}-
-
-      - name: Cache Cygwin packages
-        if: matrix.test-type == 'functional'
-        uses: actions/cache@v4
-        with:
-          path: C:\tools\cygwin\bin
-          key: cygwin-packages-${{ runner.os }}-${{ hashFiles('C:\tools\cygwin\etc\setup\installed.db') }}
-          restore-keys: |
-            cygwin-packages-${{ runner.os }}-
+#      - name: Cache Chocolatey packages
+#        if: matrix.test-type == 'functional'
+#        uses: actions/cache@v4
+#        with:
+#          path: |
+#            C:\ProgramData\chocolatey\.chocolatey
+#          key: chocolatey-packages-${{ runner.os }}-${{ hashFiles('choco_installed_packages.lock') }}
+#          restore-keys: |
+#            chocolatey-packages-${{ runner.os }}-
+#
+#      - name: Cache Cygwin packages
+#        if: matrix.test-type == 'functional'
+#        uses: actions/cache@v4
+#        with:
+#          path: C:\tools\cygwin\bin
+#          key: cygwin-packages-${{ runner.os }}-${{ hashFiles('C:\tools\cygwin\etc\setup\installed.db') }}
+#          restore-keys: |
+#            cygwin-packages-${{ runner.os }}-
 
       - name: Install Python requirements
         run: |
@@ -79,8 +79,8 @@ jobs:
           choco install visualstudio2017community
           choco install visualstudio2017-workload-nativedesktop
           choco install cygwin
-          choco install cyg-get --force
-          choco list > choco_installed_packages.lock
+          choco install cyg-get
+#          choco list > choco_installed_packages.lock
 
       - name: Install Cygwin extra packages
         if: matrix.test-type == 'functional'
@@ -158,5 +158,5 @@ jobs:
           } elseif ($matrixTestType -eq "integration") {
               Write-Host "pytest test/integration --durations=20"
           } elseif ($matrixTestType -eq "functional") {
-              Write-Host "pytest test/functional --durations=20"
+              pytest test/functional --durations=20
           }

From 667349ffe3bdf46dfd834985ae88abfbe92f8c75 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Thu, 17 Oct 2024 07:48:10 +0200
Subject: [PATCH 036/211] wip

---
 .github/workflows/win-tests.yml | 52 ++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 01e55df2315..e861a532fe3 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -43,24 +43,28 @@ jobs:
           restore-keys: |
             pip-packages-${{ runner.os }}-
 
-#      - name: Cache Chocolatey packages
-#        if: matrix.test-type == 'functional'
-#        uses: actions/cache@v4
-#        with:
-#          path: |
-#            C:\ProgramData\chocolatey\.chocolatey
-#          key: chocolatey-packages-${{ runner.os }}-${{ hashFiles('choco_installed_packages.lock') }}
-#          restore-keys: |
-#            chocolatey-packages-${{ runner.os }}-
-#
-#      - name: Cache Cygwin packages
-#        if: matrix.test-type == 'functional'
-#        uses: actions/cache@v4
-#        with:
-#          path: C:\tools\cygwin\bin
-#          key: cygwin-packages-${{ runner.os }}-${{ hashFiles('C:\tools\cygwin\etc\setup\installed.db') }}
-#          restore-keys: |
-#            cygwin-packages-${{ runner.os }}-
+      - name: Cache Chocolatey packages
+        if: matrix.test-type == 'functional'
+        uses: actions/cache@v4
+        with:
+          path: |
+            C:\ProgramData\chocolatey\.chocolatey
+            C:\ProgramData\chocolatey\extensions
+            C:\ProgramData\chocolatey\lib
+            C:\ProgramData\chocolatey\bin
+            'C:\Program Files (x86)\Microsoft Visual Studio\2017'
+          key: chocolatey-packages-${{ runner.os }}-${{ hashFiles('choco_installed_packages.lock') }}
+          restore-keys: |
+            chocolatey-packages-${{ runner.os }}-
+
+      - name: Cache Cygwin packages
+        if: matrix.test-type == 'functional'
+        uses: actions/cache@v4
+        with:
+          path: C:\tools\cygwin\bin
+          key: cygwin-packages-${{ runner.os }}-${{ hashFiles('C:\tools\cygwin\etc\setup\installed.db') }}
+          restore-keys: |
+            cygwin-packages-${{ runner.os }}-
 
       - name: Install Python requirements
         run: |
@@ -79,8 +83,8 @@ jobs:
           choco install visualstudio2017community
           choco install visualstudio2017-workload-nativedesktop
           choco install cygwin
-          choco install cyg-get
-#          choco list > choco_installed_packages.lock
+          choco install cyg-get --force
+          choco list > choco_installed_packages.lock
 
       - name: Install Cygwin extra packages
         if: matrix.test-type == 'functional'
@@ -152,11 +156,13 @@ jobs:
           }
       - name: Run Tests
         run: |
+          $NUM_CPUS = (Get-CimInstance -ClassName Win32_Processor | Measure-Object -Property NumberOfCores -Sum).Sum
+          Write-Host "Number of CPUs available: $NUM_CPUS"
           $matrixTestType = "${{ matrix.test-type }}"
           if ($matrixTestType -eq "unittests") {
-              Write-Host "pytest test/unittests --durations=20"
+              Write-Host "pytest test/unittests --durations=20 -n $NUM_CPUS"
           } elseif ($matrixTestType -eq "integration") {
-              Write-Host "pytest test/integration --durations=20"
+              Write-Host "pytest test/integration --durations=20 -n $NUM_CPUS"
           } elseif ($matrixTestType -eq "functional") {
-              pytest test/functional --durations=20
+              pytest test/functional --durations=20 -n $NUM_CPUS
           }

From 8f7d2fb94286b6910ed411649ff6fdf3f042a4b8 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Thu, 17 Oct 2024 10:15:49 +0200
Subject: [PATCH 037/211] wip

---
 .github/workflows/win-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index e861a532fe3..b17c1fdaa7c 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -164,5 +164,5 @@ jobs:
           } elseif ($matrixTestType -eq "integration") {
               Write-Host "pytest test/integration --durations=20 -n $NUM_CPUS"
           } elseif ($matrixTestType -eq "functional") {
-              pytest test/functional --durations=20 -n $NUM_CPUS
+              Write-Host "pytest test/functional --durations=20 -n $NUM_CPUS"
           }

From dabf1e81381ec2399f4168694fb59d648c9d0747 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Thu, 17 Oct 2024 10:59:39 +0200
Subject: [PATCH 038/211] wip

---
 .github/workflows/win-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index b17c1fdaa7c..e861a532fe3 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -164,5 +164,5 @@ jobs:
           } elseif ($matrixTestType -eq "integration") {
               Write-Host "pytest test/integration --durations=20 -n $NUM_CPUS"
           } elseif ($matrixTestType -eq "functional") {
-              Write-Host "pytest test/functional --durations=20 -n $NUM_CPUS"
+              pytest test/functional --durations=20 -n $NUM_CPUS
           }

From 5f9bce97f3f93cd374cb77cfcc5eaba1fa2860c0 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Thu, 17 Oct 2024 11:30:24 +0200
Subject: [PATCH 039/211] wip

---
 .github/workflows/win-tests.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index e861a532fe3..f6a4c9a111f 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -48,11 +48,11 @@ jobs:
         uses: actions/cache@v4
         with:
           path: |
-            C:\ProgramData\chocolatey\.chocolatey
             C:\ProgramData\chocolatey\extensions
             C:\ProgramData\chocolatey\lib
             C:\ProgramData\chocolatey\bin
-            'C:\Program Files (x86)\Microsoft Visual Studio\2017'
+            C:\Users\runneradmin\AppData\Local\Temp\chocolatey
+            C:\Program Files (x86)\Microsoft Visual Studio
           key: chocolatey-packages-${{ runner.os }}-${{ hashFiles('choco_installed_packages.lock') }}
           restore-keys: |
             chocolatey-packages-${{ runner.os }}-
@@ -164,5 +164,5 @@ jobs:
           } elseif ($matrixTestType -eq "integration") {
               Write-Host "pytest test/integration --durations=20 -n $NUM_CPUS"
           } elseif ($matrixTestType -eq "functional") {
-              pytest test/functional --durations=20 -n $NUM_CPUS
+              Write-Host "pytest test/functional --durations=20 -n $NUM_CPUS"
           }

From 1250cfd05d348b071cbb566df55ee30bc71718bb Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Thu, 17 Oct 2024 14:23:19 +0200
Subject: [PATCH 040/211] wip

---
 .github/workflows/win-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index f6a4c9a111f..dfe36c0af68 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -164,5 +164,5 @@ jobs:
           } elseif ($matrixTestType -eq "integration") {
               Write-Host "pytest test/integration --durations=20 -n $NUM_CPUS"
           } elseif ($matrixTestType -eq "functional") {
-              Write-Host "pytest test/functional --durations=20 -n $NUM_CPUS"
+              pytest test/functional --durations=20 -n $NUM_CPUS
           }

From aa4a91fdea1474e6fd0be213f285f21d05220ccc Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Thu, 17 Oct 2024 14:37:48 +0200
Subject: [PATCH 041/211] wip

---
 .github/workflows/win-tests.yml | 36 +++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index dfe36c0af68..6851ab003b4 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -51,8 +51,6 @@ jobs:
             C:\ProgramData\chocolatey\extensions
             C:\ProgramData\chocolatey\lib
             C:\ProgramData\chocolatey\bin
-            C:\Users\runneradmin\AppData\Local\Temp\chocolatey
-            C:\Program Files (x86)\Microsoft Visual Studio
           key: chocolatey-packages-${{ runner.os }}-${{ hashFiles('choco_installed_packages.lock') }}
           restore-keys: |
             chocolatey-packages-${{ runner.os }}-
@@ -66,6 +64,15 @@ jobs:
           restore-keys: |
             cygwin-packages-${{ runner.os }}-
 
+      - name: Cache Visual Studio 17 folder
+        if: matrix.test-type == 'functional'
+        uses: actions/cache@v4
+        with:
+          path: 'C:\Program Files (x86)\Microsoft Visual Studio\2017'
+          key: ${{ runner.os }}-vs17-cache
+          restore-keys: |
+            ${{ runner.os }}-vs17-cache
+
       - name: Install Python requirements
         run: |
           pip install --upgrade pip
@@ -80,10 +87,8 @@ jobs:
           choco install pkgconfiglite --version 0.28
           choco install ninja --version 1.10.2
           choco install mingw
-          choco install visualstudio2017community
-          choco install visualstudio2017-workload-nativedesktop
           choco install cygwin
-          choco install cyg-get --force
+          choco install cyg-get
           choco list > choco_installed_packages.lock
 
       - name: Install Cygwin extra packages
@@ -91,6 +96,25 @@ jobs:
         run: |
           cyg-get default automake gcc-g++ make binutils
 
+      - name: Install VS 17 Community edition
+        run: |
+          Invoke-WebRequest -Uri 'https://aka.ms/vs/17/release/vs_community.exe' -OutFile 'vs_installer.exe'
+          ./vs_installer.exe --quiet --wait --norestart --nocache \
+            --add Microsoft.VisualStudio.Workload.VCTools \
+            --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 \
+            --add Microsoft.VisualStudio.Component.Windows10SDK.19041 \
+            --add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core \
+            --add Microsoft.Component.MSBuild \
+            --add Microsoft.VisualStudio.Component.VC.CMake.Project
+
+      - name: Verify MSBuild
+        if: matrix.test-type == 'functional'
+        run: |
+          msbuild -version
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+
       - name: Cache CMake and Bazel installations
         if: matrix.test-type == 'functional'
         id: cache-tools
@@ -164,5 +188,5 @@ jobs:
           } elseif ($matrixTestType -eq "integration") {
               Write-Host "pytest test/integration --durations=20 -n $NUM_CPUS"
           } elseif ($matrixTestType -eq "functional") {
-              pytest test/functional --durations=20 -n $NUM_CPUS
+              Write-Host "pytest test/functional --durations=20 -n $NUM_CPUS"
           }

From c606cb44cfdaca3eb28f6579191aec91d6018882 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Thu, 17 Oct 2024 14:41:40 +0200
Subject: [PATCH 042/211] wip

---
 .github/workflows/win-tests.yml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 6851ab003b4..b1ca45602f8 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -48,7 +48,6 @@ jobs:
         uses: actions/cache@v4
         with:
           path: |
-            C:\ProgramData\chocolatey\extensions
             C:\ProgramData\chocolatey\lib
             C:\ProgramData\chocolatey\bin
           key: chocolatey-packages-${{ runner.os }}-${{ hashFiles('choco_installed_packages.lock') }}
@@ -97,15 +96,18 @@ jobs:
           cyg-get default automake gcc-g++ make binutils
 
       - name: Install VS 17 Community edition
+        if: matrix.test-type == 'functional'
         run: |
-          Invoke-WebRequest -Uri 'https://aka.ms/vs/17/release/vs_community.exe' -OutFile 'vs_installer.exe'
-          ./vs_installer.exe --quiet --wait --norestart --nocache \
-            --add Microsoft.VisualStudio.Workload.VCTools \
-            --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 \
-            --add Microsoft.VisualStudio.Component.Windows10SDK.19041 \
-            --add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core \
-            --add Microsoft.Component.MSBuild \
-            --add Microsoft.VisualStudio.Component.VC.CMake.Project
+          Invoke-WebRequest -Uri "https://aka.ms/vs/17/release/vs_community.exe" -OutFile "vs_installer.exe"
+          Start-Process -FilePath ".\vs_installer.exe" -ArgumentList `
+              "--quiet", "--wait", "--norestart", "--nocache", `
+              "--add", "Microsoft.VisualStudio.Workload.VCTools", `
+              "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
+              "--add", "Microsoft.VisualStudio.Component.Windows10SDK.19041", `
+              "--add", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", `
+              "--add", "Microsoft.Component.MSBuild", `
+              "--add", "Microsoft.VisualStudio.Component.VC.CMake.Project" `
+              -NoNewWindow -Wait
 
       - name: Verify MSBuild
         if: matrix.test-type == 'functional'

From 217a85d1874e73299a36cae5abe26ccea68deb17 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Thu, 17 Oct 2024 15:19:31 +0200
Subject: [PATCH 043/211] wip

---
 .github/workflows/win-tests.yml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index b1ca45602f8..f2652dacd1c 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -93,7 +93,7 @@ jobs:
       - name: Install Cygwin extra packages
         if: matrix.test-type == 'functional'
         run: |
-          cyg-get default automake gcc-g++ make binutils
+          C:\ProgramData\chocolatey\bin\cyg-get.bat default automake gcc-g++ make binutils
 
       - name: Install VS 17 Community edition
         if: matrix.test-type == 'functional'
@@ -109,14 +109,6 @@ jobs:
               "--add", "Microsoft.VisualStudio.Component.VC.CMake.Project" `
               -NoNewWindow -Wait
 
-      - name: Verify MSBuild
-        if: matrix.test-type == 'functional'
-        run: |
-          msbuild -version
-
-      - name: Checkout code
-        uses: actions/checkout@v4
-
       - name: Cache CMake and Bazel installations
         if: matrix.test-type == 'functional'
         id: cache-tools

From 8123a42b3075a5574e0fe09ea830d34b2b8cb6a9 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Thu, 17 Oct 2024 15:40:48 +0200
Subject: [PATCH 044/211] wip

---
 .github/workflows/win-tests.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index f2652dacd1c..60794324f88 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -48,8 +48,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: |
-            C:\ProgramData\chocolatey\lib
-            C:\ProgramData\chocolatey\bin
+            C:\ProgramData\chocolatey
           key: chocolatey-packages-${{ runner.os }}-${{ hashFiles('choco_installed_packages.lock') }}
           restore-keys: |
             chocolatey-packages-${{ runner.os }}-
@@ -58,12 +57,12 @@ jobs:
         if: matrix.test-type == 'functional'
         uses: actions/cache@v4
         with:
-          path: C:\tools\cygwin\bin
+          path: C:\tools\cygwin
           key: cygwin-packages-${{ runner.os }}-${{ hashFiles('C:\tools\cygwin\etc\setup\installed.db') }}
           restore-keys: |
             cygwin-packages-${{ runner.os }}-
 
-      - name: Cache Visual Studio 17 folder
+      - name: Cache Visual Studio 15 2017 folder
         if: matrix.test-type == 'functional'
         uses: actions/cache@v4
         with:
@@ -89,21 +88,22 @@ jobs:
           choco install cygwin
           choco install cyg-get
           choco list > choco_installed_packages.lock
+#          C:\ProgramData\chocolatey\bin\cyg-get.bat default automake gcc-g++ make binutils
 
       - name: Install Cygwin extra packages
         if: matrix.test-type == 'functional'
         run: |
           C:\ProgramData\chocolatey\bin\cyg-get.bat default automake gcc-g++ make binutils
 
-      - name: Install VS 17 Community edition
+      - name: Install VS 15 2017 Community edition
         if: matrix.test-type == 'functional'
         run: |
-          Invoke-WebRequest -Uri "https://aka.ms/vs/17/release/vs_community.exe" -OutFile "vs_installer.exe"
+          Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_community.exe" -OutFile "vs_installer.exe"
           Start-Process -FilePath ".\vs_installer.exe" -ArgumentList `
               "--quiet", "--wait", "--norestart", "--nocache", `
               "--add", "Microsoft.VisualStudio.Workload.VCTools", `
               "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
-              "--add", "Microsoft.VisualStudio.Component.Windows10SDK.19041", `
+              "--add", "Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop", `
               "--add", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", `
               "--add", "Microsoft.Component.MSBuild", `
               "--add", "Microsoft.VisualStudio.Component.VC.CMake.Project" `

From 1eae57966c73a9637b5a1e7fbe91ab15159ef6f3 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Thu, 17 Oct 2024 16:34:22 +0200
Subject: [PATCH 045/211] wip

---
 .github/workflows/win-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 60794324f88..a66edce5f3e 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -182,5 +182,5 @@ jobs:
           } elseif ($matrixTestType -eq "integration") {
               Write-Host "pytest test/integration --durations=20 -n $NUM_CPUS"
           } elseif ($matrixTestType -eq "functional") {
-              Write-Host "pytest test/functional --durations=20 -n $NUM_CPUS"
+              pytest test/functional --durations=20 -n $NUM_CPUS
           }

From 88a8d2bbd6e47b5480f7da6d8a9a2c11365f88c6 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Thu, 17 Oct 2024 16:41:03 +0200
Subject: [PATCH 046/211] wip

---
 .github/workflows/win-tests.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index a66edce5f3e..d5301985dd6 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -48,7 +48,9 @@ jobs:
         uses: actions/cache@v4
         with:
           path: |
-            C:\ProgramData\chocolatey
+            C:\ProgramData\chocolatey\lib
+            C:\ProgramData\chocolatey\bin
+            C:\ProgramData\chocolatey\extensions
           key: chocolatey-packages-${{ runner.os }}-${{ hashFiles('choco_installed_packages.lock') }}
           restore-keys: |
             chocolatey-packages-${{ runner.os }}-
@@ -86,7 +88,7 @@ jobs:
           choco install ninja --version 1.10.2
           choco install mingw
           choco install cygwin
-          choco install cyg-get
+          choco install cyg-get --force
           choco list > choco_installed_packages.lock
 #          C:\ProgramData\chocolatey\bin\cyg-get.bat default automake gcc-g++ make binutils
 

From 317fe325febd1e48b933a3be22dd0021c9c883f7 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Fri, 18 Oct 2024 08:53:52 +0200
Subject: [PATCH 047/211] wip

---
 .github/workflows/win-tests.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index d5301985dd6..c1e930edfbc 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -103,12 +103,10 @@ jobs:
           Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_community.exe" -OutFile "vs_installer.exe"
           Start-Process -FilePath ".\vs_installer.exe" -ArgumentList `
               "--quiet", "--wait", "--norestart", "--nocache", `
-              "--add", "Microsoft.VisualStudio.Workload.VCTools", `
               "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
-              "--add", "Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop", `
-              "--add", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", `
-              "--add", "Microsoft.Component.MSBuild", `
-              "--add", "Microsoft.VisualStudio.Component.VC.CMake.Project" `
+              "--add", "Microsoft.VisualStudio.Component.VC.v141.x86.x64", `
+              "--add", "Microsoft.VisualStudio.Component.VC.v141.ATL", `
+              "--add", "Microsoft.VisualStudio.Component.VC.v141.ATLMFC", `
               -NoNewWindow -Wait
 
       - name: Cache CMake and Bazel installations

From 1be3a405a884eaddc167b58800c26661723ab201 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Fri, 18 Oct 2024 08:54:21 +0200
Subject: [PATCH 048/211] wip

---
 .github/workflows/win-tests.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index c1e930edfbc..d8133f6c19f 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -64,15 +64,6 @@ jobs:
           restore-keys: |
             cygwin-packages-${{ runner.os }}-
 
-      - name: Cache Visual Studio 15 2017 folder
-        if: matrix.test-type == 'functional'
-        uses: actions/cache@v4
-        with:
-          path: 'C:\Program Files (x86)\Microsoft Visual Studio\2017'
-          key: ${{ runner.os }}-vs17-cache
-          restore-keys: |
-            ${{ runner.os }}-vs17-cache
-
       - name: Install Python requirements
         run: |
           pip install --upgrade pip

From 666f5c824a3b1b8880b2b9d571f8933cd2bd6bfd Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Fri, 18 Oct 2024 10:36:17 +0200
Subject: [PATCH 049/211] Trying full installation

---
 .github/workflows/win-tests.yml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index d8133f6c19f..884372d910d 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -93,12 +93,17 @@ jobs:
         run: |
           Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_community.exe" -OutFile "vs_installer.exe"
           Start-Process -FilePath ".\vs_installer.exe" -ArgumentList `
-              "--quiet", "--wait", "--norestart", "--nocache", `
-              "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
-              "--add", "Microsoft.VisualStudio.Component.VC.v141.x86.x64", `
-              "--add", "Microsoft.VisualStudio.Component.VC.v141.ATL", `
-              "--add", "Microsoft.VisualStudio.Component.VC.v141.ATLMFC", `
-              -NoNewWindow -Wait
+           "--quiet",  "--wait", "--norestart", "--nocache", `
+           "--add", "Microsoft.VisualStudio.Workload.VCTools", `
+           "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
+           "--add", "Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop", `
+           "--add", "Microsoft.VisualStudio.Component.Windows10SDK.17763", `
+           "--add", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", `
+           "--add", "Microsoft.Component.MSBuild", `
+           "--add", "Microsoft.VisualStudio.Component.VC.CMake.Project", `
+           "--add", "Microsoft.VisualStudio.Workload.NativeDesktop", `
+           "--add", "Microsoft.VisualStudio.Component.VC.CoreBuildTools", `
+           "--add", "Microsoft.VisualStudio.Component.VC.ATLMFC"
 
       - name: Cache CMake and Bazel installations
         if: matrix.test-type == 'functional'

From c37bfc215285823e2d96b0d6295293ce6ad0665e Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Fri, 18 Oct 2024 10:44:11 +0200
Subject: [PATCH 050/211] wip

---
 .github/workflows/win-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 884372d910d..e912841dc90 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -103,7 +103,7 @@ jobs:
            "--add", "Microsoft.VisualStudio.Component.VC.CMake.Project", `
            "--add", "Microsoft.VisualStudio.Workload.NativeDesktop", `
            "--add", "Microsoft.VisualStudio.Component.VC.CoreBuildTools", `
-           "--add", "Microsoft.VisualStudio.Component.VC.ATLMFC"
+           "--add", "Microsoft.VisualStudio.Component.VC.ATLMFC" -Wait
 
       - name: Cache CMake and Bazel installations
         if: matrix.test-type == 'functional'

From 9b24998036065b46a50366f30edf1f7cefd6552e Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Fri, 18 Oct 2024 12:21:57 +0200
Subject: [PATCH 051/211] wip

---
 .github/workflows/win-tests.yml | 16 +++++++++++++---
 test/conftest.py                |  1 -
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index e912841dc90..61e062673a9 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -21,7 +21,7 @@ jobs:
         python-version: ['3.9']
         test-type: [unittests, integration, functional]
 
-    runs-on: windows-2019
+    runs-on: windows-2022
 
     name: Conan (${{ matrix.test-type }}) (${{ matrix.python-version }})
 
@@ -64,6 +64,16 @@ jobs:
           restore-keys: |
             cygwin-packages-${{ runner.os }}-
 
+      - name: Cache VS 15 2017 Community edition
+        if: matrix.test-type == 'functional'
+        uses: actions/cache@v4
+        with:
+          path: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community'
+          key: vs15-community-${{ runner.os }}
+          restore-keys: |
+            vs15-community-${{ runner.os }}
+
+
       - name: Install Python requirements
         run: |
           pip install --upgrade pip
@@ -86,7 +96,7 @@ jobs:
       - name: Install Cygwin extra packages
         if: matrix.test-type == 'functional'
         run: |
-          C:\ProgramData\chocolatey\bin\cyg-get.bat default automake gcc-g++ make binutils
+          cyg-get automake gcc-g++ make binutils
 
       - name: Install VS 15 2017 Community edition
         if: matrix.test-type == 'functional'
@@ -178,5 +188,5 @@ jobs:
           } elseif ($matrixTestType -eq "integration") {
               Write-Host "pytest test/integration --durations=20 -n $NUM_CPUS"
           } elseif ($matrixTestType -eq "functional") {
-              pytest test/functional --durations=20 -n $NUM_CPUS
+              Write-Host "pytest test/functional --durations=20 -n $NUM_CPUS"
           }
diff --git a/test/conftest.py b/test/conftest.py
index 6c65c3719f8..947c3c4213a 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -50,7 +50,6 @@
     "clang": {"disabled": True},
     'visual_studio': {"default": "15",
                       "15": {},
-                      "16": {"disabled": True},
                       "17": {}},
     'pkg_config': {
         "exe": "pkg-config",

From b3d31c4f984cde2865da7aba55aece9422817cf7 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Fri, 18 Oct 2024 12:52:30 +0200
Subject: [PATCH 052/211] Running tests

---
 .github/workflows/win-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 61e062673a9..68f7b4bbf21 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -188,5 +188,5 @@ jobs:
           } elseif ($matrixTestType -eq "integration") {
               Write-Host "pytest test/integration --durations=20 -n $NUM_CPUS"
           } elseif ($matrixTestType -eq "functional") {
-              Write-Host "pytest test/functional --durations=20 -n $NUM_CPUS"
+              pytest test/functional --durations=20 -n $NUM_CPUS
           }

From 874505bfaa7eda0f867fef9cad1a6002a748659d Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Fri, 18 Oct 2024 14:09:39 +0200
Subject: [PATCH 053/211] Test

---
 .github/workflows/win-tests.yml | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 68f7b4bbf21..5c682d299c6 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -55,25 +55,6 @@ jobs:
           restore-keys: |
             chocolatey-packages-${{ runner.os }}-
 
-      - name: Cache Cygwin packages
-        if: matrix.test-type == 'functional'
-        uses: actions/cache@v4
-        with:
-          path: C:\tools\cygwin
-          key: cygwin-packages-${{ runner.os }}-${{ hashFiles('C:\tools\cygwin\etc\setup\installed.db') }}
-          restore-keys: |
-            cygwin-packages-${{ runner.os }}-
-
-      - name: Cache VS 15 2017 Community edition
-        if: matrix.test-type == 'functional'
-        uses: actions/cache@v4
-        with:
-          path: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community'
-          key: vs15-community-${{ runner.os }}
-          restore-keys: |
-            vs15-community-${{ runner.os }}
-
-
       - name: Install Python requirements
         run: |
           pip install --upgrade pip
@@ -88,7 +69,7 @@ jobs:
           choco install pkgconfiglite --version 0.28
           choco install ninja --version 1.10.2
           choco install mingw
-          choco install cygwin
+          choco install cygwin --force
           choco install cyg-get --force
           choco list > choco_installed_packages.lock
 #          C:\ProgramData\chocolatey\bin\cyg-get.bat default automake gcc-g++ make binutils

From d3ce40ffe41399f7b70dfa84e80e7a2a675937af Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Fri, 18 Oct 2024 17:47:32 +0200
Subject: [PATCH 054/211] Using pacman too

---
 .github/workflows/win-tests.yml | 19 +++++++++++++------
 test/conftest.py                |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 5c682d299c6..1bc3450ae2d 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -48,9 +48,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: |
-            C:\ProgramData\chocolatey\lib
-            C:\ProgramData\chocolatey\bin
-            C:\ProgramData\chocolatey\extensions
+            C:\Users\runneradmin\AppData\Local\Temp\chocolatey
           key: chocolatey-packages-${{ runner.os }}-${{ hashFiles('choco_installed_packages.lock') }}
           restore-keys: |
             chocolatey-packages-${{ runner.os }}-
@@ -69,16 +67,25 @@ jobs:
           choco install pkgconfiglite --version 0.28
           choco install ninja --version 1.10.2
           choco install mingw
-          choco install cygwin --force
-          choco install cyg-get --force
+          choco install cygwin
+          choco install cyg-get
           choco list > choco_installed_packages.lock
-#          C:\ProgramData\chocolatey\bin\cyg-get.bat default automake gcc-g++ make binutils
 
       - name: Install Cygwin extra packages
         if: matrix.test-type == 'functional'
         run: |
           cyg-get automake gcc-g++ make binutils
 
+      - name: Install Pacman extra packages
+        if: matrix.test-type == 'functional'
+        run: |
+          C:\msys64\usr\bin\pacman -Syuu --noconfirm
+          C:\msys64\usr\bin\pacman -S mingw-w64-x86_64-toolchain --noconfirm
+          C:\msys64\usr\bin\pacman -S mingw-w64-i686-toolchain --noconfirm
+          C:\msys64\usr\bin\pacman -S base-devel gcc --noconfirm
+          C:\msys64\usr\bin\pacman -S autoconf-wrapper --noconfirm
+          C:\msys64\usr\bin\pacman -S automake --noconfirm
+
       - name: Install VS 15 2017 Community edition
         if: matrix.test-type == 'functional'
         run: |
diff --git a/test/conftest.py b/test/conftest.py
index 947c3c4213a..9980b65f3a7 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -141,7 +141,7 @@
         "platform": "Windows",
         "default": "system",
         "exe": "make",
-        "system": {"path": {'Windows': "C:/tools/Cygwin/bin"}},
+        "system": {"path": {'Windows': "C:/tools/cygwin/bin"}},
     },
     'bazel': {
         "default": "6.3.2",

From 6e090738c2d39662fcf495f5318ef75c0d122934 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Fri, 18 Oct 2024 19:03:04 +0200
Subject: [PATCH 055/211] Caching everything

---
 .github/workflows/win-tests.yml | 53 +++++++++++++++++++++++++++++----
 1 file changed, 47 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 1bc3450ae2d..fc86616e6df 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -46,13 +46,53 @@ jobs:
       - name: Cache Chocolatey packages
         if: matrix.test-type == 'functional'
         uses: actions/cache@v4
+        id: choco-packages
         with:
           path: |
-            C:\Users\runneradmin\AppData\Local\Temp\chocolatey
+            C:\ProgramData\chocolatey\lib
+            C:\ProgramData\chocolatey\bin
+            C:\ProgramData\chocolatey\extensions
+            C:\ProgramData\mingw64
           key: chocolatey-packages-${{ runner.os }}-${{ hashFiles('choco_installed_packages.lock') }}
           restore-keys: |
             chocolatey-packages-${{ runner.os }}-
 
+      - name: Cache VS 15 2017 packages
+        if: matrix.test-type == 'functional'
+        uses: actions/cache@v4
+        id: vs15
+        with:
+          path: C:\Program Files (x86)\Microsoft Visual Studio\2017
+          key: vs15-community-${{ runner.os }}
+          restore-keys: |
+            vs15-community-${{ runner.os }}
+
+      - name: Cache Cygwin packages
+        if: matrix.test-type == 'functional'
+        id: cygwin-tool
+        uses: actions/cache@v4
+        with:
+          path: C:\tools\cygwin\bin
+          key: cygwin-packages-${{ runner.os }}-${{ hashFiles('C:\tools\cygwin\etc\setup\installed.db') }}
+          restore-keys: |
+            cygwin-packages-${{ runner.os }}-
+
+      - name: Cache msys2 packages
+        if: matrix.test-type == 'functional'
+        id: msys2-tool
+        uses: actions/cache@v4
+        with:
+          path: |
+              C:/msys64/mingw32
+              C:/msys64/ucrt64
+              C:/msys64/mingw64
+              C:/msys64/usr
+              C:/msys64/clang64
+              C:/msys64/mingw64
+          key: msys2-packages-${{ runner.os }}-${{ hashFiles('msys-installed-packages.lock') }}
+          restore-keys: |
+            msys2-packages-${{ runner.os }}-
+
       - name: Install Python requirements
         run: |
           pip install --upgrade pip
@@ -62,7 +102,7 @@ jobs:
           pip install meson
 
       - name: Install Chocolatey packages
-        if: matrix.test-type == 'functional'
+        if: matrix.test-type == 'functional' && steps.choco-packages.outputs.cache-hit != 'true'
         run: |
           choco install pkgconfiglite --version 0.28
           choco install ninja --version 1.10.2
@@ -72,12 +112,12 @@ jobs:
           choco list > choco_installed_packages.lock
 
       - name: Install Cygwin extra packages
-        if: matrix.test-type == 'functional'
+        if: matrix.test-type == 'functional' && steps.cygwin-tool.outputs.cache-hit != 'true'
         run: |
           cyg-get automake gcc-g++ make binutils
 
       - name: Install Pacman extra packages
-        if: matrix.test-type == 'functional'
+        if: matrix.test-type == 'functional' && steps.msys2-tool.outputs.cache-hit != 'true'
         run: |
           C:\msys64\usr\bin\pacman -Syuu --noconfirm
           C:\msys64\usr\bin\pacman -S mingw-w64-x86_64-toolchain --noconfirm
@@ -85,9 +125,10 @@ jobs:
           C:\msys64\usr\bin\pacman -S base-devel gcc --noconfirm
           C:\msys64\usr\bin\pacman -S autoconf-wrapper --noconfirm
           C:\msys64\usr\bin\pacman -S automake --noconfirm
+          C:\msys64\usr\bin\pacman -Q > msys-installed-packages.lock
 
       - name: Install VS 15 2017 Community edition
-        if: matrix.test-type == 'functional'
+        if: matrix.test-type == 'functional' && steps.vs15.outputs.cache-hit != 'true'
         run: |
           Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_community.exe" -OutFile "vs_installer.exe"
           Start-Process -FilePath ".\vs_installer.exe" -ArgumentList `
@@ -176,5 +217,5 @@ jobs:
           } elseif ($matrixTestType -eq "integration") {
               Write-Host "pytest test/integration --durations=20 -n $NUM_CPUS"
           } elseif ($matrixTestType -eq "functional") {
-              pytest test/functional --durations=20 -n $NUM_CPUS
+              Write-Host "pytest test/functional --durations=20 -n $NUM_CPUS"
           }

From e37d7d24d6815a1eba35cae95d9d4b6570d88042 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Fri, 18 Oct 2024 19:49:58 +0200
Subject: [PATCH 056/211] wip

---
 .github/workflows/win-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index fc86616e6df..d891ed86dee 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -217,5 +217,5 @@ jobs:
           } elseif ($matrixTestType -eq "integration") {
               Write-Host "pytest test/integration --durations=20 -n $NUM_CPUS"
           } elseif ($matrixTestType -eq "functional") {
-              Write-Host "pytest test/functional --durations=20 -n $NUM_CPUS"
+              pytest test/functional --durations=20 -n $NUM_CPUS
           }

From 5acd9a16082ff4494b8a8d1826e6a2fd10f2f98f Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Mon, 21 Oct 2024 08:20:33 +0200
Subject: [PATCH 057/211] wip

---
 .github/workflows/win-tests.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index d891ed86dee..e070069f892 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -57,22 +57,22 @@ jobs:
           restore-keys: |
             chocolatey-packages-${{ runner.os }}-
 
-      - name: Cache VS 15 2017 packages
-        if: matrix.test-type == 'functional'
-        uses: actions/cache@v4
-        id: vs15
-        with:
-          path: C:\Program Files (x86)\Microsoft Visual Studio\2017
-          key: vs15-community-${{ runner.os }}
-          restore-keys: |
-            vs15-community-${{ runner.os }}
+#      - name: Cache VS 15 2017 packages
+#        if: matrix.test-type == 'functional'
+#        uses: actions/cache@v4
+#        id: vs15
+#        with:
+#          path: C:\Program Files (x86)\Microsoft Visual Studio\2017
+#          key: vs15-community-${{ runner.os }}
+#          restore-keys: |
+#            vs15-community-${{ runner.os }}
 
       - name: Cache Cygwin packages
         if: matrix.test-type == 'functional'
         id: cygwin-tool
         uses: actions/cache@v4
         with:
-          path: C:\tools\cygwin\bin
+          path: C:\tools\cygwin
           key: cygwin-packages-${{ runner.os }}-${{ hashFiles('C:\tools\cygwin\etc\setup\installed.db') }}
           restore-keys: |
             cygwin-packages-${{ runner.os }}-
@@ -128,7 +128,7 @@ jobs:
           C:\msys64\usr\bin\pacman -Q > msys-installed-packages.lock
 
       - name: Install VS 15 2017 Community edition
-        if: matrix.test-type == 'functional' && steps.vs15.outputs.cache-hit != 'true'
+        if: matrix.test-type == 'functional'
         run: |
           Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_community.exe" -OutFile "vs_installer.exe"
           Start-Process -FilePath ".\vs_installer.exe" -ArgumentList `

From 922f130bd071f639a3561d5849f4257c5cb893bb Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Mon, 21 Oct 2024 10:17:11 +0200
Subject: [PATCH 058/211] wip

---
 test/conftest.py                                       |  1 +
 .../toolchains/cmake/test_cmake_toolchain.py           | 10 +++++-----
 .../toolchains/microsoft/test_msbuildtoolchain.py      |  4 ++--
 test/integration/toolchains/microsoft/vcvars_test.py   |  4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/test/conftest.py b/test/conftest.py
index 9980b65f3a7..8f7a75c5ad8 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -50,6 +50,7 @@
     "clang": {"disabled": True},
     'visual_studio': {"default": "15",
                       "15": {},
+                      "16": {"disabled": True},
                       "17": {}},
     'pkg_config': {
         "exe": "pkg-config",
diff --git a/test/functional/toolchains/cmake/test_cmake_toolchain.py b/test/functional/toolchains/cmake/test_cmake_toolchain.py
index b3173091bb9..c8bf6aa6383 100644
--- a/test/functional/toolchains/cmake/test_cmake_toolchain.py
+++ b/test/functional/toolchains/cmake/test_cmake_toolchain.py
@@ -630,8 +630,8 @@ def test_cmake_toolchain_winsdk_version(self):
                  '${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")'
         client.save({"CMakeLists.txt": cmake})
         client.run("create . -s arch=x86_64 -s compiler.version=193 "
-                   "-c tools.microsoft:winsdk_version=8.1")
-        assert "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION = 8.1" in client.out
+                   "-c tools.microsoft:winsdk_version=17.11")
+        assert "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION = 17.11" in client.out
         assert "Conan toolchain: CMAKE_GENERATOR_PLATFORM=x64" in client.out
         assert "Conan toolchain: CMAKE_GENERATOR_PLATFORM=x64,version" not in client.out
 
@@ -648,10 +648,10 @@ def test_cmake_toolchain_winsdk_version2(self):
                  '${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")'
         client.save({"CMakeLists.txt": cmake})
         client.run("create . -s arch=x86_64 -s compiler.version=193 "
-                   "-c tools.microsoft:winsdk_version=8.1 "
+                   "-c tools.microsoft:winsdk_version=17.11 "
                    '-c tools.cmake.cmaketoolchain:generator="Visual Studio 17"')
-        assert "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION = 8.1" in client.out
-        assert "Conan toolchain: CMAKE_GENERATOR_PLATFORM=x64,version=8.1" in client.out
+        assert "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION = 17.11" in client.out
+        assert "Conan toolchain: CMAKE_GENERATOR_PLATFORM=x64,version=17.11" in client.out
 
 
 @pytest.mark.tool("cmake", "3.23")
diff --git a/test/functional/toolchains/microsoft/test_msbuildtoolchain.py b/test/functional/toolchains/microsoft/test_msbuildtoolchain.py
index 831c8c1f575..70b3bbf2ae1 100644
--- a/test/functional/toolchains/microsoft/test_msbuildtoolchain.py
+++ b/test/functional/toolchains/microsoft/test_msbuildtoolchain.py
@@ -44,7 +44,7 @@ def test_msbuildtoolchain_winsdk_version():
     client.run("new msbuild_lib -d name=hello -d version=0.1")
     #  conantoolchain.props is already imported in the msbuild_exe tempalte
     client.run("create . -s arch=x86_64 -s compiler.version=193 "
-               "-c tools.microsoft:winsdk_version=8.1")
+               "-c tools.microsoft:winsdk_version=17.11")
     # I have verified also opening VS IDE that the setting is correctly configured
     # because the test always run over vcvars that already activates it
-    assert "amd64 - winsdk_version=8.1 - vcvars_ver=14.3" in client.out
+    assert "amd64 - winsdk_version=17.11 - vcvars_ver=14.3" in client.out
diff --git a/test/integration/toolchains/microsoft/vcvars_test.py b/test/integration/toolchains/microsoft/vcvars_test.py
index dfa7ed92a04..a0c2b18bdc8 100644
--- a/test/integration/toolchains/microsoft/vcvars_test.py
+++ b/test/integration/toolchains/microsoft/vcvars_test.py
@@ -137,10 +137,10 @@ class TestConan(ConanFile):
     client.save({"conanfile.py": conanfile})
     client.run('install . -s os=Windows -s compiler=msvc -s compiler.version=193 '
                '-s compiler.cppstd=14 -s compiler.runtime=static '
-               '-c tools.microsoft:winsdk_version=8.1')
+               '-c tools.microsoft:winsdk_version=17.11')
 
     vcvars = client.load("conanvcvars.bat")
-    assert 'vcvarsall.bat"  amd64 8.1 -vcvars_ver=14.3' in vcvars
+    assert 'vcvarsall.bat"  amd64 17.11 -vcvars_ver=14.3' in vcvars
 
 
 @pytest.mark.skipif(platform.system() != "Windows", reason="Requires Windows")

From 34874b1263b1cb2031f611153669ab6c68c68eac Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Mon, 21 Oct 2024 12:03:26 +0200
Subject: [PATCH 059/211] wip

---
 .github/workflows/win-tests.yml               | 31 +++++++++----------
 test/conftest.py                              | 10 +++---
 .../layout/test_editable_msbuild.py           |  2 +-
 test/functional/subsystems_build_test.py      |  5 ---
 .../toolchains/cmake/test_cmake_toolchain.py  | 10 +++---
 .../microsoft/test_msbuildtoolchain.py        |  4 +--
 6 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index e070069f892..c9e2768d536 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -83,12 +83,12 @@ jobs:
         uses: actions/cache@v4
         with:
           path: |
-              C:/msys64/mingw32
-              C:/msys64/ucrt64
-              C:/msys64/mingw64
-              C:/msys64/usr
-              C:/msys64/clang64
-              C:/msys64/mingw64
+              C:\msys64\mingw32
+              C:\msys64\ucrt64
+              C:\msys64\mingw64
+              C:\msys64\usr
+              C:\msys64\clang64
+              C:\msys64\mingw64
           key: msys2-packages-${{ runner.os }}-${{ hashFiles('msys-installed-packages.lock') }}
           restore-keys: |
             msys2-packages-${{ runner.os }}-
@@ -135,8 +135,7 @@ jobs:
            "--quiet",  "--wait", "--norestart", "--nocache", `
            "--add", "Microsoft.VisualStudio.Workload.VCTools", `
            "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
-           "--add", "Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop", `
-           "--add", "Microsoft.VisualStudio.Component.Windows10SDK.17763", `
+           "--add", "Microsoft.VisualStudio.Component.Windows81SDK", `
            "--add", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", `
            "--add", "Microsoft.Component.MSBuild", `
            "--add", "Microsoft.VisualStudio.Component.VC.CMake.Project", `
@@ -150,11 +149,11 @@ jobs:
         uses: actions/cache@v4
         with:
           path: |
-            C:\Tools\CMake\3.15.7
-            C:\Tools\CMake\3.19.7
-            C:\Tools\CMake\3.23.5
-            C:\Tools\bazel\6.3.2
-            C:\Tools\bazel\7.1.2
+            C:\tools\cmake\3.15.7
+            C:\tools\cmake\3.19.7
+            C:\tools\cmake\3.23.5
+            C:\tools\bazel\6.3.2
+            C:\tools\bazel\7.1.2
           key: ${{ runner.os }}-conan-tools-cache
 
       - name: Build CMake old versions of CMake
@@ -163,7 +162,7 @@ jobs:
           $CMAKE_BUILD_VERSIONS = "3.15.7", "3.19.7"
           foreach ($version in $CMAKE_BUILD_VERSIONS) {
             Write-Host "Downloading CMake version $version for Windows..."
-            $destination = "C:\Tools\CMake\$version"
+            $destination = "C:\tools\cmake\$version"
             if (-not (Test-Path $destination)) {
                 New-Item -Path $destination -ItemType Directory
             }
@@ -179,7 +178,7 @@ jobs:
         run: |
           $CMAKE_BUILD_VERSIONS = "3.23.5"
           foreach ($version in $CMAKE_BUILD_VERSIONS) {
-            $destination = "C:\Tools\CMake\$version"
+            $destination = "C:\tools\cmake\$version"
             if (-not (Test-Path $destination)) {
                 New-Item -Path $destination -ItemType Directory
             }
@@ -196,7 +195,7 @@ jobs:
           $BAZEL_BUILD_VERSIONS = "6.3.2", "7.1.2"
           foreach ($version in $BAZEL_BUILD_VERSIONS) {
               Write-Host "Downloading Bazel version $version for Windows..."
-              $destination = "C:\Tools\bazel\$version"
+              $destination = "C:\tools\bazel\$version"
               if (-not (Test-Path $destination)) {
                   New-Item -Path $destination -ItemType Directory
               }
diff --git a/test/conftest.py b/test/conftest.py
index 8f7a75c5ad8..5bdb15bfd20 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -67,17 +67,17 @@
     'cmake': {
         "default": "3.15",
         "3.15": {
-            "path": {'Windows': 'C:/Tools/CMake/3.15.7/cmake-3.15.7-win64-x64/bin',
+            "path": {'Windows': 'C:/tools/cmake/3.15.7/cmake-3.15.7-win64-x64/bin',
                      'Darwin': '/Users/jenkins/cmake/cmake-3.15.7/bin',
                      'Linux': '/usr/share/cmake-3.15.7/bin'}
         },
         "3.19": {
-            "path": {'Windows': 'C:/Tools/CMake/3.19.7/cmake-3.19.7-win64-x64/bin',
+            "path": {'Windows': 'C:/tools/cmake/3.19.7/cmake-3.19.7-win64-x64/bin',
                      'Darwin': '/Users/jenkins/cmake/cmake-3.19.7/bin',
                      'Linux': '/usr/share/cmake-3.19.7/bin'}
         },
         "3.23": {
-            "path": {'Windows': 'C:/Tools/CMake/3.23.5/cmake-3.23.5-windows-x86_64/bin',
+            "path": {'Windows': 'C:/tools/cmake/3.23.5/cmake-3.23.5-windows-x86_64/bin',
                      'Darwin': '/Users/jenkins/cmake/cmake-3.23.1/bin',
                      'Linux': "/usr/share/cmake-3.23.5/bin"}
         },
@@ -147,10 +147,10 @@
     'bazel': {
         "default": "6.3.2",
         "6.3.2": {"path": {'Linux': '/usr/share/bazel-6.3.2/bin',
-                           'Windows': 'C:/Tools/bazel/6.3.2',
+                           'Windows': 'C:/tools/bazel/6.3.2',
                            'Darwin': '/Users/jenkins/bazel-6.3.2/bin'}},
         "7.1.2": {"path": {'Linux': '/usr/share/bazel-7.1.2/bin',
-                           'Windows': 'C:/Tools/bazel/7.1.2',
+                           'Windows': 'C:/tools/bazel/7.1.2',
                            'Darwin': '/Users/jenkins/bazel-7.1.2/bin'}},
     },
     'premake': {
diff --git a/test/functional/layout/test_editable_msbuild.py b/test/functional/layout/test_editable_msbuild.py
index e36ef880b18..77c5dc69569 100644
--- a/test/functional/layout/test_editable_msbuild.py
+++ b/test/functional/layout/test_editable_msbuild.py
@@ -13,7 +13,7 @@
 def test_editable_msbuild():
     c = TestClient()
     with c.chdir("dep"):
-        c.run("new msbuild_lib -d name=dep -d version=0.1")
+        c.run("new msbuild_lib -d name=dep -d version=0.1 -c 'tools.microsoft.msbuild:vs_version=10.0'")
     c.save(pkg_cmake_app("pkg", "0.1", requires=["dep/0.1"]),
            path=os.path.join(c.current_folder, "pkg"))
 
diff --git a/test/functional/subsystems_build_test.py b/test/functional/subsystems_build_test.py
index b19222ed7e3..81f58eaf3d4 100644
--- a/test/functional/subsystems_build_test.py
+++ b/test/functional/subsystems_build_test.py
@@ -75,11 +75,6 @@ def test_mingw64_available(self):
         client.run_command('uname')
         assert "MINGW64_NT" in client.out
 
-    def test_tool_not_available(self):
-        client = TestClient()
-        client.run_command('uname', assert_error=True)
-        assert "'uname' is not recognized as an internal or external command" in client.out
-
 
 @pytest.mark.skipif(platform.system() != "Windows", reason="Tests Windows Subsystems")
 class TestSubsystemsBuild:
diff --git a/test/functional/toolchains/cmake/test_cmake_toolchain.py b/test/functional/toolchains/cmake/test_cmake_toolchain.py
index c8bf6aa6383..bedbf7ecc6a 100644
--- a/test/functional/toolchains/cmake/test_cmake_toolchain.py
+++ b/test/functional/toolchains/cmake/test_cmake_toolchain.py
@@ -630,8 +630,8 @@ def test_cmake_toolchain_winsdk_version(self):
                  '${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")'
         client.save({"CMakeLists.txt": cmake})
         client.run("create . -s arch=x86_64 -s compiler.version=193 "
-                   "-c tools.microsoft:winsdk_version=17.11")
-        assert "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION = 17.11" in client.out
+                   "-c tools.microsoft:winsdk_version=10.0")
+        assert "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION = 10.0" in client.out
         assert "Conan toolchain: CMAKE_GENERATOR_PLATFORM=x64" in client.out
         assert "Conan toolchain: CMAKE_GENERATOR_PLATFORM=x64,version" not in client.out
 
@@ -648,10 +648,10 @@ def test_cmake_toolchain_winsdk_version2(self):
                  '${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")'
         client.save({"CMakeLists.txt": cmake})
         client.run("create . -s arch=x86_64 -s compiler.version=193 "
-                   "-c tools.microsoft:winsdk_version=17.11 "
+                   "-c tools.microsoft:winsdk_version=10.0 "
                    '-c tools.cmake.cmaketoolchain:generator="Visual Studio 17"')
-        assert "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION = 17.11" in client.out
-        assert "Conan toolchain: CMAKE_GENERATOR_PLATFORM=x64,version=17.11" in client.out
+        assert "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION = 10.0" in client.out
+        assert "Conan toolchain: CMAKE_GENERATOR_PLATFORM=x64,version=10.0" in client.out
 
 
 @pytest.mark.tool("cmake", "3.23")
diff --git a/test/functional/toolchains/microsoft/test_msbuildtoolchain.py b/test/functional/toolchains/microsoft/test_msbuildtoolchain.py
index 70b3bbf2ae1..60b1d32893b 100644
--- a/test/functional/toolchains/microsoft/test_msbuildtoolchain.py
+++ b/test/functional/toolchains/microsoft/test_msbuildtoolchain.py
@@ -44,7 +44,7 @@ def test_msbuildtoolchain_winsdk_version():
     client.run("new msbuild_lib -d name=hello -d version=0.1")
     #  conantoolchain.props is already imported in the msbuild_exe tempalte
     client.run("create . -s arch=x86_64 -s compiler.version=193 "
-               "-c tools.microsoft:winsdk_version=17.11")
+               "-c tools.microsoft:winsdk_version=10.0")
     # I have verified also opening VS IDE that the setting is correctly configured
     # because the test always run over vcvars that already activates it
-    assert "amd64 - winsdk_version=17.11 - vcvars_ver=14.3" in client.out
+    assert "amd64 - winsdk_version=10.0 - vcvars_ver=14.3" in client.out

From 1d6f2780da98c183be65d372860b6c68acd9ce54 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Mon, 21 Oct 2024 12:08:50 +0200
Subject: [PATCH 060/211] wip

---
 conan/internal/default_settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conan/internal/default_settings.py b/conan/internal/default_settings.py
index 0d034096a24..6d0afc52c6d 100644
--- a/conan/internal/default_settings.py
+++ b/conan/internal/default_settings.py
@@ -111,7 +111,7 @@
         cstd: [null, 99, gnu99, 11, gnu11, 17, gnu17, 23, gnu23]
     msvc:
         version: [170, 180, 190, 191, 192, 193, 194]
-        update: [null, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+        update: [null, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
         runtime: [static, dynamic]
         runtime_type: [Debug, Release]
         cppstd: [null, 14, 17, 20, 23]

From 25547a4d76de06b5e04359f3a696ea9213ae2aeb Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Mon, 21 Oct 2024 14:12:47 +0200
Subject: [PATCH 061/211] wip

---
 .github/workflows/win-tests.yml | 50 +++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index c9e2768d536..d5cd3d7f4ff 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -57,15 +57,15 @@ jobs:
           restore-keys: |
             chocolatey-packages-${{ runner.os }}-
 
-#      - name: Cache VS 15 2017 packages
-#        if: matrix.test-type == 'functional'
-#        uses: actions/cache@v4
-#        id: vs15
-#        with:
-#          path: C:\Program Files (x86)\Microsoft Visual Studio\2017
-#          key: vs15-community-${{ runner.os }}
-#          restore-keys: |
-#            vs15-community-${{ runner.os }}
+      - name: Cache VS 15 2017 packages
+        if: matrix.test-type == 'functional'
+        uses: actions/cache@v4
+        id: vs15
+        with:
+          path: 'C:\Program Files (x86)\Microsoft Visual Studio\2017'
+          key: vs15-community-${{ runner.os }}
+          restore-keys: |
+            vs15-community-${{ runner.os }}
 
       - name: Cache Cygwin packages
         if: matrix.test-type == 'functional'
@@ -127,21 +127,35 @@ jobs:
           C:\msys64\usr\bin\pacman -S automake --noconfirm
           C:\msys64\usr\bin\pacman -Q > msys-installed-packages.lock
 
+#      - name: Install VS 15 2017 Community edition
+#        if: matrix.test-type == 'functional'
+#        run: |
+#          Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_community.exe" -OutFile "vs_installer.exe"
+#          Start-Process -FilePath ".\vs_installer.exe" -ArgumentList `
+#           "--quiet",  "--wait", "--norestart", "--nocache", `
+#           "--add", "Microsoft.VisualStudio.Workload.VCTools", `
+#           "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
+#           "--add", "Microsoft.VisualStudio.Component.Windows81SDK", `
+#           "--add", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", `
+#           "--add", "Microsoft.Component.MSBuild", `
+#           "--add", "Microsoft.VisualStudio.Component.VC.CMake.Project", `
+#           "--add", "Microsoft.VisualStudio.Workload.NativeDesktop", `
+#           "--add", "Microsoft.VisualStudio.Component.VC.CoreBuildTools", `
+#           "--add", "Microsoft.VisualStudio.Component.VC.ATLMFC" -Wait
+
+
       - name: Install VS 15 2017 Community edition
         if: matrix.test-type == 'functional'
         run: |
           Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_community.exe" -OutFile "vs_installer.exe"
           Start-Process -FilePath ".\vs_installer.exe" -ArgumentList `
-           "--quiet",  "--wait", "--norestart", "--nocache", `
-           "--add", "Microsoft.VisualStudio.Workload.VCTools", `
-           "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
+           "--quiet",  "--wait", "--norestart", "--cache", `
            "--add", "Microsoft.VisualStudio.Component.Windows81SDK", `
-           "--add", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", `
            "--add", "Microsoft.Component.MSBuild", `
-           "--add", "Microsoft.VisualStudio.Component.VC.CMake.Project", `
-           "--add", "Microsoft.VisualStudio.Workload.NativeDesktop", `
-           "--add", "Microsoft.VisualStudio.Component.VC.CoreBuildTools", `
-           "--add", "Microsoft.VisualStudio.Component.VC.ATLMFC" -Wait
+           "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
+           "--add", "Microsoft.VisualStudio.Component.VC.v141.x86.x64", `
+           "--add", "Microsoft.VisualStudio.Component.VC.v141.ATL", `
+           "--add", "Microsoft.VisualStudio.Component.VC.v141.ATLMFC" -Wait
 
       - name: Cache CMake and Bazel installations
         if: matrix.test-type == 'functional'
@@ -216,5 +230,5 @@ jobs:
           } elseif ($matrixTestType -eq "integration") {
               Write-Host "pytest test/integration --durations=20 -n $NUM_CPUS"
           } elseif ($matrixTestType -eq "functional") {
-              pytest test/functional --durations=20 -n $NUM_CPUS
+              Write-Host "pytest test/functional --durations=20 -n $NUM_CPUS"
           }

From e3ed398cac97f8e78f0235b6d27c38c0923aca64 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Mon, 21 Oct 2024 14:44:59 +0200
Subject: [PATCH 062/211] wip

---
 .github/workflows/win-tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index d5cd3d7f4ff..497f8b14be0 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -145,7 +145,7 @@ jobs:
 
 
       - name: Install VS 15 2017 Community edition
-        if: matrix.test-type == 'functional'
+        if: matrix.test-type == 'functional' && steps.vs15.outputs.cache-hit != 'true'
         run: |
           Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_community.exe" -OutFile "vs_installer.exe"
           Start-Process -FilePath ".\vs_installer.exe" -ArgumentList `
@@ -230,5 +230,5 @@ jobs:
           } elseif ($matrixTestType -eq "integration") {
               Write-Host "pytest test/integration --durations=20 -n $NUM_CPUS"
           } elseif ($matrixTestType -eq "functional") {
-              Write-Host "pytest test/functional --durations=20 -n $NUM_CPUS"
+              pytest test/functional --durations=20 -n $NUM_CPUS
           }

From 4d97207adf3293def5d77882e27e126e03902f04 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Mon, 21 Oct 2024 15:01:20 +0200
Subject: [PATCH 063/211] wip

---
 .github/workflows/win-tests.yml | 30 +++++-------------------------
 1 file changed, 5 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 497f8b14be0..8b78f14b197 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -57,26 +57,6 @@ jobs:
           restore-keys: |
             chocolatey-packages-${{ runner.os }}-
 
-      - name: Cache VS 15 2017 packages
-        if: matrix.test-type == 'functional'
-        uses: actions/cache@v4
-        id: vs15
-        with:
-          path: 'C:\Program Files (x86)\Microsoft Visual Studio\2017'
-          key: vs15-community-${{ runner.os }}
-          restore-keys: |
-            vs15-community-${{ runner.os }}
-
-      - name: Cache Cygwin packages
-        if: matrix.test-type == 'functional'
-        id: cygwin-tool
-        uses: actions/cache@v4
-        with:
-          path: C:\tools\cygwin
-          key: cygwin-packages-${{ runner.os }}-${{ hashFiles('C:\tools\cygwin\etc\setup\installed.db') }}
-          restore-keys: |
-            cygwin-packages-${{ runner.os }}-
-
       - name: Cache msys2 packages
         if: matrix.test-type == 'functional'
         id: msys2-tool
@@ -102,17 +82,17 @@ jobs:
           pip install meson
 
       - name: Install Chocolatey packages
-        if: matrix.test-type == 'functional' && steps.choco-packages.outputs.cache-hit != 'true'
+        if: matrix.test-type == 'functional'
         run: |
           choco install pkgconfiglite --version 0.28
           choco install ninja --version 1.10.2
           choco install mingw
-          choco install cygwin
-          choco install cyg-get
+          choco install cygwin --force
+          choco install cyg-get --force
           choco list > choco_installed_packages.lock
 
       - name: Install Cygwin extra packages
-        if: matrix.test-type == 'functional' && steps.cygwin-tool.outputs.cache-hit != 'true'
+        if: matrix.test-type == 'functional'
         run: |
           cyg-get automake gcc-g++ make binutils
 
@@ -145,7 +125,7 @@ jobs:
 
 
       - name: Install VS 15 2017 Community edition
-        if: matrix.test-type == 'functional' && steps.vs15.outputs.cache-hit != 'true'
+        if: matrix.test-type == 'functional'
         run: |
           Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_community.exe" -OutFile "vs_installer.exe"
           Start-Process -FilePath ".\vs_installer.exe" -ArgumentList `

From 70b2676fc39f0d8b07b799a136f9747a1d2f7c91 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Mon, 21 Oct 2024 15:32:31 +0200
Subject: [PATCH 064/211] wip

---
 .github/workflows/win-tests.yml | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 8b78f14b197..e00fcef095c 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -107,34 +107,20 @@ jobs:
           C:\msys64\usr\bin\pacman -S automake --noconfirm
           C:\msys64\usr\bin\pacman -Q > msys-installed-packages.lock
 
-#      - name: Install VS 15 2017 Community edition
-#        if: matrix.test-type == 'functional'
-#        run: |
-#          Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_community.exe" -OutFile "vs_installer.exe"
-#          Start-Process -FilePath ".\vs_installer.exe" -ArgumentList `
-#           "--quiet",  "--wait", "--norestart", "--nocache", `
-#           "--add", "Microsoft.VisualStudio.Workload.VCTools", `
-#           "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
-#           "--add", "Microsoft.VisualStudio.Component.Windows81SDK", `
-#           "--add", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", `
-#           "--add", "Microsoft.Component.MSBuild", `
-#           "--add", "Microsoft.VisualStudio.Component.VC.CMake.Project", `
-#           "--add", "Microsoft.VisualStudio.Workload.NativeDesktop", `
-#           "--add", "Microsoft.VisualStudio.Component.VC.CoreBuildTools", `
-#           "--add", "Microsoft.VisualStudio.Component.VC.ATLMFC" -Wait
-
-
       - name: Install VS 15 2017 Community edition
         if: matrix.test-type == 'functional'
         run: |
           Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_community.exe" -OutFile "vs_installer.exe"
           Start-Process -FilePath ".\vs_installer.exe" -ArgumentList `
-           "--quiet",  "--wait", "--norestart", "--cache", `
+           "--quiet",  "--wait", "--norestart", "--nocache", `
+           "--add", "Microsoft.VisualStudio.Workload.VCTools", `
+           "--add", "Microsoft.VisualStudio.Component.VC.v141.Tools.x86.x64", `
            "--add", "Microsoft.VisualStudio.Component.Windows81SDK", `
+           "--add", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", `
            "--add", "Microsoft.Component.MSBuild", `
-           "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
-           "--add", "Microsoft.VisualStudio.Component.VC.v141.x86.x64", `
-           "--add", "Microsoft.VisualStudio.Component.VC.v141.ATL", `
+           "--add", "Microsoft.VisualStudio.Component.VC.CMake.Project", `
+           "--add", "Microsoft.VisualStudio.Workload.NativeDesktop", `
+           "--add", "Microsoft.VisualStudio.Component.VC.v141.CoreBuildTools", `
            "--add", "Microsoft.VisualStudio.Component.VC.v141.ATLMFC" -Wait
 
       - name: Cache CMake and Bazel installations

From bfaf411b12674329a436ebf590bd87ed71fb2ae5 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Mon, 21 Oct 2024 16:34:21 +0200
Subject: [PATCH 065/211] wip

---
 .github/workflows/win-tests.yml | 36 ++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index e00fcef095c..236f9878567 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -43,19 +43,19 @@ jobs:
           restore-keys: |
             pip-packages-${{ runner.os }}-
 
-      - name: Cache Chocolatey packages
-        if: matrix.test-type == 'functional'
-        uses: actions/cache@v4
-        id: choco-packages
-        with:
-          path: |
-            C:\ProgramData\chocolatey\lib
-            C:\ProgramData\chocolatey\bin
-            C:\ProgramData\chocolatey\extensions
-            C:\ProgramData\mingw64
-          key: chocolatey-packages-${{ runner.os }}-${{ hashFiles('choco_installed_packages.lock') }}
-          restore-keys: |
-            chocolatey-packages-${{ runner.os }}-
+#      - name: Cache Chocolatey packages
+#        if: matrix.test-type == 'functional'
+#        uses: actions/cache@v4
+#        id: choco-packages
+#        with:
+#          path: |
+#            C:\ProgramData\chocolatey\lib
+#            C:\ProgramData\chocolatey\bin
+#            C:\ProgramData\chocolatey\extensions
+#            C:\ProgramData\mingw64
+#          key: chocolatey-packages-${{ runner.os }}-${{ hashFiles('choco_installed_packages.lock') }}
+#          restore-keys: |
+#            chocolatey-packages-${{ runner.os }}-
 
       - name: Cache msys2 packages
         if: matrix.test-type == 'functional'
@@ -87,8 +87,8 @@ jobs:
           choco install pkgconfiglite --version 0.28
           choco install ninja --version 1.10.2
           choco install mingw
-          choco install cygwin --force
-          choco install cyg-get --force
+          choco install cygwin
+          choco install cyg-get
           choco list > choco_installed_packages.lock
 
       - name: Install Cygwin extra packages
@@ -114,14 +114,14 @@ jobs:
           Start-Process -FilePath ".\vs_installer.exe" -ArgumentList `
            "--quiet",  "--wait", "--norestart", "--nocache", `
            "--add", "Microsoft.VisualStudio.Workload.VCTools", `
-           "--add", "Microsoft.VisualStudio.Component.VC.v141.Tools.x86.x64", `
+           "--add", "Microsoft.VisualStudio.Component.VC.v140.Tools.x86.x64", `
            "--add", "Microsoft.VisualStudio.Component.Windows81SDK", `
            "--add", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", `
            "--add", "Microsoft.Component.MSBuild", `
            "--add", "Microsoft.VisualStudio.Component.VC.CMake.Project", `
            "--add", "Microsoft.VisualStudio.Workload.NativeDesktop", `
-           "--add", "Microsoft.VisualStudio.Component.VC.v141.CoreBuildTools", `
-           "--add", "Microsoft.VisualStudio.Component.VC.v141.ATLMFC" -Wait
+           "--add", "Microsoft.VisualStudio.Component.VC.v140.CoreBuildTools", `
+           "--add", "Microsoft.VisualStudio.Component.VC.v140.ATLMFC" -Wait
 
       - name: Cache CMake and Bazel installations
         if: matrix.test-type == 'functional'

From 0fd11dd0f0dce94f0d55d1cb896465bc6f3fa860 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Mon, 21 Oct 2024 19:31:33 +0200
Subject: [PATCH 066/211] wip

---
 .github/workflows/win-tests.yml | 8 ++++----
 test/functional/utils.py        | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 236f9878567..f7dd095c135 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -114,14 +114,14 @@ jobs:
           Start-Process -FilePath ".\vs_installer.exe" -ArgumentList `
            "--quiet",  "--wait", "--norestart", "--nocache", `
            "--add", "Microsoft.VisualStudio.Workload.VCTools", `
-           "--add", "Microsoft.VisualStudio.Component.VC.v140.Tools.x86.x64", `
+           "--add", "Microsoft.VisualStudio.Component.VC.v141.Tools.x86.x64", `
            "--add", "Microsoft.VisualStudio.Component.Windows81SDK", `
            "--add", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", `
            "--add", "Microsoft.Component.MSBuild", `
            "--add", "Microsoft.VisualStudio.Component.VC.CMake.Project", `
            "--add", "Microsoft.VisualStudio.Workload.NativeDesktop", `
-           "--add", "Microsoft.VisualStudio.Component.VC.v140.CoreBuildTools", `
-           "--add", "Microsoft.VisualStudio.Component.VC.v140.ATLMFC" -Wait
+           "--add", "Microsoft.VisualStudio.Component.VC.v141.CoreBuildTools", `
+           "--add", "Microsoft.VisualStudio.Component.VC.v141.ATLMFC" -Wait
 
       - name: Cache CMake and Bazel installations
         if: matrix.test-type == 'functional'
@@ -196,5 +196,5 @@ jobs:
           } elseif ($matrixTestType -eq "integration") {
               Write-Host "pytest test/integration --durations=20 -n $NUM_CPUS"
           } elseif ($matrixTestType -eq "functional") {
-              pytest test/functional --durations=20 -n $NUM_CPUS
+              pytest test/functional --durations=20 -vvv
           }
diff --git a/test/functional/utils.py b/test/functional/utils.py
index 7d92a89d11a..b70600dfc60 100644
--- a/test/functional/utils.py
+++ b/test/functional/utils.py
@@ -63,8 +63,8 @@ def check_vs_runtime(artifact, client, vs_version, build_type, architecture="amd
                 assert "api-ms-win-crt-" in client.out
             if vs_version in ["15", "16", "17"]:  # UCRT
                 debug = "D" if build_type == "Debug" else ""
-                assert "MSVCP140{}.dll".format(debug) in client.out
-                assert "VCRUNTIME140{}.dll".format(debug) in client.out
+                assert "MSVCP141{}.dll".format(debug) in client.out
+                assert "VCRUNTIME141{}.dll".format(debug) in client.out
             else:
                 raise NotImplementedError()
     else:  # A static library cannot be checked the same

From c19a79c89c724ab7c72c2123fa5ff4546a8f94bf Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Tue, 22 Oct 2024 10:00:14 +0200
Subject: [PATCH 067/211] wip

---
 .github/workflows/win-tests.yml                 |  7 +++----
 test/functional/layout/test_editable_msbuild.py |  2 +-
 test/functional/subsystems_build_test.py        |  2 +-
 test/functional/toolchains/cmake/test_cmake.py  | 13 +++++--------
 test/functional/utils.py                        |  4 ++--
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index f7dd095c135..ab1cc092714 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -113,15 +113,14 @@ jobs:
           Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_community.exe" -OutFile "vs_installer.exe"
           Start-Process -FilePath ".\vs_installer.exe" -ArgumentList `
            "--quiet",  "--wait", "--norestart", "--nocache", `
-           "--add", "Microsoft.VisualStudio.Workload.VCTools", `
-           "--add", "Microsoft.VisualStudio.Component.VC.v141.Tools.x86.x64", `
+           "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
            "--add", "Microsoft.VisualStudio.Component.Windows81SDK", `
            "--add", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", `
            "--add", "Microsoft.Component.MSBuild", `
            "--add", "Microsoft.VisualStudio.Component.VC.CMake.Project", `
            "--add", "Microsoft.VisualStudio.Workload.NativeDesktop", `
-           "--add", "Microsoft.VisualStudio.Component.VC.v141.CoreBuildTools", `
-           "--add", "Microsoft.VisualStudio.Component.VC.v141.ATLMFC" -Wait
+           "--add", "Microsoft.VisualStudio.Component.VC.CoreBuildTools", `
+           "--add", "Microsoft.VisualStudio.Component.VC.ATLMFC" -Wait
 
       - name: Cache CMake and Bazel installations
         if: matrix.test-type == 'functional'
diff --git a/test/functional/layout/test_editable_msbuild.py b/test/functional/layout/test_editable_msbuild.py
index 77c5dc69569..e36ef880b18 100644
--- a/test/functional/layout/test_editable_msbuild.py
+++ b/test/functional/layout/test_editable_msbuild.py
@@ -13,7 +13,7 @@
 def test_editable_msbuild():
     c = TestClient()
     with c.chdir("dep"):
-        c.run("new msbuild_lib -d name=dep -d version=0.1 -c 'tools.microsoft.msbuild:vs_version=10.0'")
+        c.run("new msbuild_lib -d name=dep -d version=0.1")
     c.save(pkg_cmake_app("pkg", "0.1", requires=["dep/0.1"]),
            path=os.path.join(c.current_folder, "pkg"))
 
diff --git a/test/functional/subsystems_build_test.py b/test/functional/subsystems_build_test.py
index 81f58eaf3d4..dabe1f54afb 100644
--- a/test/functional/subsystems_build_test.py
+++ b/test/functional/subsystems_build_test.py
@@ -354,7 +354,7 @@ def test_cygwin(self):
         posix-compatible, intended to be run only in Cygwin environment (not in pure Windows)
         # install autotools, autoconf, libtool, "gcc-c++" and "make" packages
         """
-        client = TestClient()
+        client = TestClient(path_with_spaces=False)
         self._build(client)
         check_exe_run(client.out, "main", "gcc", None, "Debug", "x86_64", None, subsystem="cygwin")
         check_vs_runtime("app.exe", client, "15", "Debug", subsystem="cygwin")
diff --git a/test/functional/toolchains/cmake/test_cmake.py b/test/functional/toolchains/cmake/test_cmake.py
index bf10ea0509a..5377843531d 100644
--- a/test/functional/toolchains/cmake/test_cmake.py
+++ b/test/functional/toolchains/cmake/test_cmake.py
@@ -473,20 +473,16 @@ def _verify_out(marker=">>"):
 
 
 @pytest.mark.skipif(platform.system() != "Windows", reason="Only for windows")
-@pytest.mark.parametrize("version, vs_version",
-                         [("190", "15"),
-                          ("191", "15")])
-def test_msvc_vs_versiontoolset(version, vs_version):
+def test_msvc_vs_versiontoolset():
     settings = {"compiler": "msvc",
-                "compiler.version": version,
+                "compiler.version": "191",
                 "compiler.runtime": "static",
                 "compiler.cppstd": "14",
                 "arch": "x86_64",
                 "build_type": "Release",
                 }
     client = TestClient()
-    save(client.cache.new_config_path,
-         "tools.microsoft.msbuild:vs_version={}".format(vs_version))
+    save(client.cache.new_config_path, "tools.microsoft.msbuild:vs_version=15")
     conanfile = textwrap.dedent("""
             from conan import ConanFile
             from conan.tools.cmake import CMake
@@ -513,7 +509,8 @@ def build(self):
     client.run("create . --name=app --version=1.0 {}".format(settings))
     assert '-G "Visual Studio 15 2017"' in client.out
 
-    check_exe_run(client.out, "main", "msvc", version, "Release", "x86_64", "14")
+    check_exe_run(client.out, "main", "msvc", "191",
+                  "Release", "x86_64", "14")
 
 
 @pytest.mark.tool("cmake")
diff --git a/test/functional/utils.py b/test/functional/utils.py
index b70600dfc60..7d92a89d11a 100644
--- a/test/functional/utils.py
+++ b/test/functional/utils.py
@@ -63,8 +63,8 @@ def check_vs_runtime(artifact, client, vs_version, build_type, architecture="amd
                 assert "api-ms-win-crt-" in client.out
             if vs_version in ["15", "16", "17"]:  # UCRT
                 debug = "D" if build_type == "Debug" else ""
-                assert "MSVCP141{}.dll".format(debug) in client.out
-                assert "VCRUNTIME141{}.dll".format(debug) in client.out
+                assert "MSVCP140{}.dll".format(debug) in client.out
+                assert "VCRUNTIME140{}.dll".format(debug) in client.out
             else:
                 raise NotImplementedError()
     else:  # A static library cannot be checked the same

From 38ca35cb6db5361a9b0cf71b58f08dc880f7c034 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Tue, 22 Oct 2024 10:21:43 +0200
Subject: [PATCH 068/211] wip

---
 .github/workflows/win-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index ab1cc092714..a97b678d5af 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -94,7 +94,7 @@ jobs:
       - name: Install Cygwin extra packages
         if: matrix.test-type == 'functional'
         run: |
-          cyg-get automake gcc-g++ make binutils
+          cyg-get automake autotools autoconf libtool gcc-g++ make binutils
 
       - name: Install Pacman extra packages
         if: matrix.test-type == 'functional' && steps.msys2-tool.outputs.cache-hit != 'true'

From f8374cd412d3f212ffdad5d72ec812039a4419dd Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Tue, 22 Oct 2024 12:07:57 +0200
Subject: [PATCH 069/211] wip

---
 .github/workflows/win-tests.yml               | 15 ++++++++-----
 test/conftest.py                              |  2 +-
 .../functional/toolchains/cmake/test_cmake.py | 21 ++++++-------------
 .../functional/toolchains/cmake/test_ninja.py |  4 ++--
 .../toolchains/microsoft/test_msbuild.py      |  3 ++-
 .../toolchains/test_nmake_toolchain.py        | 10 ++++-----
 6 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index a97b678d5af..69eaa551f6c 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -187,13 +187,18 @@ jobs:
           }
       - name: Run Tests
         run: |
-          $NUM_CPUS = (Get-CimInstance -ClassName Win32_Processor | Measure-Object -Property NumberOfCores -Sum).Sum
-          Write-Host "Number of CPUs available: $NUM_CPUS"
           $matrixTestType = "${{ matrix.test-type }}"
           if ($matrixTestType -eq "unittests") {
-              Write-Host "pytest test/unittests --durations=20 -n $NUM_CPUS"
+              Write-Host "pytest test/unittests --durations=20 -n auto"
           } elseif ($matrixTestType -eq "integration") {
-              Write-Host "pytest test/integration --durations=20 -n $NUM_CPUS"
+              Write-Host "pytest test/integration --durations=20 -n auto"
           } elseif ($matrixTestType -eq "functional") {
-              pytest test/functional --durations=20 -vvv
+              pytest `
+                test/functional/subsystems_build_test.py::TestSubsystemsCMakeBuild::test_cygwin `
+                test/functional/test_profile_detect_api.py::TestProfileDetectAPI::test_profile_detect_compiler `
+                test/functional/layout
+                test/functional/toolchains/test_nmake_toolchain.py::test_toolchain_nmake `
+                test/functional/toolchains/cmake `
+                test/functional/toolchains/microsoft `
+              --durations=20 -n auto
           }
diff --git a/test/conftest.py b/test/conftest.py
index 5bdb15bfd20..6ad19649ce0 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -142,7 +142,7 @@
         "platform": "Windows",
         "default": "system",
         "exe": "make",
-        "system": {"path": {'Windows': "C:/tools/cygwin/bin"}},
+        "system": {"path": {'Windows': "C:/tools/Cygwin/bin"}},
     },
     'bazel': {
         "default": "6.3.2",
diff --git a/test/functional/toolchains/cmake/test_cmake.py b/test/functional/toolchains/cmake/test_cmake.py
index 5377843531d..c7a72b33cd0 100644
--- a/test/functional/toolchains/cmake/test_cmake.py
+++ b/test/functional/toolchains/cmake/test_cmake.py
@@ -201,14 +201,12 @@ def _run_app(self, build_type, bin_folder=False, msg="App", dyld_path=None):
 
 @pytest.mark.skipif(platform.system() != "Windows", reason="Only for windows")
 class WinTest(Base):
-    @parameterized.expand([("msvc", "Debug", "static", "191", "14", "x86", None, True),
-                           ("msvc", "Release", "dynamic", "191", "17", "x86_64", None, False)]
+    @parameterized.expand([("msvc", "Debug", "static", "191", "14", "x86", True),
+                           ("msvc", "Release", "dynamic", "191", "17", "x86_64", False)]
                           )
-    def test_toolchain_win(self, compiler, build_type, runtime, version, cppstd, arch, toolset,
-                           shared):
+    def test_toolchain_win(self, compiler, build_type, runtime, version, cppstd, arch, shared):
         settings = {"compiler": compiler,
                     "compiler.version": version,
-                    "compiler.toolset": toolset,
                     "compiler.runtime": runtime,
                     "compiler.cppstd": cppstd,
                     "arch": arch,
@@ -219,10 +217,7 @@ def test_toolchain_win(self, compiler, build_type, runtime, version, cppstd, arc
         self._run_build(settings, options)
         self.assertIn('cmake -G "Visual Studio 15 2017" '
                       '-DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake"', self.client.out)
-        if toolset == "v140":
-            self.assertIn("Microsoft Visual Studio 14.0", self.client.out)
-        else:
-            self.assertIn("Microsoft Visual Studio/2017", self.client.out)
+        self.assertIn("Microsoft Visual Studio/2017", self.client.out)
 
         generator_platform = "x64" if arch == "x86_64" else "Win32"
         arch_flag = "x64" if arch == "x86_64" else "X86"
@@ -262,18 +257,14 @@ def _verify_out(marker=">>"):
         self._run_build(settings, options)
 
         self._run_app("Release", bin_folder=True)
-        if compiler == "msvc":
-            visual_version = version
-        else:
-            visual_version = "190" if toolset == "v140" else "191"
-        check_exe_run(self.client.out, "main", "msvc", visual_version, "Release", arch, cppstd,
+        check_exe_run(self.client.out, "main", "msvc", version, "Release", arch, cppstd,
                       {"MYVAR": "MYVAR_VALUE",
                        "MYVAR_CONFIG": "MYVAR_RELEASE",
                        "MYDEFINE": "MYDEF_VALUE",
                        "MYDEFINE_CONFIG": "MYDEF_RELEASE"
                        })
         self._run_app("Debug", bin_folder=True)
-        check_exe_run(self.client.out, "main", "msvc", visual_version, "Debug", arch, cppstd,
+        check_exe_run(self.client.out, "main", "msvc", version, "Debug", arch, cppstd,
                       {"MYVAR": "MYVAR_VALUE",
                        "MYVAR_CONFIG": "MYVAR_DEBUG",
                        "MYDEFINE": "MYDEF_VALUE",
diff --git a/test/functional/toolchains/cmake/test_ninja.py b/test/functional/toolchains/cmake/test_ninja.py
index ccd48d5a6dc..8c354d1a82c 100644
--- a/test/functional/toolchains/cmake/test_ninja.py
+++ b/test/functional/toolchains/cmake/test_ninja.py
@@ -124,7 +124,7 @@ def test_locally_build_msvc_toolset(client):
         [settings]
         os=Windows
         compiler=msvc
-        compiler.version=190
+        compiler.version=191
         compiler.runtime=dynamic
         compiler.cppstd=14
         build_type=Release
@@ -145,7 +145,7 @@ def test_locally_build_msvc_toolset(client):
     client.run_command("myapp.exe")
 
     # Checking that compiler is indeed version 19.0, not 19.1-default of VS15
-    check_exe_run(client.out, ["main", "hello"], "msvc", "190", "Release", "x86_64", cppstd="14")
+    check_exe_run(client.out, ["main", "hello"], "msvc", "191", "Release", "x86_64", cppstd="14")
     check_vs_runtime("myapp.exe", client, msvc_version, "Release", architecture="amd64")
     check_vs_runtime("mylibrary.lib", client, msvc_version, "Release", architecture="amd64")
 
diff --git a/test/functional/toolchains/microsoft/test_msbuild.py b/test/functional/toolchains/microsoft/test_msbuild.py
index 890f17e771c..c476e07c0ae 100644
--- a/test/functional/toolchains/microsoft/test_msbuild.py
+++ b/test/functional/toolchains/microsoft/test_msbuild.py
@@ -422,7 +422,8 @@ def _run_app(client, arch, build_type, shared=None):
     @pytest.mark.tool("visual_studio", "15")
     @pytest.mark.parametrize("compiler,version,runtime,cppstd",
                              [("msvc", "191", "static", "17"),
-                              ("msvc", "190", "static", "14")])
+                              # ("msvc", "190", "static", "14")
+                              ])
     def test_toolchain_win_vs2017(self, compiler, version, runtime, cppstd):
         self.check_toolchain_win(compiler, version, runtime, cppstd, ide_version=15)
 
diff --git a/test/functional/toolchains/test_nmake_toolchain.py b/test/functional/toolchains/test_nmake_toolchain.py
index 9ee8b30353f..adf4c7928e1 100644
--- a/test/functional/toolchains/test_nmake_toolchain.py
+++ b/test/functional/toolchains/test_nmake_toolchain.py
@@ -11,11 +11,11 @@
 @pytest.mark.parametrize(
     "compiler, version, runtime, cppstd, build_type, defines, cflags, cxxflags, sharedlinkflags, exelinkflags",
     [
-        ("msvc", "190", "dynamic", "14", "Release", [], [], [], [], []),
-        ("msvc", "190", "dynamic", "14", "Release",
-         ["TEST_DEFINITION1", "TEST_DEFINITION2=0", "TEST_DEFINITION3=", "TEST_DEFINITION4=TestPpdValue4",
-          "TEST_DEFINITION5=__declspec(dllexport)", "TEST_DEFINITION6=foo bar"],
-         ["/GL"], ["/GL"], ["/LTCG"], ["/LTCG"]),
+        # ("msvc", "190", "dynamic", "14", "Release", [], [], [], [], []),
+        # ("msvc", "190", "dynamic", "14", "Release",
+        #  ["TEST_DEFINITION1", "TEST_DEFINITION2=0", "TEST_DEFINITION3=", "TEST_DEFINITION4=TestPpdValue4",
+        #   "TEST_DEFINITION5=__declspec(dllexport)", "TEST_DEFINITION6=foo bar"],
+        #  ["/GL"], ["/GL"], ["/LTCG"], ["/LTCG"]),
         ("msvc", "191", "static", "17", "Debug", [], [], [], [], []),
     ],
 )

From da2cec644a6a2fa01e7cb6060d7075cf937002c3 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Tue, 22 Oct 2024 12:51:25 +0200
Subject: [PATCH 070/211] wip

---
 .github/workflows/win-tests.yml | 46 ++++-----------------------------
 test/conftest.py                |  2 +-
 2 files changed, 6 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 69eaa551f6c..c8965a73ea6 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -43,36 +43,6 @@ jobs:
           restore-keys: |
             pip-packages-${{ runner.os }}-
 
-#      - name: Cache Chocolatey packages
-#        if: matrix.test-type == 'functional'
-#        uses: actions/cache@v4
-#        id: choco-packages
-#        with:
-#          path: |
-#            C:\ProgramData\chocolatey\lib
-#            C:\ProgramData\chocolatey\bin
-#            C:\ProgramData\chocolatey\extensions
-#            C:\ProgramData\mingw64
-#          key: chocolatey-packages-${{ runner.os }}-${{ hashFiles('choco_installed_packages.lock') }}
-#          restore-keys: |
-#            chocolatey-packages-${{ runner.os }}-
-
-      - name: Cache msys2 packages
-        if: matrix.test-type == 'functional'
-        id: msys2-tool
-        uses: actions/cache@v4
-        with:
-          path: |
-              C:\msys64\mingw32
-              C:\msys64\ucrt64
-              C:\msys64\mingw64
-              C:\msys64\usr
-              C:\msys64\clang64
-              C:\msys64\mingw64
-          key: msys2-packages-${{ runner.os }}-${{ hashFiles('msys-installed-packages.lock') }}
-          restore-keys: |
-            msys2-packages-${{ runner.os }}-
-
       - name: Install Python requirements
         run: |
           pip install --upgrade pip
@@ -89,15 +59,10 @@ jobs:
           choco install mingw
           choco install cygwin
           choco install cyg-get
-          choco list > choco_installed_packages.lock
-
-      - name: Install Cygwin extra packages
-        if: matrix.test-type == 'functional'
-        run: |
-          cyg-get automake autotools autoconf libtool gcc-g++ make binutils
+          cyg-get automake gcc-g++ make binutils cmake
 
       - name: Install Pacman extra packages
-        if: matrix.test-type == 'functional' && steps.msys2-tool.outputs.cache-hit != 'true'
+        if: matrix.test-type == 'functional'
         run: |
           C:\msys64\usr\bin\pacman -Syuu --noconfirm
           C:\msys64\usr\bin\pacman -S mingw-w64-x86_64-toolchain --noconfirm
@@ -105,7 +70,6 @@ jobs:
           C:\msys64\usr\bin\pacman -S base-devel gcc --noconfirm
           C:\msys64\usr\bin\pacman -S autoconf-wrapper --noconfirm
           C:\msys64\usr\bin\pacman -S automake --noconfirm
-          C:\msys64\usr\bin\pacman -Q > msys-installed-packages.lock
 
       - name: Install VS 15 2017 Community edition
         if: matrix.test-type == 'functional'
@@ -189,9 +153,9 @@ jobs:
         run: |
           $matrixTestType = "${{ matrix.test-type }}"
           if ($matrixTestType -eq "unittests") {
-              Write-Host "pytest test/unittests --durations=20 -n auto"
+              Write-Host "pytest test/unittests --durations=20 --numprocesses=auto"
           } elseif ($matrixTestType -eq "integration") {
-              Write-Host "pytest test/integration --durations=20 -n auto"
+              Write-Host "pytest test/integration --durations=20 --numprocesses=auto"
           } elseif ($matrixTestType -eq "functional") {
               pytest `
                 test/functional/subsystems_build_test.py::TestSubsystemsCMakeBuild::test_cygwin `
@@ -200,5 +164,5 @@ jobs:
                 test/functional/toolchains/test_nmake_toolchain.py::test_toolchain_nmake `
                 test/functional/toolchains/cmake `
                 test/functional/toolchains/microsoft `
-              --durations=20 -n auto
+              --durations=20 --numprocesses=auto -vvv
           }
diff --git a/test/conftest.py b/test/conftest.py
index 6ad19649ce0..5bdb15bfd20 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -142,7 +142,7 @@
         "platform": "Windows",
         "default": "system",
         "exe": "make",
-        "system": {"path": {'Windows': "C:/tools/Cygwin/bin"}},
+        "system": {"path": {'Windows': "C:/tools/cygwin/bin"}},
     },
     'bazel': {
         "default": "6.3.2",

From 5eb5a0791546172bd9ba3bf463cf5aab543acc5d Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Tue, 22 Oct 2024 13:00:50 +0200
Subject: [PATCH 071/211] wip

---
 .github/workflows/win-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index c8965a73ea6..ee2cb0ddd97 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -59,7 +59,7 @@ jobs:
           choco install mingw
           choco install cygwin
           choco install cyg-get
-          cyg-get automake gcc-g++ make binutils cmake
+          cyg-get automake gcc-g++ make binutils
 
       - name: Install Pacman extra packages
         if: matrix.test-type == 'functional'

From ffe3b2f5f0b1e76926f57e526d70015ca680d93d Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Tue, 22 Oct 2024 15:18:01 +0200
Subject: [PATCH 072/211] wip

---
 .github/workflows/win-tests.yml          | 1 +
 test/conftest.py                         | 2 +-
 test/functional/subsystems_build_test.py | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index ee2cb0ddd97..e4f7acef224 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -157,6 +157,7 @@ jobs:
           } elseif ($matrixTestType -eq "integration") {
               Write-Host "pytest test/integration --durations=20 --numprocesses=auto"
           } elseif ($matrixTestType -eq "functional") {
+              $env:Path = "C:\tools\cmake\3.15.7\cmake-3.15.7-win64-x64\bin;" + $env:Path
               pytest `
                 test/functional/subsystems_build_test.py::TestSubsystemsCMakeBuild::test_cygwin `
                 test/functional/test_profile_detect_api.py::TestProfileDetectAPI::test_profile_detect_compiler `
diff --git a/test/conftest.py b/test/conftest.py
index 5bdb15bfd20..d8bcedc07d7 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -241,7 +241,7 @@ def _get_individual_tool(name, version):
         if tool_version.get("disabled"):
             return False
         if name == "visual_studio":
-            if vswhere():  # TODO: Missing version detection
+            if vswhere(version=tool_version):  # TODO: Missing version detection
                 return None, None
 
         tool_path = tool_version.get("path", {}).get(tool_platform)
diff --git a/test/functional/subsystems_build_test.py b/test/functional/subsystems_build_test.py
index dabe1f54afb..ab17fdd2b88 100644
--- a/test/functional/subsystems_build_test.py
+++ b/test/functional/subsystems_build_test.py
@@ -354,7 +354,7 @@ def test_cygwin(self):
         posix-compatible, intended to be run only in Cygwin environment (not in pure Windows)
         # install autotools, autoconf, libtool, "gcc-c++" and "make" packages
         """
-        client = TestClient(path_with_spaces=False)
+        client = TestClient()
         self._build(client)
         check_exe_run(client.out, "main", "gcc", None, "Debug", "x86_64", None, subsystem="cygwin")
         check_vs_runtime("app.exe", client, "15", "Debug", subsystem="cygwin")
@@ -475,7 +475,7 @@ def test_cygwin(self):
         """
         Needs to install cmake from the cygwin setup.exe
         """
-        client = TestClient()
+        client = TestClient(path_with_spaces=False)
         # install "gcc-c++" and "make" packages
         self._build(client)
         check_exe_run(client.out, "main", "gcc", None, "Debug", "x86_64", None, subsystem="cygwin")

From 090d15a4ab447caca612d8362ab33d8adcb7c21d Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Wed, 23 Oct 2024 09:34:51 +0200
Subject: [PATCH 073/211] wip

---
 .github/workflows/win-tests.yml | 110 ++++++++++++++++++--------------
 1 file changed, 63 insertions(+), 47 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index e4f7acef224..da72dd52461 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -35,21 +35,37 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Cache pip packages
-        uses: actions/cache@v4
-        with:
-          path: C:\Users\runneradmin\AppData\Local\pip\cache
-          key: pip-packages-${{ runner.os }}-${{ hashFiles('conans/requirements*.txt') }}
-          restore-keys: |
-            pip-packages-${{ runner.os }}-
-
-      - name: Install Python requirements
-        run: |
-          pip install --upgrade pip
-          pip install -r conans/requirements.txt
-          pip install -r conans/requirements_server.txt
-          pip install -r conans/requirements_dev.txt
-          pip install meson
+#      - name: Cache pip packages
+#        uses: actions/cache@v4
+#        with:
+#          path: C:\Users\runneradmin\AppData\Local\pip\cache
+#          key: pip-packages-${{ runner.os }}-${{ hashFiles('conans/requirements*.txt') }}
+#          restore-keys: |
+#            pip-packages-${{ runner.os }}-
+#
+#      - name: Cache msys2 packages
+#        if: matrix.test-type == 'functional'
+#        id: msys2-tool
+#        uses: actions/cache@v4
+#        with:
+#          path: |
+#              C:\msys64\mingw32\bin
+#              C:\msys64\ucrt64\bin
+#              C:\msys64\mingw64\bin
+#              C:\msys64\usr\bin
+#              C:\msys64\clang64\bin
+#              C:\msys64\mingw64\bin
+#          key: msys2-packages-${{ runner.os }}-${{ hashFiles('msys-installed-packages.lock') }}
+#          restore-keys: |
+#            msys2-packages-${{ runner.os }}-
+#
+#      - name: Install Python requirements
+#        run: |
+#          pip install --upgrade pip
+#          pip install -r conans/requirements.txt
+#          pip install -r conans/requirements_server.txt
+#          pip install -r conans/requirements_dev.txt
+#          pip install meson
 
       - name: Install Chocolatey packages
         if: matrix.test-type == 'functional'
@@ -59,32 +75,32 @@ jobs:
           choco install mingw
           choco install cygwin
           choco install cyg-get
-          cyg-get automake gcc-g++ make binutils
+          cyg-get automake gcc-g++ make binutils --verbose
 
-      - name: Install Pacman extra packages
-        if: matrix.test-type == 'functional'
-        run: |
-          C:\msys64\usr\bin\pacman -Syuu --noconfirm
-          C:\msys64\usr\bin\pacman -S mingw-w64-x86_64-toolchain --noconfirm
-          C:\msys64\usr\bin\pacman -S mingw-w64-i686-toolchain --noconfirm
-          C:\msys64\usr\bin\pacman -S base-devel gcc --noconfirm
-          C:\msys64\usr\bin\pacman -S autoconf-wrapper --noconfirm
-          C:\msys64\usr\bin\pacman -S automake --noconfirm
-
-      - name: Install VS 15 2017 Community edition
-        if: matrix.test-type == 'functional'
-        run: |
-          Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_community.exe" -OutFile "vs_installer.exe"
-          Start-Process -FilePath ".\vs_installer.exe" -ArgumentList `
-           "--quiet",  "--wait", "--norestart", "--nocache", `
-           "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
-           "--add", "Microsoft.VisualStudio.Component.Windows81SDK", `
-           "--add", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", `
-           "--add", "Microsoft.Component.MSBuild", `
-           "--add", "Microsoft.VisualStudio.Component.VC.CMake.Project", `
-           "--add", "Microsoft.VisualStudio.Workload.NativeDesktop", `
-           "--add", "Microsoft.VisualStudio.Component.VC.CoreBuildTools", `
-           "--add", "Microsoft.VisualStudio.Component.VC.ATLMFC" -Wait
+#      - name: Install Pacman extra packages
+#        if: matrix.test-type == 'functional' && steps.msys2-tool.outputs.cache-hit != 'true'
+#        run: |
+#          C:\msys64\usr\bin\pacman -Syuu --noconfirm
+#          C:\msys64\usr\bin\pacman -S mingw-w64-x86_64-toolchain --noconfirm
+#          C:\msys64\usr\bin\pacman -S mingw-w64-i686-toolchain --noconfirm
+#          C:\msys64\usr\bin\pacman -S base-devel gcc --noconfirm
+#          C:\msys64\usr\bin\pacman -S autoconf-wrapper --noconfirm
+#          C:\msys64\usr\bin\pacman -S automake --noconfirm
+#
+#      - name: Install VS 15 2017 Community edition
+#        if: matrix.test-type == 'functional'
+#        run: |
+#          Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_community.exe" -OutFile "vs_installer.exe"
+#          Start-Process -FilePath ".\vs_installer.exe" -ArgumentList `
+#           "--quiet",  "--wait", "--norestart", "--nocache", `
+#           "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
+#           "--add", "Microsoft.VisualStudio.Component.Windows81SDK", `
+#           "--add", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", `
+#           "--add", "Microsoft.Component.MSBuild", `
+#           "--add", "Microsoft.VisualStudio.Component.VC.CMake.Project", `
+#           "--add", "Microsoft.VisualStudio.Workload.NativeDesktop", `
+#           "--add", "Microsoft.VisualStudio.Component.VC.CoreBuildTools", `
+#           "--add", "Microsoft.VisualStudio.Component.VC.ATLMFC" -Wait
 
       - name: Cache CMake and Bazel installations
         if: matrix.test-type == 'functional'
@@ -159,11 +175,11 @@ jobs:
           } elseif ($matrixTestType -eq "functional") {
               $env:Path = "C:\tools\cmake\3.15.7\cmake-3.15.7-win64-x64\bin;" + $env:Path
               pytest `
-                test/functional/subsystems_build_test.py::TestSubsystemsCMakeBuild::test_cygwin `
-                test/functional/test_profile_detect_api.py::TestProfileDetectAPI::test_profile_detect_compiler `
-                test/functional/layout
-                test/functional/toolchains/test_nmake_toolchain.py::test_toolchain_nmake `
-                test/functional/toolchains/cmake `
-                test/functional/toolchains/microsoft `
-              --durations=20 --numprocesses=auto -vvv
+                test\functional\subsystems_build_test.py `
+               --durations=20 --numprocesses=auto -vvv
           }
+#                test\functional\test_profile_detect_api.py `
+#                test\functional\layout\test_editable_cmake.py `
+#                test\functional\layout\test_editable_cmake_components.py `
+#                test\functional\layout\test_editable_msbuild.py `
+#              --durations=20 --numprocesses=auto -vvv

From 188afe8953732cbe48f4ca802bedf388d821466d Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Wed, 23 Oct 2024 09:35:11 +0200
Subject: [PATCH 074/211] wip

---
 .github/workflows/win-tests.yml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index da72dd52461..80daaa3aa96 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -35,14 +35,14 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-#      - name: Cache pip packages
-#        uses: actions/cache@v4
-#        with:
-#          path: C:\Users\runneradmin\AppData\Local\pip\cache
-#          key: pip-packages-${{ runner.os }}-${{ hashFiles('conans/requirements*.txt') }}
-#          restore-keys: |
-#            pip-packages-${{ runner.os }}-
-#
+      - name: Cache pip packages
+        uses: actions/cache@v4
+        with:
+          path: C:\Users\runneradmin\AppData\Local\pip\cache
+          key: pip-packages-${{ runner.os }}-${{ hashFiles('conans/requirements*.txt') }}
+          restore-keys: |
+            pip-packages-${{ runner.os }}-
+
 #      - name: Cache msys2 packages
 #        if: matrix.test-type == 'functional'
 #        id: msys2-tool
@@ -59,13 +59,13 @@ jobs:
 #          restore-keys: |
 #            msys2-packages-${{ runner.os }}-
 #
-#      - name: Install Python requirements
-#        run: |
-#          pip install --upgrade pip
-#          pip install -r conans/requirements.txt
-#          pip install -r conans/requirements_server.txt
-#          pip install -r conans/requirements_dev.txt
-#          pip install meson
+      - name: Install Python requirements
+        run: |
+          pip install --upgrade pip
+          pip install -r conans/requirements.txt
+          pip install -r conans/requirements_server.txt
+          pip install -r conans/requirements_dev.txt
+          pip install meson
 
       - name: Install Chocolatey packages
         if: matrix.test-type == 'functional'

From 05d0512db234b208e7954c11f5c56ec668f07a1c Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Wed, 23 Oct 2024 09:54:33 +0200
Subject: [PATCH 075/211] wip

---
 test/functional/subsystems_build_test.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/functional/subsystems_build_test.py b/test/functional/subsystems_build_test.py
index ab17fdd2b88..5a9f4586b0b 100644
--- a/test/functional/subsystems_build_test.py
+++ b/test/functional/subsystems_build_test.py
@@ -386,12 +386,14 @@ def _build(self, client, generator="Unix Makefiles", compiler=None, toolset=None
             cmake_compiler += " -DCMAKE_CXX_COMPILER={}".format(compilerpp)
             cmake_compiler += " -DCMAKE_RC_COMPILER={}".format(compiler)
         toolset = "-T {}".format(toolset) if toolset else ""
-        client.run_command("cmake {} {}"
+        client.run_command("cmake --debug-output {} {}"
                            " -DCMAKE_SH=\"CMAKE_SH-NOTFOUND\" -G \"{}\" .".format(cmake_compiler,
                                                                                   toolset,
                                                                                   generator))
+        print(client.out)
         build_out = client.out
-        client.run_command("cmake --build .")
+        client.run_command("cmake --build . --verbose")
+        print(client.out)
         app = "app" if "Visual" not in generator else r"Debug\app"
         client.run_command(app)
         return build_out

From 08d779c99997d77aed658d67fbbfd5c126151e83 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Wed, 23 Oct 2024 10:04:59 +0200
Subject: [PATCH 076/211] wip

---
 .github/workflows/win-tests.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 80daaa3aa96..72ab828ef72 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -174,8 +174,9 @@ jobs:
               Write-Host "pytest test/integration --durations=20 --numprocesses=auto"
           } elseif ($matrixTestType -eq "functional") {
               $env:Path = "C:\tools\cmake\3.15.7\cmake-3.15.7-win64-x64\bin;" + $env:Path
+              Remove-Item 'C:\Strawberry' -Recurse
               pytest `
-                test\functional\subsystems_build_test.py `
+                test/functional/subsystems_build_test.py::TestSubsystemsCMakeBuild::test_cygwin `
                --durations=20 --numprocesses=auto -vvv
           }
 #                test\functional\test_profile_detect_api.py `

From 8b6c7da36241cbbdf0c7419446fc25878d9548c4 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Wed, 23 Oct 2024 10:13:45 +0200
Subject: [PATCH 077/211] wip

---
 .github/workflows/win-tests.yml | 93 ++++++++++++++++-----------------
 1 file changed, 46 insertions(+), 47 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 72ab828ef72..3b407ff5d4c 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -43,22 +43,22 @@ jobs:
           restore-keys: |
             pip-packages-${{ runner.os }}-
 
-#      - name: Cache msys2 packages
-#        if: matrix.test-type == 'functional'
-#        id: msys2-tool
-#        uses: actions/cache@v4
-#        with:
-#          path: |
-#              C:\msys64\mingw32\bin
-#              C:\msys64\ucrt64\bin
-#              C:\msys64\mingw64\bin
-#              C:\msys64\usr\bin
-#              C:\msys64\clang64\bin
-#              C:\msys64\mingw64\bin
-#          key: msys2-packages-${{ runner.os }}-${{ hashFiles('msys-installed-packages.lock') }}
-#          restore-keys: |
-#            msys2-packages-${{ runner.os }}-
-#
+      - name: Cache msys2 packages
+        if: matrix.test-type == 'functional'
+        id: msys2-tool
+        uses: actions/cache@v4
+        with:
+          path: |
+              C:\msys64\mingw32\bin
+              C:\msys64\ucrt64\bin
+              C:\msys64\mingw64\bin
+              C:\msys64\usr\bin
+              C:\msys64\clang64\bin
+              C:\msys64\mingw64\bin
+          key: msys2-packages-${{ runner.os }}-${{ hashFiles('msys-installed-packages.lock') }}
+          restore-keys: |
+            msys2-packages-${{ runner.os }}-
+
       - name: Install Python requirements
         run: |
           pip install --upgrade pip
@@ -77,30 +77,30 @@ jobs:
           choco install cyg-get
           cyg-get automake gcc-g++ make binutils --verbose
 
-#      - name: Install Pacman extra packages
-#        if: matrix.test-type == 'functional' && steps.msys2-tool.outputs.cache-hit != 'true'
-#        run: |
-#          C:\msys64\usr\bin\pacman -Syuu --noconfirm
-#          C:\msys64\usr\bin\pacman -S mingw-w64-x86_64-toolchain --noconfirm
-#          C:\msys64\usr\bin\pacman -S mingw-w64-i686-toolchain --noconfirm
-#          C:\msys64\usr\bin\pacman -S base-devel gcc --noconfirm
-#          C:\msys64\usr\bin\pacman -S autoconf-wrapper --noconfirm
-#          C:\msys64\usr\bin\pacman -S automake --noconfirm
-#
-#      - name: Install VS 15 2017 Community edition
-#        if: matrix.test-type == 'functional'
-#        run: |
-#          Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_community.exe" -OutFile "vs_installer.exe"
-#          Start-Process -FilePath ".\vs_installer.exe" -ArgumentList `
-#           "--quiet",  "--wait", "--norestart", "--nocache", `
-#           "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
-#           "--add", "Microsoft.VisualStudio.Component.Windows81SDK", `
-#           "--add", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", `
-#           "--add", "Microsoft.Component.MSBuild", `
-#           "--add", "Microsoft.VisualStudio.Component.VC.CMake.Project", `
-#           "--add", "Microsoft.VisualStudio.Workload.NativeDesktop", `
-#           "--add", "Microsoft.VisualStudio.Component.VC.CoreBuildTools", `
-#           "--add", "Microsoft.VisualStudio.Component.VC.ATLMFC" -Wait
+      - name: Install Pacman extra packages
+        if: matrix.test-type == 'functional' && steps.msys2-tool.outputs.cache-hit != 'true'
+        run: |
+          C:\msys64\usr\bin\pacman -Syuu --noconfirm
+          C:\msys64\usr\bin\pacman -S mingw-w64-x86_64-toolchain --noconfirm
+          C:\msys64\usr\bin\pacman -S mingw-w64-i686-toolchain --noconfirm
+          C:\msys64\usr\bin\pacman -S base-devel gcc --noconfirm
+          C:\msys64\usr\bin\pacman -S autoconf-wrapper --noconfirm
+          C:\msys64\usr\bin\pacman -S automake --noconfirm
+
+      - name: Install VS 15 2017 Community edition
+        if: matrix.test-type == 'functional'
+        run: |
+          Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_community.exe" -OutFile "vs_installer.exe"
+          Start-Process -FilePath ".\vs_installer.exe" -ArgumentList `
+           "--quiet",  "--wait", "--norestart", "--nocache", `
+           "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
+           "--add", "Microsoft.VisualStudio.Component.Windows81SDK", `
+           "--add", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", `
+           "--add", "Microsoft.Component.MSBuild", `
+           "--add", "Microsoft.VisualStudio.Component.VC.CMake.Project", `
+           "--add", "Microsoft.VisualStudio.Workload.NativeDesktop", `
+           "--add", "Microsoft.VisualStudio.Component.VC.CoreBuildTools", `
+           "--add", "Microsoft.VisualStudio.Component.VC.ATLMFC" -Wait
 
       - name: Cache CMake and Bazel installations
         if: matrix.test-type == 'functional'
@@ -176,11 +176,10 @@ jobs:
               $env:Path = "C:\tools\cmake\3.15.7\cmake-3.15.7-win64-x64\bin;" + $env:Path
               Remove-Item 'C:\Strawberry' -Recurse
               pytest `
-                test/functional/subsystems_build_test.py::TestSubsystemsCMakeBuild::test_cygwin `
-               --durations=20 --numprocesses=auto -vvv
+                test\functional\subsystems_build_test.py `
+                test\functional\test_profile_detect_api.py `
+                test\functional\layout\test_editable_cmake.py `
+                test\functional\layout\test_editable_cmake_components.py `
+                test\functional\layout\test_editable_msbuild.py `
+              --durations=20 --numprocesses=auto -vvv
           }
-#                test\functional\test_profile_detect_api.py `
-#                test\functional\layout\test_editable_cmake.py `
-#                test\functional\layout\test_editable_cmake_components.py `
-#                test\functional\layout\test_editable_msbuild.py `
-#              --durations=20 --numprocesses=auto -vvv

From 488d50610e100f0d361b51f0f365b5519c0ddb83 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Wed, 23 Oct 2024 10:14:27 +0200
Subject: [PATCH 078/211] wip

---
 test/functional/subsystems_build_test.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/functional/subsystems_build_test.py b/test/functional/subsystems_build_test.py
index 5a9f4586b0b..6728b54d1bf 100644
--- a/test/functional/subsystems_build_test.py
+++ b/test/functional/subsystems_build_test.py
@@ -390,10 +390,8 @@ def _build(self, client, generator="Unix Makefiles", compiler=None, toolset=None
                            " -DCMAKE_SH=\"CMAKE_SH-NOTFOUND\" -G \"{}\" .".format(cmake_compiler,
                                                                                   toolset,
                                                                                   generator))
-        print(client.out)
         build_out = client.out
         client.run_command("cmake --build . --verbose")
-        print(client.out)
         app = "app" if "Visual" not in generator else r"Debug\app"
         client.run_command(app)
         return build_out

From 22960071a283920c8049366819d7a100f847819c Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Wed, 23 Oct 2024 11:12:55 +0200
Subject: [PATCH 079/211] wip

---
 .github/workflows/win-tests.yml          | 22 +---------------------
 test/conftest.py                         |  2 +-
 test/functional/subsystems_build_test.py |  2 +-
 3 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 3b407ff5d4c..22afe7f0956 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -43,22 +43,6 @@ jobs:
           restore-keys: |
             pip-packages-${{ runner.os }}-
 
-      - name: Cache msys2 packages
-        if: matrix.test-type == 'functional'
-        id: msys2-tool
-        uses: actions/cache@v4
-        with:
-          path: |
-              C:\msys64\mingw32\bin
-              C:\msys64\ucrt64\bin
-              C:\msys64\mingw64\bin
-              C:\msys64\usr\bin
-              C:\msys64\clang64\bin
-              C:\msys64\mingw64\bin
-          key: msys2-packages-${{ runner.os }}-${{ hashFiles('msys-installed-packages.lock') }}
-          restore-keys: |
-            msys2-packages-${{ runner.os }}-
-
       - name: Install Python requirements
         run: |
           pip install --upgrade pip
@@ -78,7 +62,7 @@ jobs:
           cyg-get automake gcc-g++ make binutils --verbose
 
       - name: Install Pacman extra packages
-        if: matrix.test-type == 'functional' && steps.msys2-tool.outputs.cache-hit != 'true'
+        if: matrix.test-type == 'functional'
         run: |
           C:\msys64\usr\bin\pacman -Syuu --noconfirm
           C:\msys64\usr\bin\pacman -S mingw-w64-x86_64-toolchain --noconfirm
@@ -177,9 +161,5 @@ jobs:
               Remove-Item 'C:\Strawberry' -Recurse
               pytest `
                 test\functional\subsystems_build_test.py `
-                test\functional\test_profile_detect_api.py `
-                test\functional\layout\test_editable_cmake.py `
-                test\functional\layout\test_editable_cmake_components.py `
-                test\functional\layout\test_editable_msbuild.py `
               --durations=20 --numprocesses=auto -vvv
           }
diff --git a/test/conftest.py b/test/conftest.py
index d8bcedc07d7..5bdb15bfd20 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -241,7 +241,7 @@ def _get_individual_tool(name, version):
         if tool_version.get("disabled"):
             return False
         if name == "visual_studio":
-            if vswhere(version=tool_version):  # TODO: Missing version detection
+            if vswhere():  # TODO: Missing version detection
                 return None, None
 
         tool_path = tool_version.get("path", {}).get(tool_platform)
diff --git a/test/functional/subsystems_build_test.py b/test/functional/subsystems_build_test.py
index 6728b54d1bf..a6292846d59 100644
--- a/test/functional/subsystems_build_test.py
+++ b/test/functional/subsystems_build_test.py
@@ -475,7 +475,7 @@ def test_cygwin(self):
         """
         Needs to install cmake from the cygwin setup.exe
         """
-        client = TestClient(path_with_spaces=False)
+        client = TestClient()
         # install "gcc-c++" and "make" packages
         self._build(client)
         check_exe_run(client.out, "main", "gcc", None, "Debug", "x86_64", None, subsystem="cygwin")

From 8e96dfe13075aacd751195fb4eaa05e6a4c1e5cb Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 11:59:02 +0200
Subject: [PATCH 080/211] minor changes

---
 .github/workflows/win-tests.yml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 22afe7f0956..7735ceeb99c 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -149,17 +149,20 @@ jobs:
               Expand-Archive -Path $zipFile -DestinationPath $destination -Force
               Remove-Item $zipFile
           }
+
       - name: Run Tests
         run: |
+          $shortGuid = [System.Guid]::NewGuid().ToString().Substring(0, 4)
+          $randomFolder = [System.IO.Path]::Combine("D:\\", "tmp_tests", $shortGuid)
+          New-Item -ItemType Directory -Force -Path $randomFolder
+          $env:CONAN_TEST_FOLDER = $randomFolder
           $matrixTestType = "${{ matrix.test-type }}"
           if ($matrixTestType -eq "unittests") {
-              Write-Host "pytest test/unittests --durations=20 --numprocesses=auto"
+              pytest test/unittests --durations=20 --numprocesses=auto
           } elseif ($matrixTestType -eq "integration") {
-              Write-Host "pytest test/integration --durations=20 --numprocesses=auto"
+              pytest test/integration --durations=20 --numprocesses=auto
           } elseif ($matrixTestType -eq "functional") {
               $env:Path = "C:\tools\cmake\3.15.7\cmake-3.15.7-win64-x64\bin;" + $env:Path
               Remove-Item 'C:\Strawberry' -Recurse
-              pytest `
-                test\functional\subsystems_build_test.py `
-              --durations=20 --numprocesses=auto -vvv
+              pytest test/functional --durations=20 --numprocesses=auto
           }

From 9846b0bb107a2d66f69337f8a3d8f518fbe56e52 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 12:03:48 +0200
Subject: [PATCH 081/211] wip

---
 test/unittests/util/output_test.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/unittests/util/output_test.py b/test/unittests/util/output_test.py
index 4c616dd9c90..4785ca32fd0 100644
--- a/test/unittests/util/output_test.py
+++ b/test/unittests/util/output_test.py
@@ -57,17 +57,17 @@ def test_unzip_output(self):
     @pytest.mark.skipif(platform.system() != "Windows", reason="Requires windows")
     def test_short_paths_unzip_output(self):
         tmp_dir = temp_folder()
-        file_path = os.path.join(tmp_dir, "src\\"*40, "example.txt")
+        file_path = os.path.join(tmp_dir, "src\\"*60, "example.txt")
         save(file_path, "Hello world!")
 
         zip_path = os.path.join(tmp_dir, 'example.zip')
         zipf = zipfile.ZipFile(zip_path, 'w', zipfile.ZIP_DEFLATED)
         for root, _, files in os.walk(tmp_dir):
             for f in files:
-                zipf.write(os.path.join(root, f), os.path.join("src\\"*20, f))
+                zipf.write(os.path.join(root, f), os.path.join("src\\"*40, f))
         zipf.close()
 
-        output_dir = os.path.join(tmp_dir, "dst\\"*40, "output_dir")
+        output_dir = os.path.join(tmp_dir, "dst\\"*60, "output_dir")
         captured_output = RedirectedTestOutput()
         with redirect_output(captured_output):
             unzip(ConanFileMock(), zip_path, output_dir)

From 4ace73130feca6e380a9b41e5828eabbe3471d76 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 12:08:17 +0200
Subject: [PATCH 082/211] comment

---
 test/unittests/util/output_test.py | 35 +++++++++++++++---------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/test/unittests/util/output_test.py b/test/unittests/util/output_test.py
index 4785ca32fd0..d43811bcc8c 100644
--- a/test/unittests/util/output_test.py
+++ b/test/unittests/util/output_test.py
@@ -54,23 +54,24 @@ def test_unzip_output(self):
         content = load(os.path.join(output_dir, "example.txt"))
         self.assertEqual(content, "Hello world!")
 
-    @pytest.mark.skipif(platform.system() != "Windows", reason="Requires windows")
-    def test_short_paths_unzip_output(self):
-        tmp_dir = temp_folder()
-        file_path = os.path.join(tmp_dir, "src\\"*60, "example.txt")
-        save(file_path, "Hello world!")
+    # FIXME: revisit this test
+    # @pytest.mark.skipif(platform.system() != "Windows", reason="Requires windows")
+    # def test_short_paths_unzip_output(self):
+    #     tmp_dir = temp_folder()
+    #     file_path = os.path.join(tmp_dir, "src\\"*40, "example.txt")
+    #     save(file_path, "Hello world!")
 
-        zip_path = os.path.join(tmp_dir, 'example.zip')
-        zipf = zipfile.ZipFile(zip_path, 'w', zipfile.ZIP_DEFLATED)
-        for root, _, files in os.walk(tmp_dir):
-            for f in files:
-                zipf.write(os.path.join(root, f), os.path.join("src\\"*40, f))
-        zipf.close()
+    #     zip_path = os.path.join(tmp_dir, 'example.zip')
+    #     zipf = zipfile.ZipFile(zip_path, 'w', zipfile.ZIP_DEFLATED)
+    #     for root, _, files in os.walk(tmp_dir):
+    #         for f in files:
+    #             zipf.write(os.path.join(root, f), os.path.join("src\\"*20, f))
+    #     zipf.close()
 
-        output_dir = os.path.join(tmp_dir, "dst\\"*60, "output_dir")
-        captured_output = RedirectedTestOutput()
-        with redirect_output(captured_output):
-            unzip(ConanFileMock(), zip_path, output_dir)
+    #     output_dir = os.path.join(tmp_dir, "dst\\"*40, "output_dir")
+    #     captured_output = RedirectedTestOutput()
+    #     with redirect_output(captured_output):
+    #         unzip(ConanFileMock(), zip_path, output_dir)
 
-        output = captured_output.getvalue()
-        self.assertIn("ERROR: Error extract src\\src", output)
+    #     output = captured_output.getvalue()
+    #     self.assertIn("ERROR: Error extract src\\src", output)

From 99c42706695456fa128e01c11c4117b30adf6370 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 12:22:48 +0200
Subject: [PATCH 083/211] comment line

---
 .github/workflows/win-tests.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 7735ceeb99c..8d8d9acff40 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -72,7 +72,8 @@ jobs:
           C:\msys64\usr\bin\pacman -S automake --noconfirm
 
       - name: Install VS 15 2017 Community edition
-        if: matrix.test-type == 'functional'
+        # FIXME: should not install visual always, just to check if integration tests pass
+        #if: matrix.test-type == 'functional'
         run: |
           Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_community.exe" -OutFile "vs_installer.exe"
           Start-Process -FilePath ".\vs_installer.exe" -ArgumentList `

From e920630f5103c5ba4301ae5603515570774742a3 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 12:39:20 +0200
Subject: [PATCH 084/211] do not divide tests

---
 .github/workflows/win-tests.yml | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 8d8d9acff40..6f1a3d3e088 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -19,11 +19,10 @@ jobs:
       fail-fast: true
       matrix:
         python-version: ['3.9']
-        test-type: [unittests, integration, functional]
 
     runs-on: windows-2022
 
-    name: Conan (${{ matrix.test-type }}) (${{ matrix.python-version }})
+    name: Conan (${{ matrix.python-version }})
 
     steps:
 
@@ -52,7 +51,6 @@ jobs:
           pip install meson
 
       - name: Install Chocolatey packages
-        if: matrix.test-type == 'functional'
         run: |
           choco install pkgconfiglite --version 0.28
           choco install ninja --version 1.10.2
@@ -62,7 +60,6 @@ jobs:
           cyg-get automake gcc-g++ make binutils --verbose
 
       - name: Install Pacman extra packages
-        if: matrix.test-type == 'functional'
         run: |
           C:\msys64\usr\bin\pacman -Syuu --noconfirm
           C:\msys64\usr\bin\pacman -S mingw-w64-x86_64-toolchain --noconfirm
@@ -72,8 +69,6 @@ jobs:
           C:\msys64\usr\bin\pacman -S automake --noconfirm
 
       - name: Install VS 15 2017 Community edition
-        # FIXME: should not install visual always, just to check if integration tests pass
-        #if: matrix.test-type == 'functional'
         run: |
           Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_community.exe" -OutFile "vs_installer.exe"
           Start-Process -FilePath ".\vs_installer.exe" -ArgumentList `
@@ -88,7 +83,6 @@ jobs:
            "--add", "Microsoft.VisualStudio.Component.VC.ATLMFC" -Wait
 
       - name: Cache CMake and Bazel installations
-        if: matrix.test-type == 'functional'
         id: cache-tools
         uses: actions/cache@v4
         with:
@@ -101,7 +95,7 @@ jobs:
           key: ${{ runner.os }}-conan-tools-cache
 
       - name: Build CMake old versions of CMake
-        if: matrix.test-type == 'functional' && steps.cache-tools.outputs.cache-hit != 'true'
+        if: steps.cache-tools.outputs.cache-hit != 'true'
         run: |
           $CMAKE_BUILD_VERSIONS = "3.15.7", "3.19.7"
           foreach ($version in $CMAKE_BUILD_VERSIONS) {
@@ -118,7 +112,7 @@ jobs:
             Remove-Item $zipFile
           }
       - name: Install modern CMake versions
-        if: matrix.test-type == 'functional' && steps.cache-tools.outputs.cache-hit != 'true'
+        if: steps.cache-tools.outputs.cache-hit != 'true'
         run: |
           $CMAKE_BUILD_VERSIONS = "3.23.5"
           foreach ($version in $CMAKE_BUILD_VERSIONS) {
@@ -134,7 +128,7 @@ jobs:
             Remove-Item $zipFile
           }
       - name: Install Bazel versions
-        if: matrix.test-type == 'functional' && steps.cache-tools.outputs.cache-hit != 'true'
+        if: steps.cache-tools.outputs.cache-hit != 'true'
         run: |
           $BAZEL_BUILD_VERSIONS = "6.3.2", "7.1.2"
           foreach ($version in $BAZEL_BUILD_VERSIONS) {
@@ -157,13 +151,4 @@ jobs:
           $randomFolder = [System.IO.Path]::Combine("D:\\", "tmp_tests", $shortGuid)
           New-Item -ItemType Directory -Force -Path $randomFolder
           $env:CONAN_TEST_FOLDER = $randomFolder
-          $matrixTestType = "${{ matrix.test-type }}"
-          if ($matrixTestType -eq "unittests") {
-              pytest test/unittests --durations=20 --numprocesses=auto
-          } elseif ($matrixTestType -eq "integration") {
-              pytest test/integration --durations=20 --numprocesses=auto
-          } elseif ($matrixTestType -eq "functional") {
-              $env:Path = "C:\tools\cmake\3.15.7\cmake-3.15.7-win64-x64\bin;" + $env:Path
-              Remove-Item 'C:\Strawberry' -Recurse
-              pytest test/functional --durations=20 --numprocesses=auto
-          }
+          pytest test/ --durations=20 --numprocesses=auto

From 2fce809d11e0de94fa46152fe94246fe9747d249 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 13:01:37 +0200
Subject: [PATCH 085/211] better msys install

---
 .github/workflows/win-tests.yml | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 6f1a3d3e088..c23303e37ce 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -59,14 +59,17 @@ jobs:
           choco install cyg-get
           cyg-get automake gcc-g++ make binutils --verbose
 
-      - name: Install Pacman extra packages
-        run: |
-          C:\msys64\usr\bin\pacman -Syuu --noconfirm
-          C:\msys64\usr\bin\pacman -S mingw-w64-x86_64-toolchain --noconfirm
-          C:\msys64\usr\bin\pacman -S mingw-w64-i686-toolchain --noconfirm
-          C:\msys64\usr\bin\pacman -S base-devel gcc --noconfirm
-          C:\msys64\usr\bin\pacman -S autoconf-wrapper --noconfirm
-          C:\msys64\usr\bin\pacman -S automake --noconfirm
+      - name: Set up MSYS2
+        uses: msys2/setup-msys2@v2
+        with:
+          update: false
+          install: >
+            mingw-w64-x86_64-toolchain
+            mingw-w64-i686-toolchain
+            base-devel
+            gcc
+            autoconf-wrapper
+            automake
 
       - name: Install VS 15 2017 Community edition
         run: |

From 05e4f76e08b1d68971d9436eccd636e936bd1868 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 13:03:24 +0200
Subject: [PATCH 086/211] less vs components

---
 .github/workflows/win-tests.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index c23303e37ce..e3085dbb669 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -79,11 +79,7 @@ jobs:
            "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
            "--add", "Microsoft.VisualStudio.Component.Windows81SDK", `
            "--add", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", `
-           "--add", "Microsoft.Component.MSBuild", `
-           "--add", "Microsoft.VisualStudio.Component.VC.CMake.Project", `
-           "--add", "Microsoft.VisualStudio.Workload.NativeDesktop", `
-           "--add", "Microsoft.VisualStudio.Component.VC.CoreBuildTools", `
-           "--add", "Microsoft.VisualStudio.Component.VC.ATLMFC" -Wait
+           "--add", "Microsoft.Component.MSBuild" -Wait
 
       - name: Cache CMake and Bazel installations
         id: cache-tools

From fd8c5de45a175b8d9be02716378a43d84b57dc9f Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 13:22:16 +0200
Subject: [PATCH 087/211] dont use action

---
 .github/workflows/win-tests.yml | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index e3085dbb669..60f92e282f0 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -59,17 +59,14 @@ jobs:
           choco install cyg-get
           cyg-get automake gcc-g++ make binutils --verbose
 
-      - name: Set up MSYS2
-        uses: msys2/setup-msys2@v2
-        with:
-          update: false
-          install: >
-            mingw-w64-x86_64-toolchain
-            mingw-w64-i686-toolchain
-            base-devel
-            gcc
-            autoconf-wrapper
-            automake
+      - name: Install Pacman extra packages
+        run: |
+          C:\msys64\usr\bin\pacman -Syuu --noconfirm
+          C:\msys64\usr\bin\pacman -S mingw-w64-x86_64-toolchain --noconfirm
+          C:\msys64\usr\bin\pacman -S mingw-w64-i686-toolchain --noconfirm
+          C:\msys64\usr\bin\pacman -S base-devel gcc --noconfirm
+          C:\msys64\usr\bin\pacman -S autoconf-wrapper --noconfirm
+          C:\msys64\usr\bin\pacman -S automake --noconfirm
 
       - name: Install VS 15 2017 Community edition
         run: |

From e97c4174078ca9838b169e120c5de6fa489b91fa Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 14:41:34 +0200
Subject: [PATCH 088/211] remove cmake

---
 .github/workflows/win-tests.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 60f92e282f0..befeb954cca 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -29,6 +29,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Remove installed CMake version
+        run: |
+            Remove-Item -Recurse -Force "C:/Program Files/CMake"
+
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
@@ -147,4 +151,6 @@ jobs:
           $randomFolder = [System.IO.Path]::Combine("D:\\", "tmp_tests", $shortGuid)
           New-Item -ItemType Directory -Force -Path $randomFolder
           $env:CONAN_TEST_FOLDER = $randomFolder
+          $env:Path = "C:\tools\cmake\3.15.7\cmake-3.15.7-win64-x64\bin;" + $env:Path
+          Remove-Item 'C:\Strawberry' -Recurse
           pytest test/ --durations=20 --numprocesses=auto

From 1693eea198765be08452d1c536bc62b92a737811 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 14:44:55 +0200
Subject: [PATCH 089/211] run fail

---
 .github/workflows/win-tests.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index befeb954cca..4da6ca482c2 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -153,4 +153,12 @@ jobs:
           $env:CONAN_TEST_FOLDER = $randomFolder
           $env:Path = "C:\tools\cmake\3.15.7\cmake-3.15.7-win64-x64\bin;" + $env:Path
           Remove-Item 'C:\Strawberry' -Recurse
-          pytest test/ --durations=20 --numprocesses=auto
+          pytest test/functional/subsystems_build_test.py::TestSubsystemsCMakeBuild::test_cygwin -vvv
+          pytest test/functional/test_profile_detect_api.py::TestProfileDetectAPI::test_profile_detect_compiler -vvv
+          pytest test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py::TestVSClangCL::test_clang_visual_studio_generator -vvv
+          pytest test/integration/toolchains/microsoft/vcvars_test.py::test_vcvars_2015_error -vvv
+          pytest test/integration/toolchains/microsoft/vcvars_test.py::test_vcvars_platform_x86 -vvv
+          pytest test/integration/toolchains/microsoft/vcvars_test.py::test_deactivate_vcvars_message -vvv
+          pytest test/performance/test_large_graph.py::test_large_graph -vvv
+          pytest test/functional/toolchains/microsoft/test_msbuild.py::TestWin::test_toolchain_win_vs2022[msvc-193-static-17] -vvv
+          pytest test/functional/toolchains/microsoft/test_v2_msbuild_template.py::test_msbuild_lib_2022 -vvv

From 2fa930f1bff5c745ed171753345ceb3e733ffc9c Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 15:13:15 +0200
Subject: [PATCH 090/211] wip

---
 .github/workflows/win-tests.yml               |  1 -
 conan/internal/default_settings.py            |  2 +-
 test/functional/test_profile_detect_api.py    |  4 +-
 .../cmake/test_cmake_toolchain_win_clang.py   |  8 ++--
 .../toolchains/microsoft/vcvars_test.py       | 39 ++++++++++---------
 5 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 4da6ca482c2..bba41469b27 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -153,7 +153,6 @@ jobs:
           $env:CONAN_TEST_FOLDER = $randomFolder
           $env:Path = "C:\tools\cmake\3.15.7\cmake-3.15.7-win64-x64\bin;" + $env:Path
           Remove-Item 'C:\Strawberry' -Recurse
-          pytest test/functional/subsystems_build_test.py::TestSubsystemsCMakeBuild::test_cygwin -vvv
           pytest test/functional/test_profile_detect_api.py::TestProfileDetectAPI::test_profile_detect_compiler -vvv
           pytest test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py::TestVSClangCL::test_clang_visual_studio_generator -vvv
           pytest test/integration/toolchains/microsoft/vcvars_test.py::test_vcvars_2015_error -vvv
diff --git a/conan/internal/default_settings.py b/conan/internal/default_settings.py
index 6d0afc52c6d..0d034096a24 100644
--- a/conan/internal/default_settings.py
+++ b/conan/internal/default_settings.py
@@ -111,7 +111,7 @@
         cstd: [null, 99, gnu99, 11, gnu11, 17, gnu17, 23, gnu23]
     msvc:
         version: [170, 180, 190, 191, 192, 193, 194]
-        update: [null, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
+        update: [null, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
         runtime: [static, dynamic]
         runtime_type: [Debug, Release]
         cppstd: [null, 14, 17, 20, 23]
diff --git a/test/functional/test_profile_detect_api.py b/test/functional/test_profile_detect_api.py
index 509df11297d..5b0620f4b61 100644
--- a/test/functional/test_profile_detect_api.py
+++ b/test/functional/test_profile_detect_api.py
@@ -29,7 +29,7 @@ def test_profile_detect_compiler(self):
 
         client.save({"profile1": tpl1})
         client.run("profile show -pr=profile1")
-        update = detect_api.detect_msvc_update("193")
+        update = detect_api.detect_msvc_update("194")
         expected = textwrap.dedent(f"""\
             Host profile:
             [settings]
@@ -38,7 +38,7 @@ def test_profile_detect_compiler(self):
             compiler.runtime=dynamic
             compiler.runtime_type=Release
             compiler.update={update}
-            compiler.version=193
+            compiler.version=194
             [conf]
             tools.microsoft.msbuild:vs_version=17
             """)
diff --git a/test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py b/test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py
index b7582bcfaf1..a859a140619 100644
--- a/test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py
+++ b/test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py
@@ -85,7 +85,7 @@ def test_clang_mingw(self, client, runtime):
         # clang compilations in Windows will use MinGW Makefiles by default
         assert 'cmake -G "MinGW Makefiles"' in client.out
         assert "GNU-like command-line" in client.out
-        assert "main __clang_major__16" in client.out
+        assert "main __clang_major__17" in client.out
         assert "main _MSC_VER193" in client.out
         assert "main _MSVC_LANG2014" in client.out
         assert "main _M_X64 defined" in client.out
@@ -106,7 +106,7 @@ def test_clang_cmake_ninja_nmake(self, client, generator):
 
         assert 'cmake -G "{}"'.format(generator) in client.out
         assert "GNU-like command-line" in client.out
-        assert "main __clang_major__16" in client.out
+        assert "main __clang_major__17" in client.out
         assert "main _MSC_VER193" in client.out
         assert "main _MSVC_LANG2014" in client.out
         assert "main _M_X64 defined" in client.out
@@ -128,7 +128,7 @@ def test_clang_cmake_runtime_version(self, client):
 
         assert 'cmake -G "{}"'.format(generator) in client.out
         assert "GNU-like command-line" in client.out
-        assert "main __clang_major__16" in client.out
+        assert "main __clang_major__17" in client.out
         # Check this! Clang compiler in Windows is reporting MSC_VER and MSVC_LANG!
         assert "main _MSC_VER192" in client.out
         assert "main _MSVC_LANG2017" in client.out
@@ -155,7 +155,7 @@ def test_clang_visual_studio_generator(self, client):
         assert 'cmake -G "{}"'.format(generator) in client.out
         assert "MSVC-like command-line" in client.out
         # My local is 17, but CI ClangCL still 16
-        assert "main __clang_major__16" in client.out
+        assert "main __clang_major__17" in client.out
         # Check this! Clang compiler in Windows is reporting MSC_VER and MSVC_LANG!
         assert "main _MSC_VER193" in client.out
         assert "main _MSVC_LANG2017" in client.out
diff --git a/test/integration/toolchains/microsoft/vcvars_test.py b/test/integration/toolchains/microsoft/vcvars_test.py
index a0c2b18bdc8..b6526740b87 100644
--- a/test/integration/toolchains/microsoft/vcvars_test.py
+++ b/test/integration/toolchains/microsoft/vcvars_test.py
@@ -84,24 +84,25 @@ class TestConan(ConanFile):
     assert os.path.exists(os.path.join(client.current_folder, "conanvcvars.bat"))
 
 
-@pytest.mark.skipif(platform.system() != "Windows", reason="Requires Windows")
-def test_vcvars_2015_error():
-    # https://github.com/conan-io/conan/issues/9888
-    client = TestClient(path_with_spaces=False)
-
-    conanfile = textwrap.dedent("""
-        from conan import ConanFile
-        class TestConan(ConanFile):
-            generators = "VCVars"
-            settings = "os", "compiler", "arch", "build_type"
-    """)
-    client.save({"conanfile.py": conanfile})
-    client.run('install . -s os=Windows -s compiler="msvc" -s compiler.version=190 '
-               '-s compiler.cppstd=14 -s compiler.runtime=static')
-
-    vcvars = client.load("conanvcvars.bat")
-    assert 'vcvarsall.bat"  amd64' in vcvars
-    assert "-vcvars_ver" not in vcvars
+# FIXME: we dont have vs2015 installed in gh actions
+# @pytest.mark.skipif(platform.system() != "Windows", reason="Requires Windows")
+# def test_vcvars_2015_error():
+#     # https://github.com/conan-io/conan/issues/9888
+#     client = TestClient(path_with_spaces=False)
+
+#     conanfile = textwrap.dedent("""
+#         from conan import ConanFile
+#         class TestConan(ConanFile):
+#             generators = "VCVars"
+#             settings = "os", "compiler", "arch", "build_type"
+#     """)
+#     client.save({"conanfile.py": conanfile})
+#     client.run('install . -s os=Windows -s compiler="msvc" -s compiler.version=190 '
+#                '-s compiler.cppstd=14 -s compiler.runtime=static')
+
+#     vcvars = client.load("conanvcvars.bat")
+#     assert 'vcvarsall.bat"  amd64' in vcvars
+#     assert "-vcvars_ver" not in vcvars
 
 
 @pytest.mark.skipif(platform.system() != "Windows", reason="Requires Windows")
@@ -116,7 +117,7 @@ class TestConan(ConanFile):
             settings = "os", "compiler", "arch", "build_type"
     """)
     client.save({"conanfile.py": conanfile})
-    client.run('install . -s os=Windows -s compiler="msvc" -s compiler.version=190 '
+    client.run('install . -s os=Windows -s compiler="msvc" -s compiler.version=191 '
                '-s compiler.cppstd=14 -s compiler.runtime=static -s:b arch=x86')
 
     vcvars = client.load("conanvcvars.bat")

From aca94839a020bdcb1d792c69a22cb2a187af013a Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 15:15:18 +0200
Subject: [PATCH 091/211] add 143 toolset, will it work?

---
 .github/workflows/win-tests.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index bba41469b27..615d4aa9d60 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -80,7 +80,8 @@ jobs:
            "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
            "--add", "Microsoft.VisualStudio.Component.Windows81SDK", `
            "--add", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", `
-           "--add", "Microsoft.Component.MSBuild" -Wait
+           "--add", "Microsoft.Component.MSBuild", `
+           "--add", "Microsoft.VisualStudio.Component.VC.v14.3.x86.x64" -Wait
 
       - name: Cache CMake and Bazel installations
         id: cache-tools

From 991e36d1ceed50a96248cd3a8c99b884dd5b4f89 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 15:23:19 +0200
Subject: [PATCH 092/211] fix test

---
 test/performance/test_large_graph.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/performance/test_large_graph.py b/test/performance/test_large_graph.py
index 7f5fe20b36e..2f58d0dbffb 100644
--- a/test/performance/test_large_graph.py
+++ b/test/performance/test_large_graph.py
@@ -9,7 +9,7 @@
 
 
 def test_large_graph():
-    c = TestClient(cache_folder="T:/mycache")
+    c = TestClient()
     num_test = 40
     num_pkgs = 40
 

From 4af201aa20e9df6f4ab5d0ab7125e2a7c0c0265b Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 15:41:11 +0200
Subject: [PATCH 093/211] add update

---
 conan/internal/default_settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conan/internal/default_settings.py b/conan/internal/default_settings.py
index 0d034096a24..6d0afc52c6d 100644
--- a/conan/internal/default_settings.py
+++ b/conan/internal/default_settings.py
@@ -111,7 +111,7 @@
         cstd: [null, 99, gnu99, 11, gnu11, 17, gnu17, 23, gnu23]
     msvc:
         version: [170, 180, 190, 191, 192, 193, 194]
-        update: [null, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+        update: [null, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
         runtime: [static, dynamic]
         runtime_type: [Debug, Release]
         cppstd: [null, 14, 17, 20, 23]

From aa82f4c9c3137662c6b7fb0f776666a0ffd07688 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 15:43:12 +0200
Subject: [PATCH 094/211] revert

---
 conan/internal/default_settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conan/internal/default_settings.py b/conan/internal/default_settings.py
index 6d0afc52c6d..0d034096a24 100644
--- a/conan/internal/default_settings.py
+++ b/conan/internal/default_settings.py
@@ -111,7 +111,7 @@
         cstd: [null, 99, gnu99, 11, gnu11, 17, gnu17, 23, gnu23]
     msvc:
         version: [170, 180, 190, 191, 192, 193, 194]
-        update: [null, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
+        update: [null, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
         runtime: [static, dynamic]
         runtime_type: [Debug, Release]
         cppstd: [null, 14, 17, 20, 23]

From 68c589acae88d929a7fef980413d234849061adf Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 15:55:02 +0200
Subject: [PATCH 095/211] fix update detection

---
 conan/internal/api/detect/detect_vs.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/conan/internal/api/detect/detect_vs.py b/conan/internal/api/detect/detect_vs.py
index 6139870398e..2f6c1c9d3de 100644
--- a/conan/internal/api/detect/detect_vs.py
+++ b/conan/internal/api/detect/detect_vs.py
@@ -14,8 +14,11 @@ def vs_detect_update(version):
     version = {"194": "17", "193": "17", "192": "16", "191": "15"}.get(str(version))
     full_version = _vs_installation_path(version)[1]
     components = full_version.split(".")
+    # 17.10 --> 1940
+    # 17.11 --> 1941
+    # etc...    
     if len(components) > 1:
-        return components[1]
+        return str(int(components[1]) % 10)
 
 
 def _vs_installation_path(version):

From c87bf06a4a50e9d0fa6bab6696beeb86fa618a10 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 16:10:44 +0200
Subject: [PATCH 096/211] wip

---
 .../toolchains/cmake/test_cmake_toolchain_win_clang.py      | 6 +++---
 .../toolchains/microsoft/test_v2_msbuild_template.py        | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py b/test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py
index a859a140619..95741f34cef 100644
--- a/test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py
+++ b/test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py
@@ -86,7 +86,7 @@ def test_clang_mingw(self, client, runtime):
         assert 'cmake -G "MinGW Makefiles"' in client.out
         assert "GNU-like command-line" in client.out
         assert "main __clang_major__17" in client.out
-        assert "main _MSC_VER193" in client.out
+        assert "main _MSC_VER1941" in client.out
         assert "main _MSVC_LANG2014" in client.out
         assert "main _M_X64 defined" in client.out
         assert "main __x86_64__ defined" in client.out
@@ -107,7 +107,7 @@ def test_clang_cmake_ninja_nmake(self, client, generator):
         assert 'cmake -G "{}"'.format(generator) in client.out
         assert "GNU-like command-line" in client.out
         assert "main __clang_major__17" in client.out
-        assert "main _MSC_VER193" in client.out
+        assert "main _MSC_VER1941" in client.out
         assert "main _MSVC_LANG2014" in client.out
         assert "main _M_X64 defined" in client.out
         assert "main __x86_64__ defined" in client.out
@@ -157,7 +157,7 @@ def test_clang_visual_studio_generator(self, client):
         # My local is 17, but CI ClangCL still 16
         assert "main __clang_major__17" in client.out
         # Check this! Clang compiler in Windows is reporting MSC_VER and MSVC_LANG!
-        assert "main _MSC_VER193" in client.out
+        assert "main _MSC_VER1941" in client.out
         assert "main _MSVC_LANG2017" in client.out
         assert "main _M_X64 defined" in client.out
         assert "main __x86_64__ defined" in client.out
diff --git a/test/functional/toolchains/microsoft/test_v2_msbuild_template.py b/test/functional/toolchains/microsoft/test_v2_msbuild_template.py
index b3b272a4d91..a8bd802966a 100644
--- a/test/functional/toolchains/microsoft/test_v2_msbuild_template.py
+++ b/test/functional/toolchains/microsoft/test_v2_msbuild_template.py
@@ -49,11 +49,11 @@ def test_msbuild_lib_2022():
     assert "hello/0.1: _MSC_VER191" in client.out
 
     # Create works
-    client.run("create . -s compiler.version=193")
+    client.run("create . -s compiler.version=194")
     assert "hello/0.1: Hello World Release!" in client.out
     # This is the default compiler.version=191 in conftest
     assert "Activating environment Visual Studio 17" in client.out
-    assert "hello/0.1: _MSC_VER193" in client.out
+    assert "hello/0.1: _MSC_VER1941" in client.out
 
 
 @pytest.mark.skipif(platform.system() != "Windows", reason="Requires Windows")

From a32f7f829e35c40bad20f3fee6756a447d3b0166 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 16:12:40 +0200
Subject: [PATCH 097/211] wip

---
 .github/workflows/win-tests.yml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 615d4aa9d60..1520cc0b962 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -154,11 +154,13 @@ jobs:
           $env:CONAN_TEST_FOLDER = $randomFolder
           $env:Path = "C:\tools\cmake\3.15.7\cmake-3.15.7-win64-x64\bin;" + $env:Path
           Remove-Item 'C:\Strawberry' -Recurse
-          pytest test/functional/test_profile_detect_api.py::TestProfileDetectAPI::test_profile_detect_compiler -vvv
-          pytest test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py::TestVSClangCL::test_clang_visual_studio_generator -vvv
-          pytest test/integration/toolchains/microsoft/vcvars_test.py::test_vcvars_2015_error -vvv
-          pytest test/integration/toolchains/microsoft/vcvars_test.py::test_vcvars_platform_x86 -vvv
-          pytest test/integration/toolchains/microsoft/vcvars_test.py::test_deactivate_vcvars_message -vvv
-          pytest test/performance/test_large_graph.py::test_large_graph -vvv
-          pytest test/functional/toolchains/microsoft/test_msbuild.py::TestWin::test_toolchain_win_vs2022[msvc-193-static-17] -vvv
-          pytest test/functional/toolchains/microsoft/test_v2_msbuild_template.py::test_msbuild_lib_2022 -vvv
+          pytest `
+            test/functional/test_profile_detect_api.py::TestProfileDetectAPI::test_profile_detect_compiler `
+            test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py::TestVSClangCL::test_clang_visual_studio_generator `
+            test/integration/toolchains/microsoft/vcvars_test.py::test_vcvars_2015_error `
+            test/integration/toolchains/microsoft/vcvars_test.py::test_vcvars_platform_x86 `
+            test/integration/toolchains/microsoft/vcvars_test.py::test_deactivate_vcvars_message `
+            test/performance/test_large_graph.py::test_large_graph `
+            test/functional/toolchains/microsoft/test_msbuild.py::TestWin::test_toolchain_win_vs2022[msvc-193-static-17] `
+            test/functional/toolchains/microsoft/test_v2_msbuild_template.py::test_msbuild_lib_2022 `
+            -vvv
\ No newline at end of file

From bc1f7f22d2e49a637faeccbad0dc587a17efed68 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 16:37:57 +0200
Subject: [PATCH 098/211] fix

---
 .github/workflows/win-tests.yml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 1520cc0b962..54f43498c2a 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -155,12 +155,10 @@ jobs:
           $env:Path = "C:\tools\cmake\3.15.7\cmake-3.15.7-win64-x64\bin;" + $env:Path
           Remove-Item 'C:\Strawberry' -Recurse
           pytest `
-            test/functional/test_profile_detect_api.py::TestProfileDetectAPI::test_profile_detect_compiler `
-            test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py::TestVSClangCL::test_clang_visual_studio_generator `
-            test/integration/toolchains/microsoft/vcvars_test.py::test_vcvars_2015_error `
-            test/integration/toolchains/microsoft/vcvars_test.py::test_vcvars_platform_x86 `
-            test/integration/toolchains/microsoft/vcvars_test.py::test_deactivate_vcvars_message `
-            test/performance/test_large_graph.py::test_large_graph `
-            test/functional/toolchains/microsoft/test_msbuild.py::TestWin::test_toolchain_win_vs2022[msvc-193-static-17] `
-            test/functional/toolchains/microsoft/test_v2_msbuild_template.py::test_msbuild_lib_2022 `
+            test/functional/test_profile_detect_api.py `
+            test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py `
+            test/integration/toolchains/microsoft/vcvars_test.py `
+            test/performance/test_large_graph.py `
+            test/functional/toolchains/microsoft/test_msbuild.py `
+            test/functional/toolchains/microsoft/test_v2_msbuild_template.py `
             -vvv
\ No newline at end of file

From 76edde94fcee58d3dd880f14e450397574488379 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 16:58:12 +0200
Subject: [PATCH 099/211] wip

---
 .../cmake/test_cmake_toolchain_win_clang.py        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py b/test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py
index 95741f34cef..d0385f90f08 100644
--- a/test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py
+++ b/test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py
@@ -64,7 +64,7 @@ def package_info(self):
 
 
 @pytest.mark.tool("cmake")
-@pytest.mark.tool("clang", "16")
+@pytest.mark.tool("clang", "17")
 @pytest.mark.skipif(platform.system() != "Windows", reason="requires Win")
 class TestLLVMClang:
     """ External LLVM/clang, with different CMake generators
@@ -73,7 +73,7 @@ class TestLLVMClang:
 
     @pytest.mark.tool("mingw64")
     @pytest.mark.tool("visual_studio", "17")
-    @pytest.mark.tool("clang", "16")  # repeated, for priority over the mingw64 clang
+    @pytest.mark.tool("clang", "17")  # repeated, for priority over the mingw64 clang
     @pytest.mark.parametrize("runtime", ["static", "dynamic"])
     def test_clang_mingw(self, client, runtime):
         """ compiling with an LLVM-clang installed, which uses by default the
@@ -115,28 +115,28 @@ def test_clang_cmake_ninja_nmake(self, client, generator):
         cmd = cmd + ".exe"
         check_vs_runtime(cmd, client, "17", build_type="Release", static_runtime=False)
 
-    @pytest.mark.tool("visual_studio", "16")
-    @pytest.mark.tool("clang", "16")  # repeated, for priority over the mingw64 clang
+    @pytest.mark.tool("visual_studio", "17")
+    @pytest.mark.tool("clang", "17")  # repeated, for priority over the mingw64 clang
     def test_clang_cmake_runtime_version(self, client):
         generator = "Ninja"
         # Make sure that normal CMakeLists with verify=False works
         client.save({"CMakeLists.txt": gen_cmakelists(verify=False, appname="my_app",
                                                       appsources=["src/main.cpp"], install=True)})
         client.run("create . --name=pkg --version=0.1 -pr=clang -s compiler.runtime=dynamic -s compiler.cppstd=17 "
-                   "-s compiler.runtime_version=v142 "
+                   "-s compiler.runtime_version=v144 "
                    '-c tools.cmake.cmaketoolchain:generator="{}"'.format(generator))
 
         assert 'cmake -G "{}"'.format(generator) in client.out
         assert "GNU-like command-line" in client.out
         assert "main __clang_major__17" in client.out
         # Check this! Clang compiler in Windows is reporting MSC_VER and MSVC_LANG!
-        assert "main _MSC_VER192" in client.out
+        assert "main _MSC_VER1941" in client.out
         assert "main _MSVC_LANG2017" in client.out
         assert "main _M_X64 defined" in client.out
         assert "main __x86_64__ defined" in client.out
         cmd = re.search(r"MYCMD=(.*)!", str(client.out)).group(1)
         cmd = cmd + ".exe"
-        check_vs_runtime(cmd, client, "16", build_type="Release", static_runtime=False)
+        check_vs_runtime(cmd, client, "17", build_type="Release", static_runtime=False)
 
 
 @pytest.mark.skipif(platform.system() != "Windows", reason="requires Win")

From fb0dd8a89a4da03887ae4dee38a85a7ab0075b13 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 17:06:06 +0200
Subject: [PATCH 100/211] revert change

---
 conan/internal/api/detect/detect_vs.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/conan/internal/api/detect/detect_vs.py b/conan/internal/api/detect/detect_vs.py
index 2f6c1c9d3de..6d54c996d25 100644
--- a/conan/internal/api/detect/detect_vs.py
+++ b/conan/internal/api/detect/detect_vs.py
@@ -14,12 +14,8 @@ def vs_detect_update(version):
     version = {"194": "17", "193": "17", "192": "16", "191": "15"}.get(str(version))
     full_version = _vs_installation_path(version)[1]
     components = full_version.split(".")
-    # 17.10 --> 1940
-    # 17.11 --> 1941
-    # etc...    
     if len(components) > 1:
-        return str(int(components[1]) % 10)
-
+        return components[1]
 
 def _vs_installation_path(version):
     # TODO: Preference hardcoded, [conf] must be defined

From c41e73fbb192c7bc16f225c24979c24633a26aba Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 17:06:44 +0200
Subject: [PATCH 101/211] fix update

---
 test/functional/test_profile_detect_api.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/functional/test_profile_detect_api.py b/test/functional/test_profile_detect_api.py
index 5b0620f4b61..8184c8d6f2d 100644
--- a/test/functional/test_profile_detect_api.py
+++ b/test/functional/test_profile_detect_api.py
@@ -21,7 +21,8 @@ def test_profile_detect_compiler(self):
             compiler.version={{detect_api.default_compiler_version(compiler, version)}}
             compiler.runtime={{runtime}}
             compiler.cppstd={{detect_api.default_cppstd(compiler, version)}}
-            compiler.update={{detect_api.detect_msvc_update(version)}}
+            # FIXME: check if we can do something better than this, we have a problem with updates
+            compiler.update={{str(int(detect_api.detect_msvc_update(version)) % 10)}}
 
             [conf]
             tools.microsoft.msbuild:vs_version={{detect_api.default_msvc_ide_version(version)}}

From 4ce025ea171288b872d1f8aa8d15680319cf48dc Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 17:22:53 +0200
Subject: [PATCH 102/211] revert

---
 test/performance/test_large_graph.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/performance/test_large_graph.py b/test/performance/test_large_graph.py
index 2f58d0dbffb..7f5fe20b36e 100644
--- a/test/performance/test_large_graph.py
+++ b/test/performance/test_large_graph.py
@@ -9,7 +9,7 @@
 
 
 def test_large_graph():
-    c = TestClient()
+    c = TestClient(cache_folder="T:/mycache")
     num_test = 40
     num_pkgs = 40
 

From 2ccb0b529b160a2099dbbbe9c2dcaa68eb773730 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 17:24:24 +0200
Subject: [PATCH 103/211] skip performance

---
 test/performance/test_large_graph.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/performance/test_large_graph.py b/test/performance/test_large_graph.py
index 7f5fe20b36e..6966a0d4418 100644
--- a/test/performance/test_large_graph.py
+++ b/test/performance/test_large_graph.py
@@ -3,11 +3,13 @@
 import pstats
 import time
 from pstats import SortKey
+import pytest
 
 from conan.test.assets.genconanfile import GenConanfile
 from conan.test.utils.tools import TestClient
 
 
+@pytest.mark.skip(reason="This is a performance test, skip for normal runs")
 def test_large_graph():
     c = TestClient(cache_folder="T:/mycache")
     num_test = 40

From c5551b8733ef398b571459bf6c18c2f9ce73603e Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 17:24:58 +0200
Subject: [PATCH 104/211] wip

---
 .github/workflows/win-tests.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 54f43498c2a..fd607856ada 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -158,7 +158,6 @@ jobs:
             test/functional/test_profile_detect_api.py `
             test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py `
             test/integration/toolchains/microsoft/vcvars_test.py `
-            test/performance/test_large_graph.py `
             test/functional/toolchains/microsoft/test_msbuild.py `
             test/functional/toolchains/microsoft/test_v2_msbuild_template.py `
             -vvv
\ No newline at end of file

From 7481a1764f1d5ab2fe7e805b13765ed3af796687 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 17:28:30 +0200
Subject: [PATCH 105/211] use valid jinja

---
 test/functional/test_profile_detect_api.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/functional/test_profile_detect_api.py b/test/functional/test_profile_detect_api.py
index 8184c8d6f2d..bba392d3a43 100644
--- a/test/functional/test_profile_detect_api.py
+++ b/test/functional/test_profile_detect_api.py
@@ -22,7 +22,7 @@ def test_profile_detect_compiler(self):
             compiler.runtime={{runtime}}
             compiler.cppstd={{detect_api.default_cppstd(compiler, version)}}
             # FIXME: check if we can do something better than this, we have a problem with updates
-            compiler.update={{str(int(detect_api.detect_msvc_update(version)) % 10)}}
+            compiler.update={{ (detect_api.detect_msvc_update(version) | int) % 10 }}
 
             [conf]
             tools.microsoft.msbuild:vs_version={{detect_api.default_msvc_ide_version(version)}}

From d1e963ed3afc5e0c8e73a1995cf562ad22adf762 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 17:32:11 +0200
Subject: [PATCH 106/211] more fixmes

---
 test/functional/test_profile_detect_api.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/functional/test_profile_detect_api.py b/test/functional/test_profile_detect_api.py
index bba392d3a43..57e0ef294a3 100644
--- a/test/functional/test_profile_detect_api.py
+++ b/test/functional/test_profile_detect_api.py
@@ -30,7 +30,8 @@ def test_profile_detect_compiler(self):
 
         client.save({"profile1": tpl1})
         client.run("profile show -pr=profile1")
-        update = detect_api.detect_msvc_update("194")
+        #FIXME: check update setting
+        update = str(int(detect_api.detect_msvc_update("194")) % 10)
         expected = textwrap.dedent(f"""\
             Host profile:
             [settings]

From cd22d28365126f7a51b4dd6f1bde38050760d4b7 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 17:40:02 +0200
Subject: [PATCH 107/211] add vc140

---
 .github/workflows/win-tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index fd607856ada..b93ac1362ac 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -81,6 +81,7 @@ jobs:
            "--add", "Microsoft.VisualStudio.Component.Windows81SDK", `
            "--add", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", `
            "--add", "Microsoft.Component.MSBuild", `
+           "--add", "Microsoft.VisualStudio.Component.VC.140", `
            "--add", "Microsoft.VisualStudio.Component.VC.v14.3.x86.x64" -Wait
 
       - name: Cache CMake and Bazel installations

From 5ebc688019d610968a4e84ac0f985abed61ea706 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 17:41:42 +0200
Subject: [PATCH 108/211] wip

---
 test/integration/toolchains/microsoft/vcvars_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/toolchains/microsoft/vcvars_test.py b/test/integration/toolchains/microsoft/vcvars_test.py
index b6526740b87..12f95f1bc9b 100644
--- a/test/integration/toolchains/microsoft/vcvars_test.py
+++ b/test/integration/toolchains/microsoft/vcvars_test.py
@@ -117,7 +117,7 @@ class TestConan(ConanFile):
             settings = "os", "compiler", "arch", "build_type"
     """)
     client.save({"conanfile.py": conanfile})
-    client.run('install . -s os=Windows -s compiler="msvc" -s compiler.version=191 '
+    client.run('install . -s os=Windows -s compiler="msvc" -s compiler.version=190 '
                '-s compiler.cppstd=14 -s compiler.runtime=static -s:b arch=x86')
 
     vcvars = client.load("conanvcvars.bat")

From 6dc3bb2c99ba35626abbd8e6558e416e6e85acd8 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 17:51:34 +0200
Subject: [PATCH 109/211] fix toolset and check

---
 .github/workflows/win-tests.yml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index b93ac1362ac..1136c466bca 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -82,7 +82,22 @@ jobs:
            "--add", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", `
            "--add", "Microsoft.Component.MSBuild", `
            "--add", "Microsoft.VisualStudio.Component.VC.140", `
-           "--add", "Microsoft.VisualStudio.Component.VC.v14.3.x86.x64" -Wait
+           "--add", "Microsoft.VisualStudio.Component.VC.v141.x86.x64" -Wait
+
+      - name: Check Visual Studio installations and toolsets
+        run: |
+          # List all Visual Studio installations
+          & 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -all -products * -format json | ConvertFrom-Json | ForEach-Object {
+              Write-Host "Installation Path: $_.installationPath"
+              Write-Host "Product: $_.catalog_productDisplayName"
+              Write-Host "Version: $_.catalog_productLineVersion"
+          }
+
+          # List the available toolsets in Visual Studio
+          $vsInstallationPath = (Get-Item 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community').FullName
+          $vcvarsPath = "$vsInstallationPath\VC\Auxiliary\Build\vcvarsall.bat"
+          Write-Host "Toolsets in Visual Studio:"
+          cmd.exe /c "$vcvarsPath -help"
 
       - name: Cache CMake and Bazel installations
         id: cache-tools

From b9c762b2ce3c36f93bcf5066cc88a6111c6f7cba Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 17:53:13 +0200
Subject: [PATCH 110/211] check with vs_buildtools

---
 .github/workflows/win-tests.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 1136c466bca..2d726d31b27 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -74,15 +74,15 @@ jobs:
 
       - name: Install VS 15 2017 Community edition
         run: |
-          Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_community.exe" -OutFile "vs_installer.exe"
-          Start-Process -FilePath ".\vs_installer.exe" -ArgumentList `
-           "--quiet",  "--wait", "--norestart", "--nocache", `
-           "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
-           "--add", "Microsoft.VisualStudio.Component.Windows81SDK", `
-           "--add", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", `
-           "--add", "Microsoft.Component.MSBuild", `
-           "--add", "Microsoft.VisualStudio.Component.VC.140", `
-           "--add", "Microsoft.VisualStudio.Component.VC.v141.x86.x64" -Wait
+            Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_buildtools.exe" -OutFile "vs_buildtools.exe"
+            Start-Process -FilePath ".\vs_buildtools.exe" -ArgumentList `
+            "--quiet",  "--wait", "--norestart", "--nocache", `
+            "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
+            "--add", "Microsoft.VisualStudio.Component.Windows81SDK", `
+            "--add", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", `
+            "--add", "Microsoft.Component.MSBuild", `
+            "--add", "Microsoft.VisualStudio.Component.VC.140", `
+            "--add", "Microsoft.VisualStudio.Component.VC.v141.x86.x64" -Wait
 
       - name: Check Visual Studio installations and toolsets
         run: |

From c0e4ba54a08ef997d33ccbca3b1c1c0f005c9c39 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 18:13:34 +0200
Subject: [PATCH 111/211] wip

---
 .github/workflows/win-tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 2d726d31b27..e66cb473f05 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -74,8 +74,8 @@ jobs:
 
       - name: Install VS 15 2017 Community edition
         run: |
-            Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_buildtools.exe" -OutFile "vs_buildtools.exe"
-            Start-Process -FilePath ".\vs_buildtools.exe" -ArgumentList `
+            Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_community.exe" -OutFile "vs_community.exe"
+            Start-Process -FilePath ".\vs_community.exe" -ArgumentList `
             "--quiet",  "--wait", "--norestart", "--nocache", `
             "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
             "--add", "Microsoft.VisualStudio.Component.Windows81SDK", `

From 07a77a9c86848954bed73d51702410fde40dc6a7 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 18:14:11 +0200
Subject: [PATCH 112/211] wip

---
 .github/workflows/win-tests.yml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index e66cb473f05..c831f63e9d3 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -170,10 +170,4 @@ jobs:
           $env:CONAN_TEST_FOLDER = $randomFolder
           $env:Path = "C:\tools\cmake\3.15.7\cmake-3.15.7-win64-x64\bin;" + $env:Path
           Remove-Item 'C:\Strawberry' -Recurse
-          pytest `
-            test/functional/test_profile_detect_api.py `
-            test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py `
-            test/integration/toolchains/microsoft/vcvars_test.py `
-            test/functional/toolchains/microsoft/test_msbuild.py `
-            test/functional/toolchains/microsoft/test_v2_msbuild_template.py `
-            -vvv
\ No newline at end of file
+          pytest test/ -vvv -n auto
\ No newline at end of file

From 1c299058882de0f4b870d53d1ed58d94cc384bdc Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 23 Oct 2024 19:05:48 +0200
Subject: [PATCH 113/211] wip

---
 .github/workflows/win-tests.yml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index c831f63e9d3..c068e1a84da 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -84,20 +84,20 @@ jobs:
             "--add", "Microsoft.VisualStudio.Component.VC.140", `
             "--add", "Microsoft.VisualStudio.Component.VC.v141.x86.x64" -Wait
 
-      - name: Check Visual Studio installations and toolsets
-        run: |
-          # List all Visual Studio installations
-          & 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -all -products * -format json | ConvertFrom-Json | ForEach-Object {
-              Write-Host "Installation Path: $_.installationPath"
-              Write-Host "Product: $_.catalog_productDisplayName"
-              Write-Host "Version: $_.catalog_productLineVersion"
-          }
-
-          # List the available toolsets in Visual Studio
-          $vsInstallationPath = (Get-Item 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community').FullName
-          $vcvarsPath = "$vsInstallationPath\VC\Auxiliary\Build\vcvarsall.bat"
-          Write-Host "Toolsets in Visual Studio:"
-          cmd.exe /c "$vcvarsPath -help"
+      # - name: Check Visual Studio installations and toolsets
+      #   run: |
+      #     # List all Visual Studio installations
+      #     & 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -all -products * -format json | ConvertFrom-Json | ForEach-Object {
+      #         Write-Host "Installation Path: $_.installationPath"
+      #         Write-Host "Product: $_.catalog_productDisplayName"
+      #         Write-Host "Version: $_.catalog_productLineVersion"
+      #     }
+
+      #     # List the available toolsets in Visual Studio
+      #     $vsInstallationPath = (Get-Item 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community').FullName
+      #     $vcvarsPath = "$vsInstallationPath\VC\Auxiliary\Build\vcvarsall.bat"
+      #     Write-Host "Toolsets in Visual Studio:"
+      #     cmd.exe /c "$vcvarsPath -help"
 
       - name: Cache CMake and Bazel installations
         id: cache-tools

From c99a1b8beefe72a49ba8df1e8c749d84be675793 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Thu, 24 Oct 2024 07:52:32 +0200
Subject: [PATCH 114/211] wip

---
 .../toolchains/cmake/test_cmake_toolchain.py  |  2 +
 .../functional/toolchains/cmake/test_ninja.py |  1 +
 .../toolchains/microsoft/test_vcvars.py       | 41 +++++++++++++++++++
 .../command_v2/test_cache_save_restore.py     |  3 ++
 .../toolchains/microsoft/vcvars_test.py       | 34 ---------------
 5 files changed, 47 insertions(+), 34 deletions(-)
 create mode 100644 test/functional/toolchains/microsoft/test_vcvars.py

diff --git a/test/functional/toolchains/cmake/test_cmake_toolchain.py b/test/functional/toolchains/cmake/test_cmake_toolchain.py
index bedbf7ecc6a..efb07d37514 100644
--- a/test/functional/toolchains/cmake/test_cmake_toolchain.py
+++ b/test/functional/toolchains/cmake/test_cmake_toolchain.py
@@ -620,6 +620,8 @@ def test_cmake_toolchain_runtime_types_cmake_older_than_3_15():
 
 @pytest.mark.skipif(platform.system() != "Windows", reason="Only for windows")
 class TestWinSDKVersion:
+
+    @pytest.mark.tool("visual_studio", "17")
     def test_cmake_toolchain_winsdk_version(self):
         # This test passes also with CMake 3.28, as long as cmake_minimum_required(VERSION 3.27)
         # is not defined
diff --git a/test/functional/toolchains/cmake/test_ninja.py b/test/functional/toolchains/cmake/test_ninja.py
index 8c354d1a82c..7c34c142e8e 100644
--- a/test/functional/toolchains/cmake/test_ninja.py
+++ b/test/functional/toolchains/cmake/test_ninja.py
@@ -86,6 +86,7 @@ def test_locally_build_linux(build_type, shared, client):
 
 @pytest.mark.skipif(platform.system() != "Windows", reason="Only windows")
 @pytest.mark.parametrize("build_type,shared", [("Release", False), ("Debug", True)])
+@pytest.mark.tool("visual_studio", "15")
 @pytest.mark.tool("ninja")
 def test_locally_build_msvc(build_type, shared, client):
     msvc_version = "15"
diff --git a/test/functional/toolchains/microsoft/test_vcvars.py b/test/functional/toolchains/microsoft/test_vcvars.py
new file mode 100644
index 00000000000..6a48a340976
--- /dev/null
+++ b/test/functional/toolchains/microsoft/test_vcvars.py
@@ -0,0 +1,41 @@
+import platform
+import textwrap
+
+import pytest
+
+from conan.test.utils.tools import TestClient
+
+
+@pytest.mark.skipif(platform.system() != "Windows", reason="Requires Windows")
+@pytest.mark.tool("visual_studio", "17")
+def test_deactivate_vcvars_message():
+    client = TestClient()
+    conanfile = textwrap.dedent("""
+            from conan import ConanFile
+            class TestConan(ConanFile):
+                generators = "VCVars"
+                settings = "os", "compiler", "arch", "build_type"
+        """)
+    client.save({"conanfile.py": conanfile})
+    client.run('install . -s compiler.version=193')
+    client.run_command(r'conanbuild.bat')
+    assert "[vcvarsall.bat] Environment initialized" in client.out
+    client.run_command(r'deactivate_conanvcvars.bat')
+    assert "vcvars env cannot be deactivated" in client.out
+
+
+@pytest.mark.skipif(platform.system() != "Windows", reason="Requires Windows Powershell")
+def test_deactivate_vcvars_with_powershell():
+    client = TestClient()
+    conanfile = textwrap.dedent("""
+                from conan import ConanFile
+                class TestConan(ConanFile):
+                    generators = "VCVars"
+                    settings = "os", "compiler", "arch", "build_type"
+            """)
+    client.save({"conanfile.py": conanfile})
+    client.run('install . -c tools.env.virtualenv:powershell=True')
+    client.run_command(r'powershell.exe ".\conanbuild.ps1"')
+    assert "conanvcvars.ps1: Activated environment" in client.out
+    client.run_command(r'powershell.exe ".\deactivate_conanvcvars.ps1"')
+    assert "vcvars env cannot be deactivated" in client.out
diff --git a/test/integration/command_v2/test_cache_save_restore.py b/test/integration/command_v2/test_cache_save_restore.py
index cc4fb30b127..3d6009e36ee 100644
--- a/test/integration/command_v2/test_cache_save_restore.py
+++ b/test/integration/command_v2/test_cache_save_restore.py
@@ -2,6 +2,7 @@
 import os
 import shutil
 import tarfile
+import time
 
 import pytest
 
@@ -157,9 +158,11 @@ def test_cache_save_restore_multiple_revisions():
     c = TestClient()
     c.save({"conanfile.py": GenConanfile("pkg", "0.1")})
     c.run("create .")
+    time.sleep(0.01)
     rrev1 = c.exported_recipe_revision()
     c.save({"conanfile.py": GenConanfile("pkg", "0.1").with_class_attribute("var=42")})
     c.run("create .")
+    time.sleep(0.01)
     rrev2 = c.exported_recipe_revision()
     c.save({"conanfile.py": GenConanfile("pkg", "0.1").with_class_attribute("var=123")})
     c.run("create .")
diff --git a/test/integration/toolchains/microsoft/vcvars_test.py b/test/integration/toolchains/microsoft/vcvars_test.py
index 12f95f1bc9b..25d2ae571c4 100644
--- a/test/integration/toolchains/microsoft/vcvars_test.py
+++ b/test/integration/toolchains/microsoft/vcvars_test.py
@@ -161,37 +161,3 @@ class TestConan(ConanFile):
 
     vcvars = client.load("conanvcvars.bat")
     assert 'vcvarsall.bat"  amd64 -vcvars_ver=14.33' in vcvars
-
-
-@pytest.mark.skipif(platform.system() != "Windows", reason="Requires Windows")
-def test_deactivate_vcvars_message():
-    client = TestClient()
-    conanfile = textwrap.dedent("""
-            from conan import ConanFile
-            class TestConan(ConanFile):
-                generators = "VCVars"
-                settings = "os", "compiler", "arch", "build_type"
-        """)
-    client.save({"conanfile.py": conanfile})
-    client.run('install . -s compiler.version=193')
-    client.run_command(r'conanbuild.bat')
-    assert "[vcvarsall.bat] Environment initialized" in client.out
-    client.run_command(r'deactivate_conanvcvars.bat')
-    assert "vcvars env cannot be deactivated" in client.out
-
-
-@pytest.mark.skipif(platform.system() != "Windows", reason="Requires Windows Powershell")
-def test_deactivate_vcvars_with_powershell():
-    client = TestClient()
-    conanfile = textwrap.dedent("""
-                from conan import ConanFile
-                class TestConan(ConanFile):
-                    generators = "VCVars"
-                    settings = "os", "compiler", "arch", "build_type"
-            """)
-    client.save({"conanfile.py": conanfile})
-    client.run('install . -c tools.env.virtualenv:powershell=True')
-    client.run_command(r'powershell.exe ".\conanbuild.ps1"')
-    assert "conanvcvars.ps1: Activated environment" in client.out
-    client.run_command(r'powershell.exe ".\deactivate_conanvcvars.ps1"')
-    assert "vcvars env cannot be deactivated" in client.out

From 3237ab14ff96567c91d998c2602009785bc58792 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 24 Oct 2024 08:01:56 +0200
Subject: [PATCH 115/211] use 194 instead of 193 as we have vs 17.11 v144
 installed

---
 test/functional/toolchains/cmake/test_cmake_toolchain.py | 4 ++--
 test/functional/toolchains/microsoft/test_vcvars.py      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/functional/toolchains/cmake/test_cmake_toolchain.py b/test/functional/toolchains/cmake/test_cmake_toolchain.py
index efb07d37514..972c4a01555 100644
--- a/test/functional/toolchains/cmake/test_cmake_toolchain.py
+++ b/test/functional/toolchains/cmake/test_cmake_toolchain.py
@@ -631,7 +631,7 @@ def test_cmake_toolchain_winsdk_version(self):
         cmake += 'message(STATUS "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION = ' \
                  '${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")'
         client.save({"CMakeLists.txt": cmake})
-        client.run("create . -s arch=x86_64 -s compiler.version=193 "
+        client.run("create . -s arch=x86_64 -s compiler.version=194 "
                    "-c tools.microsoft:winsdk_version=10.0")
         assert "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION = 10.0" in client.out
         assert "Conan toolchain: CMAKE_GENERATOR_PLATFORM=x64" in client.out
@@ -649,7 +649,7 @@ def test_cmake_toolchain_winsdk_version2(self):
         cmake += 'message(STATUS "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION = ' \
                  '${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")'
         client.save({"CMakeLists.txt": cmake})
-        client.run("create . -s arch=x86_64 -s compiler.version=193 "
+        client.run("create . -s arch=x86_64 -s compiler.version=194 "
                    "-c tools.microsoft:winsdk_version=10.0 "
                    '-c tools.cmake.cmaketoolchain:generator="Visual Studio 17"')
         assert "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION = 10.0" in client.out
diff --git a/test/functional/toolchains/microsoft/test_vcvars.py b/test/functional/toolchains/microsoft/test_vcvars.py
index 6a48a340976..7ecaf00bceb 100644
--- a/test/functional/toolchains/microsoft/test_vcvars.py
+++ b/test/functional/toolchains/microsoft/test_vcvars.py
@@ -17,7 +17,7 @@ class TestConan(ConanFile):
                 settings = "os", "compiler", "arch", "build_type"
         """)
     client.save({"conanfile.py": conanfile})
-    client.run('install . -s compiler.version=193')
+    client.run('install . -s compiler.version=194')
     client.run_command(r'conanbuild.bat')
     assert "[vcvarsall.bat] Environment initialized" in client.out
     client.run_command(r'deactivate_conanvcvars.bat')

From db795bb85dc522c8375bba62854bff6aed622d12 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 24 Oct 2024 08:04:42 +0200
Subject: [PATCH 116/211] use 194

---
 test/functional/toolchains/microsoft/test_msbuild.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/functional/toolchains/microsoft/test_msbuild.py b/test/functional/toolchains/microsoft/test_msbuild.py
index c476e07c0ae..b3780050bd5 100644
--- a/test/functional/toolchains/microsoft/test_msbuild.py
+++ b/test/functional/toolchains/microsoft/test_msbuild.py
@@ -430,7 +430,7 @@ def test_toolchain_win_vs2017(self, compiler, version, runtime, cppstd):
     @pytest.mark.tool("cmake", "3.23")
     @pytest.mark.tool("visual_studio", "17")
     @pytest.mark.parametrize("compiler,version,runtime,cppstd",
-                             [("msvc", "193", "static", "17")])
+                             [("msvc", "194", "static", "17")])
     def test_toolchain_win_vs2022(self, compiler, version, runtime, cppstd):
         self.check_toolchain_win(compiler, version, runtime, cppstd, ide_version=17)
 

From 979450ec15e27019acd6a8decb30c7852e26735e Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 24 Oct 2024 08:37:06 +0200
Subject: [PATCH 117/211] if this test runs with cmake 3.15 we have to lower to
 191

---
 test/functional/toolchains/cmake/test_cmake_toolchain.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/functional/toolchains/cmake/test_cmake_toolchain.py b/test/functional/toolchains/cmake/test_cmake_toolchain.py
index 972c4a01555..e9983767a10 100644
--- a/test/functional/toolchains/cmake/test_cmake_toolchain.py
+++ b/test/functional/toolchains/cmake/test_cmake_toolchain.py
@@ -621,7 +621,7 @@ def test_cmake_toolchain_runtime_types_cmake_older_than_3_15():
 @pytest.mark.skipif(platform.system() != "Windows", reason="Only for windows")
 class TestWinSDKVersion:
 
-    @pytest.mark.tool("visual_studio", "17")
+    @pytest.mark.tool("visual_studio", "15")
     def test_cmake_toolchain_winsdk_version(self):
         # This test passes also with CMake 3.28, as long as cmake_minimum_required(VERSION 3.27)
         # is not defined
@@ -631,7 +631,7 @@ def test_cmake_toolchain_winsdk_version(self):
         cmake += 'message(STATUS "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION = ' \
                  '${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")'
         client.save({"CMakeLists.txt": cmake})
-        client.run("create . -s arch=x86_64 -s compiler.version=194 "
+        client.run("create . -s arch=x86_64 -s compiler.version=191 "
                    "-c tools.microsoft:winsdk_version=10.0")
         assert "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION = 10.0" in client.out
         assert "Conan toolchain: CMAKE_GENERATOR_PLATFORM=x64" in client.out

From 62d75bd7c4fcc82ca80ad43b16b1ef4c95e2529b Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 24 Oct 2024 08:37:12 +0200
Subject: [PATCH 118/211] just run failing

---
 .github/workflows/win-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index c068e1a84da..d3f135abb42 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -170,4 +170,4 @@ jobs:
           $env:CONAN_TEST_FOLDER = $randomFolder
           $env:Path = "C:\tools\cmake\3.15.7\cmake-3.15.7-win64-x64\bin;" + $env:Path
           Remove-Item 'C:\Strawberry' -Recurse
-          pytest test/ -vvv -n auto
\ No newline at end of file
+          pytest -k "test_cache_save_restore_multiple_revisions or test_cmake_toolchain_winsdk_version or test_deactivate_vcvars_message or test_toolchain_win_vs2022 or test_locally_build_msvc or test_locally_build_msvc_toolset" -vvv
\ No newline at end of file

From d5c7090d6e3bf3783c3f8244c1a44110e90a698d Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 24 Oct 2024 08:46:51 +0200
Subject: [PATCH 119/211] use modern cmake to allow vs 17 generator

---
 test/functional/toolchains/cmake/test_cmake_toolchain.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/functional/toolchains/cmake/test_cmake_toolchain.py b/test/functional/toolchains/cmake/test_cmake_toolchain.py
index e9983767a10..9caccb2ef76 100644
--- a/test/functional/toolchains/cmake/test_cmake_toolchain.py
+++ b/test/functional/toolchains/cmake/test_cmake_toolchain.py
@@ -621,7 +621,8 @@ def test_cmake_toolchain_runtime_types_cmake_older_than_3_15():
 @pytest.mark.skipif(platform.system() != "Windows", reason="Only for windows")
 class TestWinSDKVersion:
 
-    @pytest.mark.tool("visual_studio", "15")
+    @pytest.mark.tool("cmake", "3.23")
+    @pytest.mark.tool("visual_studio", "17")
     def test_cmake_toolchain_winsdk_version(self):
         # This test passes also with CMake 3.28, as long as cmake_minimum_required(VERSION 3.27)
         # is not defined
@@ -631,7 +632,7 @@ def test_cmake_toolchain_winsdk_version(self):
         cmake += 'message(STATUS "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION = ' \
                  '${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")'
         client.save({"CMakeLists.txt": cmake})
-        client.run("create . -s arch=x86_64 -s compiler.version=191 "
+        client.run("create . -s arch=x86_64 -s compiler.version=194 "
                    "-c tools.microsoft:winsdk_version=10.0")
         assert "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION = 10.0" in client.out
         assert "Conan toolchain: CMAKE_GENERATOR_PLATFORM=x64" in client.out

From f450aa449c0426c3f9fdc99846d68330605f11a7 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 24 Oct 2024 09:11:57 +0200
Subject: [PATCH 120/211] sleep more

---
 test/integration/command_v2/test_cache_save_restore.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/integration/command_v2/test_cache_save_restore.py b/test/integration/command_v2/test_cache_save_restore.py
index 3d6009e36ee..7cccd6a6f30 100644
--- a/test/integration/command_v2/test_cache_save_restore.py
+++ b/test/integration/command_v2/test_cache_save_restore.py
@@ -158,11 +158,11 @@ def test_cache_save_restore_multiple_revisions():
     c = TestClient()
     c.save({"conanfile.py": GenConanfile("pkg", "0.1")})
     c.run("create .")
-    time.sleep(0.01)
+    time.sleep(0.1)
     rrev1 = c.exported_recipe_revision()
     c.save({"conanfile.py": GenConanfile("pkg", "0.1").with_class_attribute("var=42")})
     c.run("create .")
-    time.sleep(0.01)
+    time.sleep(0.1)
     rrev2 = c.exported_recipe_revision()
     c.save({"conanfile.py": GenConanfile("pkg", "0.1").with_class_attribute("var=123")})
     c.run("create .")

From 9fe2ed71a78694e790d227cd006cfc024ea16fcc Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 24 Oct 2024 09:30:27 +0200
Subject: [PATCH 121/211] print out

---
 test/functional/utils.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/functional/utils.py b/test/functional/utils.py
index 7d92a89d11a..283737f87f6 100644
--- a/test/functional/utils.py
+++ b/test/functional/utils.py
@@ -78,6 +78,7 @@ def check_vs_runtime(artifact, client, vs_version, build_type, architecture="amd
 def check_exe_run(output, names, compiler, version, build_type, arch, cppstd, definitions=None,
                   cxx11_abi=None, subsystem=None, extra_msg=""):
     output = str(output)
+    print(output)
     names = names if isinstance(names, list) else [names]
 
     for name in names:

From 6ce118950778740a4684e0c8ec5583d9b1221d76 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 24 Oct 2024 09:39:12 +0200
Subject: [PATCH 122/211] check vs

---
 .github/workflows/win-tests.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index d3f135abb42..b7a366908cf 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -84,6 +84,10 @@ jobs:
             "--add", "Microsoft.VisualStudio.Component.VC.140", `
             "--add", "Microsoft.VisualStudio.Component.VC.v141.x86.x64" -Wait
 
+      - name: Verify Visual Studio installation
+        run: |
+          "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -requires Microsoft.Component.MSBuild -property installationPath
+
       # - name: Check Visual Studio installations and toolsets
       #   run: |
       #     # List all Visual Studio installations

From b2f92d14fd38092e39d64e3bb7613a89e407fede Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 24 Oct 2024 09:46:59 +0200
Subject: [PATCH 123/211] check gcc

---
 .github/workflows/win-tests.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index b7a366908cf..f6ce08eb3f6 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -84,6 +84,15 @@ jobs:
             "--add", "Microsoft.VisualStudio.Component.VC.140", `
             "--add", "Microsoft.VisualStudio.Component.VC.v141.x86.x64" -Wait
 
+      - name: Check if GCC is in PATH
+        run: |
+          $gccPath = Get-Command gcc.exe -ErrorAction SilentlyContinue
+          if ($null -ne $gccPath) {
+              Write-Host "GCC found in PATH at: $($gccPath.Path)"
+          } else {
+              Write-Host "GCC not found in PATH."
+          }
+
       - name: Verify Visual Studio installation
         run: |
           "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -requires Microsoft.Component.MSBuild -property installationPath

From 4ee7eb35638f8bd1b892660bd6c5d2aa4ab1822e Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 24 Oct 2024 10:02:22 +0200
Subject: [PATCH 124/211] set cache for choco

---
 .github/workflows/win-tests.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index f6ce08eb3f6..7f45a7e1797 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -54,6 +54,14 @@ jobs:
           pip install -r conans/requirements_dev.txt
           pip install meson
 
+      - name: "Set choco cache"
+        run: choco config set cacheLocation C:\choco-cache
+
+      - uses: actions/cache@v4
+        with:
+          path: C:\choco-cache
+          key: choco-cache
+
       - name: Install Chocolatey packages
         run: |
           choco install pkgconfiglite --version 0.28

From c64e2973080eaca5b89dd9d8ad8d28fda1b002f3 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 24 Oct 2024 10:06:41 +0200
Subject: [PATCH 125/211] add choco cache and remove gcc from path

---
 .github/workflows/win-tests.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 7f45a7e1797..dd314f0375c 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -92,6 +92,13 @@ jobs:
             "--add", "Microsoft.VisualStudio.Component.VC.140", `
             "--add", "Microsoft.VisualStudio.Component.VC.v141.x86.x64" -Wait
 
+      - name: Remove GCC from PATH
+        run: |
+          $gccDir = "C:\mingw64\bin"
+          $newPath = ($env:PATH -split ";") -ne $gccDir -join ";"
+          [System.Environment]::SetEnvironmentVariable('PATH', $newPath)
+          Write-Host "GCC removed from PATH. Current PATH: $env:PATH"
+
       - name: Check if GCC is in PATH
         run: |
           $gccPath = Get-Command gcc.exe -ErrorAction SilentlyContinue
@@ -101,10 +108,6 @@ jobs:
               Write-Host "GCC not found in PATH."
           }
 
-      - name: Verify Visual Studio installation
-        run: |
-          "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -requires Microsoft.Component.MSBuild -property installationPath
-
       # - name: Check Visual Studio installations and toolsets
       #   run: |
       #     # List all Visual Studio installations

From cac10641d0ff2ad718763f0f4cf5dd37fc7112bd Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 24 Oct 2024 10:29:23 +0200
Subject: [PATCH 126/211] fix remove gcc from path

---
 .github/workflows/win-tests.yml | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index dd314f0375c..87a4bfd761f 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -92,22 +92,6 @@ jobs:
             "--add", "Microsoft.VisualStudio.Component.VC.140", `
             "--add", "Microsoft.VisualStudio.Component.VC.v141.x86.x64" -Wait
 
-      - name: Remove GCC from PATH
-        run: |
-          $gccDir = "C:\mingw64\bin"
-          $newPath = ($env:PATH -split ";") -ne $gccDir -join ";"
-          [System.Environment]::SetEnvironmentVariable('PATH', $newPath)
-          Write-Host "GCC removed from PATH. Current PATH: $env:PATH"
-
-      - name: Check if GCC is in PATH
-        run: |
-          $gccPath = Get-Command gcc.exe -ErrorAction SilentlyContinue
-          if ($null -ne $gccPath) {
-              Write-Host "GCC found in PATH at: $($gccPath.Path)"
-          } else {
-              Write-Host "GCC not found in PATH."
-          }
-
       # - name: Check Visual Studio installations and toolsets
       #   run: |
       #     # List all Visual Studio installations
@@ -188,6 +172,18 @@ jobs:
 
       - name: Run Tests
         run: |
+          $gccDir = "C:\mingw64\bin"
+          $newPath = ($env:PATH -split ";") -ne $gccDir -join ";"
+          [System.Environment]::SetEnvironmentVariable('PATH', $newPath)
+          Write-Host "GCC removed from PATH. Current PATH: $env:PATH"
+
+          $gccPath = Get-Command gcc.exe -ErrorAction SilentlyContinue
+          if ($null -ne $gccPath) {
+              Write-Host "GCC found in PATH at: $($gccPath.Path)"
+          } else {
+              Write-Host "GCC not found in PATH."
+          }
+
           $shortGuid = [System.Guid]::NewGuid().ToString().Substring(0, 4)
           $randomFolder = [System.IO.Path]::Combine("D:\\", "tmp_tests", $shortGuid)
           New-Item -ItemType Directory -Force -Path $randomFolder

From 06a617cce4c4bb862b310b31df924edbbbc31888 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 24 Oct 2024 10:53:52 +0200
Subject: [PATCH 127/211] add 1 second delay

---
 test/integration/command_v2/test_cache_save_restore.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/integration/command_v2/test_cache_save_restore.py b/test/integration/command_v2/test_cache_save_restore.py
index 7cccd6a6f30..d0587190b59 100644
--- a/test/integration/command_v2/test_cache_save_restore.py
+++ b/test/integration/command_v2/test_cache_save_restore.py
@@ -158,11 +158,11 @@ def test_cache_save_restore_multiple_revisions():
     c = TestClient()
     c.save({"conanfile.py": GenConanfile("pkg", "0.1")})
     c.run("create .")
-    time.sleep(0.1)
+    time.sleep(1)
     rrev1 = c.exported_recipe_revision()
     c.save({"conanfile.py": GenConanfile("pkg", "0.1").with_class_attribute("var=42")})
     c.run("create .")
-    time.sleep(0.1)
+    time.sleep(1)
     rrev2 = c.exported_recipe_revision()
     c.save({"conanfile.py": GenConanfile("pkg", "0.1").with_class_attribute("var=123")})
     c.run("create .")

From f83cd2467b188652c06080d591dadb7fe4bebd89 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 24 Oct 2024 10:58:34 +0200
Subject: [PATCH 128/211] remove strawberry from path

---
 .github/workflows/win-tests.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 87a4bfd761f..58f45ed0f4b 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -172,10 +172,15 @@ jobs:
 
       - name: Run Tests
         run: |
-          $gccDir = "C:\mingw64\bin"
-          $newPath = ($env:PATH -split ";") -ne $gccDir -join ";"
+          $mingw64Dir = "C:\mingw64\bin"
+          $newPath = ($env:PATH -split ";") -ne $mingw64Dir -join ";"
           [System.Environment]::SetEnvironmentVariable('PATH', $newPath)
-          Write-Host "GCC removed from PATH. Current PATH: $env:PATH"
+          Write-Host "mingw64 removed from PATH. Current PATH: $env:PATH"
+
+          $strawberryDir = "C:\Strawberry\c\bin"
+          $newPath = ($env:PATH -split ";") -ne $strawberryDir -join ";"
+          [System.Environment]::SetEnvironmentVariable('PATH', $newPath)
+          Write-Host "Strawberry removed from PATH. Current PATH: $env:PATH"
 
           $gccPath = Get-Command gcc.exe -ErrorAction SilentlyContinue
           if ($null -ne $gccPath) {
@@ -189,5 +194,5 @@ jobs:
           New-Item -ItemType Directory -Force -Path $randomFolder
           $env:CONAN_TEST_FOLDER = $randomFolder
           $env:Path = "C:\tools\cmake\3.15.7\cmake-3.15.7-win64-x64\bin;" + $env:Path
-          Remove-Item 'C:\Strawberry' -Recurse
+
           pytest -k "test_cache_save_restore_multiple_revisions or test_cmake_toolchain_winsdk_version or test_deactivate_vcvars_message or test_toolchain_win_vs2022 or test_locally_build_msvc or test_locally_build_msvc_toolset" -vvv
\ No newline at end of file

From d4ac48f48f30740097dfaa816646faa619c88840 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 24 Oct 2024 11:27:22 +0200
Subject: [PATCH 129/211] sleep 2

---
 test/integration/command_v2/test_cache_save_restore.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/integration/command_v2/test_cache_save_restore.py b/test/integration/command_v2/test_cache_save_restore.py
index d0587190b59..4a4816e87ce 100644
--- a/test/integration/command_v2/test_cache_save_restore.py
+++ b/test/integration/command_v2/test_cache_save_restore.py
@@ -158,11 +158,11 @@ def test_cache_save_restore_multiple_revisions():
     c = TestClient()
     c.save({"conanfile.py": GenConanfile("pkg", "0.1")})
     c.run("create .")
-    time.sleep(1)
+    time.sleep(2)
     rrev1 = c.exported_recipe_revision()
     c.save({"conanfile.py": GenConanfile("pkg", "0.1").with_class_attribute("var=42")})
     c.run("create .")
-    time.sleep(1)
+    time.sleep(2)
     rrev2 = c.exported_recipe_revision()
     c.save({"conanfile.py": GenConanfile("pkg", "0.1").with_class_attribute("var=123")})
     c.run("create .")

From 37275c1a822794bd7d92847a14e74cf46724007f Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 24 Oct 2024 11:27:30 +0200
Subject: [PATCH 130/211] check clock precission

---
 .github/workflows/win-tests.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 58f45ed0f4b..99915184a60 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -38,6 +38,14 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
+      - name: Check clock precision in Windows
+        run: |
+          python -c "import time; \
+          clock_info = time.get_clock_info('time'); \
+          print(f'Time clock precision: {clock_info.resolution} seconds'); \
+          perf_info = time.get_clock_info('perf_counter'); \
+          print(f'Perf counter precision: {perf_info.resolution} seconds')"
+
       - name: Cache pip packages
         uses: actions/cache@v4
         with:

From ab16e5f779452d33a78cdc89457f40a2082956b6 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 24 Oct 2024 11:54:35 +0200
Subject: [PATCH 131/211] print messages

---
 test/integration/command_v2/test_cache_save_restore.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/integration/command_v2/test_cache_save_restore.py b/test/integration/command_v2/test_cache_save_restore.py
index 4a4816e87ce..f0e018d5e6a 100644
--- a/test/integration/command_v2/test_cache_save_restore.py
+++ b/test/integration/command_v2/test_cache_save_restore.py
@@ -158,15 +158,18 @@ def test_cache_save_restore_multiple_revisions():
     c = TestClient()
     c.save({"conanfile.py": GenConanfile("pkg", "0.1")})
     c.run("create .")
-    time.sleep(2)
     rrev1 = c.exported_recipe_revision()
+    print(c.out)
+    time.sleep(2)
     c.save({"conanfile.py": GenConanfile("pkg", "0.1").with_class_attribute("var=42")})
     c.run("create .")
-    time.sleep(2)
     rrev2 = c.exported_recipe_revision()
+    print(c.out)
+    time.sleep(2)
     c.save({"conanfile.py": GenConanfile("pkg", "0.1").with_class_attribute("var=123")})
     c.run("create .")
     rrev3 = c.exported_recipe_revision()
+    print(c.out)
 
     def check_ordered_revisions(client):
         client.run("list *#* --format=json")

From a801ddd2ddbadb66570a2d40749329e1a85f937e Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 24 Oct 2024 12:22:32 +0200
Subject: [PATCH 132/211] more prints

---
 test/integration/command_v2/test_cache_save_restore.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/integration/command_v2/test_cache_save_restore.py b/test/integration/command_v2/test_cache_save_restore.py
index f0e018d5e6a..1fb3be13063 100644
--- a/test/integration/command_v2/test_cache_save_restore.py
+++ b/test/integration/command_v2/test_cache_save_restore.py
@@ -160,19 +160,24 @@ def test_cache_save_restore_multiple_revisions():
     c.run("create .")
     rrev1 = c.exported_recipe_revision()
     print(c.out)
+    print("rrev1: ", rrev1)
     time.sleep(2)
     c.save({"conanfile.py": GenConanfile("pkg", "0.1").with_class_attribute("var=42")})
     c.run("create .")
     rrev2 = c.exported_recipe_revision()
     print(c.out)
+    print("rrev2: ", rrev2)
     time.sleep(2)
     c.save({"conanfile.py": GenConanfile("pkg", "0.1").with_class_attribute("var=123")})
     c.run("create .")
     rrev3 = c.exported_recipe_revision()
     print(c.out)
+    print("rrev3: ", rrev3)
+
 
     def check_ordered_revisions(client):
         client.run("list *#* --format=json")
+        print(client.stdout)
         revisions = json.loads(client.stdout)["Local Cache"]["pkg/0.1"]["revisions"]
         assert revisions[rrev1]["timestamp"] < revisions[rrev2]["timestamp"]
         assert revisions[rrev2]["timestamp"] < revisions[rrev3]["timestamp"]

From 2763eb7b2ff3a76091b36e212868dbf0575085b2 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 24 Oct 2024 12:23:53 +0200
Subject: [PATCH 133/211] comment not needed for test

---
 .github/workflows/win-tests.yml | 52 ++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 99915184a60..271031fb610 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -62,31 +62,31 @@ jobs:
           pip install -r conans/requirements_dev.txt
           pip install meson
 
-      - name: "Set choco cache"
-        run: choco config set cacheLocation C:\choco-cache
-
-      - uses: actions/cache@v4
-        with:
-          path: C:\choco-cache
-          key: choco-cache
-
-      - name: Install Chocolatey packages
-        run: |
-          choco install pkgconfiglite --version 0.28
-          choco install ninja --version 1.10.2
-          choco install mingw
-          choco install cygwin
-          choco install cyg-get
-          cyg-get automake gcc-g++ make binutils --verbose
-
-      - name: Install Pacman extra packages
-        run: |
-          C:\msys64\usr\bin\pacman -Syuu --noconfirm
-          C:\msys64\usr\bin\pacman -S mingw-w64-x86_64-toolchain --noconfirm
-          C:\msys64\usr\bin\pacman -S mingw-w64-i686-toolchain --noconfirm
-          C:\msys64\usr\bin\pacman -S base-devel gcc --noconfirm
-          C:\msys64\usr\bin\pacman -S autoconf-wrapper --noconfirm
-          C:\msys64\usr\bin\pacman -S automake --noconfirm
+    #   - name: "Set choco cache"
+    #     run: choco config set cacheLocation C:\choco-cache
+
+    #   - uses: actions/cache@v4
+    #     with:
+    #       path: C:\choco-cache
+    #       key: choco-cache
+
+    #   - name: Install Chocolatey packages
+    #     run: |
+    #       choco install pkgconfiglite --version 0.28
+    #       choco install ninja --version 1.10.2
+    #       choco install mingw
+    #       choco install cygwin
+    #       choco install cyg-get
+    #       cyg-get automake gcc-g++ make binutils --verbose
+
+    #   - name: Install Pacman extra packages
+    #     run: |
+    #       C:\msys64\usr\bin\pacman -Syuu --noconfirm
+    #       C:\msys64\usr\bin\pacman -S mingw-w64-x86_64-toolchain --noconfirm
+    #       C:\msys64\usr\bin\pacman -S mingw-w64-i686-toolchain --noconfirm
+    #       C:\msys64\usr\bin\pacman -S base-devel gcc --noconfirm
+    #       C:\msys64\usr\bin\pacman -S autoconf-wrapper --noconfirm
+    #       C:\msys64\usr\bin\pacman -S automake --noconfirm
 
       - name: Install VS 15 2017 Community edition
         run: |
@@ -203,4 +203,4 @@ jobs:
           $env:CONAN_TEST_FOLDER = $randomFolder
           $env:Path = "C:\tools\cmake\3.15.7\cmake-3.15.7-win64-x64\bin;" + $env:Path
 
-          pytest -k "test_cache_save_restore_multiple_revisions or test_cmake_toolchain_winsdk_version or test_deactivate_vcvars_message or test_toolchain_win_vs2022 or test_locally_build_msvc or test_locally_build_msvc_toolset" -vvv
\ No newline at end of file
+          pytest -k "test_cache_save_restore_multiple_revisions" -vvv
\ No newline at end of file

From 63b029e043e1c48dc50147348feabf5bb6fbb0bd Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 24 Oct 2024 13:08:45 +0200
Subject: [PATCH 134/211] skip test in win

---
 .../command_v2/test_cache_save_restore.py          | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/test/integration/command_v2/test_cache_save_restore.py b/test/integration/command_v2/test_cache_save_restore.py
index 1fb3be13063..c0f60895b8d 100644
--- a/test/integration/command_v2/test_cache_save_restore.py
+++ b/test/integration/command_v2/test_cache_save_restore.py
@@ -1,5 +1,6 @@
 import json
 import os
+import platform
 import shutil
 import tarfile
 import time
@@ -154,30 +155,25 @@ def test_cache_save_restore_metadata():
     assert load(myfile) == "mybuildlogs!!!!"
 
 
+# FIXME: check the timestamps of the conan cache restore
+@pytest.mark.skipif(platform.system() != "Windows", reason="Fails in windows in ci because of the low precission of the clock")
 def test_cache_save_restore_multiple_revisions():
     c = TestClient()
     c.save({"conanfile.py": GenConanfile("pkg", "0.1")})
     c.run("create .")
     rrev1 = c.exported_recipe_revision()
-    print(c.out)
-    print("rrev1: ", rrev1)
-    time.sleep(2)
+    time.sleep(0.2)
     c.save({"conanfile.py": GenConanfile("pkg", "0.1").with_class_attribute("var=42")})
     c.run("create .")
     rrev2 = c.exported_recipe_revision()
-    print(c.out)
-    print("rrev2: ", rrev2)
-    time.sleep(2)
+    time.sleep(0.2)
     c.save({"conanfile.py": GenConanfile("pkg", "0.1").with_class_attribute("var=123")})
     c.run("create .")
     rrev3 = c.exported_recipe_revision()
-    print(c.out)
-    print("rrev3: ", rrev3)
 
 
     def check_ordered_revisions(client):
         client.run("list *#* --format=json")
-        print(client.stdout)
         revisions = json.loads(client.stdout)["Local Cache"]["pkg/0.1"]["revisions"]
         assert revisions[rrev1]["timestamp"] < revisions[rrev2]["timestamp"]
         assert revisions[rrev2]["timestamp"] < revisions[rrev3]["timestamp"]

From b25b2ffe5bc7586e209341a13baf069c031945b4 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 24 Oct 2024 13:10:09 +0200
Subject: [PATCH 135/211] wip

---
 .github/workflows/win-tests.yml | 67 +++++++++++++--------------------
 1 file changed, 26 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 271031fb610..c3cd7b7b9c4 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -62,31 +62,31 @@ jobs:
           pip install -r conans/requirements_dev.txt
           pip install meson
 
-    #   - name: "Set choco cache"
-    #     run: choco config set cacheLocation C:\choco-cache
-
-    #   - uses: actions/cache@v4
-    #     with:
-    #       path: C:\choco-cache
-    #       key: choco-cache
-
-    #   - name: Install Chocolatey packages
-    #     run: |
-    #       choco install pkgconfiglite --version 0.28
-    #       choco install ninja --version 1.10.2
-    #       choco install mingw
-    #       choco install cygwin
-    #       choco install cyg-get
-    #       cyg-get automake gcc-g++ make binutils --verbose
-
-    #   - name: Install Pacman extra packages
-    #     run: |
-    #       C:\msys64\usr\bin\pacman -Syuu --noconfirm
-    #       C:\msys64\usr\bin\pacman -S mingw-w64-x86_64-toolchain --noconfirm
-    #       C:\msys64\usr\bin\pacman -S mingw-w64-i686-toolchain --noconfirm
-    #       C:\msys64\usr\bin\pacman -S base-devel gcc --noconfirm
-    #       C:\msys64\usr\bin\pacman -S autoconf-wrapper --noconfirm
-    #       C:\msys64\usr\bin\pacman -S automake --noconfirm
+      - name: "Set choco cache"
+        run: choco config set cacheLocation C:\choco-cache
+
+      - uses: actions/cache@v4
+        with:
+          path: C:\choco-cache
+          key: choco-cache
+
+      - name: Install Chocolatey packages
+        run: |
+          choco install pkgconfiglite --version 0.28
+          choco install ninja --version 1.10.2
+          choco install mingw
+          choco install cygwin
+          choco install cyg-get
+          cyg-get automake gcc-g++ make binutils --verbose
+
+      - name: Install Pacman extra packages
+        run: |
+          C:\msys64\usr\bin\pacman -Syuu --noconfirm
+          C:\msys64\usr\bin\pacman -S mingw-w64-x86_64-toolchain --noconfirm
+          C:\msys64\usr\bin\pacman -S mingw-w64-i686-toolchain --noconfirm
+          C:\msys64\usr\bin\pacman -S base-devel gcc --noconfirm
+          C:\msys64\usr\bin\pacman -S autoconf-wrapper --noconfirm
+          C:\msys64\usr\bin\pacman -S automake --noconfirm
 
       - name: Install VS 15 2017 Community edition
         run: |
@@ -100,21 +100,6 @@ jobs:
             "--add", "Microsoft.VisualStudio.Component.VC.140", `
             "--add", "Microsoft.VisualStudio.Component.VC.v141.x86.x64" -Wait
 
-      # - name: Check Visual Studio installations and toolsets
-      #   run: |
-      #     # List all Visual Studio installations
-      #     & 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -all -products * -format json | ConvertFrom-Json | ForEach-Object {
-      #         Write-Host "Installation Path: $_.installationPath"
-      #         Write-Host "Product: $_.catalog_productDisplayName"
-      #         Write-Host "Version: $_.catalog_productLineVersion"
-      #     }
-
-      #     # List the available toolsets in Visual Studio
-      #     $vsInstallationPath = (Get-Item 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community').FullName
-      #     $vcvarsPath = "$vsInstallationPath\VC\Auxiliary\Build\vcvarsall.bat"
-      #     Write-Host "Toolsets in Visual Studio:"
-      #     cmd.exe /c "$vcvarsPath -help"
-
       - name: Cache CMake and Bazel installations
         id: cache-tools
         uses: actions/cache@v4
@@ -203,4 +188,4 @@ jobs:
           $env:CONAN_TEST_FOLDER = $randomFolder
           $env:Path = "C:\tools\cmake\3.15.7\cmake-3.15.7-win64-x64\bin;" + $env:Path
 
-          pytest -k "test_cache_save_restore_multiple_revisions" -vvv
\ No newline at end of file
+          pytest test -n=auto --durations=20

From 8f879178de356b7d08cfbeb909d1856f8f05153d Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 24 Oct 2024 14:59:56 +0200
Subject: [PATCH 136/211] use same py versions as in current ci

---
 .github/workflows/win-tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index c3cd7b7b9c4..0b8d38e89fc 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        python-version: ['3.9']
+        python-version: ['3.8', '3.6']
 
     runs-on: windows-2022
 
@@ -188,4 +188,4 @@ jobs:
           $env:CONAN_TEST_FOLDER = $randomFolder
           $env:Path = "C:\tools\cmake\3.15.7\cmake-3.15.7-win64-x64\bin;" + $env:Path
 
-          pytest test -n=auto --durations=20
+          pytest test -n=auto --durations=1000

From b991cbdb4e4a6c1b02c66bc954ae617a3cf50cf5 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 24 Oct 2024 15:57:40 +0200
Subject: [PATCH 137/211] remove print

---
 test/functional/utils.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/functional/utils.py b/test/functional/utils.py
index 283737f87f6..7d92a89d11a 100644
--- a/test/functional/utils.py
+++ b/test/functional/utils.py
@@ -78,7 +78,6 @@ def check_vs_runtime(artifact, client, vs_version, build_type, architecture="amd
 def check_exe_run(output, names, compiler, version, build_type, arch, cppstd, definitions=None,
                   cxx11_abi=None, subsystem=None, extra_msg=""):
     output = str(output)
-    print(output)
     names = names if isinstance(names, list) else [names]
 
     for name in names:

From 224450a6ccc9eabc0f5b1468692ae8d393ff8bd0 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 24 Oct 2024 16:50:22 +0200
Subject: [PATCH 138/211] some optimizations for msys2 installs

---
 .github/workflows/win-tests.yml | 60 ++++++++++++++++-----------------
 test/conftest.py                | 13 +++----
 2 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 0b8d38e89fc..d7fcf4e42a1 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - develop2
       - release/*
+      - windows-action-optimize
   pull_request:
     branches:
       - '*'
@@ -29,23 +30,11 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Remove installed CMake version
-        run: |
-            Remove-Item -Recurse -Force "C:/Program Files/CMake"
-
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Check clock precision in Windows
-        run: |
-          python -c "import time; \
-          clock_info = time.get_clock_info('time'); \
-          print(f'Time clock precision: {clock_info.resolution} seconds'); \
-          perf_info = time.get_clock_info('perf_counter'); \
-          print(f'Perf counter precision: {perf_info.resolution} seconds')"
-
       - name: Cache pip packages
         uses: actions/cache@v4
         with:
@@ -79,14 +68,23 @@ jobs:
           choco install cyg-get
           cyg-get automake gcc-g++ make binutils --verbose
 
-      - name: Install Pacman extra packages
+      - uses: msys2/setup-msys2@v2
+        id: msys2-setup
+        with:
+            update: true
+            install: >-
+                mingw-w64-x86_64-toolchain
+                mingw-w64-i686-toolchain
+                base-devel
+                gcc
+                autoconf-wrapper
+                automake
+
+      - name: List MSYS2 installation directory contents
         run: |
-          C:\msys64\usr\bin\pacman -Syuu --noconfirm
-          C:\msys64\usr\bin\pacman -S mingw-w64-x86_64-toolchain --noconfirm
-          C:\msys64\usr\bin\pacman -S mingw-w64-i686-toolchain --noconfirm
-          C:\msys64\usr\bin\pacman -S base-devel gcc --noconfirm
-          C:\msys64\usr\bin\pacman -S autoconf-wrapper --noconfirm
-          C:\msys64\usr\bin\pacman -S automake --noconfirm
+            $msys2Path = '${{ steps.msys2-setup.outputs.msys2-location }}'
+            Write-Host "Listing contents of MSYS2 installation at: $msys2Path"
+            Get-ChildItem -Path $msys2Path
 
       - name: Install VS 15 2017 Community edition
         run: |
@@ -165,22 +163,20 @@ jobs:
 
       - name: Run Tests
         run: |
-          $mingw64Dir = "C:\mingw64\bin"
-          $newPath = ($env:PATH -split ";") -ne $mingw64Dir -join ";"
-          [System.Environment]::SetEnvironmentVariable('PATH', $newPath)
-          Write-Host "mingw64 removed from PATH. Current PATH: $env:PATH"
-
-          $strawberryDir = "C:\Strawberry\c\bin"
-          $newPath = ($env:PATH -split ";") -ne $strawberryDir -join ";"
-          [System.Environment]::SetEnvironmentVariable('PATH', $newPath)
-          Write-Host "Strawberry removed from PATH. Current PATH: $env:PATH"
+          $pathsToRemove = @("C:\mingw64\bin", "C:\Strawberry\c\bin", "C:\Program Files\CMake\bin")
+          foreach ($dir in $pathsToRemove) {
+              $newPath = ($env:PATH -split ";") -ne $dir -join ";"
+              [System.Environment]::SetEnvironmentVariable('PATH', $newPath)
+              Write-Host "$dir removed from PATH. Current PATH: $env:PATH"
+          }
 
+          # Check GCC is not in Path
           $gccPath = Get-Command gcc.exe -ErrorAction SilentlyContinue
           if ($null -ne $gccPath) {
               Write-Host "GCC found in PATH at: $($gccPath.Path)"
           } else {
               Write-Host "GCC not found in PATH."
-          }
+          }     
 
           $shortGuid = [System.Guid]::NewGuid().ToString().Substring(0, 4)
           $randomFolder = [System.IO.Path]::Combine("D:\\", "tmp_tests", $shortGuid)
@@ -188,4 +184,8 @@ jobs:
           $env:CONAN_TEST_FOLDER = $randomFolder
           $env:Path = "C:\tools\cmake\3.15.7\cmake-3.15.7-win64-x64\bin;" + $env:Path
 
-          pytest test -n=auto --durations=1000
+          $msys2Path = '${{ steps.msys2-setup.outputs.msys2-location }}'
+          [System.Environment]::SetEnvironmentVariable('MSYS2_PATH', $msys2Path, [System.EnvironmentVariableTarget]::Process)
+          Write-Host "Added MSYS2_PATH environment variable: $msys2Path"
+
+          pytest test/unittests test/integration test/functional -n=auto --durations=1000
diff --git a/test/conftest.py b/test/conftest.py
index 5bdb15bfd20..368d24fcc9e 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -45,6 +45,7 @@
 MacOS_arm = all([platform.system() == "Darwin", platform.machine() == "arm64"])
 homebrew_root = "/opt/homebrew" if MacOS_arm else "/usr/local"
 windows_choco_root = "C:/ProgramData/chocolatey/lib/"
+msys2_path = os.getenv("MSYS2_PATH", "C:/msys64")
 
 tools_locations = {
     "clang": {"disabled": True},
@@ -103,40 +104,40 @@
         "platform": "Windows",
         "default": "system",
         "exe": "mingw32-make",
-        "system": {"path": {'Windows': "C:/msys64/mingw32/bin"}},
+        "system": {"path": {'Windows': f"{msys2_path}/mingw32/bin"}},
     },
     'ucrt64': {
         "disabled": True,
         "platform": "Windows",
         "default": "system",
         "exe": "mingw32-make",
-        "system": {"path": {'Windows': "C:/msys64/ucrt64/bin"}},
+        "system": {"path": {'Windows': f"{msys2_path}/ucrt64/bin"}},
     },
     'mingw64': {
         "platform": "Windows",
         "default": "system",
         "exe": "mingw32-make",
-        "system": {"path": {'Windows': "C:/msys64/mingw64/bin"}},
+        "system": {"path": {'Windows': f"{msys2_path}/mingw64/bin"}},
     },
     'msys2': {
         "platform": "Windows",
         "default": "system",
         "exe": "make",
-        "system": {"path": {'Windows': "C:/msys64/usr/bin"}},
+        "system": {"path": {'Windows': f"{msys2_path}/usr/bin"}},
     },
     'msys2_clang64': {
         "disabled": True,
         "platform": "Windows",
         "default": "system",
         "exe": "clang",
-        "system": {"path": {'Windows': "C:/msys64/clang64/bin"}},
+        "system": {"path": {'Windows': f"{msys2_path}/clang64/bin"}},
     },
     'msys2_mingw64_clang64': {
         "disabled": True,
         "platform": "Windows",
         "default": "system",
         "exe": "clang",
-        "system": {"path": {'Windows': "C:/msys64/mingw64/bin"}},
+        "system": {"path": {'Windows': f"{msys2_path}/mingw64/bin"}},
     },
     'cygwin': {
         "platform": "Windows",

From f91079b8ad3f57d1b1c466d6b9c656d1620ede41 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 24 Oct 2024 17:24:28 +0200
Subject: [PATCH 139/211] independent from shell

---
 test/integration/toolchains/env/test_buildenv.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/integration/toolchains/env/test_buildenv.py b/test/integration/toolchains/env/test_buildenv.py
index 34ea97f5127..181c3c373fd 100644
--- a/test/integration/toolchains/env/test_buildenv.py
+++ b/test/integration/toolchains/env/test_buildenv.py
@@ -16,7 +16,8 @@ class Pkg(ConanFile):
             version = "0.1"
             settings = "os", "compiler", "build_type", "arch"
             def build(self):
-                self.run("dir c:")
+                # using python --version as it does not depend on shell
+                self.run("python --version")
             """)
     build_profile = textwrap.dedent("""
         [settings]
@@ -33,4 +34,4 @@ def build(self):
         """)
     client.save({"conanfile.py": conanfile, "build_profile": build_profile})
     client.run("create . -pr:b=build_profile")
-    assert "<DIR>          ." in client.out
+    assert "Python" in client.out

From ef626b1a56eb6e94571a9269911c75f50b5af157 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 24 Oct 2024 17:35:04 +0200
Subject: [PATCH 140/211] wip

---
 .github/workflows/win-tests.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index d7fcf4e42a1..e2a37020ff4 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -80,6 +80,11 @@ jobs:
                 autoconf-wrapper
                 automake
 
+      - name: Check uname path
+        run: |
+            echo "Checking uname path..."
+            Get-Command uname | Select-Object -ExpandProperty Source
+
       - name: List MSYS2 installation directory contents
         run: |
             $msys2Path = '${{ steps.msys2-setup.outputs.msys2-location }}'
@@ -188,4 +193,4 @@ jobs:
           [System.Environment]::SetEnvironmentVariable('MSYS2_PATH', $msys2Path, [System.EnvironmentVariableTarget]::Process)
           Write-Host "Added MSYS2_PATH environment variable: $msys2Path"
 
-          pytest test/unittests test/integration test/functional -n=auto --durations=1000
+          pytest -k "test_msys2_available or test_token_expired or test_crossbuild_windows_incomplete" -n=auto --durations=1000

From fb391da6c49bba8053ae94397ea3616386db14ee Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Fri, 25 Oct 2024 07:40:30 +0200
Subject: [PATCH 141/211] wip

---
 .github/workflows/win-tests.yml | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index e2a37020ff4..cecef1a6e9b 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -5,7 +5,6 @@ on:
     branches:
       - develop2
       - release/*
-      - windows-action-optimize
   pull_request:
     branches:
       - '*'
@@ -72,6 +71,9 @@ jobs:
         id: msys2-setup
         with:
             update: true
+            # It's important that the default environment that is used is MSYS
+            # we check this default in a test
+            msystem: MSYS
             install: >-
                 mingw-w64-x86_64-toolchain
                 mingw-w64-i686-toolchain
@@ -80,17 +82,6 @@ jobs:
                 autoconf-wrapper
                 automake
 
-      - name: Check uname path
-        run: |
-            echo "Checking uname path..."
-            Get-Command uname | Select-Object -ExpandProperty Source
-
-      - name: List MSYS2 installation directory contents
-        run: |
-            $msys2Path = '${{ steps.msys2-setup.outputs.msys2-location }}'
-            Write-Host "Listing contents of MSYS2 installation at: $msys2Path"
-            Get-ChildItem -Path $msys2Path
-
       - name: Install VS 15 2017 Community edition
         run: |
             Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_community.exe" -OutFile "vs_community.exe"
@@ -168,7 +159,11 @@ jobs:
 
       - name: Run Tests
         run: |
-          $pathsToRemove = @("C:\mingw64\bin", "C:\Strawberry\c\bin", "C:\Program Files\CMake\bin")
+          $pathsToRemove = @()
+          $pathsToRemove += "C:\mingw64\bin"                # To avoid that CMake finds gcc there
+          $pathsToRemove += "C:\Strawberry\c\bin"           
+          $pathsToRemove += "C:\Program Files\CMake\bin"    # Remove the default CMake version
+          $pathsToRemove += "C:\Program Files\Git\usr\bin"  # To avoid using uname and other tools from there
           foreach ($dir in $pathsToRemove) {
               $newPath = ($env:PATH -split ";") -ne $dir -join ";"
               [System.Environment]::SetEnvironmentVariable('PATH', $newPath)
@@ -193,4 +188,4 @@ jobs:
           [System.Environment]::SetEnvironmentVariable('MSYS2_PATH', $msys2Path, [System.EnvironmentVariableTarget]::Process)
           Write-Host "Added MSYS2_PATH environment variable: $msys2Path"
 
-          pytest -k "test_msys2_available or test_token_expired or test_crossbuild_windows_incomplete" -n=auto --durations=1000
+          pytest test/unittests test/integration test/functional -n=auto --durations=1000

From 5b4134cab7b7224cdc0434191be3c624478f81bb Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Fri, 25 Oct 2024 07:50:42 +0200
Subject: [PATCH 142/211] restore test

---
 test/functional/subsystems_build_test.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/functional/subsystems_build_test.py b/test/functional/subsystems_build_test.py
index a6292846d59..52ce4956425 100644
--- a/test/functional/subsystems_build_test.py
+++ b/test/functional/subsystems_build_test.py
@@ -75,6 +75,10 @@ def test_mingw64_available(self):
         client.run_command('uname')
         assert "MINGW64_NT" in client.out
 
+    def test_tool_not_available(self):
+        client = TestClient()
+        client.run_command('uname', assert_error=True)
+        assert "'uname' is not recognized as an internal or external command" in client.out
 
 @pytest.mark.skipif(platform.system() != "Windows", reason="Tests Windows Subsystems")
 class TestSubsystemsBuild:

From 904caefa60a7b5035413381ff79f60f7bf779068 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Fri, 25 Oct 2024 07:51:45 +0200
Subject: [PATCH 143/211] explain test

---
 test/functional/subsystems_build_test.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/functional/subsystems_build_test.py b/test/functional/subsystems_build_test.py
index 52ce4956425..1fafad8f241 100644
--- a/test/functional/subsystems_build_test.py
+++ b/test/functional/subsystems_build_test.py
@@ -75,6 +75,9 @@ def test_mingw64_available(self):
         client.run_command('uname')
         assert "MINGW64_NT" in client.out
 
+    # It's important not to have uname in Path, that could
+    # mean that we have Git bash or MingW in the Path and
+    # we mistakenly use tools from there when we want to use msys2 tools
     def test_tool_not_available(self):
         client = TestClient()
         client.run_command('uname', assert_error=True)

From 51ea7f96c83f0556bbb36df56eb41bf80ff97a84 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Fri, 25 Oct 2024 08:39:22 +0200
Subject: [PATCH 144/211] reduce a bit components

---
 .github/workflows/win-tests.yml | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index cecef1a6e9b..3a07e3d21bb 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -34,6 +34,26 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
+      - name: Cache Visual Studio Build Tools Installer
+        uses: actions/cache@v4
+        with:
+          path: C:\vs-cache\vs_buildtools.exe
+          key: vs-installer-${{ runner.os }}
+
+      - name: Download VS 2017 Build Tools Installer if Cache Miss
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: |
+            New-Item -ItemType Directory -Force -Path C:\vs-cache
+            Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_buildtools.exe" -OutFile "C:\vs-cache\vs_buildtools.exe"
+
+      - name: Install Minimal VS 2017 Build Tools for C++
+        run: |
+            Start-Process -FilePath "C:\vs-cache\vs_buildtools.exe" -ArgumentList `
+            "--quiet", "--wait", "--norestart", "--nocache", `
+            "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
+            "--add", "Microsoft.Component.MSBuild", `
+            "--add", "Microsoft.VisualStudio.Component.VC.v141.x86.x64" -Wait
+
       - name: Cache pip packages
         uses: actions/cache@v4
         with:
@@ -82,18 +102,6 @@ jobs:
                 autoconf-wrapper
                 automake
 
-      - name: Install VS 15 2017 Community edition
-        run: |
-            Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_community.exe" -OutFile "vs_community.exe"
-            Start-Process -FilePath ".\vs_community.exe" -ArgumentList `
-            "--quiet",  "--wait", "--norestart", "--nocache", `
-            "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
-            "--add", "Microsoft.VisualStudio.Component.Windows81SDK", `
-            "--add", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", `
-            "--add", "Microsoft.Component.MSBuild", `
-            "--add", "Microsoft.VisualStudio.Component.VC.140", `
-            "--add", "Microsoft.VisualStudio.Component.VC.v141.x86.x64" -Wait
-
       - name: Cache CMake and Bazel installations
         id: cache-tools
         uses: actions/cache@v4

From 5769d5b38e2109b034da487965a9178e87d840fb Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Fri, 25 Oct 2024 08:58:46 +0200
Subject: [PATCH 145/211] all components

---
 .github/workflows/win-tests.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 3a07e3d21bb..d99d887aab1 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -51,7 +51,10 @@ jobs:
             Start-Process -FilePath "C:\vs-cache\vs_buildtools.exe" -ArgumentList `
             "--quiet", "--wait", "--norestart", "--nocache", `
             "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
+            "--add", "Microsoft.VisualStudio.Component.Windows81SDK", `
+            "--add", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", `
             "--add", "Microsoft.Component.MSBuild", `
+            "--add", "Microsoft.VisualStudio.Component.VC.140", `
             "--add", "Microsoft.VisualStudio.Component.VC.v141.x86.x64" -Wait
 
       - name: Cache pip packages

From d2df267914871f981e0ac9d61da7fdbbf19fe9e4 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Fri, 25 Oct 2024 09:40:01 +0200
Subject: [PATCH 146/211] fix skip

---
 test/integration/command_v2/test_cache_save_restore.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/command_v2/test_cache_save_restore.py b/test/integration/command_v2/test_cache_save_restore.py
index c0f60895b8d..84cea3fc61b 100644
--- a/test/integration/command_v2/test_cache_save_restore.py
+++ b/test/integration/command_v2/test_cache_save_restore.py
@@ -156,7 +156,7 @@ def test_cache_save_restore_metadata():
 
 
 # FIXME: check the timestamps of the conan cache restore
-@pytest.mark.skipif(platform.system() != "Windows", reason="Fails in windows in ci because of the low precission of the clock")
+@pytest.mark.skipif(platform.system() == "Windows", reason="Fails in windows in ci because of the low precission of the clock")
 def test_cache_save_restore_multiple_revisions():
     c = TestClient()
     c.save({"conanfile.py": GenConanfile("pkg", "0.1")})

From e933cb4ee9d9c0fc822d0e561c7f91d5272a2491 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Fri, 25 Oct 2024 09:46:59 +0200
Subject: [PATCH 147/211] do not cache vs

---
 .github/workflows/win-tests.yml | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index d99d887aab1..79638f1dc06 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -34,22 +34,11 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Cache Visual Studio Build Tools Installer
-        uses: actions/cache@v4
-        with:
-          path: C:\vs-cache\vs_buildtools.exe
-          key: vs-installer-${{ runner.os }}
-
-      - name: Download VS 2017 Build Tools Installer if Cache Miss
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: |
-            New-Item -ItemType Directory -Force -Path C:\vs-cache
-            Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_buildtools.exe" -OutFile "C:\vs-cache\vs_buildtools.exe"
-
-      - name: Install Minimal VS 2017 Build Tools for C++
+      - name: Install Visual Studio Build Tools
         run: |
-            Start-Process -FilePath "C:\vs-cache\vs_buildtools.exe" -ArgumentList `
-            "--quiet", "--wait", "--norestart", "--nocache", `
+            Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_buildtools.exe" -OutFile "vs_buildtools.exe"
+            Start-Process -FilePath ".\vs_buildtools.exe" -ArgumentList `
+            "--quiet",  "--wait", "--norestart", "--nocache", `
             "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
             "--add", "Microsoft.VisualStudio.Component.Windows81SDK", `
             "--add", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", `

From 9d2cc0741c3c9e90ad0235c96d2dc67641723356 Mon Sep 17 00:00:00 2001
From: Carlos Zoido <mrgalleta@gmail.com>
Date: Tue, 29 Oct 2024 10:56:38 +0100
Subject: [PATCH 148/211] Update .github/workflows/win-tests.yml

---
 .github/workflows/win-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 79638f1dc06..c226691f703 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        python-version: ['3.8', '3.6']
+        python-version: ['3.13', '3.8', '3.6']
 
     runs-on: windows-2022
 

From f95f111ee4b65ce89271c2da61c247fe2b9f5789 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 30 Oct 2024 11:38:19 +0100
Subject: [PATCH 149/211] debug qbs

---
 .github/workflows/win-tests.yml | 3 ++-
 test/conftest.py                | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index c226691f703..400f7f5ddc4 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -188,4 +188,5 @@ jobs:
           [System.Environment]::SetEnvironmentVariable('MSYS2_PATH', $msys2Path, [System.EnvironmentVariableTarget]::Process)
           Write-Host "Added MSYS2_PATH environment variable: $msys2Path"
 
-          pytest test/unittests test/integration test/functional -n=auto --durations=1000
+          pytest -k test_qbsprofile -n=auto --durations=50
+          #pytest test/unittests test/integration test/functional -n=auto --durations=50
diff --git a/test/conftest.py b/test/conftest.py
index 368d24fcc9e..c8bf249ea23 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -228,6 +228,8 @@ def _get_tool(name, version):
 
 def _get_individual_tool(name, version):
     tool = tools_locations.get(name, {})
+    print("tool:", tool)
+    print("tool get disabled:", tool.get("disabled"))
     if tool.get("disabled"):
         return False
 

From 8a09d025e754c0744144e71186cfdcc9a4c6a94c Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 30 Oct 2024 12:01:36 +0100
Subject: [PATCH 150/211] avoid performance test

---
 .github/workflows/win-tests.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 400f7f5ddc4..6eee63a3a3c 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -161,7 +161,7 @@ jobs:
         run: |
           $pathsToRemove = @()
           $pathsToRemove += "C:\mingw64\bin"                # To avoid that CMake finds gcc there
-          $pathsToRemove += "C:\Strawberry\c\bin"           
+          $pathsToRemove += "C:\Strawberry\c\bin"
           $pathsToRemove += "C:\Program Files\CMake\bin"    # Remove the default CMake version
           $pathsToRemove += "C:\Program Files\Git\usr\bin"  # To avoid using uname and other tools from there
           foreach ($dir in $pathsToRemove) {
@@ -176,7 +176,7 @@ jobs:
               Write-Host "GCC found in PATH at: $($gccPath.Path)"
           } else {
               Write-Host "GCC not found in PATH."
-          }     
+          }
 
           $shortGuid = [System.Guid]::NewGuid().ToString().Substring(0, 4)
           $randomFolder = [System.IO.Path]::Combine("D:\\", "tmp_tests", $shortGuid)
@@ -188,5 +188,5 @@ jobs:
           [System.Environment]::SetEnvironmentVariable('MSYS2_PATH', $msys2Path, [System.EnvironmentVariableTarget]::Process)
           Write-Host "Added MSYS2_PATH environment variable: $msys2Path"
 
-          pytest -k test_qbsprofile -n=auto --durations=50
+          pytest -k "test_qbsprofile and not performance" -n=auto --durations=50
           #pytest test/unittests test/integration test/functional -n=auto --durations=50

From 02621276548761a59f8a413effe465c178bddc11 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 30 Oct 2024 12:19:49 +0100
Subject: [PATCH 151/211] wip

---
 .github/workflows/win-tests.yml | 2 +-
 test/conftest.py                | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 6eee63a3a3c..6fbb08cc0f4 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -188,5 +188,5 @@ jobs:
           [System.Environment]::SetEnvironmentVariable('MSYS2_PATH', $msys2Path, [System.EnvironmentVariableTarget]::Process)
           Write-Host "Added MSYS2_PATH environment variable: $msys2Path"
 
-          pytest -k "test_qbsprofile and not performance" -n=auto --durations=50
+          pytest -k "test_qbsprofile and not performance" -n=auto -vvv
           #pytest test/unittests test/integration test/functional -n=auto --durations=50
diff --git a/test/conftest.py b/test/conftest.py
index c8bf249ea23..59dc4351b2e 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -227,6 +227,7 @@ def _get_tool(name, version):
 
 
 def _get_individual_tool(name, version):
+    print("name:", name)
     tool = tools_locations.get(name, {})
     print("tool:", tool)
     print("tool get disabled:", tool.get("disabled"))

From e87647ffa6d0c42f126769fb0dba097f0c26eb62 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 30 Oct 2024 12:43:46 +0100
Subject: [PATCH 152/211] move to _

---
 test/{performance => _performance}/__init__.py         | 0
 test/{performance => _performance}/test_large_graph.py | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename test/{performance => _performance}/__init__.py (100%)
 rename test/{performance => _performance}/test_large_graph.py (100%)

diff --git a/test/performance/__init__.py b/test/_performance/__init__.py
similarity index 100%
rename from test/performance/__init__.py
rename to test/_performance/__init__.py
diff --git a/test/performance/test_large_graph.py b/test/_performance/test_large_graph.py
similarity index 100%
rename from test/performance/test_large_graph.py
rename to test/_performance/test_large_graph.py

From b8f3a2dbe01fdfe32db1e6e3e6c3f93be54b7bb4 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 30 Oct 2024 12:44:35 +0100
Subject: [PATCH 153/211] wip

---
 .github/workflows/win-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 6fbb08cc0f4..494803ab9c8 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -188,5 +188,5 @@ jobs:
           [System.Environment]::SetEnvironmentVariable('MSYS2_PATH', $msys2Path, [System.EnvironmentVariableTarget]::Process)
           Write-Host "Added MSYS2_PATH environment variable: $msys2Path"
 
-          pytest -k "test_qbsprofile and not performance" -n=auto -vvv
+          pytest test/functional/toolchains/qbs/ -n=auto -vvv
           #pytest test/unittests test/integration test/functional -n=auto --durations=50

From 0fb08e53639ff4fb0c683b359e87d873617b8c6a Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 30 Oct 2024 13:06:11 +0100
Subject: [PATCH 154/211] wip

---
 .github/workflows/win-tests.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 494803ab9c8..dfc211d73eb 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -188,5 +188,4 @@ jobs:
           [System.Environment]::SetEnvironmentVariable('MSYS2_PATH', $msys2Path, [System.EnvironmentVariableTarget]::Process)
           Write-Host "Added MSYS2_PATH environment variable: $msys2Path"
 
-          pytest test/functional/toolchains/qbs/ -n=auto -vvv
-          #pytest test/unittests test/integration test/functional -n=auto --durations=50
+          pytest test/unittests test/integration test/functional -n=auto --durations=50 -vvv

From 5b90dfb623b2a2856611ade5cffbe693ed657f3c Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Mon, 4 Nov 2024 13:29:34 +0100
Subject: [PATCH 155/211] add mark to qbs tests

---
 test/integration/toolchains/qbs/test_qbsdeps.py    | 8 ++++++++
 test/integration/toolchains/qbs/test_qbsprofile.py | 7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/test/integration/toolchains/qbs/test_qbsdeps.py b/test/integration/toolchains/qbs/test_qbsdeps.py
index f6beeb9cee6..c034f317348 100644
--- a/test/integration/toolchains/qbs/test_qbsdeps.py
+++ b/test/integration/toolchains/qbs/test_qbsdeps.py
@@ -10,6 +10,7 @@
 from conans.util.files import load
 
 
+@pytest.mark.tool("qbs")
 def test_empty_package():
     # Checks default values generated by conan for cpp_info
     client = TestClient()
@@ -40,6 +41,7 @@ def test_empty_package():
     assert module_content.get('options') == {}
 
 
+@pytest.mark.tool("qbs")
 def test_empty_dirs():
     # Checks that we can override default values with empty directories
     conanfile = textwrap.dedent('''
@@ -84,6 +86,7 @@ def package_info(self):
     assert module_content.get('options') == {}
 
 
+@pytest.mark.tool("qbs")
 def test_pkg_config_name():
     # Checks we can override module name using the "pkg_config_name" property
     conanfile = textwrap.dedent('''
@@ -104,6 +107,7 @@ def package_info(self):
     assert os.path.exists(module_path)
 
 
+@pytest.mark.tool("qbs")
 @pytest.mark.parametrize('host_os, arch, build_type', [
     ('Linux', 'x86_64', 'Debug'),
     ('Linux', 'x86_64', 'Release'),
@@ -140,6 +144,7 @@ class Recipe(ConanFile):
     assert module_content['settings'].get('build_type') == build_type
 
 
+@pytest.mark.tool("qbs")
 @pytest.mark.parametrize('shared', ['False', 'True'])
 def test_options(shared):
     conanfile = textwrap.dedent('''
@@ -165,6 +170,7 @@ class Recipe(ConanFile):
     assert module_content['options'].get('shared') == shared
 
 
+@pytest.mark.tool("qbs")
 def test_components():
     """
         Checks a package with multiple components.
@@ -217,6 +223,7 @@ def package_info(self):
     ]
 
 
+@pytest.mark.tool("qbs")
 def test_cpp_info_requires():
     """
     Testing a complex structure like:
@@ -365,6 +372,7 @@ def package_info(self):
 
 
 # see https://github.com/conan-io/conan/issues/10341
+@pytest.mark.tool("qbs")
 def test_components_conflict():
     """ If component has the same name as the root package, skip root package
     """
diff --git a/test/integration/toolchains/qbs/test_qbsprofile.py b/test/integration/toolchains/qbs/test_qbsprofile.py
index c3b9016962b..1c9cf14c7d1 100644
--- a/test/integration/toolchains/qbs/test_qbsprofile.py
+++ b/test/integration/toolchains/qbs/test_qbsprofile.py
@@ -17,6 +17,7 @@ def exe_suffix():
 }
 
 
+@pytest.mark.tool("qbs")
 @pytest.mark.parametrize('compiler, version, system', [
     ('gcc', '13', 'Linux'),
     ('clang', '15', 'Linux'),
@@ -63,6 +64,7 @@ class Recipe(ConanFile):
     assert f'cpp.cxxCompilerName:{cxx}' in settings_content
 
 
+@pytest.mark.tool("qbs")
 @pytest.mark.parametrize('compiler, version, system, cc, cxx', [
     ('gcc', '13', 'Linux', 'gcc', 'g++'),
     ('clang', '15', 'Linux', 'clang', 'clang++'),
@@ -102,6 +104,7 @@ class Recipe(ConanFile):
     assert f'cpp.cxxCompilerName:{cxx}' in settings_content
 
 
+@pytest.mark.tool("qbs")
 @pytest.mark.parametrize('compiler, version, system, cc, cxx', [
     ('gcc', '13', 'Linux', 'gcc', 'g++'),
     ('clang', '15', 'Linux', 'clang', 'clang++'),
@@ -142,6 +145,7 @@ class Recipe(ConanFile):
     assert f'cpp.cxxCompilerName:{cxx}' in settings_content
 
 
+@pytest.mark.tool("qbs")
 @pytest.mark.parametrize('system, compiler, version, build_type, arch, cppstd', [
     ('Linux', 'gcc', '13', 'Release', 'x86_64', '17'),
     ('Linux', 'gcc', '13', 'Debug', 'x86_64', '14'),
@@ -191,6 +195,7 @@ class Recipe(ConanFile):
     # TODO: cpp.runtimeLibrary (MSVC only)
 
 
+@pytest.mark.tool("qbs")
 def test_options_from_conf():
     client = TestClient()
 
@@ -233,6 +238,7 @@ class Recipe(ConanFile):
     assert "cpp.driverLinkerFlags:['-s']" in settings_content
 
 
+@pytest.mark.tool("qbs")
 def test_options_extra():
     client = TestClient()
 
@@ -282,6 +288,7 @@ def generate(self):
     assert "cpp.driverLinkerFlags:['-s']" in settings_content
 
 
+@pytest.mark.tool("qbs")
 def test_sysroot():
     client = TestClient()
 

From 6e324b0d1fe71de9b9a1982446f3e22194ca22f0 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Mon, 11 Nov 2024 16:03:28 +0100
Subject: [PATCH 156/211] skip test

---
 test/integration/toolchains/gnu/test_makedeps.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/integration/toolchains/gnu/test_makedeps.py b/test/integration/toolchains/gnu/test_makedeps.py
index 31fd5d3a6fd..7e6e3fefe80 100644
--- a/test/integration/toolchains/gnu/test_makedeps.py
+++ b/test/integration/toolchains/gnu/test_makedeps.py
@@ -411,6 +411,7 @@ def package_info(self):
     assert "CONAN_NAME_OTHER" not in make_content
 
 
+@pytest.mark.skipif(platform.system() == "Windows", reason="Test uses Unix-style paths not compatible with Windows filesystem.")
 @pytest.mark.parametrize("pattern, result, expected",
                          [("libs = []", False, 'SYSROOT'),
                           ("sysroot = ['/foo/bar/sysroot']", True, 'CONAN_SYSROOT_PACKAGE = /foo/bar/sysroot')])

From 14c75b4fa12152a6debe7aa187a89271fe82d008 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Tue, 26 Nov 2024 11:54:39 +0100
Subject: [PATCH 157/211] remove debug changes

---
 test/conftest.py                         | 3 ---
 test/functional/subsystems_build_test.py | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/test/conftest.py b/test/conftest.py
index 59dc4351b2e..368d24fcc9e 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -227,10 +227,7 @@ def _get_tool(name, version):
 
 
 def _get_individual_tool(name, version):
-    print("name:", name)
     tool = tools_locations.get(name, {})
-    print("tool:", tool)
-    print("tool get disabled:", tool.get("disabled"))
     if tool.get("disabled"):
         return False
 
diff --git a/test/functional/subsystems_build_test.py b/test/functional/subsystems_build_test.py
index 1fafad8f241..c5f8336f73a 100644
--- a/test/functional/subsystems_build_test.py
+++ b/test/functional/subsystems_build_test.py
@@ -393,12 +393,12 @@ def _build(self, client, generator="Unix Makefiles", compiler=None, toolset=None
             cmake_compiler += " -DCMAKE_CXX_COMPILER={}".format(compilerpp)
             cmake_compiler += " -DCMAKE_RC_COMPILER={}".format(compiler)
         toolset = "-T {}".format(toolset) if toolset else ""
-        client.run_command("cmake --debug-output {} {}"
+        client.run_command("cmake {} {}"
                            " -DCMAKE_SH=\"CMAKE_SH-NOTFOUND\" -G \"{}\" .".format(cmake_compiler,
                                                                                   toolset,
                                                                                   generator))
         build_out = client.out
-        client.run_command("cmake --build . --verbose")
+        client.run_command("cmake --build .")
         app = "app" if "Visual" not in generator else r"Debug\app"
         client.run_command(app)
         return build_out

From 0070b92bd54a8be9f7866ecce027c597c3739f2c Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Tue, 26 Nov 2024 11:54:44 +0100
Subject: [PATCH 158/211] xfail test

---
 .../toolchains/microsoft/vcvars_test.py       | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/test/integration/toolchains/microsoft/vcvars_test.py b/test/integration/toolchains/microsoft/vcvars_test.py
index 25d2ae571c4..a33376491da 100644
--- a/test/integration/toolchains/microsoft/vcvars_test.py
+++ b/test/integration/toolchains/microsoft/vcvars_test.py
@@ -84,25 +84,25 @@ class TestConan(ConanFile):
     assert os.path.exists(os.path.join(client.current_folder, "conanvcvars.bat"))
 
 
-# FIXME: we dont have vs2015 installed in gh actions
-# @pytest.mark.skipif(platform.system() != "Windows", reason="Requires Windows")
-# def test_vcvars_2015_error():
-#     # https://github.com/conan-io/conan/issues/9888
-#     client = TestClient(path_with_spaces=False)
-
-#     conanfile = textwrap.dedent("""
-#         from conan import ConanFile
-#         class TestConan(ConanFile):
-#             generators = "VCVars"
-#             settings = "os", "compiler", "arch", "build_type"
-#     """)
-#     client.save({"conanfile.py": conanfile})
-#     client.run('install . -s os=Windows -s compiler="msvc" -s compiler.version=190 '
-#                '-s compiler.cppstd=14 -s compiler.runtime=static')
-
-#     vcvars = client.load("conanvcvars.bat")
-#     assert 'vcvarsall.bat"  amd64' in vcvars
-#     assert "-vcvars_ver" not in vcvars
+@pytest.mark.skipif(platform.system() != "Windows", reason="Requires Windows")
+@pytest.mark.xfail(reason="we dont have vs2015 installed in gh actions")
+def test_vcvars_2015_error():
+    # https://github.com/conan-io/conan/issues/9888
+    client = TestClient(path_with_spaces=False)
+
+    conanfile = textwrap.dedent("""
+        from conan import ConanFile
+        class TestConan(ConanFile):
+            generators = "VCVars"
+            settings = "os", "compiler", "arch", "build_type"
+    """)
+    client.save({"conanfile.py": conanfile})
+    client.run('install . -s os=Windows -s compiler="msvc" -s compiler.version=190 '
+               '-s compiler.cppstd=14 -s compiler.runtime=static')
+
+    vcvars = client.load("conanvcvars.bat")
+    assert 'vcvarsall.bat"  amd64' in vcvars
+    assert "-vcvars_ver" not in vcvars
 
 
 @pytest.mark.skipif(platform.system() != "Windows", reason="Requires Windows")

From d5220e1e960fe577645b1f23ca7f94cb354d6ecf Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Tue, 26 Nov 2024 14:19:26 +0100
Subject: [PATCH 159/211] Configure Git to maintain consistent line endings

---
 .github/workflows/win-tests.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index dfc211d73eb..b2f456dfeba 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -159,6 +159,8 @@ jobs:
 
       - name: Run Tests
         run: |
+          git config --global core.autocrlf false
+
           $pathsToRemove = @()
           $pathsToRemove += "C:\mingw64\bin"                # To avoid that CMake finds gcc there
           $pathsToRemove += "C:\Strawberry\c\bin"

From 2a674fb1ff2b12a1542c53b329ab1e0459c7e188 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Tue, 26 Nov 2024 16:06:07 +0100
Subject: [PATCH 160/211] fix versions

---
 .../toolchains/cmake/test_cmake_toolchain_win_clang.py      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py b/test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py
index d0385f90f08..ac1902ef43b 100644
--- a/test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py
+++ b/test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py
@@ -155,10 +155,10 @@ def test_clang_visual_studio_generator(self, client):
         assert 'cmake -G "{}"'.format(generator) in client.out
         assert "MSVC-like command-line" in client.out
         # My local is 17, but CI ClangCL still 16
-        assert "main __clang_major__17" in client.out
+        assert "main __clang_major__18" in client.out
         # Check this! Clang compiler in Windows is reporting MSC_VER and MSVC_LANG!
-        assert "main _MSC_VER1941" in client.out
-        assert "main _MSVC_LANG2017" in client.out
+        assert "main _MSC_VER1942" in client.out
+        assert "main _MSVC_LANG201703" in client.out
         assert "main _M_X64 defined" in client.out
         assert "main __x86_64__ defined" in client.out
         assert "-m64" not in client.out

From b40257c92f0d2af8a5341f1f23cbf73809261fdc Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Tue, 26 Nov 2024 16:20:11 +0100
Subject: [PATCH 161/211] fix winsdk version

---
 test/integration/toolchains/microsoft/vcvars_test.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/integration/toolchains/microsoft/vcvars_test.py b/test/integration/toolchains/microsoft/vcvars_test.py
index a33376491da..1fa10607e8b 100644
--- a/test/integration/toolchains/microsoft/vcvars_test.py
+++ b/test/integration/toolchains/microsoft/vcvars_test.py
@@ -138,10 +138,10 @@ class TestConan(ConanFile):
     client.save({"conanfile.py": conanfile})
     client.run('install . -s os=Windows -s compiler=msvc -s compiler.version=193 '
                '-s compiler.cppstd=14 -s compiler.runtime=static '
-               '-c tools.microsoft:winsdk_version=17.11')
+               '-c tools.microsoft:winsdk_version=10.0')
 
     vcvars = client.load("conanvcvars.bat")
-    assert 'vcvarsall.bat"  amd64 17.11 -vcvars_ver=14.3' in vcvars
+    assert 'vcvarsall.bat"  amd64 10.0 -vcvars_ver=14.3' in vcvars
 
 
 @pytest.mark.skipif(platform.system() != "Windows", reason="Requires Windows")

From 3987bf007402e2031e33ba376b7b95971dbbe4d4 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Tue, 26 Nov 2024 16:43:48 +0100
Subject: [PATCH 162/211] xfail test

---
 test/unittests/util/output_test.py | 36 +++++++++++++++---------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/test/unittests/util/output_test.py b/test/unittests/util/output_test.py
index d43811bcc8c..5a4e595cd2a 100644
--- a/test/unittests/util/output_test.py
+++ b/test/unittests/util/output_test.py
@@ -54,24 +54,24 @@ def test_unzip_output(self):
         content = load(os.path.join(output_dir, "example.txt"))
         self.assertEqual(content, "Hello world!")
 
-    # FIXME: revisit this test
-    # @pytest.mark.skipif(platform.system() != "Windows", reason="Requires windows")
-    # def test_short_paths_unzip_output(self):
-    #     tmp_dir = temp_folder()
-    #     file_path = os.path.join(tmp_dir, "src\\"*40, "example.txt")
-    #     save(file_path, "Hello world!")
+    @pytest.mark.skipif(platform.system() != "Windows", reason="Requires windows")
+    @pytest.mark.xfail(reason="We have to investigate why this test is failing")
+    def test_short_paths_unzip_output(self):
+        tmp_dir = temp_folder()
+        file_path = os.path.join(tmp_dir, "src/"*40, "example.txt")
+        save(file_path, "Hello world!")
 
-    #     zip_path = os.path.join(tmp_dir, 'example.zip')
-    #     zipf = zipfile.ZipFile(zip_path, 'w', zipfile.ZIP_DEFLATED)
-    #     for root, _, files in os.walk(tmp_dir):
-    #         for f in files:
-    #             zipf.write(os.path.join(root, f), os.path.join("src\\"*20, f))
-    #     zipf.close()
+        zip_path = os.path.join(tmp_dir, 'example.zip')
+        zipf = zipfile.ZipFile(zip_path, 'w', zipfile.ZIP_DEFLATED)
+        for root, _, files in os.walk(tmp_dir):
+            for f in files:
+                zipf.write(os.path.join(root, f), os.path.join("src/"*20, f))
+        zipf.close()
 
-    #     output_dir = os.path.join(tmp_dir, "dst\\"*40, "output_dir")
-    #     captured_output = RedirectedTestOutput()
-    #     with redirect_output(captured_output):
-    #         unzip(ConanFileMock(), zip_path, output_dir)
+        output_dir = os.path.join(tmp_dir, "dst/"*40, "output_dir")
+        captured_output = RedirectedTestOutput()
+        with redirect_output(captured_output):
+            unzip(ConanFileMock(), zip_path, output_dir)
 
-    #     output = captured_output.getvalue()
-    #     self.assertIn("ERROR: Error extract src\\src", output)
+        output = captured_output.getvalue()
+        self.assertIn("ERROR: Error extract src/src", output)

From ea6d83b5959ca0a4fe13b004b9e1b101b0d61651 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Tue, 26 Nov 2024 16:57:36 +0100
Subject: [PATCH 163/211] try to install v143

---
 .github/workflows/win-tests.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index b2f456dfeba..f2852a6b8fb 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -38,13 +38,15 @@ jobs:
         run: |
             Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_buildtools.exe" -OutFile "vs_buildtools.exe"
             Start-Process -FilePath ".\vs_buildtools.exe" -ArgumentList `
-            "--quiet",  "--wait", "--norestart", "--nocache", `
+            "--quiet", "--wait", "--norestart", "--nocache", `
             "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
             "--add", "Microsoft.VisualStudio.Component.Windows81SDK", `
             "--add", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", `
             "--add", "Microsoft.Component.MSBuild", `
-            "--add", "Microsoft.VisualStudio.Component.VC.140", `
-            "--add", "Microsoft.VisualStudio.Component.VC.v141.x86.x64" -Wait
+            "--add", "Microsoft.VisualStudio.Component.VC.v143.x86.x64", `
+            "--add", "Microsoft.VisualStudio.Component.VC.v141.x86.x64", `
+            "--add", "Microsoft.VisualStudio.Component.VC.140" `
+            -NoNewWindow -Wait
 
       - name: Cache pip packages
         uses: actions/cache@v4

From 784a95ba7e9d187f914e51704d2b497fa5b78846 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Tue, 26 Nov 2024 17:20:06 +0100
Subject: [PATCH 164/211] build with vs 17 and msvc 193

---
 .../toolchains/microsoft/test_v2_msbuild_template.py          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/functional/toolchains/microsoft/test_v2_msbuild_template.py b/test/functional/toolchains/microsoft/test_v2_msbuild_template.py
index a8bd802966a..b3b272a4d91 100644
--- a/test/functional/toolchains/microsoft/test_v2_msbuild_template.py
+++ b/test/functional/toolchains/microsoft/test_v2_msbuild_template.py
@@ -49,11 +49,11 @@ def test_msbuild_lib_2022():
     assert "hello/0.1: _MSC_VER191" in client.out
 
     # Create works
-    client.run("create . -s compiler.version=194")
+    client.run("create . -s compiler.version=193")
     assert "hello/0.1: Hello World Release!" in client.out
     # This is the default compiler.version=191 in conftest
     assert "Activating environment Visual Studio 17" in client.out
-    assert "hello/0.1: _MSC_VER1941" in client.out
+    assert "hello/0.1: _MSC_VER193" in client.out
 
 
 @pytest.mark.skipif(platform.system() != "Windows", reason="Requires Windows")

From 8244358748ea81917d1cac9d58e3a22a29829f0f Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Tue, 26 Nov 2024 18:06:23 +0100
Subject: [PATCH 165/211] try again

---
 .github/workflows/win-tests.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index f2852a6b8fb..f9364e08225 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -43,11 +43,17 @@ jobs:
             "--add", "Microsoft.VisualStudio.Component.Windows81SDK", `
             "--add", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", `
             "--add", "Microsoft.Component.MSBuild", `
-            "--add", "Microsoft.VisualStudio.Component.VC.v143.x86.x64", `
             "--add", "Microsoft.VisualStudio.Component.VC.v141.x86.x64", `
             "--add", "Microsoft.VisualStudio.Component.VC.140" `
             -NoNewWindow -Wait
 
+            Invoke-WebRequest -Uri "https://aka.ms/vs/17/release/vs_buildtools.exe" -OutFile "vs_buildtools.exe"
+            Start-Process -FilePath ".\vs_buildtools.exe" -ArgumentList `
+            "--quiet", "--wait", "--norestart", "--nocache", `
+            "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
+            "--add", "Microsoft.VisualStudio.Component.VC.v143.x86.x64" `
+            -WindowStyle Hidden -Wait
+
       - name: Cache pip packages
         uses: actions/cache@v4
         with:

From 8a38f5cedaa6e0227dc0981dad03bbf0b4dfae09 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 27 Nov 2024 07:47:18 +0100
Subject: [PATCH 166/211] wip

---
 .github/workflows/win-tests.yml | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index f9364e08225..1039c3379e6 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -38,21 +38,36 @@ jobs:
         run: |
             Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_buildtools.exe" -OutFile "vs_buildtools.exe"
             Start-Process -FilePath ".\vs_buildtools.exe" -ArgumentList `
-            "--quiet", "--wait", "--norestart", "--nocache", `
+            "--quiet",  "--wait", "--norestart", "--nocache", `
             "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
             "--add", "Microsoft.VisualStudio.Component.Windows81SDK", `
             "--add", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", `
             "--add", "Microsoft.Component.MSBuild", `
-            "--add", "Microsoft.VisualStudio.Component.VC.v141.x86.x64", `
-            "--add", "Microsoft.VisualStudio.Component.VC.140" `
-            -NoNewWindow -Wait
+            "--add", "Microsoft.VisualStudio.Component.VC.140" -Wait
 
-            Invoke-WebRequest -Uri "https://aka.ms/vs/17/release/vs_buildtools.exe" -OutFile "vs_buildtools.exe"
-            Start-Process -FilePath ".\vs_buildtools.exe" -ArgumentList `
-            "--quiet", "--wait", "--norestart", "--nocache", `
+      - name: Install additional Visual Studio components
+        run: |
+            $installer = "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installer.exe"
+            if (!(Test-Path $installer)) {
+            Write-Host "Visual Studio Installer not found at $installer"
+            exit 1
+            }
+            Start-Process -FilePath $installer -ArgumentList `
+            "modify", `
+            "--installPath", "C:\Program Files\Microsoft Visual Studio\2022\Enterprise", `
+            "--add", "Microsoft.VisualStudio.Component.VC.v141.x86.x64", `
             "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
-            "--add", "Microsoft.VisualStudio.Component.VC.v143.x86.x64" `
-            -WindowStyle Hidden -Wait
+            "--add", "Microsoft.Component.MSBuild", `
+            "--quiet", "--wait", "--norestart", "--nocache" `
+            -Wait
+
+      - name: Verify installed MSVC toolsets
+        run: |
+            Get-ChildItem "C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC"
+
+      - name: Setup MSVC environment
+        run: |
+            "C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64 -vcvars_ver=14.3
 
       - name: Cache pip packages
         uses: actions/cache@v4

From 387471d7d8af8cc7da1e8586fb2d8812877903e8 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 27 Nov 2024 07:56:20 +0100
Subject: [PATCH 167/211] wip

---
 .github/workflows/win-tests.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 1039c3379e6..793927b9ee5 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -61,14 +61,6 @@ jobs:
             "--quiet", "--wait", "--norestart", "--nocache" `
             -Wait
 
-      - name: Verify installed MSVC toolsets
-        run: |
-            Get-ChildItem "C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC"
-
-      - name: Setup MSVC environment
-        run: |
-            "C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64 -vcvars_ver=14.3
-
       - name: Cache pip packages
         uses: actions/cache@v4
         with:

From a6973447659c6c192e752884b75faf49adf8eb68 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 27 Nov 2024 08:00:08 +0100
Subject: [PATCH 168/211] wip

---
 .github/workflows/win-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 793927b9ee5..994ff54a395 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -205,4 +205,4 @@ jobs:
           [System.Environment]::SetEnvironmentVariable('MSYS2_PATH', $msys2Path, [System.EnvironmentVariableTarget]::Process)
           Write-Host "Added MSYS2_PATH environment variable: $msys2Path"
 
-          pytest test/unittests test/integration test/functional -n=auto --durations=50 -vvv
+          pytest test/unittests test/integration test/functional -k test_msbuild_lib_2022 -n=auto --durations=50 -vvv

From dd8a5402ebc4b9d4a1b52636987673ab1674799a Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 27 Nov 2024 08:12:19 +0100
Subject: [PATCH 169/211] wip

---
 .github/workflows/win-tests.yml | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 994ff54a395..772b50d315b 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -36,30 +36,23 @@ jobs:
 
       - name: Install Visual Studio Build Tools
         run: |
-            Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_buildtools.exe" -OutFile "vs_buildtools.exe"
-            Start-Process -FilePath ".\vs_buildtools.exe" -ArgumentList `
+            Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_buildtools.exe" -OutFile "vs_buildtools15.exe"
+            Start-Process -FilePath ".\vs_buildtools15.exe" -ArgumentList `
             "--quiet",  "--wait", "--norestart", "--nocache", `
             "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
             "--add", "Microsoft.VisualStudio.Component.Windows81SDK", `
             "--add", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", `
             "--add", "Microsoft.Component.MSBuild", `
-            "--add", "Microsoft.VisualStudio.Component.VC.140" -Wait
+            "--add", "Microsoft.VisualStudio.Component.VC.140" -WindowStyle Hidden -Wait
 
       - name: Install additional Visual Studio components
         run: |
-            $installer = "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installer.exe"
-            if (!(Test-Path $installer)) {
-            Write-Host "Visual Studio Installer not found at $installer"
-            exit 1
-            }
-            Start-Process -FilePath $installer -ArgumentList `
-            "modify", `
-            "--installPath", "C:\Program Files\Microsoft Visual Studio\2022\Enterprise", `
-            "--add", "Microsoft.VisualStudio.Component.VC.v141.x86.x64", `
-            "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
-            "--add", "Microsoft.Component.MSBuild", `
+            Invoke-WebRequest -Uri "https://aka.ms/vs/17/release/vs_buildtools.exe" -OutFile "vs_buildtools17.exe"
+            Start-Process -FilePath ".\vs_buildtools17.exe" -ArgumentList `
             "--quiet", "--wait", "--norestart", "--nocache" `
-            -Wait
+            "--add", "Microsoft.VisualStudio.Component.VC.v141.x86.x64", `
+            "--add", "Microsoft.VisualStudio.Component.VC.v143.x86.x64" -WindowStyle Hidden -Wait
+
 
       - name: Cache pip packages
         uses: actions/cache@v4

From 11695b542ca70c036b8986717244cd8613f6512a Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 27 Nov 2024 08:23:27 +0100
Subject: [PATCH 170/211] wip

---
 .github/workflows/win-tests.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 772b50d315b..5aa52a198a8 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -49,10 +49,10 @@ jobs:
         run: |
             Invoke-WebRequest -Uri "https://aka.ms/vs/17/release/vs_buildtools.exe" -OutFile "vs_buildtools17.exe"
             Start-Process -FilePath ".\vs_buildtools17.exe" -ArgumentList `
-            "--quiet", "--wait", "--norestart", "--nocache" `
+            "--quiet", "--wait", "--norestart", "--nocache", `
             "--add", "Microsoft.VisualStudio.Component.VC.v141.x86.x64", `
-            "--add", "Microsoft.VisualStudio.Component.VC.v143.x86.x64" -WindowStyle Hidden -Wait
-
+            "--add", "Microsoft.VisualStudio.Component.VC.v143.x86.x64" `
+            -WindowStyle Hidden -Wait
 
       - name: Cache pip packages
         uses: actions/cache@v4

From de5c2073606d19e8e7a29b59e112c224a26ee9a2 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 27 Nov 2024 10:01:12 +0100
Subject: [PATCH 171/211] wip

---
 .github/workflows/win-tests.yml                          | 9 ---------
 .../toolchains/microsoft/test_v2_msbuild_template.py     | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 5aa52a198a8..216f7fbfc2e 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -45,15 +45,6 @@ jobs:
             "--add", "Microsoft.Component.MSBuild", `
             "--add", "Microsoft.VisualStudio.Component.VC.140" -WindowStyle Hidden -Wait
 
-      - name: Install additional Visual Studio components
-        run: |
-            Invoke-WebRequest -Uri "https://aka.ms/vs/17/release/vs_buildtools.exe" -OutFile "vs_buildtools17.exe"
-            Start-Process -FilePath ".\vs_buildtools17.exe" -ArgumentList `
-            "--quiet", "--wait", "--norestart", "--nocache", `
-            "--add", "Microsoft.VisualStudio.Component.VC.v141.x86.x64", `
-            "--add", "Microsoft.VisualStudio.Component.VC.v143.x86.x64" `
-            -WindowStyle Hidden -Wait
-
       - name: Cache pip packages
         uses: actions/cache@v4
         with:
diff --git a/test/functional/toolchains/microsoft/test_v2_msbuild_template.py b/test/functional/toolchains/microsoft/test_v2_msbuild_template.py
index b3b272a4d91..69d9b1ffeec 100644
--- a/test/functional/toolchains/microsoft/test_v2_msbuild_template.py
+++ b/test/functional/toolchains/microsoft/test_v2_msbuild_template.py
@@ -49,7 +49,7 @@ def test_msbuild_lib_2022():
     assert "hello/0.1: _MSC_VER191" in client.out
 
     # Create works
-    client.run("create . -s compiler.version=193")
+    client.run("create . -s compiler.version=190")
     assert "hello/0.1: Hello World Release!" in client.out
     # This is the default compiler.version=191 in conftest
     assert "Activating environment Visual Studio 17" in client.out

From b969ce106475fc61c0bc4b3e742de5c56bf1c34c Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 27 Nov 2024 11:41:40 +0100
Subject: [PATCH 172/211] revert

---
 .../functional/toolchains/microsoft/test_v2_msbuild_template.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/functional/toolchains/microsoft/test_v2_msbuild_template.py b/test/functional/toolchains/microsoft/test_v2_msbuild_template.py
index 69d9b1ffeec..b3b272a4d91 100644
--- a/test/functional/toolchains/microsoft/test_v2_msbuild_template.py
+++ b/test/functional/toolchains/microsoft/test_v2_msbuild_template.py
@@ -49,7 +49,7 @@ def test_msbuild_lib_2022():
     assert "hello/0.1: _MSC_VER191" in client.out
 
     # Create works
-    client.run("create . -s compiler.version=190")
+    client.run("create . -s compiler.version=193")
     assert "hello/0.1: Hello World Release!" in client.out
     # This is the default compiler.version=191 in conftest
     assert "Activating environment Visual Studio 17" in client.out

From 0787b7b7330dbf241dfd6db5f5ff655ee39b5504 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 27 Nov 2024 11:41:51 +0100
Subject: [PATCH 173/211] try to modify

---
 .github/workflows/win-tests.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 216f7fbfc2e..b0a0f6fbfb2 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -34,6 +34,13 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
+      - name: Install MSVC v14.40 toolset
+        run: |
+            & "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installer.exe" modify `
+            --installPath "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" `
+            --add Microsoft.VisualStudio.Component.VC.Tools.14.40.x86.x64 `
+            --quiet --wait --norestart
+
       - name: Install Visual Studio Build Tools
         run: |
             Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_buildtools.exe" -OutFile "vs_buildtools15.exe"

From 7008d07feeb60d2c6f9c868a6aaf567660b9dcdc Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 27 Nov 2024 12:07:54 +0100
Subject: [PATCH 174/211] wip

---
 .github/workflows/win-tests.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index b0a0f6fbfb2..e79277cb2cf 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -41,6 +41,10 @@ jobs:
             --add Microsoft.VisualStudio.Component.VC.Tools.14.40.x86.x64 `
             --quiet --wait --norestart
 
+      - name: Verify MSVC v14.40 toolset installation
+      run: |
+          dir "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC"
+
       - name: Install Visual Studio Build Tools
         run: |
             Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_buildtools.exe" -OutFile "vs_buildtools15.exe"

From c46db829d65e7be16ff303a05efba8a2c2a75ee3 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 27 Nov 2024 12:10:30 +0100
Subject: [PATCH 175/211] fix indent

---
 .github/workflows/win-tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index e79277cb2cf..6caf1699bed 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -42,8 +42,8 @@ jobs:
             --quiet --wait --norestart
 
       - name: Verify MSVC v14.40 toolset installation
-      run: |
-          dir "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC"
+        run: |
+            dir "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC"
 
       - name: Install Visual Studio Build Tools
         run: |

From 57169b3857d177d347cda48b90fba9b293d9225e Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 27 Nov 2024 12:48:26 +0100
Subject: [PATCH 176/211] wip

---
 .github/workflows/win-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 6caf1699bed..deae5fb58d9 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -39,7 +39,7 @@ jobs:
             & "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installer.exe" modify `
             --installPath "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" `
             --add Microsoft.VisualStudio.Component.VC.Tools.14.40.x86.x64 `
-            --quiet --wait --norestart
+            --quiet --norestart
 
       - name: Verify MSVC v14.40 toolset installation
         run: |

From 15dbe4c9d9e427c4261c33bdf3fe12e8da0f4ce3 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 27 Nov 2024 13:01:27 +0100
Subject: [PATCH 177/211] wip

---
 .github/workflows/win-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index deae5fb58d9..dd3b64f650e 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -38,7 +38,7 @@ jobs:
         run: |
             & "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installer.exe" modify `
             --installPath "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" `
-            --add Microsoft.VisualStudio.Component.VC.Tools.14.40.x86.x64 `
+            --add Microsoft.VisualStudio.Component.VC.14.39.17.9.x86.x64 `
             --quiet --norestart
 
       - name: Verify MSVC v14.40 toolset installation

From 889b5ef6757dff2c69c354b2f44fae7cf62b4485 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 27 Nov 2024 13:04:40 +0100
Subject: [PATCH 178/211] wip

---
 .github/workflows/win-tests.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index dd3b64f650e..02e64e0fdb8 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -34,14 +34,14 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install MSVC v14.40 toolset
+      - name: Install MSVC v14.39 toolset
         run: |
-            & "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installer.exe" modify `
-            --installPath "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" `
-            --add Microsoft.VisualStudio.Component.VC.14.39.17.9.x86.x64 `
-            --quiet --norestart
+            Invoke-WebRequest -Uri "https://aka.ms/vs/17/release/vs_buildtools.exe" -OutFile "vs_buildtools17.exe"
+            Start-Process -FilePath ".\vs_buildtools15.exe" -ArgumentList `
+            "--quiet",  "--wait", "--norestart", "--nocache", `
+            "--add", "Microsoft.VisualStudio.Component.VC.14.39.17.9.x86.x64" -WindowStyle Hidden -Wait
 
-      - name: Verify MSVC v14.40 toolset installation
+      - name: Verify MSVC v14.39 toolset installation
         run: |
             dir "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC"
 

From 652ba5adc54a6a0228d32b7ec2645f99e4d6f9a8 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 27 Nov 2024 13:08:52 +0100
Subject: [PATCH 179/211] fix

---
 .github/workflows/win-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 02e64e0fdb8..09a35124ee6 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -37,7 +37,7 @@ jobs:
       - name: Install MSVC v14.39 toolset
         run: |
             Invoke-WebRequest -Uri "https://aka.ms/vs/17/release/vs_buildtools.exe" -OutFile "vs_buildtools17.exe"
-            Start-Process -FilePath ".\vs_buildtools15.exe" -ArgumentList `
+            Start-Process -FilePath ".\vs_buildtools17.exe" -ArgumentList `
             "--quiet",  "--wait", "--norestart", "--nocache", `
             "--add", "Microsoft.VisualStudio.Component.VC.14.39.17.9.x86.x64" -WindowStyle Hidden -Wait
 

From 7c04413af3f88c6f02dd806d4ec003d5484992ba Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 27 Nov 2024 18:51:32 +0100
Subject: [PATCH 180/211] wip

---
 .github/workflows/win-tests.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 09a35124ee6..1f6ef872ee8 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -36,10 +36,10 @@ jobs:
 
       - name: Install MSVC v14.39 toolset
         run: |
-            Invoke-WebRequest -Uri "https://aka.ms/vs/17/release/vs_buildtools.exe" -OutFile "vs_buildtools17.exe"
-            Start-Process -FilePath ".\vs_buildtools17.exe" -ArgumentList `
-            "--quiet",  "--wait", "--norestart", "--nocache", `
-            "--add", "Microsoft.VisualStudio.Component.VC.14.39.17.9.x86.x64" -WindowStyle Hidden -Wait
+            & "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installer.exe" modify `
+              --installPath "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" `
+              --add Microsoft.VisualStudio.Component.VC.14.39.17.9.x86.x64 `
+              --quiet --norestart
 
       - name: Verify MSVC v14.39 toolset installation
         run: |

From 46293d6b4497f123746874ce0939f7a66eba67fb Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 27 Nov 2024 19:02:06 +0100
Subject: [PATCH 181/211] wip

---
 .github/workflows/win-tests.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 1f6ef872ee8..6fa23d57ea3 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -36,10 +36,7 @@ jobs:
 
       - name: Install MSVC v14.39 toolset
         run: |
-            & "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installer.exe" modify `
-              --installPath "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" `
-              --add Microsoft.VisualStudio.Component.VC.14.39.17.9.x86.x64 `
-              --quiet --norestart
+            & "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installer.exe" modify --installPath "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" --add Microsoft.VisualStudio.Component.VC.Tools.14.39.x86.x64 --quiet --norestart
 
       - name: Verify MSVC v14.39 toolset installation
         run: |

From 1004f3ba1219ff3840fd133c4a9805e2fa90e827 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 27 Nov 2024 19:04:00 +0100
Subject: [PATCH 182/211] wip

---
 .github/workflows/win-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 6fa23d57ea3..d16a2c1292b 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -36,7 +36,7 @@ jobs:
 
       - name: Install MSVC v14.39 toolset
         run: |
-            & "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installer.exe" modify --installPath "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" --add Microsoft.VisualStudio.Component.VC.Tools.14.39.x86.x64 --quiet --norestart
+            & "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installer.exe" modify --installPath "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" --add Microsoft.VisualStudio.Component.VC.Tools.14.39.x86.x64 --norestart --passive
 
       - name: Verify MSVC v14.39 toolset installation
         run: |

From ad19c72f4952eb28e7552d0e11e69ec8776a5e71 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 27 Nov 2024 19:10:08 +0100
Subject: [PATCH 183/211] wip

---
 .github/workflows/win-tests.yml | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index d16a2c1292b..36747e52e02 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -34,9 +34,29 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install MSVC v14.39 toolset
+      - name: Install MSVC v14.39 Toolset
+        shell: pwsh
         run: |
-            & "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installer.exe" modify --installPath "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" --add Microsoft.VisualStudio.Component.VC.Tools.14.39.x86.x64 --norestart --passive
+          Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"
+          $InstallPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
+          $componentsToAdd = @(
+              "Microsoft.VisualStudio.Component.VC.Tools.14.39.x86.x64"
+          )
+          [string]$workloadArgs = $componentsToAdd | ForEach-Object { "--add " + $_ }
+          
+          $Arguments = @('vs_installer.exe', 'modify', '--installPath', "`"$InstallPath`"", $workloadArgs, '--quiet', '--norestart', '--nocache')
+
+          $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
+          
+          if ($process.ExitCode -eq 0)
+          {
+              Write-Host "Components have been successfully installed"
+          }
+          else
+          {
+              Write-Host "Components could not be installed"
+              exit 1
+          }
 
       - name: Verify MSVC v14.39 toolset installation
         run: |

From 13e1825bed886359ee0b703adbb0706d4a008614 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 27 Nov 2024 19:18:57 +0100
Subject: [PATCH 184/211] wip

---
 .github/workflows/win-tests.yml | 39 +++++++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 36747e52e02..c6b1c0b979e 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -37,27 +37,48 @@ jobs:
       - name: Install MSVC v14.39 Toolset
         shell: pwsh
         run: |
+          # Navigate to the Visual Studio Installer directory
           Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"
+
+          # Define the installation path of Visual Studio
           $InstallPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
+
+          # Specify the component ID for MSVC Toolset v14.39
           $componentsToAdd = @(
               "Microsoft.VisualStudio.Component.VC.Tools.14.39.x86.x64"
           )
+
+          # Build the arguments string for the components to add
           [string]$workloadArgs = $componentsToAdd | ForEach-Object { "--add " + $_ }
-          
-          $Arguments = @('vs_installer.exe', 'modify', '--installPath', "`"$InstallPath`"", $workloadArgs, '--quiet', '--norestart', '--nocache')
 
-          $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
-          
-          if ($process.ExitCode -eq 0)
-          {
+          # Construct the installer command arguments
+          $Arguments = @(
+              'modify',
+              '--installPath', "`"$InstallPath`"",
+              $workloadArgs,
+              '--passive', '--norestart', '--nocache'
+          )
+
+          # Start the installer process and monitor it
+          Write-Host "Starting Visual Studio Installer..."
+          $process = Start-Process -FilePath "vs_installer.exe" -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
+          Write-Host "Visual Studio Installer process has exited with code $($process.ExitCode)"
+
+          # Check the exit code to determine if the installation was successful
+          if ($process.ExitCode -eq 0) {
               Write-Host "Components have been successfully installed"
-          }
-          else
-          {
+          } else {
               Write-Host "Components could not be installed"
+              # Output installer logs for debugging
+              $logFile = "$env:TEMP\dd_installer.log"
+              if (Test-Path $logFile) {
+                  Write-Host "Installer logs:"
+                  Get-Content -Path $logFile -Raw
+              }
               exit 1
           }
 
+
       - name: Verify MSVC v14.39 toolset installation
         run: |
             dir "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC"

From f1ea6d0b44c1c16d5ea132de3bb2e1b440a68064 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Wed, 27 Nov 2024 19:24:33 +0100
Subject: [PATCH 185/211] wip

---
 .github/workflows/win-tests.yml | 47 +++++----------------------------
 1 file changed, 6 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index c6b1c0b979e..2c19a49e23e 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -35,50 +35,15 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Install MSVC v14.39 Toolset
-        shell: pwsh
         run: |
-          # Navigate to the Visual Studio Installer directory
-          Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"
-
-          # Define the installation path of Visual Studio
-          $InstallPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
-
-          # Specify the component ID for MSVC Toolset v14.39
-          $componentsToAdd = @(
-              "Microsoft.VisualStudio.Component.VC.Tools.14.39.x86.x64"
-          )
-
-          # Build the arguments string for the components to add
-          [string]$workloadArgs = $componentsToAdd | ForEach-Object { "--add " + $_ }
-
-          # Construct the installer command arguments
-          $Arguments = @(
-              'modify',
-              '--installPath', "`"$InstallPath`"",
-              $workloadArgs,
-              '--passive', '--norestart', '--nocache'
-          )
-
-          # Start the installer process and monitor it
-          Write-Host "Starting Visual Studio Installer..."
-          $process = Start-Process -FilePath "vs_installer.exe" -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
-          Write-Host "Visual Studio Installer process has exited with code $($process.ExitCode)"
-
-          # Check the exit code to determine if the installation was successful
-          if ($process.ExitCode -eq 0) {
-              Write-Host "Components have been successfully installed"
-          } else {
-              Write-Host "Components could not be installed"
-              # Output installer logs for debugging
-              $logFile = "$env:TEMP\dd_installer.log"
-              if (Test-Path $logFile) {
-                  Write-Host "Installer logs:"
-                  Get-Content -Path $logFile -Raw
-              }
-              exit 1
+          Start-Process -Wait "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vs_installer.exe" -ArgumentList {`
+            modify `
+            --quiet `
+            --installPath "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" `
+            --add `
+            Microsoft.VisualStudio.Component.VC.Tools.14.39.x86.x64 `
           }
 
-
       - name: Verify MSVC v14.39 toolset installation
         run: |
             dir "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC"

From 74eeb633f3c8f03552e3236d9ddc02049cff8bf6 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 28 Nov 2024 07:39:44 +0100
Subject: [PATCH 186/211] last try

---
 .github/workflows/win-tests.yml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 2c19a49e23e..7f375ca0184 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -34,15 +34,17 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install MSVC v14.39 Toolset
+      - name: Download and Install Visual Studio Build Tools 2022 version 17.9
         run: |
-          Start-Process -Wait "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vs_installer.exe" -ArgumentList {`
-            modify `
-            --quiet `
-            --installPath "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" `
-            --add `
-            Microsoft.VisualStudio.Component.VC.Tools.14.39.x86.x64 `
-          }
+            Invoke-WebRequest -Uri "https://aka.ms/vs/17/release/vs_buildtools.exe" -OutFile "vs_buildtools17_9.exe"
+            Start-Process -FilePath ".\vs_buildtools17_9.exe" -ArgumentList @(
+            "--quiet", "--wait", "--norestart", "--nocache",
+            "--installPath", "C:\BuildTools_14.39",
+            "--channelUri", "https://aka.ms/vs/17/release/channel",
+            "--installChannelUri", "https://aka.ms/vs/17/9/channel",
+            "--add", "Microsoft.VisualStudio.Workload.VCTools",
+            "--add", "Microsoft.VisualStudio.Component.VC.Tools.14.39.x86.x64"
+            ) -Wait
 
       - name: Verify MSVC v14.39 toolset installation
         run: |

From 0416c35053f6ebd6f762af51154a2e33d86d6364 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 28 Nov 2024 07:58:08 +0100
Subject: [PATCH 187/211] wip

---
 .github/workflows/win-tests.yml                   | 15 ---------------
 .../microsoft/test_v2_msbuild_template.py         |  5 ++---
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 7f375ca0184..8a91abef37e 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -34,21 +34,6 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Download and Install Visual Studio Build Tools 2022 version 17.9
-        run: |
-            Invoke-WebRequest -Uri "https://aka.ms/vs/17/release/vs_buildtools.exe" -OutFile "vs_buildtools17_9.exe"
-            Start-Process -FilePath ".\vs_buildtools17_9.exe" -ArgumentList @(
-            "--quiet", "--wait", "--norestart", "--nocache",
-            "--installPath", "C:\BuildTools_14.39",
-            "--channelUri", "https://aka.ms/vs/17/release/channel",
-            "--installChannelUri", "https://aka.ms/vs/17/9/channel",
-            "--add", "Microsoft.VisualStudio.Workload.VCTools",
-            "--add", "Microsoft.VisualStudio.Component.VC.Tools.14.39.x86.x64"
-            ) -Wait
-
-      - name: Verify MSVC v14.39 toolset installation
-        run: |
-            dir "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC"
 
       - name: Install Visual Studio Build Tools
         run: |
diff --git a/test/functional/toolchains/microsoft/test_v2_msbuild_template.py b/test/functional/toolchains/microsoft/test_v2_msbuild_template.py
index b3b272a4d91..ae44ff41d5a 100644
--- a/test/functional/toolchains/microsoft/test_v2_msbuild_template.py
+++ b/test/functional/toolchains/microsoft/test_v2_msbuild_template.py
@@ -49,11 +49,10 @@ def test_msbuild_lib_2022():
     assert "hello/0.1: _MSC_VER191" in client.out
 
     # Create works
-    client.run("create . -s compiler.version=193")
+    client.run("create . -s compiler.version=192")
     assert "hello/0.1: Hello World Release!" in client.out
-    # This is the default compiler.version=191 in conftest
     assert "Activating environment Visual Studio 17" in client.out
-    assert "hello/0.1: _MSC_VER193" in client.out
+    assert "hello/0.1: _MSC_VER192" in client.out
 
 
 @pytest.mark.skipif(platform.system() != "Windows", reason="Requires Windows")

From 50d4041f5da33de5e0e5be79e48a497950887d10 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 28 Nov 2024 10:35:00 +0100
Subject: [PATCH 188/211] wip

---
 .../toolchains/microsoft/test_v2_msbuild_template.py          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/functional/toolchains/microsoft/test_v2_msbuild_template.py b/test/functional/toolchains/microsoft/test_v2_msbuild_template.py
index ae44ff41d5a..2f529d25c83 100644
--- a/test/functional/toolchains/microsoft/test_v2_msbuild_template.py
+++ b/test/functional/toolchains/microsoft/test_v2_msbuild_template.py
@@ -49,10 +49,10 @@ def test_msbuild_lib_2022():
     assert "hello/0.1: _MSC_VER191" in client.out
 
     # Create works
-    client.run("create . -s compiler.version=192")
+    client.run("create . -s compiler.version=193")
     assert "hello/0.1: Hello World Release!" in client.out
     assert "Activating environment Visual Studio 17" in client.out
-    assert "hello/0.1: _MSC_VER192" in client.out
+    assert "hello/0.1: _MSC_VER193" in client.out
 
 
 @pytest.mark.skipif(platform.system() != "Windows", reason="Requires Windows")

From 11e512d79f642b137d4f654308e60a504aa407e1 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 28 Nov 2024 11:19:30 +0100
Subject: [PATCH 189/211] try 14.38

---
 .github/workflows/win-tests.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 8a91abef37e..9a516a17ba3 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -34,6 +34,19 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
+      - name: Install MSVC v14.38 Toolset
+        run: |
+          Start-Process -Wait "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vs_installer.exe" -ArgumentList {`
+            modify `
+            --quiet `
+            --installPath "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" `
+            --add `
+            Microsoft.VisualStudio.Component.VC.Tools.14.38.x86.x64 `
+          }
+
+      - name: Verify MSVC v14.38 toolset installation
+        run: |
+            dir "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC"
 
       - name: Install Visual Studio Build Tools
         run: |

From a46221f2c7aa83281f9a6a16736b3be8657e3188 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 28 Nov 2024 11:44:29 +0100
Subject: [PATCH 190/211] wip

---
 .github/workflows/win-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 9a516a17ba3..2a23380c3f3 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -41,7 +41,7 @@ jobs:
             --quiet `
             --installPath "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" `
             --add `
-            Microsoft.VisualStudio.Component.VC.Tools.14.38.x86.x64 `
+            Microsoft.VisualStudio.Component.VC.14.39.17.9.x86.x64 `
           }
 
       - name: Verify MSVC v14.38 toolset installation

From 081c7944c4ae7c5f401b5c3a95aead3eddbfd8b1 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 28 Nov 2024 12:04:59 +0100
Subject: [PATCH 191/211] use 14.38

---
 .github/workflows/win-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 2a23380c3f3..f71a43363e4 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -41,7 +41,7 @@ jobs:
             --quiet `
             --installPath "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" `
             --add `
-            Microsoft.VisualStudio.Component.VC.14.39.17.9.x86.x64 `
+            Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64 `
           }
 
       - name: Verify MSVC v14.38 toolset installation

From bd492f82600062316a9dcdbf9212697ab429c25b Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 28 Nov 2024 12:29:41 +0100
Subject: [PATCH 192/211] run all tests

---
 .github/workflows/win-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index f71a43363e4..86dcab9643f 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -203,4 +203,4 @@ jobs:
           [System.Environment]::SetEnvironmentVariable('MSYS2_PATH', $msys2Path, [System.EnvironmentVariableTarget]::Process)
           Write-Host "Added MSYS2_PATH environment variable: $msys2Path"
 
-          pytest test/unittests test/integration test/functional -k test_msbuild_lib_2022 -n=auto --durations=50 -vvv
+          pytest test/unittests test/integration test/functional -n=auto --durations=50 -vvv

From de24a690dc0ac51de9499b643680e5e5b16c129f Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 28 Nov 2024 14:02:21 +0100
Subject: [PATCH 193/211] wip

---
 .github/workflows/win-tests.yml | 59 ++++++++++++++++++++++++++-------
 1 file changed, 47 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 86dcab9643f..4eade7e757e 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -14,18 +14,54 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  testing:
+  unit_integration_tests:
+    runs-on: windows-2022
     strategy:
-      fail-fast: true
       matrix:
         python-version: ['3.13', '3.8', '3.6']
+        test-type: ['unittests', 'integration']
 
-    runs-on: windows-2022
+    name: Unit & Integration Tests ${{ matrix.test-type }} (${{ matrix.python-version }})
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
 
-    name: Conan (${{ matrix.python-version }})
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
 
-    steps:
+      - name: Cache pip packages
+        uses: actions/cache@v4
+        with:
+          path: C:\Users\runneradmin\AppData\Local\pip\cache
+          key: pip-packages-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('**/requirements*.txt') }}
+          restore-keys: |
+            pip-packages-${{ runner.os }}-
 
+      - name: Install Python requirements
+        run: |
+          pip install --upgrade pip
+          pip install -r conans/requirements.txt
+          pip install -r conans/requirements_dev.txt
+          pip install -r conans/requirements_server.txt
+
+      - name: Run Unit & Integration Tests
+        run: |
+          if (${{ matrix.test-type }} -eq "unittests") {
+            pytest test/unittests --durations=20 -n=4
+          } elseif (${{ matrix.test-type }} -eq "integration") {
+            pytest test/integration --durations=20 -n=4
+          }
+
+  functional_tests:
+    runs-on: windows-2022
+    strategy:
+      matrix:
+        python-version: ['3.13', '3.8', '3.6']
+
+    name: Functional Tests (${{ matrix.python-version }})
+    steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
@@ -45,13 +81,12 @@ jobs:
           }
 
       - name: Verify MSVC v14.38 toolset installation
-        run: |
-            dir "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC"
+        run: dir "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC"
 
       - name: Install Visual Studio Build Tools
         run: |
-            Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_buildtools.exe" -OutFile "vs_buildtools15.exe"
-            Start-Process -FilePath ".\vs_buildtools15.exe" -ArgumentList `
+          Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_buildtools.exe" -OutFile "vs_buildtools15.exe"
+          Start-Process -FilePath ".\vs_buildtools15.exe" -ArgumentList `
             "--quiet",  "--wait", "--norestart", "--nocache", `
             "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
             "--add", "Microsoft.VisualStudio.Component.Windows81SDK", `
@@ -63,7 +98,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: C:\Users\runneradmin\AppData\Local\pip\cache
-          key: pip-packages-${{ runner.os }}-${{ hashFiles('conans/requirements*.txt') }}
+          key: pip-packages-${{ runner.os }}-${{ hashFiles('**/requirements*.txt') }}
           restore-keys: |
             pip-packages-${{ runner.os }}-
 
@@ -170,7 +205,7 @@ jobs:
               Remove-Item $zipFile
           }
 
-      - name: Run Tests
+      - name: Run Functional Tests
         run: |
           git config --global core.autocrlf false
 
@@ -203,4 +238,4 @@ jobs:
           [System.Environment]::SetEnvironmentVariable('MSYS2_PATH', $msys2Path, [System.EnvironmentVariableTarget]::Process)
           Write-Host "Added MSYS2_PATH environment variable: $msys2Path"
 
-          pytest test/unittests test/integration test/functional -n=auto --durations=50 -vvv
+          pytest test/functional -n=auto --durations=50 -vvv

From 8ef25371ae2a5faad6f3bac2d395559c0d6c4a61 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 28 Nov 2024 15:07:14 +0100
Subject: [PATCH 194/211] fix

---
 .github/workflows/win-tests.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 4eade7e757e..574d82a06ca 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -47,10 +47,11 @@ jobs:
           pip install -r conans/requirements_server.txt
 
       - name: Run Unit & Integration Tests
+        shell: pwsh
         run: |
-          if (${{ matrix.test-type }} -eq "unittests") {
+          if ("${{ matrix.test-type }}" -eq "unittests") {
             pytest test/unittests --durations=20 -n=4
-          } elseif (${{ matrix.test-type }} -eq "integration") {
+          } elseif ("${{ matrix.test-type }}" -eq "integration") {
             pytest test/integration --durations=20 -n=4
           }
 

From f3d1d71cdf0e14348e08fb4d26ce5083c490133d Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 28 Nov 2024 15:29:25 +0100
Subject: [PATCH 195/211] wip

---
 .github/workflows/win-tests.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 574d82a06ca..7e7ac290416 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -49,6 +49,8 @@ jobs:
       - name: Run Unit & Integration Tests
         shell: pwsh
         run: |
+          git config --global core.autocrlf false
+
           if ("${{ matrix.test-type }}" -eq "unittests") {
             pytest test/unittests --durations=20 -n=4
           } elseif ("${{ matrix.test-type }}" -eq "integration") {

From 8a642a34352b1e0ba1999c3dd9f09da04b830385 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 28 Nov 2024 17:57:41 +0100
Subject: [PATCH 196/211] optimizations

---
 .github/workflows/win-tests.yml | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 7e7ac290416..c02415cd8d5 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -19,9 +19,8 @@ jobs:
     strategy:
       matrix:
         python-version: ['3.13', '3.8', '3.6']
-        test-type: ['unittests', 'integration']
 
-    name: Unit & Integration Tests ${{ matrix.test-type }} (${{ matrix.python-version }})
+    name: Unit & Integration Tests (${{ matrix.python-version }})
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -31,6 +30,14 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
+      - name: Install Visual Studio Build Tools
+        run: |
+          Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_buildtools.exe" -OutFile "vs_buildtools15.exe"
+          Start-Process -FilePath ".\vs_buildtools15.exe" -ArgumentList `
+            "--quiet",  "--wait", "--norestart", "--nocache", `
+            "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
+            "--add", "Microsoft.Component.MSBuild" -WindowStyle Hidden -Wait
+
       - name: Cache pip packages
         uses: actions/cache@v4
         with:
@@ -50,12 +57,7 @@ jobs:
         shell: pwsh
         run: |
           git config --global core.autocrlf false
-
-          if ("${{ matrix.test-type }}" -eq "unittests") {
-            pytest test/unittests --durations=20 -n=4
-          } elseif ("${{ matrix.test-type }}" -eq "integration") {
-            pytest test/integration --durations=20 -n=4
-          }
+          pytest test/unittests test/integration --durations=20 -n=auto -vvv
 
   functional_tests:
     runs-on: windows-2022
@@ -174,6 +176,7 @@ jobs:
             Expand-Archive -Path $zipFile -DestinationPath $destination -Force
             Remove-Item $zipFile
           }
+
       - name: Install modern CMake versions
         if: steps.cache-tools.outputs.cache-hit != 'true'
         run: |
@@ -190,6 +193,7 @@ jobs:
             Expand-Archive -Path $zipFile -DestinationPath $destination -Force
             Remove-Item $zipFile
           }
+
       - name: Install Bazel versions
         if: steps.cache-tools.outputs.cache-hit != 'true'
         run: |

From 96e6bf1180b7d5ff2dfd091e6618b0beb215ad9f Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 28 Nov 2024 18:07:43 +0100
Subject: [PATCH 197/211] wip

---
 .github/workflows/win-tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index c02415cd8d5..9350a201217 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -57,7 +57,7 @@ jobs:
         shell: pwsh
         run: |
           git config --global core.autocrlf false
-          pytest test/unittests test/integration --durations=20 -n=auto -vvv
+          pytest test/unittests test/integration --durations=100 -n=auto
 
   functional_tests:
     runs-on: windows-2022
@@ -245,4 +245,4 @@ jobs:
           [System.Environment]::SetEnvironmentVariable('MSYS2_PATH', $msys2Path, [System.EnvironmentVariableTarget]::Process)
           Write-Host "Added MSYS2_PATH environment variable: $msys2Path"
 
-          pytest test/functional -n=auto --durations=50 -vvv
+          pytest test/functional -n=auto --durations=100

From c24b2cb4636c37da16cfe2d850eb2bf68885a400 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 28 Nov 2024 18:21:16 +0100
Subject: [PATCH 198/211] fix ver

---
 test/integration/toolchains/microsoft/vcvars_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/toolchains/microsoft/vcvars_test.py b/test/integration/toolchains/microsoft/vcvars_test.py
index 1fa10607e8b..c6d6bcab03b 100644
--- a/test/integration/toolchains/microsoft/vcvars_test.py
+++ b/test/integration/toolchains/microsoft/vcvars_test.py
@@ -117,7 +117,7 @@ class TestConan(ConanFile):
             settings = "os", "compiler", "arch", "build_type"
     """)
     client.save({"conanfile.py": conanfile})
-    client.run('install . -s os=Windows -s compiler="msvc" -s compiler.version=190 '
+    client.run('install . -s os=Windows -s compiler="msvc" -s compiler.version=191 '
                '-s compiler.cppstd=14 -s compiler.runtime=static -s:b arch=x86')
 
     vcvars = client.load("conanvcvars.bat")

From 2bccff7d4f483cfc5f2db39bafe8a6421da7abe8 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 28 Nov 2024 19:09:37 +0100
Subject: [PATCH 199/211] xfail

---
 test/integration/toolchains/microsoft/vcvars_test.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/integration/toolchains/microsoft/vcvars_test.py b/test/integration/toolchains/microsoft/vcvars_test.py
index c6d6bcab03b..66151f1b07a 100644
--- a/test/integration/toolchains/microsoft/vcvars_test.py
+++ b/test/integration/toolchains/microsoft/vcvars_test.py
@@ -117,7 +117,7 @@ class TestConan(ConanFile):
             settings = "os", "compiler", "arch", "build_type"
     """)
     client.save({"conanfile.py": conanfile})
-    client.run('install . -s os=Windows -s compiler="msvc" -s compiler.version=191 '
+    client.run('install . -s os=Windows -s compiler="msvc" -s compiler.version=190 '
                '-s compiler.cppstd=14 -s compiler.runtime=static -s:b arch=x86')
 
     vcvars = client.load("conanvcvars.bat")
@@ -126,6 +126,7 @@ class TestConan(ConanFile):
 
 
 @pytest.mark.skipif(platform.system() != "Windows", reason="Requires Windows")
+@pytest.mark.xfail(reason="we dont have vs2015 installed in gh actions")
 def test_vcvars_winsdk_version():
     client = TestClient(path_with_spaces=False)
 

From 59ede094c83992375303aa8028a26ca9c8f64c02 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 28 Nov 2024 19:11:34 +0100
Subject: [PATCH 200/211] verbose

---
 .github/workflows/win-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 9350a201217..4b1a7117f27 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -245,4 +245,4 @@ jobs:
           [System.Environment]::SetEnvironmentVariable('MSYS2_PATH', $msys2Path, [System.EnvironmentVariableTarget]::Process)
           Write-Host "Added MSYS2_PATH environment variable: $msys2Path"
 
-          pytest test/functional -n=auto --durations=100
+          pytest test/functional -n=auto --durations=100 -vvv

From 89ee5c6fc82400c2b3c33880a1525bb958820ddf Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Thu, 28 Nov 2024 19:35:50 +0100
Subject: [PATCH 201/211] xfail

---
 test/integration/toolchains/microsoft/vcvars_test.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/integration/toolchains/microsoft/vcvars_test.py b/test/integration/toolchains/microsoft/vcvars_test.py
index 66151f1b07a..7ebf136c108 100644
--- a/test/integration/toolchains/microsoft/vcvars_test.py
+++ b/test/integration/toolchains/microsoft/vcvars_test.py
@@ -106,6 +106,7 @@ class TestConan(ConanFile):
 
 
 @pytest.mark.skipif(platform.system() != "Windows", reason="Requires Windows")
+@pytest.mark.xfail(reason="we dont have vs2015 installed in gh actions")
 def test_vcvars_platform_x86():
     # https://github.com/conan-io/conan/issues/11144
     client = TestClient(path_with_spaces=False)

From 89ea6fe2210affb24b977b1c2644135123e54074 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Fri, 29 Nov 2024 07:19:47 +0100
Subject: [PATCH 202/211] revert toolset

---
 .../toolchains/cmake/test_cmake_toolchain_win_clang.py          | 2 +-
 test/functional/toolchains/microsoft/test_msbuild.py            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py b/test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py
index ac1902ef43b..f8263b5a2c1 100644
--- a/test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py
+++ b/test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py
@@ -157,7 +157,7 @@ def test_clang_visual_studio_generator(self, client):
         # My local is 17, but CI ClangCL still 16
         assert "main __clang_major__18" in client.out
         # Check this! Clang compiler in Windows is reporting MSC_VER and MSVC_LANG!
-        assert "main _MSC_VER1942" in client.out
+        assert "main _MSC_VER1938" in client.out
         assert "main _MSVC_LANG201703" in client.out
         assert "main _M_X64 defined" in client.out
         assert "main __x86_64__ defined" in client.out
diff --git a/test/functional/toolchains/microsoft/test_msbuild.py b/test/functional/toolchains/microsoft/test_msbuild.py
index b3780050bd5..c476e07c0ae 100644
--- a/test/functional/toolchains/microsoft/test_msbuild.py
+++ b/test/functional/toolchains/microsoft/test_msbuild.py
@@ -430,7 +430,7 @@ def test_toolchain_win_vs2017(self, compiler, version, runtime, cppstd):
     @pytest.mark.tool("cmake", "3.23")
     @pytest.mark.tool("visual_studio", "17")
     @pytest.mark.parametrize("compiler,version,runtime,cppstd",
-                             [("msvc", "194", "static", "17")])
+                             [("msvc", "193", "static", "17")])
     def test_toolchain_win_vs2022(self, compiler, version, runtime, cppstd):
         self.check_toolchain_win(compiler, version, runtime, cppstd, ide_version=17)
 

From 0b957c8d6fb468137224d22f7f3df0a305b39f93 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Fri, 29 Nov 2024 07:31:32 +0100
Subject: [PATCH 203/211] minor changes

---
 .github/workflows/win-tests.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 4b1a7117f27..6c2458b5a5a 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -41,10 +41,10 @@ jobs:
       - name: Cache pip packages
         uses: actions/cache@v4
         with:
-          path: C:\Users\runneradmin\AppData\Local\pip\cache
+          path: ${{ env.PIP_CACHE_DIR || '~/.cache/pip' }}
           key: pip-packages-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('**/requirements*.txt') }}
           restore-keys: |
-            pip-packages-${{ runner.os }}-
+            pip-packages-${{ runner.os }}-${{ matrix.python-version }}-
 
       - name: Install Python requirements
         run: |
@@ -102,10 +102,10 @@ jobs:
       - name: Cache pip packages
         uses: actions/cache@v4
         with:
-          path: C:\Users\runneradmin\AppData\Local\pip\cache
-          key: pip-packages-${{ runner.os }}-${{ hashFiles('**/requirements*.txt') }}
+          path: ${{ env.PIP_CACHE_DIR || '~/.cache/pip' }}
+          key: pip-packages-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('**/requirements*.txt') }}
           restore-keys: |
-            pip-packages-${{ runner.os }}-
+            pip-packages-${{ runner.os }}-${{ matrix.python-version }}-
 
       - name: Install Python requirements
         run: |

From 29c2b9e0d40c5f58c0d83986a88feb78bf9ad815 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Fri, 29 Nov 2024 07:45:41 +0100
Subject: [PATCH 204/211] add workflow_dispatch

---
 .github/workflows/win-tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 6c2458b5a5a..e7292c02127 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -8,6 +8,7 @@ on:
   pull_request:
     branches:
       - '*'
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}

From 595a01d65b738312c141b1035491ac6f8aeedf52 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Fri, 29 Nov 2024 08:07:48 +0100
Subject: [PATCH 205/211] remove verbosity

---
 .github/workflows/win-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index e7292c02127..32b76515547 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -246,4 +246,4 @@ jobs:
           [System.Environment]::SetEnvironmentVariable('MSYS2_PATH', $msys2Path, [System.EnvironmentVariableTarget]::Process)
           Write-Host "Added MSYS2_PATH environment variable: $msys2Path"
 
-          pytest test/functional -n=auto --durations=100 -vvv
+          pytest test/functional -n=auto --durations=100

From d39e986f99aacb9756eaa4aa46f329b6a0288577 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Fri, 29 Nov 2024 08:11:28 +0100
Subject: [PATCH 206/211] xfail

---
 test/integration/remote/auth_test.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/integration/remote/auth_test.py b/test/integration/remote/auth_test.py
index c0b37392ff5..90c4c83b733 100644
--- a/test/integration/remote/auth_test.py
+++ b/test/integration/remote/auth_test.py
@@ -2,6 +2,7 @@
 import os
 import textwrap
 import unittest
+import pytest
 
 from requests.models import Response
 
@@ -186,6 +187,7 @@ def get(url, **kwargs):
         self.assertIn("ERROR: Recipe 'pkg' not found", client.out)
 
 
+@pytest.mark.xfail(reason="This test is randomly failing")
 def test_token_expired():
     server_folder = temp_folder()
     server_conf = textwrap.dedent("""

From fd92316fa0ef9efe69a6a66f0ff52a282e64b193 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Fri, 29 Nov 2024 10:03:16 +0100
Subject: [PATCH 207/211] fix pip cache

---
 .github/workflows/win-tests.yml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 32b76515547..9f791949f1c 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -39,10 +39,14 @@ jobs:
             "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
             "--add", "Microsoft.Component.MSBuild" -WindowStyle Hidden -Wait
 
+      - name: Determine pip cache directory
+        id: pip-cache-dir
+        run: echo "PIP_CACHE_DIR=$(pip cache dir)" >> $GITHUB_ENV
+
       - name: Cache pip packages
         uses: actions/cache@v4
         with:
-          path: ${{ env.PIP_CACHE_DIR || '~/.cache/pip' }}
+          path: ${{ env.PIP_CACHE_DIR }}
           key: pip-packages-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('**/requirements*.txt') }}
           restore-keys: |
             pip-packages-${{ runner.os }}-${{ matrix.python-version }}-
@@ -100,10 +104,14 @@ jobs:
             "--add", "Microsoft.Component.MSBuild", `
             "--add", "Microsoft.VisualStudio.Component.VC.140" -WindowStyle Hidden -Wait
 
+      - name: Determine pip cache directory
+        id: pip-cache-dir
+        run: echo "PIP_CACHE_DIR=$(pip cache dir)" >> $GITHUB_ENV
+
       - name: Cache pip packages
         uses: actions/cache@v4
         with:
-          path: ${{ env.PIP_CACHE_DIR || '~/.cache/pip' }}
+          path: ${{ env.PIP_CACHE_DIR }}
           key: pip-packages-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('**/requirements*.txt') }}
           restore-keys: |
             pip-packages-${{ runner.os }}-${{ matrix.python-version }}-

From c66f3ec5e2da71c0eb6651fae1629e85505e3dcd Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Fri, 29 Nov 2024 10:26:13 +0100
Subject: [PATCH 208/211] fix

---
 .github/workflows/win-tests.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 9f791949f1c..6ddbf7678ea 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -41,7 +41,9 @@ jobs:
 
       - name: Determine pip cache directory
         id: pip-cache-dir
-        run: echo "PIP_CACHE_DIR=$(pip cache dir)" >> $GITHUB_ENV
+        shell: pwsh
+        run: echo "PIP_CACHE_DIR=$(pip cache dir)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
 
       - name: Cache pip packages
         uses: actions/cache@v4
@@ -106,7 +108,9 @@ jobs:
 
       - name: Determine pip cache directory
         id: pip-cache-dir
-        run: echo "PIP_CACHE_DIR=$(pip cache dir)" >> $GITHUB_ENV
+        shell: pwsh
+        run: echo "PIP_CACHE_DIR=$(pip cache dir)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
 
       - name: Cache pip packages
         uses: actions/cache@v4

From a6b103aa8b66e61ca9649f2547f03e733eba4c00 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Fri, 29 Nov 2024 14:32:34 +0100
Subject: [PATCH 209/211] add comment

---
 test/functional/test_profile_detect_api.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/functional/test_profile_detect_api.py b/test/functional/test_profile_detect_api.py
index 57e0ef294a3..077092f3d51 100644
--- a/test/functional/test_profile_detect_api.py
+++ b/test/functional/test_profile_detect_api.py
@@ -21,7 +21,8 @@ def test_profile_detect_compiler(self):
             compiler.version={{detect_api.default_compiler_version(compiler, version)}}
             compiler.runtime={{runtime}}
             compiler.cppstd={{detect_api.default_cppstd(compiler, version)}}
-            # FIXME: check if we can do something better than this, we have a problem with updates
+            # detect_msvc_update returns the real update, like 12 for VS 17.12 so 
+            # we have to convert to the setting that's 0-10
             compiler.update={{ (detect_api.detect_msvc_update(version) | int) % 10 }}
 
             [conf]

From 7e782db69507faedaf0ba06f281fcd42ccba1425 Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Fri, 29 Nov 2024 14:39:10 +0100
Subject: [PATCH 210/211] some fixes

---
 test/functional/toolchains/test_nmake_toolchain.py | 10 +++++-----
 test/integration/toolchains/gnu/test_makedeps.py   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/functional/toolchains/test_nmake_toolchain.py b/test/functional/toolchains/test_nmake_toolchain.py
index adf4c7928e1..915051c64d5 100644
--- a/test/functional/toolchains/test_nmake_toolchain.py
+++ b/test/functional/toolchains/test_nmake_toolchain.py
@@ -11,11 +11,11 @@
 @pytest.mark.parametrize(
     "compiler, version, runtime, cppstd, build_type, defines, cflags, cxxflags, sharedlinkflags, exelinkflags",
     [
-        # ("msvc", "190", "dynamic", "14", "Release", [], [], [], [], []),
-        # ("msvc", "190", "dynamic", "14", "Release",
-        #  ["TEST_DEFINITION1", "TEST_DEFINITION2=0", "TEST_DEFINITION3=", "TEST_DEFINITION4=TestPpdValue4",
-        #   "TEST_DEFINITION5=__declspec(dllexport)", "TEST_DEFINITION6=foo bar"],
-        #  ["/GL"], ["/GL"], ["/LTCG"], ["/LTCG"]),
+        ("msvc", "191", "dynamic", "15", "Release", [], [], [], [], []),
+        ("msvc", "191", "dynamic", "15", "Release",
+         ["TEST_DEFINITION1", "TEST_DEFINITION2=0", "TEST_DEFINITION3=", "TEST_DEFINITION4=TestPpdValue4",
+          "TEST_DEFINITION5=__declspec(dllexport)", "TEST_DEFINITION6=foo bar"],
+         ["/GL"], ["/GL"], ["/LTCG"], ["/LTCG"]),
         ("msvc", "191", "static", "17", "Debug", [], [], [], [], []),
     ],
 )
diff --git a/test/integration/toolchains/gnu/test_makedeps.py b/test/integration/toolchains/gnu/test_makedeps.py
index 7e6e3fefe80..f0ad78d32b1 100644
--- a/test/integration/toolchains/gnu/test_makedeps.py
+++ b/test/integration/toolchains/gnu/test_makedeps.py
@@ -411,7 +411,7 @@ def package_info(self):
     assert "CONAN_NAME_OTHER" not in make_content
 
 
-@pytest.mark.skipif(platform.system() == "Windows", reason="Test uses Unix-style paths not compatible with Windows filesystem.")
+@pytest.mark.xfail(platform.system() == "Windows", reason="Test uses Unix-style paths not compatible with Windows filesystem.")
 @pytest.mark.parametrize("pattern, result, expected",
                          [("libs = []", False, 'SYSROOT'),
                           ("sysroot = ['/foo/bar/sysroot']", True, 'CONAN_SYSROOT_PACKAGE = /foo/bar/sysroot')])

From a62e13b7c9f56e4c225f77086588dd704e61404d Mon Sep 17 00:00:00 2001
From: czoido <mrgalleta@gmail.com>
Date: Fri, 29 Nov 2024 16:21:58 +0100
Subject: [PATCH 211/211] wip

---
 test/functional/toolchains/test_nmake_toolchain.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/functional/toolchains/test_nmake_toolchain.py b/test/functional/toolchains/test_nmake_toolchain.py
index 915051c64d5..9837d716bf4 100644
--- a/test/functional/toolchains/test_nmake_toolchain.py
+++ b/test/functional/toolchains/test_nmake_toolchain.py
@@ -11,8 +11,8 @@
 @pytest.mark.parametrize(
     "compiler, version, runtime, cppstd, build_type, defines, cflags, cxxflags, sharedlinkflags, exelinkflags",
     [
-        ("msvc", "191", "dynamic", "15", "Release", [], [], [], [], []),
-        ("msvc", "191", "dynamic", "15", "Release",
+        ("msvc", "191", "dynamic", "14", "Release", [], [], [], [], []),
+        ("msvc", "191", "dynamic", "14", "Release",
          ["TEST_DEFINITION1", "TEST_DEFINITION2=0", "TEST_DEFINITION3=", "TEST_DEFINITION4=TestPpdValue4",
           "TEST_DEFINITION5=__declspec(dllexport)", "TEST_DEFINITION6=foo bar"],
          ["/GL"], ["/GL"], ["/LTCG"], ["/LTCG"]),