Merge branch 'release/v3.2.1'

dbforge · Oct 1, 2017 · 28d5d2e · 28d5d2e
2 parents 793c5ac + dfbba32
commit 28d5d2e
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -2,9 +2,9 @@
 
 # nUpdate - .NET Update Solution
 
-[![Release](https://img.shields.io/badge/release-v3.2-blue.svg)](https://github.com/ProgTrade/nUpdate/releases)
-[![NuGet](https://img.shields.io/badge/nuget%20nUpdate.ProvideTAP-v3.2-red.svg)](https://www.nuget.org/packages/nUpdate.ProvideTAP/)
-[![NuGet](https://img.shields.io/badge/nuget%20nUpdate.WithoutTAP-v3.2-red.svg)](https://www.nuget.org/packages/nUpdate.WithoutTAP/)  
+[![Release](https://img.shields.io/badge/release-v3.2.1-blue.svg)](https://github.com/ProgTrade/nUpdate/releases)
+[![NuGet](https://img.shields.io/badge/nuget%20nUpdate.ProvideTAP-v3.2.1-red.svg)](https://www.nuget.org/packages/nUpdate.ProvideTAP/)
+[![NuGet](https://img.shields.io/badge/nuget%20nUpdate.WithoutTAP-v3.2.1-red.svg)](https://www.nuget.org/packages/nUpdate.WithoutTAP/)  
 [![Issues](https://img.shields.io/github/issues/ProgTrade/nUpdate.svg)](https://github.com/ProgTrade/nUpdate/issues)
 [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/ProgTrade/nUpdate/master/LICENSE)
 [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=dominic%2ebeger%40hotmail%2ede&lc=DE&item_name=nUpdate&no_note=0&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHostedGuest)
@@ -41,7 +41,7 @@ You can get the necessary libraries and applications from the current [releases]
 If you want to use nUpdate with the Taskbased Asynchronous Pattern including `async` and `await`, then install this package:
 
 ```
-PM> Install-Package nUpdate.ProvideTAP -Version 3.2
+PM> Install-Package nUpdate.ProvideTAP -Version 3.2.1
 ```
 
 ##### Trouble installing nUpdate.ProvideTAP?
@@ -53,7 +53,7 @@ It may be that Visual Studio shows you a warning like `The primary reference "nU
 Otherwise, if you want to use the Eventbased Asynchronous Pattern, make sure to install this package:
 
 ```
-PM> Install-Package nUpdate.WithoutTAP -Version 3.2
+PM> Install-Package nUpdate.WithoutTAP -Version 3.2.1
 ```
 
 ## Web

diff --git a/nUpdate.Administration/Program.cs b/nUpdate.Administration/Program.cs
@@ -54,7 +54,7 @@ public static class Program
         /// <summary>
         ///     The version string shown in all dialog titles.
         /// </summary>
-        public static string VersionString => "nUpdate Administration v3.2.0";
+        public static string VersionString => "nUpdate Administration v3.2.1";
 
         public static string AesKeyPassword => "VZh7mLRPNI";
         public static string AesIvPassword => "cOijH2vgwR";

diff --git a/nUpdate.Administration/Properties/AssemblyInfo.cs b/nUpdate.Administration/Properties/AssemblyInfo.cs
@@ -38,6 +38,6 @@
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("3.2.0.0")]
-[assembly: AssemblyFileVersion("3.2.0.0")]
+[assembly: AssemblyVersion("3.2.1.0")]
+[assembly: AssemblyFileVersion("3.2.1.0")]
 [assembly: NeutralResourcesLanguage("")]
diff --git a/nUpdate.Administration/UI/Dialogs/InfoDialog.Designer.cs b/nUpdate.Administration/UI/Dialogs/InfoDialog.Designer.cs
diff --git a/nUpdate.Client.GuiInterface/Properties/AssemblyInfo.cs b/nUpdate.Client.GuiInterface/Properties/AssemblyInfo.cs
@@ -37,5 +37,5 @@
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("3.2.0.0")]
-[assembly: AssemblyFileVersion("3.2.0.0")]
+[assembly: AssemblyVersion("3.2.1.0")]
+[assembly: AssemblyFileVersion("3.2.1.0")]
diff --git a/nUpdate.Internal/Properties/AssemblyInfo.cs b/nUpdate.Internal/Properties/AssemblyInfo.cs
@@ -38,8 +38,8 @@
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("3.2.0.0")]
-[assembly: AssemblyFileVersion("3.2.0.0")]
+[assembly: AssemblyVersion("3.2.1.0")]
+[assembly: AssemblyFileVersion("3.2.1.0")]
 [assembly: InternalsVisibleTo("nUpdate.Shared")]
 [assembly: InternalsVisibleTo("nUpdate.ProvideTAP")]
 [assembly: InternalsVisibleTo("nUpdate.WithoutTAP")]
diff --git a/nUpdate.Internal/Resources/nUpdate UpdateInstaller.exe b/nUpdate.Internal/Resources/nUpdate UpdateInstaller.exe
diff --git a/nUpdate.ProvideTAP/Properties/AssemblyInfo.cs b/nUpdate.ProvideTAP/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.2.0.0")]
-[assembly: AssemblyFileVersion("3.2.0.0")]
+[assembly: AssemblyVersion("3.2.1.0")]
+[assembly: AssemblyFileVersion("3.2.1.0")]
diff --git a/nUpdate.Test/Properties/AssemblyInfo.cs b/nUpdate.Test/Properties/AssemblyInfo.cs
@@ -37,5 +37,5 @@
 // durch Einsatz von '*', wie in nachfolgendem Beispiel:
 // [Assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("3.2.0.0")]
-[assembly: AssemblyFileVersion("3.2.0.0")]
+[assembly: AssemblyVersion("3.2.1.0")]
+[assembly: AssemblyFileVersion("3.2.1.0")]
diff --git a/nUpdate.UpdateInstaller/Properties/AssemblyInfo.cs b/nUpdate.UpdateInstaller/Properties/AssemblyInfo.cs
@@ -37,5 +37,5 @@
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("3.2.0.0")]
-[assembly: AssemblyFileVersion("3.2.0.0")]
+[assembly: AssemblyVersion("3.2.1.0")]
+[assembly: AssemblyFileVersion("3.2.1.0")]
diff --git a/nUpdate.WithoutTAP/Properties/AssemblyInfo.cs b/nUpdate.WithoutTAP/Properties/AssemblyInfo.cs
@@ -34,5 +34,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.2.0.0")]
-[assembly: AssemblyFileVersion("3.2.0.0")]
+[assembly: AssemblyVersion("3.2.1.0")]
+[assembly: AssemblyFileVersion("3.2.1.0")]
diff --git a/nUpdate.WithoutTAP/Updating/UpdaterUI.cs b/nUpdate.WithoutTAP/Updating/UpdaterUI.cs
@@ -1,4 +1,4 @@
-// Copyright © Dominic Beger 2017
+// Copyright © Dominic Beger 2017
 
 using System;
 using System.Drawing;
@@ -43,8 +43,7 @@ public void ShowUserInterface()
                             var noUpdateDialog = new NoUpdateFoundDialog {UpdateManager = UpdateManager};
                             var noUpdateDialogResult = new DialogResultWrapper();
                             Context.Send(d => noUpdateDialog.ShowDialog(noUpdateDialogResult), null);
-                            if (noUpdateDialogResult.DialogResult != DialogResult.OK)
-                                return;
+                            return;
                         }
                     }
                     else
@@ -89,7 +88,7 @@ public void ShowUserInterface()
                     if (downloadDialogResult.DialogResult != DialogResult.OK)
                         return;
 
-                    var valid = false;
+                    bool valid;
                     try
                     {
                         valid = UpdateManager.ValidatePackages();
@@ -137,4 +136,4 @@ public void ShowUserInterface()
             });
         }
     }
-}
+}