Skip to content

Commit d0f89c6

Browse files
authored
Ensure we rewrite all entries, even if not signed (#15284)
1 parent 9ad0880 commit d0f89c6

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

src/Microsoft.DotNet.SignTool/src/ZipData.cs

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -338,21 +338,22 @@ private void RepackTarGZip(TaskLoggingHelper log, string tempDir, string tarTool
338338
{
339339
var relativeName = entry.Name;
340340
var signedPart = FindNestedPart(relativeName);
341-
if (!signedPart.HasValue)
341+
342+
if (signedPart.HasValue)
342343
{
343-
log.LogMessage(MessageImportance.Low, $"Didn't find signed part for nested file: {FileSignInfo.FullPath} -> {relativeName}");
344+
using var signedStream = File.OpenRead(signedPart.Value.FileSignInfo.FullPath);
345+
log.LogMessage(MessageImportance.Low, $"Copying signed stream from {signedPart.Value.FileSignInfo.FullPath} to {FileSignInfo.FullPath} -> {relativeName}.");
346+
entry.DataStream = signedStream;
347+
writer.WriteEntry(entry);
344348
continue;
345349
}
346-
347-
using var signedStream = File.OpenRead(signedPart.Value.FileSignInfo.FullPath);
348-
log.LogMessage(MessageImportance.Low, $"Copying signed stream from {signedPart.Value.FileSignInfo.FullPath} to {FileSignInfo.FullPath} -> {relativeName}.");
349-
entry.DataStream = signedStream;
350-
writer.WriteEntry(entry);
351-
}
352-
else
353-
{
354-
writer.WriteEntry(entry);
350+
else
351+
{
352+
log.LogMessage(MessageImportance.Low, $"Didn't find signed part for nested file: {FileSignInfo.FullPath} -> {relativeName}");
353+
}
355354
}
355+
356+
writer.WriteEntry(entry);
356357
}
357358
}
358359

0 commit comments

Comments
 (0)