support set_runenv

2 files changed, 12 insertions, 3 deletions

diff --git a/xmake/plugins/project/vsxmake/getinfo.lua b/xmake/plugins/project/vsxmake/getinfo.lua
index d029a8a4b..53200dd2c 100644
--- a/xmake/plugins/project/vsxmake/getinfo.lua
+++ b/xmake/plugins/project/vsxmake/getinfo.lua
@@ -176,10 +176,18 @@ function _make_targetinfo(mode, arch, target)
     -- save runenvs
     local runenvs = {}
     for k, v in pairs(target:get("runenvs")) do
-        local defs = table.imap(v, function(_, v) return vformat(v) end)
-        table.insert(runenvs, format("%s=%s", k, path.joinenv(defs)))
+        local defs = table.imap(table.wrap(v), function(_, v) return vformat(v) end)
+        runenvs[k] = format("%s;$([System.Environment]::GetEnvironmentVariable('%s'))", path.joinenv(defs), k)
     end
-    targetinfo.runenvs = table.concat(runenvs, "\n")
+    for k, v in pairs(target:get("runenv")) do
+        local defs = table.imap(table.wrap(v), function(_, v) return vformat(v) end)
+        runenvs[k] = path.joinenv(defs)
+    end
+    local runenvstr = {}
+    for k, v in pairs(runenvs) do
+        table.insert(runenvstr, k .. "=" .. v)
+    end
+    targetinfo.runenvs = table.concat(runenvstr, "\n")
 
     -- use mfc? save the mfc runtime kind
     if target:rule("win.sdk.mfc.shared_app") or target:rule("win.sdk.mfc.shared") then
diff --git a/xmake/plugins/project/vsxmake/vsproj/Xmake.targets b/xmake/plugins/project/vsxmake/vsproj/Xmake.targets
index 0a74e5f45..99583bf74 100644
--- a/xmake/plugins/project/vsxmake/vsproj/Xmake.targets
+++ b/xmake/plugins/project/vsxmake/vsproj/Xmake.targets
@@ -130,6 +130,7 @@ MSBuild Properties:
     XmakeIncludeDirs: $(XmakeIncludeDirs)
     XmakeLinkDirs: $(XmakeLinkDirs)
     XmakeSourceDirs: $(XmakeSourceDirs)
+    XmakeRunEnvs: $(XmakeRunEnvs)
   Xmake Path:
     XmakeProgramDir: $(XmakeProgramDir)
     XmakeProjectDir: $(XmakeProjectDir)