Skip to content

Commit 7027b4b

Browse files
authored
Fixed bug in duplicate file check (microsoft#108)
1 parent 5bcd7e8 commit 7027b4b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

build/Tasks/ZipArchiveTask.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@ public override bool Execute()
4141
foreach (ITaskItem fileItem in Files)
4242
{
4343
string destinationFileName = new FileInfo(fileItem.ItemSpec).Name;
44+
string destinationFolder = fileItem.GetMetadata("Destination");
45+
string type = fileItem.GetMetadata("Type");
46+
if (!string.IsNullOrEmpty(destinationFolder))
47+
{
48+
destinationFileName = Path.Combine(destinationFolder, destinationFileName);
49+
}
4450

4551
// Prevent duplicate files from getting zipped.
4652
if (uniqueFiles.Contains(destinationFileName))
@@ -49,12 +55,6 @@ public override bool Execute()
4955
}
5056

5157
uniqueFiles.Add(destinationFileName);
52-
string destinationFolder = fileItem.GetMetadata("Destination");
53-
string type = fileItem.GetMetadata("Type");
54-
if (!string.IsNullOrEmpty(destinationFolder))
55-
{
56-
destinationFileName = Path.Combine(destinationFolder, destinationFileName);
57-
}
5858

5959
// Create directories
6060
if (!string.IsNullOrEmpty(type) && type.Equals("Directory"))

0 commit comments

Comments
 (0)