improve vsxmake xpack

40 files changed, 4 insertions, 4 deletions

diff --git a/xmake/plugins/project/vsxmake/vsxmake.lua b/xmake/plugins/project/vsxmake/vsxmake.lua
index 50695ebc2..bf44c5937 100644
--- a/xmake/plugins/project/vsxmake/vsxmake.lua
+++ b/xmake/plugins/project/vsxmake/vsxmake.lua
@@ -27,7 +27,7 @@ import("getinfo")
 import("core.project.config")
 import("core.cache.localcache")
 
-local template_root = path.join(os.scriptdir(), "vsproj", "templates")
+local template_root = path.join(os.programdir(), "vsxmake", "vsproj", "templates")
 local template_sln = path.join(template_root, "sln", "vsxmake.sln")
 local template_vcx = path.join(template_root, "vcxproj", "#target#.vcxproj")
 
diff --git a/xmake/plugins/project/vsxmake/vsproj/Xmake.Defaults.props b/xmake/scripts/vsxmake/vsproj/Xmake.Defaults.props
index 702647639..702647639 100644
--- a/xmake/plugins/project/vsxmake/vsproj/Xmake.Defaults.props
+++ b/xmake/scripts/vsxmake/vsproj/Xmake.Defaults.props
diff --git a/xmake/plugins/project/vsxmake/vsproj/Xmake.props b/xmake/scripts/vsxmake/vsproj/Xmake.props
index 3e3a33298..3e3a33298 100644
--- a/xmake/plugins/project/vsxmake/vsproj/Xmake.props
+++ b/xmake/scripts/vsxmake/vsproj/Xmake.props
diff --git a/xmake/plugins/project/vsxmake/vsproj/Xmake.targets b/xmake/scripts/vsxmake/vsproj/Xmake.targets
index 55f6b1fd2..55f6b1fd2 100644
--- a/xmake/plugins/project/vsxmake/vsproj/Xmake.targets
+++ b/xmake/scripts/vsxmake/vsproj/Xmake.targets
diff --git a/xmake/plugins/project/vsxmake/vsproj/Xmake.xml b/xmake/scripts/vsxmake/vsproj/Xmake.xml
index 11dddabec..11dddabec 100644
--- a/xmake/plugins/project/vsxmake/vsproj/Xmake.xml
+++ b/xmake/scripts/vsxmake/vsproj/Xmake.xml
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/Xmake.Custom.items b/xmake/scripts/vsxmake/vsproj/templates/Xmake.Custom.items
index a894e8d0d..a894e8d0d 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/Xmake.Custom.items
+++ b/xmake/scripts/vsxmake/vsproj/templates/Xmake.Custom.items
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/Xmake.Custom.items.filters b/xmake/scripts/vsxmake/vsproj/templates/Xmake.Custom.items.filters
index f69e1abb7..f69e1abb7 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/Xmake.Custom.items.filters
+++ b/xmake/scripts/vsxmake/vsproj/templates/Xmake.Custom.items.filters
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/Xmake.Custom.props b/xmake/scripts/vsxmake/vsproj/templates/Xmake.Custom.props
index d6aa9927e..d6aa9927e 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/Xmake.Custom.props
+++ b/xmake/scripts/vsxmake/vsproj/templates/Xmake.Custom.props
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/Xmake.Custom.targets b/xmake/scripts/vsxmake/vsproj/templates/Xmake.Custom.targets
index 8a5153db8..8a5153db8 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/Xmake.Custom.targets
+++ b/xmake/scripts/vsxmake/vsproj/templates/Xmake.Custom.targets
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/sln/ProjConfig(target,mode,arch) b/xmake/scripts/vsxmake/vsproj/templates/sln/ProjConfig(target,mode,arch)
index 20ed12788..20ed12788 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/sln/ProjConfig(target,mode,arch)
+++ b/xmake/scripts/vsxmake/vsproj/templates/sln/ProjConfig(target,mode,arch)
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/sln/Project(target) b/xmake/scripts/vsxmake/vsproj/templates/sln/Project(target)
index 11e743c8a..11e743c8a 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/sln/Project(target)
+++ b/xmake/scripts/vsxmake/vsproj/templates/sln/Project(target)
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/sln/ProjectGroup(group) b/xmake/scripts/vsxmake/vsproj/templates/sln/ProjectGroup(group)
index 2a32553a7..2a32553a7 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/sln/ProjectGroup(group)
+++ b/xmake/scripts/vsxmake/vsproj/templates/sln/ProjectGroup(group)
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/sln/ProjectGroupConfig(group_dep) b/xmake/scripts/vsxmake/vsproj/templates/sln/ProjectGroupConfig(group_dep)
index d08963bfb..d08963bfb 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/sln/ProjectGroupConfig(group_dep)
+++ b/xmake/scripts/vsxmake/vsproj/templates/sln/ProjectGroupConfig(group_dep)
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/sln/SlnConfig(mode,arch) b/xmake/scripts/vsxmake/vsproj/templates/sln/SlnConfig(mode,arch)
index b1784b846..b1784b846 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/sln/SlnConfig(mode,arch)
+++ b/xmake/scripts/vsxmake/vsproj/templates/sln/SlnConfig(mode,arch)
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/sln/vsxmake.sln b/xmake/scripts/vsxmake/vsproj/templates/sln/vsxmake.sln
index 49bbcd708..49bbcd708 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/sln/vsxmake.sln
+++ b/xmake/scripts/vsxmake/vsproj/templates/sln/vsxmake.sln
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/#target#.vcxproj.filters b/xmake/scripts/vsxmake/vsproj/templates/vcxproj.filters/#target#.vcxproj.filters
index eee3d1a12..eee3d1a12 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/#target#.vcxproj.filters
+++ b/xmake/scripts/vsxmake/vsproj/templates/vcxproj.filters/#target#.vcxproj.filters
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/File.c(filec) b/xmake/scripts/vsxmake/vsproj/templates/vcxproj.filters/File.c(filec)
index 134ee2b62..134ee2b62 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/File.c(filec)
+++ b/xmake/scripts/vsxmake/vsproj/templates/vcxproj.filters/File.c(filec)
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/File.cu(filecu) b/xmake/scripts/vsxmake/vsproj/templates/vcxproj.filters/File.cu(filecu)
index 9e7ce6858..9e7ce6858 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/File.cu(filecu)
+++ b/xmake/scripts/vsxmake/vsproj/templates/vcxproj.filters/File.cu(filecu)
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/File.cxx(filecxx) b/xmake/scripts/vsxmake/vsproj/templates/vcxproj.filters/File.cxx(filecxx)
index 134ee2b62..134ee2b62 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/File.cxx(filecxx)
+++ b/xmake/scripts/vsxmake/vsproj/templates/vcxproj.filters/File.cxx(filecxx)
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/File.mpp(filempp) b/xmake/scripts/vsxmake/vsproj/templates/vcxproj.filters/File.mpp(filempp)
index 134ee2b62..134ee2b62 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/File.mpp(filempp)
+++ b/xmake/scripts/vsxmake/vsproj/templates/vcxproj.filters/File.mpp(filempp)
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/File.obj(fileobj) b/xmake/scripts/vsxmake/vsproj/templates/vcxproj.filters/File.obj(fileobj)
index f0039d2d5..f0039d2d5 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/File.obj(fileobj)
+++ b/xmake/scripts/vsxmake/vsproj/templates/vcxproj.filters/File.obj(fileobj)
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/File.rc(filerc) b/xmake/scripts/vsxmake/vsproj/templates/vcxproj.filters/File.rc(filerc)
index c0b9568e6..c0b9568e6 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/File.rc(filerc)
+++ b/xmake/scripts/vsxmake/vsproj/templates/vcxproj.filters/File.rc(filerc)
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/File.ui(fileui) b/xmake/scripts/vsxmake/vsproj/templates/vcxproj.filters/File.ui(fileui)
index 9aee25191..9aee25191 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/File.ui(fileui)
+++ b/xmake/scripts/vsxmake/vsproj/templates/vcxproj.filters/File.ui(fileui)
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/Filter(dir) b/xmake/scripts/vsxmake/vsproj/templates/vcxproj.filters/Filter(dir)
index 763e5e83c..763e5e83c 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/Filter(dir)
+++ b/xmake/scripts/vsxmake/vsproj/templates/vcxproj.filters/Filter(dir)
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/Include.c(incc) b/xmake/scripts/vsxmake/vsproj/templates/vcxproj.filters/Include.c(incc)
index 36908e21f..36908e21f 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/Include.c(incc)
+++ b/xmake/scripts/vsxmake/vsproj/templates/vcxproj.filters/Include.c(incc)
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/Include.natvis(incnatvis) b/xmake/scripts/vsxmake/vsproj/templates/vcxproj.filters/Include.natvis(incnatvis)
index f0787a035..f0787a035 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/Include.natvis(incnatvis)
+++ b/xmake/scripts/vsxmake/vsproj/templates/vcxproj.filters/Include.natvis(incnatvis)
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/#target#.vcxproj b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/#target#.vcxproj
index 111dd454b..b194ce86c 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/#target#.vcxproj
+++ b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/#target#.vcxproj
@@ -27,10 +27,10 @@
     <XmakeProgramDir Condition="'$(XmakeProgramDir)' == ''">$(XMAKE_PROGRAM_DIR)</XmakeProgramDir>
     <XmakeProgramDir Condition="'$(XmakeProgramDir)' == ''">#programdir#</XmakeProgramDir>
   </PropertyGroup>
-  <Import Project="$(XmakeProgramDir)\plugins\project\vsxmake\vsproj\Xmake.Defaults.props" />
+  <Import Project="$(XmakeProgramDir)\scripts\vsxmake\vsproj\Xmake.Defaults.props" />
 #Import(XmakeConfig)#
 #Import(XmakePath)#
-  <Import Project="$(XmakeProgramDir)\plugins\project\vsxmake\vsproj\Xmake.props" />
+  <Import Project="$(XmakeProgramDir)\scripts\vsxmake\vsproj\Xmake.props" />
   <ItemGroup>
 #Import(Include.c)#
 #Import(Include.natvis)#
@@ -51,5 +51,5 @@
   <!-- <ItemGroup>
 #Import(ProjectRef)#
   </ItemGroup> -->
-  <Import Project="$(XmakeProgramDir)\plugins\project\vsxmake\vsproj\Xmake.targets" />
+  <Import Project="$(XmakeProgramDir)\scripts\vsxmake\vsproj\Xmake.targets" />
 </Project>
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/File.c(filec) b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/File.c(filec)
index 7bb854de9..7bb854de9 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/File.c(filec)
+++ b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/File.c(filec)
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/File.cu(filecu) b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/File.cu(filecu)
index 72be50b63..72be50b63 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/File.cu(filecu)
+++ b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/File.cu(filecu)
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/File.cxx(filecxx) b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/File.cxx(filecxx)
index c1bf2e626..c1bf2e626 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/File.cxx(filecxx)
+++ b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/File.cxx(filecxx)
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/File.mpp(filempp) b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/File.mpp(filempp)
index 7c435b1c6..7c435b1c6 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/File.mpp(filempp)
+++ b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/File.mpp(filempp)
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/File.obj(fileobj) b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/File.obj(fileobj)
index 7cefaca84..7cefaca84 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/File.obj(fileobj)
+++ b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/File.obj(fileobj)
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/File.rc(filerc) b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/File.rc(filerc)
index 7ffa8591b..7ffa8591b 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/File.rc(filerc)
+++ b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/File.rc(filerc)
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/File.ui(fileui) b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/File.ui(fileui)
index 6429fe3e9..6429fe3e9 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/File.ui(fileui)
+++ b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/File.ui(fileui)
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/Include.c(incc) b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/Include.c(incc)
index e50fbb7a0..e50fbb7a0 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/Include.c(incc)
+++ b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/Include.c(incc)
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/Include.natvis(incnatvis) b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/Include.natvis(incnatvis)
index 533f394ab..533f394ab 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/Include.natvis(incnatvis)
+++ b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/Include.natvis(incnatvis)
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/ProjectConfiguration(mode,arch) b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/ProjectConfiguration(mode,arch)
index d6956bf15..d6956bf15 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/ProjectConfiguration(mode,arch)
+++ b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/ProjectConfiguration(mode,arch)
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/ProjectRef(dep) b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/ProjectRef(dep)
index 33434eca3..33434eca3 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/ProjectRef(dep)
+++ b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/ProjectRef(dep)
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/XmakeConfig(mode,arch) b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/XmakeConfig(mode,arch)
index 5fa6d0f0f..5fa6d0f0f 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/XmakeConfig(mode,arch)
+++ b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/XmakeConfig(mode,arch)
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/XmakePath(mode,arch) b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/XmakePath(mode,arch)
index 9afa8460f..9afa8460f 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/XmakePath(mode,arch)
+++ b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/XmakePath(mode,arch)