Support toolset v145 (Visual Studio 2026) (#1787)

huangqinjin · web-flow · commit a3f1f702e6a6 · 2025-09-17T16:04:00.000-07:00
diff --git a/src/vcpkg/visualstudio.cpp b/src/vcpkg/visualstudio.cpp
@@ -24,6 +24,7 @@ namespace vcpkg::VisualStudio
     static constexpr StringLiteral V_141 = "v141";
     static constexpr StringLiteral V_142 = "v142";
     static constexpr StringLiteral V_143 = "v143";
+    static constexpr StringLiteral V_145 = "v145";
 
     struct VisualStudioInstance
     {
@@ -168,6 +169,7 @@ namespace vcpkg::VisualStudio
 
         // VS 2017 changed the installer such that cl.exe cannot be found by path navigation and
         // the env variable is only set when vcvars has been run. Therefore we close the safety valves.
+        maybe_append_comntools("vs180comntools", "18.0", false);
         maybe_append_comntools("vs170comntools", "17.0", false);
         maybe_append_comntools("vs160comntools", "16.0", false);
         maybe_append_legacy_vs("vs140comntools", "Microsoft Visual Studio 14.0", "14.0");
@@ -274,6 +276,10 @@ namespace vcpkg::VisualStudio
                     {
                         toolset_version = V_143;
                     }
+                    else if (toolset_version_prefix[3] == '5')
+                    {
+                        toolset_version = V_145;
+                    }
                     else
                     {
                         // unknown toolset minor version

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ namespace vcpkg::VisualStudio`
`24`	`24`	`static constexpr StringLiteral V_141 = "v141";`
`25`	`25`	`static constexpr StringLiteral V_142 = "v142";`
`26`	`26`	`static constexpr StringLiteral V_143 = "v143";`
	`27`	`+ static constexpr StringLiteral V_145 = "v145";`
`27`	`28`
`28`	`29`	`struct VisualStudioInstance`
`29`	`30`	`{`
`@@ -168,6 +169,7 @@ namespace vcpkg::VisualStudio`
`168`	`169`
`169`	`170`	`// VS 2017 changed the installer such that cl.exe cannot be found by path navigation and`
`170`	`171`	`// the env variable is only set when vcvars has been run. Therefore we close the safety valves.`
	`172`	`+ maybe_append_comntools("vs180comntools", "18.0", false);`
`171`	`173`	`maybe_append_comntools("vs170comntools", "17.0", false);`
`172`	`174`	`maybe_append_comntools("vs160comntools", "16.0", false);`
`173`	`175`	`maybe_append_legacy_vs("vs140comntools", "Microsoft Visual Studio 14.0", "14.0");`
`@@ -274,6 +276,10 @@ namespace vcpkg::VisualStudio`
`274`	`276`	`{`
`275`	`277`	`toolset_version = V_143;`
`276`	`278`	`}`
	`279`	`+ else if (toolset_version_prefix[3] == '5')`
	`280`	`+ {`
	`281`	`+ toolset_version = V_145;`
	`282`	`+ }`
`277`	`283`	`else`
`278`	`284`	`{`
`279`	`285`	`// unknown toolset minor version`