diff options
| -rw-r--r-- | samples/tools.proj | 11 | ||||
| -rw-r--r-- | tools/drop.proj | 11 |
2 files changed, 10 insertions, 12 deletions
diff --git a/samples/tools.proj b/samples/tools.proj index 0c413b7..9a8b70c 100644 --- a/samples/tools.proj +++ b/samples/tools.proj @@ -46,19 +46,18 @@ </Target> <Target Name="Build" DependsOnTargets="Layout" Returns="@(RedistributableFiles)"> - <PropertyGroup> - <ToolsZip>$(ToolsDirectoryNoSlash)$(ZipFormat)</ToolsZip> - </PropertyGroup> <ItemGroup> - <RedistributableFiles Include="$(ToolsZip)"> + <ToolsZip Include="$(ToolsDirectoryNoSlash).zip" /> + <ToolsZip Include="$(ToolsDirectoryNoSlash).7z" /> + <RedistributableFiles Include="@(ToolsZip)"> <Package>DotNetOpenAuth-Tools</Package> <Platform>.NET $(TargetFrameworkVersion)</Platform> </RedistributableFiles> </ItemGroup> - <Delete Files="$(ToolsZip)" /> + <Delete Files="@(ToolsZip)" /> <AddFilesTo7Zip - ZipFileName="$(ToolsZip)" + ZipFileName="%(ToolsZip.Identity)" Files="@(AllToolTargets)" WorkingDirectory="$(ToolsDirectory)" ToolPath="$(Zip7ToolPath)" /> diff --git a/tools/drop.proj b/tools/drop.proj index fa088cb..0a617a6 100644 --- a/tools/drop.proj +++ b/tools/drop.proj @@ -149,18 +149,17 @@ </Target> <Target Name="Build" DependsOnTargets="Layout" Returns="@(RedistributableFiles)"> - <PropertyGroup> - <DropZip>$(DropDirectoryNoSlash)$(ZipFormat)</DropZip> - </PropertyGroup> <ItemGroup> - <RedistributableFiles Include="$(DropZip)"> + <DropZip Include="$(DropDirectoryNoSlash).7z" /> + <DropZip Include="$(DropDirectoryNoSlash).zip" /> + <RedistributableFiles Include="@(DropZip)"> <Package>DotNetOpenAuth</Package> </RedistributableFiles> </ItemGroup> - <Delete Files="$(DropZip)" /> + <Delete Files="@(DropZip)" /> <AddFilesTo7Zip Files="@(AllDropTargets)" - ZipFileName="$(DropZip)" + ZipFileName="%(DropZip.Identity)" WorkingDirectory="$(DropsRoot)" ToolPath="$(Zip7ToolPath)" /> </Target> |