ModApi.Updater: use System.IO.Compression instead of ZipStorer

Author: Rosalie241

Updater/ModApi.Updater/MainWindow.xaml.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics;
 using System.IO;
+using System.IO.Compression;
 using System.Windows;
 using System.Windows.Input;
 
@@ -39,19 +40,33 @@ private void MainWindow_Loaded(object sender, RoutedEventArgs e)
             {
                 using (MemoryStream unmStream = new MemoryStream(ModApi.Updater.Properties.Resources.ModApiUpdate))
                 {
-                    using (ZipStorer archive = ZipStorer.Open(unmStream, FileAccess.Read, true))
+                    string unm = Environment.ExpandEnvironmentVariables(@"%appdata%\ModAPITemp.zip");
+                    if (File.Exists(unm))
+                        File.Delete(unm);
+
+                    using (var file = File.Create(unm))
+                    {
+                        unmStream.Seek(0, SeekOrigin.Begin);
+                        unmStream.CopyTo(file);
+                    }
+
+                    using (ZipArchive archive = ZipFile.Open(unm, ZipArchiveMode.Update))
                     {
-                        InstallProgressBar.Maximum = archive.ReadCentralDir().Count;
+                        InstallProgressBar.Maximum = archive.Entries.Count;
 
-                        foreach (ZipStorer.ZipFileEntry s in archive.ReadCentralDir())
+                        foreach (var s in archive.Entries)
                         {
-                            string fileOutPath = Path.Combine(path, s.FilenameInZip);
+                            string fileOutPath = Path.Combine(path, s.FullName);
 
                             if (File.Exists(fileOutPath))
                                 File.Delete(fileOutPath);
 
-                            if (IsPathNotPartOfConfiguration(fileOutPath))
-                                archive.ExtractFile(s, fileOutPath);
+                            if (!s.FullName.EndsWith("/") &&
+                                !s.FullName.EndsWith("\\") &&
+                                IsPathNotPartOfConfiguration(fileOutPath))
+                            {
+                                s.ExtractToFile(fileOutPath);
+                            }
 
                             if (InstallProgressBar.Value < InstallProgressBar.Maximum)
                                 InstallProgressBar.Value++;

Updater/ModApi.Updater/ModApi.Updater.csproj

@@ -60,6 +60,8 @@
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.Compression.FileSystem" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
@@ -80,7 +82,6 @@
     </ApplicationDefinition>
     <Compile Include="EmbeddedAssembly.cs" />
     <Compile Include="Permissions.cs" />
-    <Compile Include="ZipStorer.cs" />
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>