修复发布目录获取不对的问题

nulastudio · Dec 5, 2019 · bd6be91 · bd6be91
1 parent e3e7645
commit bd6be91
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/NetCoreBeautyGlobalTool/NetCoreBeautyGlobalTool.csproj b/NetCoreBeautyGlobalTool/NetCoreBeautyGlobalTool.csproj
@@ -9,7 +9,7 @@
     <ToolCommandName>ncbeauty</ToolCommandName>
     <PackageOutputPath>.nupkg</PackageOutputPath>
 
-    <Version>1.1.4</Version>
+    <Version>1.1.5</Version>
 
     <Authors>LiesAuer</Authors>
     <Description>Move a .NET Core app runtime components and dependencies into a sub-directory and make it beauty.</Description>

diff --git a/NetCoreBeautyNuget/Beauty.targets b/NetCoreBeautyNuget/Beauty.targets
@@ -8,9 +8,7 @@
     <RuntimeOS Condition="$(IsOSX) == 'True'">osx-x64</RuntimeOS>
     <BeautyBinExt Condition="$(IsWindows) == 'True'">.exe</BeautyBinExt>
     <BeautyBin>"$(MSBuildThisFileDirectory)../tools/$(RuntimeOS)/ncbeauty$(BeautyBinExt)"</BeautyBin>
-    <RootDir>$([System.IO.Directory]::GetParent('$(MSBuildProjectDirectory)').FullName)</RootDir>
-    <RelatedDir>$(PublishDir.Replace('$(RootDir)','.'))</RelatedDir>
-    <BeautyDir>"$(RootDir)/$(RelatedDir).HERE/.."</BeautyDir>
+    <BeautyDir>"$([System.IO.Path]::GetFullPath('$(PublishDir)')).HERE/.."</BeautyDir>
     <BeautyLibsDir Condition="$(BeautyLibsDir) == ''">runtimes</BeautyLibsDir>
     <BeautyAfterTasks>Publish;$(BeautyAfterTasks)</BeautyAfterTasks>
     <GitCDN Condition="$(GitCDN) != ''">--gitcdn $(GitCDN)</GitCDN>

diff --git a/NetCoreBeautyNuget/NetCoreBeauty.nuspec b/NetCoreBeautyNuget/NetCoreBeauty.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>nulastudio.NetCoreBeauty</id>
     <description>Move a .NET Core app runtime components and dependencies into a sub-directory and make it beauty.</description>
-    <version>1.1.4</version>
+    <version>1.1.5</version>
     <authors>LiesAuer</authors>
     <owners>nulastudio</owners>
     <projectUrl>https://github.com/nulastudio/NetCoreBeauty</projectUrl>