Skip to content

Fixed up commit submitted for hierarchy of zip files. #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cfontan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed up commit submitted for hierarchy of zip files. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Useful MSBuild inline tasks and targets. Import the common.tasks and/or common.t

Usage examples

Zip task:
Zip task (ignore hierarchy):

```xml
<Target Name="BeforeBuild">
Expand All @@ -18,6 +18,27 @@ Zip task:
OverwriteExistingFile="true" />
</Target>
```
Zip task (folders hierarchy maintained relative to InputBaseDirectory):

<Target Name="BeforeBuild">
<ItemGroup>
<FilesToZip Include="$(ProjectDir)\PayloadUnzipped\*.*" />
</ItemGroup>
<Zip
InputFileNames="@(FilesToZip)"
InputBaseDirectory="$(ProjectDir)\PayloadUnzipped"
OutputFileName="$(ProjectDir)$(TargetZipFile)"
OverwriteExistingFile="true" />
</Target>
ZipDir task (folders hierarchy maintained relative to InputBaseDirectory):

<Target Name="BeforeBuild">
<ZipDir
InputBaseDirectory="$(ProjectDir)\PayloadUnzipped"
OutputFileName="$(ProjectDir)$(TargetZipFile)"
OverwriteExistingFile="true"
IncludeBaseDirectory="false" />
</Target>

SafeGitClean:

Expand Down
13 changes: 11 additions & 2 deletions common.tasks
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<UsingTask TaskName="Zip" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
<ParameterGroup>
<InputFileNames ParameterType="Microsoft.Build.Framework.ITaskItem[]" Required="true" />
<InputBaseDirectory ParameterType="System.String" Required="false" />
<OutputFileName ParameterType="System.String" Required="true" />
<OverwriteExistingFile ParameterType="System.Boolean" Required="false" />
</ParameterGroup>
Expand All @@ -13,11 +14,19 @@
<Code Type="Fragment" Language="cs">
<![CDATA[
var fileMode = OverwriteExistingFile ? FileMode.Create : FileMode.CreateNew;
var baseDir = string.IsNullOrWhiteSpace(InputBaseDirectory) ? string.Empty : Path.GetFullPath(InputBaseDirectory);
var filesToZip = InputFileNames.Select(f => Path.GetFullPath(f.ItemSpec)).Where(n => n.StartsWith(baseDir));

using (var archive = new ZipArchive(new FileStream(OutputFileName, fileMode), ZipArchiveMode.Create))
{
foreach (var inputFileName in InputFileNames.Select(f => f.ItemSpec))
foreach (var inputFileName in filesToZip)
{
var archiveEntry = archive.CreateEntry(Path.GetFileName(inputFileName));
var entryName = baseDir.Length == 0
? Path.GetFileName(inputFileName)
: inputFileName.Substring(baseDir.Length + 1);


var archiveEntry = archive.CreateEntry(entryName);
using (var fs = new FileStream(inputFileName, FileMode.Open))
{
using (var zipStream = archiveEntry.Open())
Expand Down