From 9943cbae2e39a219cd5f889802d9db11aaefda5c Mon Sep 17 00:00:00 2001 From: OpportunityLiu Date: Fri, 23 Aug 2019 16:42:13 +0800 Subject: use privete var --- .../project/vsxmake/vsproj/Xmake.Defaults.props | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/xmake/plugins/project/vsxmake/vsproj/Xmake.Defaults.props b/xmake/plugins/project/vsxmake/vsproj/Xmake.Defaults.props index f0ee8495e..29359c951 100644 --- a/xmake/plugins/project/vsxmake/vsproj/Xmake.Defaults.props +++ b/xmake/plugins/project/vsxmake/vsproj/Xmake.Defaults.props @@ -2,19 +2,19 @@ - $(XmakeProgramDir) - $(XmakeProjectDir) - $(XmakeScriptDir) + <_XmakeProgramDir>$(XmakeProgramDir) + <_XmakeProjectDir>$(XmakeProjectDir) + <_XmakeScriptDir>$(XmakeScriptDir) - $([System.IO.Path]::GetFullPath('$(MSBuildProjectDirectory)\$(XmakeProgramDirResolved)')) - $([System.IO.Path]::GetFullPath('$(MSBuildProjectDirectory)\$(XmakeProjectDirResolved)')) - $([System.IO.Path]::GetFullPath('$(MSBuildProjectDirectory)\$(XmakeScriptDirResolved)')) + <_XmakeProgramDir Condition="!$([System.IO.Path]::IsPathRooted('$(_XmakeProgramDir)'))">$([System.IO.Path]::GetFullPath('$(MSBuildProjectDirectory)\$(_XmakeProgramDir)')) + <_XmakeProjectDir Condition="!$([System.IO.Path]::IsPathRooted('$(_XmakeProjectDir)'))">$([System.IO.Path]::GetFullPath('$(MSBuildProjectDirectory)\$(_XmakeProjectDir)')) + <_XmakeScriptDir Condition="!$([System.IO.Path]::IsPathRooted('$(_XmakeScriptDir)'))">$([System.IO.Path]::GetFullPath('$(MSBuildProjectDirectory)\$(_XmakeScriptDir)')) - $([System.IO.Path]::GetFullPath('$(XmakeProgramDirResolved)')) - $([System.IO.Path]::GetFullPath('$(XmakeProjectDirResolved)')) - $([System.IO.Path]::GetFullPath('$(XmakeScriptDirResolved)')) + $([System.IO.Path]::GetFullPath('$(_XmakeProgramDir)')) + $([System.IO.Path]::GetFullPath('$(_XmakeProjectDir)')) + $([System.IO.Path]::GetFullPath('$(_XmakeScriptDir)')) -- cgit v1.3.1