Skip to content

Commit 04865b1

Browse files
authored
Remove DotNetZip (#4617)
1 parent 3a4b82b commit 04865b1

File tree

4 files changed

+5
-11
lines changed

4 files changed

+5
-11
lines changed

src/Directory.Packages.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<PackageVersion Include="Azure.ResourceManager.ServiceBus" Version="1.0.1" />
1313
<PackageVersion Include="ByteSize" Version="2.1.2" />
1414
<PackageVersion Include="Caliburn.Micro" Version="4.0.212" />
15-
<PackageVersion Include="DotNetZip" Version="1.16.0" />
1615
<PackageVersion Include="FluentValidation" Version="11.10.0" />
1716
<PackageVersion Include="Fody" Version="6.8.2" />
1817
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />

src/ServiceControlInstaller.Engine.UnitTests/Zip/UnpackTest.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
{
33
using System;
44
using System.IO;
5+
using System.IO.Compression;
56
using System.Linq;
67
using FileSystem;
7-
using Ionic.Zip;
88
using NUnit.Framework;
99

1010
[TestFixture]
@@ -38,11 +38,7 @@ public void Setup()
3838
}
3939
}
4040

41-
using (var zip = new ZipFile())
42-
{
43-
zip.AddDirectory(workingFolder.FullName, null);
44-
zip.Save(zipFilePath);
45-
}
41+
ZipFile.CreateFromDirectory(workingFolder.FullName, zipFilePath);
4642

4743
Console.WriteLine(zipFilePath);
4844
}

src/ServiceControlInstaller.Engine/FileSystem/FileUtils.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ namespace ServiceControlInstaller.Engine.FileSystem
33
using System;
44
using System.Diagnostics;
55
using System.IO;
6+
using System.IO.Compression;
67
using System.Linq;
78
using System.Reflection;
89
using System.Security.AccessControl;
910
using System.Threading;
10-
using Ionic.Zip;
1111

1212
static class FileUtils
1313
{
@@ -147,8 +147,8 @@ public static void UnzipToSubdirectory(string zipResourceName, string targetPath
147147

148148
internal static void UnzipToSubdirectory(Stream zipStream, string targetPath)
149149
{
150-
using var zip = ZipFile.Read(zipStream);
151-
zip.ExtractAll(targetPath, ExtractExistingFileAction.OverwriteSilently);
150+
using var zip = new ZipArchive(zipStream, ZipArchiveMode.Read, leaveOpen: false);
151+
zip.ExtractToDirectory(targetPath, overwriteFiles: true);
152152
}
153153

154154
static void RunWithRetries(Action action)

src/ServiceControlInstaller.Engine/ServiceControlInstaller.Engine.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="DotNetZip" />
1918
<PackageReference Include="Microsoft.Data.SqlClient" />
2019
<PackageReference Include="Npgsql" />
2120
<PackageReference Include="NuGet.Versioning" />

0 commit comments

Comments
 (0)