Merge branch 'release/v3.1.5'

dbforge · Sep 2, 2017 · be9c2b5 · be9c2b5
2 parents fe0d71a + 92c1423
commit be9c2b5
Show file tree

Hide file tree

Showing 25 changed files with 173 additions and 157 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.1.2-blue.svg)](https://github.com/ProgTrade/nUpdate/releases)
-[![NuGet](https://img.shields.io/badge/nuget%20nUpdate.ProvideTAP-v3.1.2-red.svg)](https://www.nuget.org/packages/nUpdate.ProvideTAP/)
-[![NuGet](https://img.shields.io/badge/nuget%20nUpdate.WithoutTAP-v3.1.2-red.svg)](https://www.nuget.org/packages/nUpdate.WithoutTAP/)  
+[![Release](https://img.shields.io/badge/release-v3.1.5-blue.svg)](https://github.com/ProgTrade/nUpdate/releases)
+[![NuGet](https://img.shields.io/badge/nuget%20nUpdate.ProvideTAP-v3.1.5-red.svg)](https://www.nuget.org/packages/nUpdate.ProvideTAP/)
+[![NuGet](https://img.shields.io/badge/nuget%20nUpdate.WithoutTAP-v3.1.5-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)
@@ -28,7 +28,7 @@ Also, nUpdate is designed to fit in with all operating systems since Windows Vis
 - Smart statistics about the downloads of your published updates
 - Supports very large update packages
 - ...
- 
+
 
 ## Installation
 
@@ -39,15 +39,15 @@ 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.1.2 
+PM> Install-Package nUpdate.ProvideTAP -Version 3.1.5
 ```
 
 Otherwise, if you want to use the Eventbased Asynchronous Pattern only, make sure to install this package:
 
 ```
-PM> Install-Package nUpdate.WithoutTAP -Version 3.1.2
+PM> Install-Package nUpdate.WithoutTAP -Version 3.1.5
 ```
- 
+
 ## Web
 * [nUpdate] - The official website of nUpdate.
 * [@nUpdateLib] - The official twitter account of nUpdate.

diff --git a/nUpdate.Administration/Core/Application/UpdateProject.cs b/nUpdate.Administration/Core/Application/UpdateProject.cs
@@ -3,12 +3,9 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Net;
 using nUpdate.Administration.Core.History;
 using nUpdate.Core;
-using nUpdate.Updating;
-using Newtonsoft.Json.Linq;
 using Starksoft.Aspen.Ftps;
 
 namespace nUpdate.Administration.Core.Application

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.1.2";
+        public static string VersionString => "nUpdate Administration v3.1.5";
 
         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.1.2.0")]
-[assembly: AssemblyFileVersion("3.1.2.0")]
+[assembly: AssemblyVersion("3.1.5.0")]
+[assembly: AssemblyFileVersion("3.1.5.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.Administration/UI/Dialogs/NewProjectDialog.cs b/nUpdate.Administration/UI/Dialogs/NewProjectDialog.cs
@@ -237,7 +237,7 @@ public void Reset()
 
         private void NewProjectDialog_Load(object sender, EventArgs e)
         {
-            if (!ConnectionChecker.IsConnectionAvailable())
+            if (!ConnectionManager.IsConnectionAvailable())
             {
                 Popup.ShowPopup(this, SystemIcons.Error, "No network connection available.",
                     "No active network connection was found. In order to create a project a network connection is required in order to communicate with the server.",
@@ -721,8 +721,9 @@ ON DELETE NO ACTION
                         string myConnectionString = null;
                         Invoke(new Action(() =>
                         {
-                            myConnectionString = $"SERVER={SqlWebUrl};" + $"DATABASE={SqlDatabaseName};" +
-                                                 $"UID={SqlUsername};" + $"PASSWORD={sqlPasswordTextBox.Text};";
+                            myConnectionString = $"SERVER='{SqlWebUrl}';" + $"DATABASE='{SqlDatabaseName}';" +
+                                                 $"UID='{SqlUsername}';" +
+                                                 $"PASSWORD='{sqlPasswordTextBox.Text}';";
                         }));
 
                         myConnection = new MySqlConnection(myConnectionString);

diff --git a/nUpdate.Administration/UI/Dialogs/PackageAddDialog.cs b/nUpdate.Administration/UI/Dialogs/PackageAddDialog.cs
@@ -167,14 +167,15 @@ public void Reset()
             if (Project.UseStatistics)
             {
                 Invoke(new Action(() => loadingLabel.Text = "Undoing SQL-entries..."));
-                var connectionString = $"SERVER={Project.SqlWebUrl};" + $"DATABASE={Project.SqlDatabaseName};" +
-                                       $"UID={Project.SqlUsername};" +
-                                       $"PASSWORD={SqlPassword.ConvertToInsecureString()};";
+                var connectionString = $"SERVER='{Project.SqlWebUrl}';" + $"DATABASE='{Project.SqlDatabaseName}';" +
+                                       $"UID='{Project.SqlUsername}';" +
+                                       $"PASSWORD='{SqlPassword.ConvertToInsecureString()}';";
 
                 bool connectingFailed = false;
-                var deleteConnection = new MySqlConnection(connectionString);
+                MySqlConnection deleteConnection = null;
                 try
                 {
+                    deleteConnection = new MySqlConnection(connectionString);
                     deleteConnection.Open();
                 }
                 catch (Exception ex)
@@ -208,7 +209,7 @@ public void Reset()
                     }
                 }
 
-                deleteConnection.Close();
+                deleteConnection?.Close();
                 Settings.Default.VersionID -= 1;
                 Settings.Default.Save();
                 Settings.Default.Reload();
@@ -681,10 +682,9 @@ var tabPage in
                         Invoke(new Action(() => loadingLabel.Text = "Connecting to SQL-server..."));
                         try
                         {
-                            var connectionString = $"SERVER={Project.SqlWebUrl};" +
-                                                   $"DATABASE={Project.SqlDatabaseName};" +
-                                                   $"UID={Project.SqlUsername};" +
-                                                   $"PASSWORD={SqlPassword.ConvertToInsecureString()};";
+                            var connectionString = $"SERVER='{Project.SqlWebUrl}';" + $"DATABASE='{Project.SqlDatabaseName}';" +
+                                                   $"UID='{Project.SqlUsername}';" +
+                                                   $"PASSWORD='{SqlPassword.ConvertToInsecureString()}';";
 
                             _insertConnection = new MySqlConnection(connectionString);
                             _insertConnection.Open();

diff --git a/nUpdate.Administration/UI/Dialogs/PackageEditDialog.cs b/nUpdate.Administration/UI/Dialogs/PackageEditDialog.cs
@@ -155,13 +155,14 @@ public void Reset()
             if (_commandsExecuted)
             {
                 Invoke(new Action(() => loadingLabel.Text = "Connecting to SQL-server..."));
-                var connectionString = $"SERVER={Project.SqlWebUrl};" + $"DATABASE={Project.SqlDatabaseName};" +
-                                       $"UID={Project.SqlUsername};" +
-                                       $"PASSWORD={SqlPassword.ConvertToInsecureString()};";
+                var connectionString = $"SERVER='{Project.SqlWebUrl}';" + $"DATABASE='{Project.SqlDatabaseName}';" +
+                                       $"UID='{Project.SqlUsername}';" +
+                                       $"PASSWORD='{SqlPassword.ConvertToInsecureString()}';";
 
-                var myConnection = new MySqlConnection(connectionString);
+                MySqlConnection myConnection = null;
                 try
                 {
+                    myConnection = new MySqlConnection(connectionString);
                     myConnection.Open();
                 }
                 catch (MySqlException ex)
@@ -171,7 +172,7 @@ public void Reset()
                             () =>
                                 Popup.ShowPopup(this, SystemIcons.Error, "An MySQL-exception occured.",
                                     ex, PopupButtons.Ok)));
-                    myConnection.Close();
+                    myConnection?.Close();
                     Invoke(new Action(Close));
                     return;
                 }
@@ -182,7 +183,7 @@ public void Reset()
                             () =>
                                 Popup.ShowPopup(this, SystemIcons.Error, "Error while connecting to the database.",
                                     ex, PopupButtons.Ok)));
-                    myConnection.Close();
+                    myConnection?.Close();
                     Invoke(new Action(Close));
                     return;
                 }
@@ -344,7 +345,7 @@ private void PackageEditDialog_Load(object sender, EventArgs e)
 
             categoryTreeView.SelectedNode = categoryTreeView.Nodes[0];
             if (_packageConfiguration.UnsupportedVersions != null &&
-                _packageConfiguration.UnsupportedVersions.Count() != 0)
+                _packageConfiguration.UnsupportedVersions.Length != 0)
             {
                 someVersionsRadioButton.Checked = true;
                 unsupportedVersionsPanel.Enabled = true;
@@ -710,13 +711,14 @@ await Task.Factory.StartNew(() =>
                 {
                     Invoke(new Action(() => loadingLabel.Text = "Connecting to SQL-server..."));
 
-                    var connectionString = $"SERVER={Project.SqlWebUrl};" + $"DATABASE={Project.SqlDatabaseName};" +
-                                           $"UID={Project.SqlUsername};" +
-                                           $"PASSWORD={SqlPassword.ConvertToInsecureString()};";
+                    var connectionString = $"SERVER='{Project.SqlWebUrl}';" + $"DATABASE='{Project.SqlDatabaseName}';" +
+                                           $"UID='{Project.SqlUsername}';" +
+                                           $"PASSWORD='{SqlPassword.ConvertToInsecureString()}';";
 
-                    var myConnection = new MySqlConnection(connectionString);
+                    MySqlConnection myConnection = null;
                     try
                     {
+                        myConnection = new MySqlConnection(connectionString);
                         myConnection.Open();
                     }
                     catch (MySqlException ex)
@@ -726,7 +728,7 @@ await Task.Factory.StartNew(() =>
                                 () =>
                                     Popup.ShowPopup(this, SystemIcons.Error, "An MySQL-exception occured.",
                                         ex, PopupButtons.Ok)));
-                        myConnection.Close();
+                        myConnection?.Close();
                         Reset();
                         return;
                     }
@@ -737,7 +739,7 @@ await Task.Factory.StartNew(() =>
                                 () =>
                                     Popup.ShowPopup(this, SystemIcons.Error, "Error while connecting to the database.",
                                         ex, PopupButtons.Ok)));
-                        myConnection.Close();
+                        myConnection?.Close();
                         Reset();
                         return;
                     }