Merge pull request #1130 from kenjiuno/fix-get-rid-of-dnz

Remove dependency of `DotNetZip`.
OpenKH · Dec 28, 2024 · bf15aab · bf15aab
2 parents 9d4a6bd + c6bc463
commit bf15aab
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/OpenKh.Egs/OpenKh.Egs.csproj b/OpenKh.Egs/OpenKh.Egs.csproj
@@ -5,7 +5,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DotNetZip" Version="1.16.0" />
     <PackageReference Include="Xe.BinaryMapper" Version="1.5.2" />
   </ItemGroup>
 

diff --git a/OpenKh.Imaging/OpenKh.Imaging.csproj b/OpenKh.Imaging/OpenKh.Imaging.csproj
@@ -10,7 +10,7 @@
 
     <PackageReference Include="System.Memory" Version="4.5.5" />
     <PackageReference Include="Crc32.NET" Version="1.2.0" />
-    <PackageReference Include="DotNetZip" Version="1.16.0" />
+    <PackageReference Include="Iconic.Zlib.Netstandard" Version="1.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/OpenKh.Tools.ModsManager/ViewModels/SetupWizardViewModel.cs b/OpenKh.Tools.ModsManager/ViewModels/SetupWizardViewModel.cs
@@ -12,9 +12,9 @@
 using Xe.Tools;
 using Xe.Tools.Wpf.Commands;
 using Xe.Tools.Wpf.Dialogs;
-using Ionic.Zip;
 using System.Text.RegularExpressions;
 using System.Threading;
+using System.IO.Compression;
 
 namespace OpenKh.Tools.ModsManager.ViewModels
 {
@@ -990,9 +990,9 @@ public SetupWizardViewModel()
                     _client.DownloadFile(new System.Uri(releases.Assets[0].BrowserDownloadUrl), DownPath);
                     try
                     {
-                        using (ZipFile zip = new ZipFile(DownPath))
+                        using (var zip = ZipFile.OpenRead(DownPath))
                         {
-                            zip.ExtractAll(TempExtractionLocation, ExtractExistingFileAction.OverwriteSilently);
+                            zip.ExtractToDirectory(TempExtractionLocation, true);
                         }
                     }
                     catch