Fixed an issue in ZipExtractor causing it to throw an error if file a…

…lready exists.
ravibpatel · Aug 26, 2020 · 974a876 · 974a876
1 parent 2a2af4e
commit 974a876
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 36 deletions.
diff --git a/AutoUpdater.NET/AutoUpdater.NET.csproj b/AutoUpdater.NET/AutoUpdater.NET.csproj
@@ -14,8 +14,6 @@
         <FileVersion>1.6.1.0</FileVersion>
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>AutoUpdater.NET.snk</AssemblyOriginatorKeyFile>
-        <DebugType>embedded</DebugType>
-        <DebugSymbols>true</DebugSymbols>
         <NeutralLanguage>en</NeutralLanguage>
         <PackageId>Autoupdater.NET.Official</PackageId>
         <IncludeSymbols>true</IncludeSymbols>
@@ -28,9 +26,14 @@
         <PackageTags>autoupdate updater c# vb wpf winforms</PackageTags>
         <PackageReleaseNotes>https://github.com/ravibpatel/AutoUpdater.NET/releases</PackageReleaseNotes>
         <PackageOutputPath>build</PackageOutputPath>
+        <DocumentationFile>$(OutputPath)\$(Configuration)\AutoUpdater.NET.xml</DocumentationFile>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
         <OutputPath>build\lib</OutputPath>
+        <DebugType>pdbonly</DebugType>
+    </PropertyGroup>
+    <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+      <DebugType>full</DebugType>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(TargetFramework)' != 'net20' ">
         <DefineConstants>NETWPF</DefineConstants>

diff --git a/AutoUpdater.NET/AutoUpdater.cs b/AutoUpdater.NET/AutoUpdater.cs
@@ -506,48 +506,47 @@ private static void ShowError(Exception exception)
         }
 
         /// <summary>
-        /// Detects and exits all instances of running assembly, including current.
+        ///     Detects and exits all instances of running assembly, including current.
         /// </summary>
         private static void Exit()
         {
-            if (ApplicationExitEvent != null)
+            var currentProcess = Process.GetCurrentProcess();
+            foreach (var process in Process.GetProcessesByName(currentProcess.ProcessName))
             {
-                ApplicationExitEvent();
-            }
-            else
-            {
-                var currentProcess = Process.GetCurrentProcess();
-                foreach (var process in Process.GetProcessesByName(currentProcess.ProcessName))
+                string processPath;
+                try
                 {
-                    string processPath;
-                    try
-                    {
-                        processPath = process.MainModule?.FileName;
-                    }
-                    catch (Win32Exception)
+                    processPath = process.MainModule?.FileName;
+                }
+                catch (Win32Exception)
+                {
+                    // Current process should be same as processes created by other instances of the application so it should be able to access modules of other instances. 
+                    // This means this is not the process we are looking for so we can safely skip this.
+                    continue;
+                }
+
+                //get all instances of assembly except current
+                if (process.Id != currentProcess.Id && currentProcess.MainModule?.FileName == processPath)
+                {
+                    if (process.CloseMainWindow())
                     {
-                        // Current process should be same as processes created by other instances of the application so it should be able to access modules of other instances. 
-                        // This means this is not the process we are looking for so we can safely skip this.
-                        continue;
+                        process.WaitForExit((int) TimeSpan.FromSeconds(10)
+                            .TotalMilliseconds); //give some time to process message
                     }
 
-                    if (process.Id != currentProcess.Id && !string.IsNullOrEmpty(processPath) && 
-                        currentProcess.MainModule?.FileName == processPath
-                    ) //get all instances of assembly except current
+                    if (!process.HasExited)
                     {
-                        if (process.CloseMainWindow())
-                        {
-                            process.WaitForExit((int) TimeSpan.FromSeconds(10)
-                                .TotalMilliseconds); //give some time to process message
-                        }
-
-                        if (!process.HasExited)
-                        {
-                            process.Kill(); //TODO show UI message asking user to close program himself instead of silently killing it
-                        }
+                        process.Kill(); //TODO show UI message asking user to close program himself instead of silently killing it
                     }
                 }
-
+            }
+
+            if (ApplicationExitEvent != null)
+            {
+                ApplicationExitEvent();
+            }
+            else
+            {
                 if (_isWinFormsApplication)
                 {
                     MethodInvoker methodInvoker = Application.Exit;

diff --git a/AutoUpdater.NET/NetworkAuthentication.cs b/AutoUpdater.NET/NetworkAuthentication.cs
@@ -23,6 +23,7 @@ public NetworkAuthentication(string username, string password)
             Password = password;
         }
 
+        /// <inheritdoc />
         public void Apply(ref MyWebClient webClient)
         {
             webClient.Credentials = new NetworkCredential(Username, Password);

diff --git a/AutoUpdater.NET/Resources/ZipExtractor.exe b/AutoUpdater.NET/Resources/ZipExtractor.exe
diff --git a/ZipExtractor/FormMain.cs b/ZipExtractor/FormMain.cs
@@ -95,6 +95,7 @@ private void FormMain_Shown(object sender, EventArgs e)
 
                     try
                     {
+                        int progress = 0;
                         for (var index = 0; index < entries.Count; index++)
                         {
                             if (_backgroundWorker.CancellationPending)
@@ -110,14 +111,15 @@ private void FormMain_Shown(object sender, EventArgs e)
 #else
                             string currentFile = string.Format(Resources.CurrentFileExtracting, entry.FilenameInZip);
 #endif
+                            _backgroundWorker.ReportProgress(progress, currentFile);
                             int retries = 0;
                             bool notCopied = true;
                             while (notCopied)
                             {
                                 try
                                 {
 #if NET45
-                                    entry.ExtractToFile(Path.Combine(path, entry.FullName));
+                                    entry.ExtractToFile(Path.Combine(path, entry.FullName), true);
 #else
                                     zip.ExtractFile(entry, Path.Combine(path, entry.FilenameInZip));
 #endif
@@ -144,7 +146,7 @@ private void FormMain_Shown(object sender, EventArgs e)
                                 }
                             }
 
-                            int progress = (index + 1) * 100 / entries.Count;
+                            progress = (index + 1) * 100 / entries.Count;
                             _backgroundWorker.ReportProgress(progress, currentFile);
 
                             _logBuilder.AppendLine($"{currentFile} [{progress}%]");

diff --git a/ZipExtractor/ZipExtractor.csproj b/ZipExtractor/ZipExtractor.csproj
@@ -15,7 +15,6 @@
         <ApplicationIcon>ZipExtractor.ico</ApplicationIcon>
         <ApplicationManifest>app.manifest</ApplicationManifest>
         <SignAssembly>true</SignAssembly>
-        <OutputPath>..\AutoUpdater.NET\Resources</OutputPath>
         <AssemblyOriginatorKeyFile>ZipExtractor.snk</AssemblyOriginatorKeyFile>
         <NeutralLanguage>en</NeutralLanguage>
         <DebugType>none</DebugType>