diff options
| -rw-r--r-- | doc/doc.proj | 2 | ||||
| -rw-r--r-- | samples/Samples.proj | 2 | ||||
| -rw-r--r-- | samples/tools.proj | 2 | ||||
| -rw-r--r-- | tools/DotNetOpenAuth.props | 1 | ||||
| -rw-r--r-- | tools/drop.proj | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/doc/doc.proj b/doc/doc.proj index c4f2bf3..55b2cb8 100644 --- a/doc/doc.proj +++ b/doc/doc.proj @@ -24,7 +24,7 @@ <Target Name="PrepareForPublish" DependsOnTargets="BuildProduct;Html"> <PropertyGroup> - <DocZip>$(DropDirectoryNoSlash)-htmldoc.7z</DocZip> + <DocZip>$(DropDirectoryNoSlash)-htmldoc$(ZipFormat)</DocZip> </PropertyGroup> <ItemGroup> diff --git a/samples/Samples.proj b/samples/Samples.proj index ed37e6d..e6ac9f8 100644 --- a/samples/Samples.proj +++ b/samples/Samples.proj @@ -58,7 +58,7 @@ <Target Name="PrepareForPublish" DependsOnTargets="Build"> <PropertyGroup> - <SamplesZip>$(DropDirectoryNoSlash)-samples.7z</SamplesZip> + <SamplesZip>$(DropDirectoryNoSlash)-samples$(ZipFormat)</SamplesZip> </PropertyGroup> <ItemGroup> diff --git a/samples/tools.proj b/samples/tools.proj index a93567e..0c413b7 100644 --- a/samples/tools.proj +++ b/samples/tools.proj @@ -47,7 +47,7 @@ <Target Name="Build" DependsOnTargets="Layout" Returns="@(RedistributableFiles)"> <PropertyGroup> - <ToolsZip>$(ToolsDirectoryNoSlash).7z</ToolsZip> + <ToolsZip>$(ToolsDirectoryNoSlash)$(ZipFormat)</ToolsZip> </PropertyGroup> <ItemGroup> <RedistributableFiles Include="$(ToolsZip)"> diff --git a/tools/DotNetOpenAuth.props b/tools/DotNetOpenAuth.props index 12ea3f9..698f06d 100644 --- a/tools/DotNetOpenAuth.props +++ b/tools/DotNetOpenAuth.props @@ -12,6 +12,7 @@ <ToolsDir>$(ProjectRoot)tools\</ToolsDir> <ZipLevel>6</ZipLevel> <Zip7ToolPath>$(ToolsDir)7-Zip.x86\</Zip7ToolPath> + <ZipFormat Condition=" '$(ZipFormat)' == '' ">.7z</ZipFormat> <ClrVersion Condition=" '$(TargetFrameworkVersion)' == 'v4.0' ">4</ClrVersion> <ClrVersion Condition=" '$(TargetFrameworkVersion)' != 'v4.0' ">2</ClrVersion> diff --git a/tools/drop.proj b/tools/drop.proj index 3ec02c2..fa088cb 100644 --- a/tools/drop.proj +++ b/tools/drop.proj @@ -150,7 +150,7 @@ <Target Name="Build" DependsOnTargets="Layout" Returns="@(RedistributableFiles)"> <PropertyGroup> - <DropZip>$(DropDirectoryNoSlash).7z</DropZip> + <DropZip>$(DropDirectoryNoSlash)$(ZipFormat)</DropZip> </PropertyGroup> <ItemGroup> <RedistributableFiles Include="$(DropZip)"> |