fixes

conan-io · May 3, 2024 · a56c639 · a56c639
1 parent 9dc624f
commit a56c639
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/conan/tools/microsoft/visual.py b/conan/tools/microsoft/visual.py
@@ -77,7 +77,7 @@ def msvc_version_to_toolset_version(version):
                 '191': 'v141',
                 '192': 'v142',
                 "193": 'v143',
-                "194": 'v144'}
+                "194": 'v143'}
     return toolsets.get(str(version))
 
 
@@ -126,15 +126,13 @@ def generate(self, scope="build"):
             vs_version = {"v140": "14",
                           "v141": "15",
                           "v142": "16",
-                          "v143": "17",
-                          "v144": "17"}.get(toolset_version)
+                          "v143": "17"}.get(toolset_version)
             if vs_version is None:
-                raise ConanException("Visual Studio Runtime version (v140-v144) not defined")
+                raise ConanException("Visual Studio Runtime version (v140-v143) not defined")
             vcvars_ver = {"v140": "14.0",
                           "v141": "14.1",
                           "v142": "14.2",
-                          "v143": "14.3",
-                          "v144": "14.4"}.get(toolset_version)
+                          "v143": "14.3"}.get(toolset_version)
         else:
             vs_version = vs_ide_version(conanfile)
             if int(vs_version) <= 14:

diff --git a/conans/client/conf/__init__.py b/conans/client/conf/__init__.py
@@ -94,7 +94,7 @@
                     "10", "10.1", "10.2", "10.3", "10.4", "10.5",
                     "11", "11.1", "11.2", "11.3", "11.4",
                     "12", "12.1", "12.2", "12.3",
-                    "13", "13.1", "13.2", 
+                    "13", "13.1", "13.2",
                     "14", "14.1"]
         libcxx: [libstdc++, libstdc++11]
         threads: [null, posix, win32]  # Windows MinGW
@@ -115,7 +115,7 @@
         cppstd: [null, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20, 23, gnu23]
         runtime: [null, static, dynamic]
         runtime_type: [null, Debug, Release]
-        runtime_version: [null, v140, v141, v142, v143, v144]
+        runtime_version: [null, v140, v141, v142, v143]
     apple-clang:
         version: ["5.0", "5.1", "6.0", "6.1", "7.0", "7.3", "8.0", "8.1", "9.0", "9.1",
                   "10.0", "11.0", "12.0", "13", "13.0", "13.1", "14", "14.0", "15", "15.0"]

diff --git a/conans/test/unittests/tools/cmake/test_cmaketoolchain.py b/conans/test/unittests/tools/cmake/test_cmaketoolchain.py
@@ -231,7 +231,7 @@ def test_toolset_update_version_overflow(conanfile_msvc):
     conanfile_msvc.settings.compiler.version = "194"
     conanfile_msvc.settings.compiler.update = "8"
     toolchain = CMakeToolchain(conanfile_msvc)
-    assert 'set(CMAKE_GENERATOR_TOOLSET "v144,version=14.48" CACHE STRING "" FORCE)' in toolchain.content
+    assert 'set(CMAKE_GENERATOR_TOOLSET "v143,version=14.48" CACHE STRING "" FORCE)' in toolchain.content
 
 
 def test_toolset_x64(conanfile_msvc):

diff --git a/conans/test/unittests/tools/microsoft/test_msvs_toolset.py b/conans/test/unittests/tools/microsoft/test_msvs_toolset.py
@@ -15,7 +15,7 @@ def test_invalid_compiler():
 
 
 @pytest.mark.parametrize("compiler_version,expected_toolset", [
-    ("194", "v144"),
+    ("194", "v143"),
     ("193", "v143"),
     ("192", "v142"),
     ("191", "v141"),