Merge branch 'release/v3.1.2'

dbforge · Aug 30, 2017 · fe0d71a · fe0d71a
2 parents f7cc2b7 + 9806f23
commit fe0d71a
Show file tree

Hide file tree

Showing 15 changed files with 45 additions and 69 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-blue.svg)](https://github.com/ProgTrade/nUpdate/releases)
-[![NuGet](https://img.shields.io/badge/nuget%20nUpdate.ProvideTAP-v3.1-red.svg)](https://www.nuget.org/packages/nUpdate.ProvideTAP/)
-[![NuGet](https://img.shields.io/badge/nuget%20nUpdate.WithoutTAP-v3.1-red.svg)](https://www.nuget.org/packages/nUpdate.WithoutTAP/)  
+[![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/)  
 [![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)
@@ -39,13 +39,13 @@ 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.0 
+PM> Install-Package nUpdate.ProvideTAP -Version 3.1.2 
 ```
 
 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.0
+PM> Install-Package nUpdate.WithoutTAP -Version 3.1.2
 ```
 
 ## 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.1";
+        public static string VersionString => "nUpdate Administration v3.1.2";
 
         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.0.0")]
-[assembly: AssemblyFileVersion("3.1.0.0")]
+[assembly: AssemblyVersion("3.1.2.0")]
+[assembly: AssemblyFileVersion("3.1.2.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/ProjectDialog.cs b/nUpdate.Administration/UI/Dialogs/ProjectDialog.cs
@@ -306,6 +306,7 @@ public void Reset()
 
         private bool InitializeProjectData()
         {
+            _allowCancel = false;
             try
             {
                 Invoke(new Action(() =>
@@ -357,12 +358,17 @@ private bool InitializeProjectData()
                                 PopupButtons.Ok)));
                 return false;
             }
+            finally
+            {
+                _allowCancel = true;
+            }
 
             return true;
         }
 
         private void InitializePackageItems()
         {
+            _allowCancel = false;
             Invoke(new Action(() =>
             {
                 if (packagesList.Items.Count > 0)
@@ -428,6 +434,8 @@ private void InitializePackageItems()
                                     PopupButtons.Ok)));
                 }
             }
+
+            _allowCancel = true;
         }
 
         private async void ProjectDialog_Load(object sender, EventArgs e)
@@ -508,11 +516,10 @@ private void ProjectDialog_FormClosing(object sender, FormClosingEventArgs e)
 
         private async Task InitializeAsync()
         {
+            _allowCancel = false;
             await BeginUpdateConfigurationCheck();
             if (Project.UseStatistics)
-            {
                 await InitializeStatisticsData();
-            }
             else
             {
                 foreach (
@@ -526,6 +533,7 @@ private async Task InitializeAsync()
                 noStatisticsLabel.Visible = true;
                 _isSetByUser = true;
             }
+            _allowCancel = true;
         }
 
         private Task InitializeStatisticsData()
@@ -1038,11 +1046,9 @@ private void BrowseAssemblyButtonClicked(object sender, EventArgs e)
             }
         }
 
-        private void updateStatisticsButton_Click(object sender, EventArgs e)
+        private async void updateStatisticsButton_Click(object sender, EventArgs e)
         {
-#pragma warning disable 4014
-            InitializeStatisticsData();
-#pragma warning restore 4014
+            await InitializeStatisticsData();
         }
 
         private void loadFromAssemblyRadioButton_CheckedChanged(object sender, EventArgs e)
@@ -1416,14 +1422,12 @@ private async Task BeginUpdateConfigurationCheck()
             await Task.Factory.StartNew(() => CheckUpdateConfigurationStatus(_configurationFileUrl));
         }
 
-        private void checkUpdateConfigurationLinkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        private async void checkUpdateConfigurationLinkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
-#pragma warning disable 4014
-            BeginUpdateConfigurationCheck();
-#pragma warning restore 4014
+            await BeginUpdateConfigurationCheck();
         }
 
-        private void CheckUpdateConfigurationStatus(Uri configFileUri)
+        private async void CheckUpdateConfigurationStatus(Uri configFileUri)
         {
             if (!ConnectionChecker.IsConnectionAvailable())
             {
@@ -1555,12 +1559,6 @@ private void CheckUpdateConfigurationStatus(Uri configFileUri)
                     }
                 }
             }
-            Invoke(
-                new Action(
-                    () =>
-                        checkUpdateConfigurationLinkLabel.Enabled = true));
-            SetUiState(true);
-
 
             try
             {
@@ -1692,9 +1690,7 @@ private void CheckUpdateConfigurationStatus(Uri configFileUri)
                 }
 
                 _hasFinishedCheck = true;
-#pragma warning disable 4014
-                BeginUpdateConfigurationCheck();
-#pragma warning restore 4014
+                await BeginUpdateConfigurationCheck();
             }
         }
 
@@ -1721,9 +1717,9 @@ private void deleteButton_Click(object sender, EventArgs e)
         /// <summary>
         ///     Initializes a new thread for deleting the package.
         /// </summary>
-        private async void DeletePackage()
+        private Task DeletePackage()
         {
-            await Task.Factory.StartNew(() =>
+            return Task.Factory.StartNew(async () =>
             {
                 IEnumerator enumerator = null;
                 Invoke(
@@ -2019,11 +2015,7 @@ private async void DeletePackage()
 
                 SetUiState(true);
                 if (Project.UseStatistics)
-                {
-#pragma warning disable 4014
-                    InitializeStatisticsData();
-#pragma warning restore 4014
-                }
+                    await InitializeStatisticsData();
                 InitializePackageItems();
                 InitializeProjectData();
             });

diff --git a/nUpdate.Client.GuiInterface/Properties/AssemblyInfo.cs b/nUpdate.Client.GuiInterface/Properties/AssemblyInfo.cs
@@ -38,4 +38,4 @@
 // [assembly: AssemblyVersion("1.0.*")]
 
 [assembly: AssemblyVersion("3.1.0.0")]
-[assembly: AssemblyFileVersion("3.1.0.0")]
+[assembly: AssemblyFileVersion("3.1.2.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.1.0.0")]
-[assembly: AssemblyFileVersion("3.1.0.0")]
+[assembly: AssemblyVersion("3.1.2.0")]
+[assembly: AssemblyFileVersion("3.1.2.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.1.0.0")]
-[assembly: AssemblyFileVersion("3.1.0.0")]
+[assembly: AssemblyVersion("3.1.2.0")]
+[assembly: AssemblyFileVersion("3.1.2.0")]
diff --git a/nUpdate.UserInterfaceTest/App.config b/nUpdate.UserInterfaceTest/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
     </startup>
 </configuration>
diff --git a/nUpdate/Properties/AssemblyInfo.cs b/nUpdate/Properties/AssemblyInfo.cs
@@ -37,5 +37,5 @@
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("3.1.0.0")]
-[assembly: AssemblyFileVersion("3.1.0.0")]
+[assembly: AssemblyVersion("3.1.2.0")]
+[assembly: AssemblyFileVersion("3.1.2.0")]
diff --git a/nUpdate/Resources/nUpdate UpdateInstaller.exe b/nUpdate/Resources/nUpdate UpdateInstaller.exe
diff --git a/nUpdate/Resources/nUpdate UpdateInstaller.pdb b/nUpdate/Resources/nUpdate UpdateInstaller.pdb
diff --git a/nUpdate/app.config b/nUpdate/app.config
@@ -1,16 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.6.10.0" newVersion="2.6.10.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.6.10.0" newVersion="2.6.10.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
+<configuration />
diff --git a/nUpdate/nUpdate.csproj b/nUpdate/nUpdate.csproj
@@ -65,35 +65,33 @@
   <ItemGroup>
     <Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
-      <Private>True</Private>
+      <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Microsoft.Threading.Tasks.Extensions, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
-      <Private>True</Private>
+      <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop, Version=1.0.168.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
-      <Private>True</Private>
+      <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.IO, Version=2.6.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.IO.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Net" />
     <Reference Include="System.Runtime, Version=2.6.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Runtime.dll</HintPath>
-      <Private>True</Private>
+      <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="System.Threading.Tasks, Version=2.6.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Threading.Tasks.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>

diff --git a/nUpdate/packages.config b/nUpdate/packages.config
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <packages>
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net40" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net40" />
 </packages>