attempt to select latest version

1 files changed, 12 insertions, 1 deletions

diff --git a/xmake/modules/detect/sdks/find_vstudio.lua b/xmake/modules/detect/sdks/find_vstudio.lua
index d48a7af53..501f8d79b 100644
--- a/xmake/modules/detect/sdks/find_vstudio.lua
+++ b/xmake/modules/detect/sdks/find_vstudio.lua
@@ -211,7 +211,7 @@ function find_build_tools(opt)
 end
 
 -- load vcvarsall environment variables
-function _load_vcvarsall(vcvarsall, vsver, arch, opt)
+function _load_vcvarsall_impl(vcvarsall, vsver, arch, opt)
     opt = opt or {}
 
     -- is VsDevCmd.bat?
@@ -346,6 +346,17 @@ function _load_vcvarsall(vcvarsall, vsver, arch, opt)
     return variables
 end
 
+function _load_vcvarsall(vcvarsall, vsver, arch, opt)
+    opt = opt or {}
+    local vs_toolset = opt.toolset or opt.vcvars_ver
+    local result = _load_vcvarsall_impl(vcvarsall, vsver, arch, opt)
+    if result and not vs_toolset then
+        -- if no vs toolset version is specified, we default to the latest version.
+        print(result)
+    end
+    return result
+end
+
 -- find vstudio for msvc
 function _find_vstudio(opt)
     opt = opt or {}