call upgrade_vsproj in msbuild

2 files changed, 12 insertions, 4 deletions

diff --git a/xmake/modules/package/tools/msbuild.lua b/xmake/modules/package/tools/msbuild.lua
index e3194322e..8bcd1bc28 100644
--- a/xmake/modules/package/tools/msbuild.lua
+++ b/xmake/modules/package/tools/msbuild.lua
@@ -22,6 +22,7 @@
 import("core.base.option")
 import("core.tool.toolchain")
 import("lib.detect.find_tool")
+import("private.utils.upgrade_vsproj")
 
 -- get the number of parallel jobs
 function _get_parallel_njobs(opt)
@@ -74,16 +75,18 @@ end
 
 -- build package
 function build(package, configs, opt)
-
-    -- init options
     opt = opt or {}
 
     -- pass configurations
+    local slnfile
     local argv = {}
     for name, value in pairs(_get_configs(package, configs, opt)) do
         value = tostring(value):trim()
         if value ~= "" then
             if type(name) == "number" then
+                if value:endswith(".sln") then
+                    slnfile = value
+                end
                 table.insert(argv, value)
             else
                 table.insert(argv, name .. "=" .. value)
@@ -91,6 +94,11 @@ function build(package, configs, opt)
         end
     end
 
+    -- upgrade vs solution file?
+    if slnfile and opt.upgrade then
+        upgrade_vsproj.upgrade(slnfile, opt)
+    end
+
     -- do build
     local envs = opt.envs or buildenvs(package, opt)
     local msbuild = find_tool("msbuild", {envs = envs})
diff --git a/xmake/modules/private/utils/upgrade_vsproj.lua b/xmake/modules/private/utils/upgrade_vsproj.lua
index b1dc9eff0..eee1f39cb 100644
--- a/xmake/modules/private/utils/upgrade_vsproj.lua
+++ b/xmake/modules/private/utils/upgrade_vsproj.lua
@@ -30,7 +30,7 @@ local options = {
 }
 
 -- upgrade vs project file
-function _upgrade(projectfile, opt)
+function upgrade(projectfile, opt)
     opt = opt or {}
 end
 
@@ -41,6 +41,6 @@ function main(...)
                                            , "Usage: xmake l private.utils.upgrade_vsproj [options]")
 
     for _, projectfile in ipairs(opt.vs_projectfiles) do
-        _upgrade(projectfile, opt)
+        upgrade(projectfile, opt)
     end
 end