diff --git a/MSBuild/Common.targets b/MSBuild/Common.targets index 04a8013..758f278 100644 --- a/MSBuild/Common.targets +++ b/MSBuild/Common.targets @@ -1,4 +1,4 @@ - + wwwDayDream.$(MSBuildProjectName) $(MSBuildProjectName) @@ -27,11 +27,12 @@ - + $(MinVerMajor).$(MinVerMinor).$(MinVerPatch).0 $(MinVerMajor).$(MinVerMinor).$(MinVerPatch) $(PlainVersion) + $(PlainVersion) \ No newline at end of file diff --git a/MSBuild/Packaging.TCLI.targets b/MSBuild/Packaging.TCLI.targets index 3d5b946..f7ddc7c 100644 --- a/MSBuild/Packaging.TCLI.targets +++ b/MSBuild/Packaging.TCLI.targets @@ -61,14 +61,12 @@ %(PackageReadmeNoHashFileLines.Identity) - - $([System.IO.Path]::GetFullPath('$(MSBuildProjectPath)$(PackageOutputPath)$(PackageId).$(PackageVersion).nupkg')) - $([System.IO.Path]::GetFullPath('$(MSBuildProjectPath)$(PackageOutputPath)$(PackageAuthor)-$(PackageId)-$(PackageVersion).zip')) + $([System.IO.Path]::GetFullPath('$(MSBuildProjectPath)$(PackageOutputPath)')) $([System.IO.Path]::GetFullPath('$(MSBuildProjectPath)$(PackageOutputPath)$(PackageId).$(PackageVersion).nupkg')) $([System.IO.Path]::GetFullPath('$(MSBuildProjectPath)$(PackageOutputPath)$(PackageAuthor)-$(PackageId)-$(PackageVersion).zip')) @@ -134,14 +132,6 @@ - - - - - - -1 - @(Packages) - - + \ No newline at end of file