Skip to content

Commit fe0d71a

Browse files
author
Dominic Beger
committed
Merge branch 'release/v3.1.2'
2 parents f7cc2b7 + 9806f23 commit fe0d71a

File tree

15 files changed

+45
-69
lines changed

15 files changed

+45
-69
lines changed

‎README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
# nUpdate - .NET Update Solution
44

5-
[![Release](https://img.shields.io/badge/release-v3.1-blue.svg)](https://github.com/ProgTrade/nUpdate/releases)
6-
[![NuGet](https://img.shields.io/badge/nuget%20nUpdate.ProvideTAP-v3.1-red.svg)](https://www.nuget.org/packages/nUpdate.ProvideTAP/)
7-
[![NuGet](https://img.shields.io/badge/nuget%20nUpdate.WithoutTAP-v3.1-red.svg)](https://www.nuget.org/packages/nUpdate.WithoutTAP/)
5+
[![Release](https://img.shields.io/badge/release-v3.1.2-blue.svg)](https://github.com/ProgTrade/nUpdate/releases)
6+
[![NuGet](https://img.shields.io/badge/nuget%20nUpdate.ProvideTAP-v3.1.2-red.svg)](https://www.nuget.org/packages/nUpdate.ProvideTAP/)
7+
[![NuGet](https://img.shields.io/badge/nuget%20nUpdate.WithoutTAP-v3.1.2-red.svg)](https://www.nuget.org/packages/nUpdate.WithoutTAP/)
88
[![Issues](https://img.shields.io/github/issues/ProgTrade/nUpdate.svg)](https://github.com/ProgTrade/nUpdate/issues)
99
[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/ProgTrade/nUpdate/master/LICENSE)
1010
[![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]
3939
If you want to use nUpdate with the Taskbased Asynchronous Pattern including `async` and `await`, then install this package:
4040

4141
```
42-
PM> Install-Package nUpdate.ProvideTAP -Version 3.1.0
42+
PM> Install-Package nUpdate.ProvideTAP -Version 3.1.2
4343
```
4444

4545
Otherwise, if you want to use the Eventbased Asynchronous Pattern only, make sure to install this package:
4646

4747
```
48-
PM> Install-Package nUpdate.WithoutTAP -Version 3.1.0
48+
PM> Install-Package nUpdate.WithoutTAP -Version 3.1.2
4949
```
5050

5151
## Web

‎nUpdate.Administration/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public static class Program
5454
/// <summary>
5555
/// The version string shown in all dialog titles.
5656
/// </summary>
57-
public static string VersionString => "nUpdate Administration v3.1";
57+
public static string VersionString => "nUpdate Administration v3.1.2";
5858

5959
public static string AesKeyPassword => "VZh7mLRPNI";
6060
public static string AesIvPassword => "cOijH2vgwR";

‎nUpdate.Administration/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@
3838
// übernehmen, indem Sie "*" eingeben:
3939
// [assembly: AssemblyVersion("1.0.*")]
4040

41-
[assembly: AssemblyVersion("3.1.0.0")]
42-
[assembly: AssemblyFileVersion("3.1.0.0")]
41+
[assembly: AssemblyVersion("3.1.2.0")]
42+
[assembly: AssemblyFileVersion("3.1.2.0")]
4343
[assembly: NeutralResourcesLanguage("")]

‎nUpdate.Administration/UI/Dialogs/InfoDialog.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎nUpdate.Administration/UI/Dialogs/ProjectDialog.cs

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,7 @@ public void Reset()
306306

307307
private bool InitializeProjectData()
308308
{
309+
_allowCancel = false;
309310
try
310311
{
311312
Invoke(new Action(() =>
@@ -357,12 +358,17 @@ private bool InitializeProjectData()
357358
PopupButtons.Ok)));
358359
return false;
359360
}
361+
finally
362+
{
363+
_allowCancel = true;
364+
}
360365

361366
return true;
362367
}
363368

364369
private void InitializePackageItems()
365370
{
371+
_allowCancel = false;
366372
Invoke(new Action(() =>
367373
{
368374
if (packagesList.Items.Count > 0)
@@ -428,6 +434,8 @@ private void InitializePackageItems()
428434
PopupButtons.Ok)));
429435
}
430436
}
437+
438+
_allowCancel = true;
431439
}
432440

433441
private async void ProjectDialog_Load(object sender, EventArgs e)
@@ -508,11 +516,10 @@ private void ProjectDialog_FormClosing(object sender, FormClosingEventArgs e)
508516

509517
private async Task InitializeAsync()
510518
{
519+
_allowCancel = false;
511520
await BeginUpdateConfigurationCheck();
512521
if (Project.UseStatistics)
513-
{
514522
await InitializeStatisticsData();
515-
}
516523
else
517524
{
518525
foreach (
@@ -526,6 +533,7 @@ from Control c in statisticsTabPage.Controls where c.GetType() != typeof (Panel)
526533
noStatisticsLabel.Visible = true;
527534
_isSetByUser = true;
528535
}
536+
_allowCancel = true;
529537
}
530538

531539
private Task InitializeStatisticsData()
@@ -1038,11 +1046,9 @@ private void BrowseAssemblyButtonClicked(object sender, EventArgs e)
10381046
}
10391047
}
10401048

1041-
private void updateStatisticsButton_Click(object sender, EventArgs e)
1049+
private async void updateStatisticsButton_Click(object sender, EventArgs e)
10421050
{
1043-
#pragma warning disable 4014
1044-
InitializeStatisticsData();
1045-
#pragma warning restore 4014
1051+
await InitializeStatisticsData();
10461052
}
10471053

10481054
private void loadFromAssemblyRadioButton_CheckedChanged(object sender, EventArgs e)
@@ -1416,14 +1422,12 @@ private async Task BeginUpdateConfigurationCheck()
14161422
await Task.Factory.StartNew(() => CheckUpdateConfigurationStatus(_configurationFileUrl));
14171423
}
14181424

1419-
private void checkUpdateConfigurationLinkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
1425+
private async void checkUpdateConfigurationLinkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
14201426
{
1421-
#pragma warning disable 4014
1422-
BeginUpdateConfigurationCheck();
1423-
#pragma warning restore 4014
1427+
await BeginUpdateConfigurationCheck();
14241428
}
14251429

1426-
private void CheckUpdateConfigurationStatus(Uri configFileUri)
1430+
private async void CheckUpdateConfigurationStatus(Uri configFileUri)
14271431
{
14281432
if (!ConnectionChecker.IsConnectionAvailable())
14291433
{
@@ -1555,12 +1559,6 @@ var directoryInfo in
15551559
}
15561560
}
15571561
}
1558-
Invoke(
1559-
new Action(
1560-
() =>
1561-
checkUpdateConfigurationLinkLabel.Enabled = true));
1562-
SetUiState(true);
1563-
15641562

15651563
try
15661564
{
@@ -1692,9 +1690,7 @@ var directoryInfo in
16921690
}
16931691

16941692
_hasFinishedCheck = true;
1695-
#pragma warning disable 4014
1696-
BeginUpdateConfigurationCheck();
1697-
#pragma warning restore 4014
1693+
await BeginUpdateConfigurationCheck();
16981694
}
16991695
}
17001696

@@ -1721,9 +1717,9 @@ private void deleteButton_Click(object sender, EventArgs e)
17211717
/// <summary>
17221718
/// Initializes a new thread for deleting the package.
17231719
/// </summary>
1724-
private async void DeletePackage()
1720+
private Task DeletePackage()
17251721
{
1726-
await Task.Factory.StartNew(() =>
1722+
return Task.Factory.StartNew(async () =>
17271723
{
17281724
IEnumerator enumerator = null;
17291725
Invoke(
@@ -2019,11 +2015,7 @@ await Task.Factory.StartNew(() =>
20192015

20202016
SetUiState(true);
20212017
if (Project.UseStatistics)
2022-
{
2023-
#pragma warning disable 4014
2024-
InitializeStatisticsData();
2025-
#pragma warning restore 4014
2026-
}
2018+
await InitializeStatisticsData();
20272019
InitializePackageItems();
20282020
InitializeProjectData();
20292021
});

‎nUpdate.Client.GuiInterface/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@
3838
// [assembly: AssemblyVersion("1.0.*")]
3939

4040
[assembly: AssemblyVersion("3.1.0.0")]
41-
[assembly: AssemblyFileVersion("3.1.0.0")]
41+
[assembly: AssemblyFileVersion("3.1.2.0")]

‎nUpdate.Test/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@
3737
// durch Einsatz von '*', wie in nachfolgendem Beispiel:
3838
// [Assembly: AssemblyVersion("1.0.*")]
3939

40-
[assembly: AssemblyVersion("3.1.0.0")]
41-
[assembly: AssemblyFileVersion("3.1.0.0")]
40+
[assembly: AssemblyVersion("3.1.2.0")]
41+
[assembly: AssemblyFileVersion("3.1.2.0")]

‎nUpdate.UpdateInstaller/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@
3737
// übernehmen, indem Sie "*" eingeben:
3838
// [assembly: AssemblyVersion("1.0.*")]
3939

40-
[assembly: AssemblyVersion("3.1.0.0")]
41-
[assembly: AssemblyFileVersion("3.1.0.0")]
40+
[assembly: AssemblyVersion("3.1.2.0")]
41+
[assembly: AssemblyFileVersion("3.1.2.0")]

‎nUpdate.UserInterfaceTest/App.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
55
</startup>
66
</configuration>

‎nUpdate/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@
3737
// übernehmen, indem Sie "*" eingeben:
3838
// [assembly: AssemblyVersion("1.0.*")]
3939

40-
[assembly: AssemblyVersion("3.1.0.0")]
41-
[assembly: AssemblyFileVersion("3.1.0.0")]
40+
[assembly: AssemblyVersion("3.1.2.0")]
41+
[assembly: AssemblyFileVersion("3.1.2.0")]

‎nUpdate/Resources/nUpdate UpdateInstaller.exe

0 Bytes
Binary file not shown.

‎nUpdate/Resources/nUpdate UpdateInstaller.pdb

0 Bytes
Binary file not shown.

‎nUpdate/app.config

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
11
<?xml version="1.0" encoding="utf-8"?>
22

3-
<configuration>
4-
<runtime>
5-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
6-
<dependentAssembly>
7-
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
8-
<bindingRedirect oldVersion="0.0.0.0-2.6.10.0" newVersion="2.6.10.0" />
9-
</dependentAssembly>
10-
<dependentAssembly>
11-
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
12-
<bindingRedirect oldVersion="0.0.0.0-2.6.10.0" newVersion="2.6.10.0" />
13-
</dependentAssembly>
14-
</assemblyBinding>
15-
</runtime>
16-
</configuration>
3+
<configuration />

‎nUpdate/nUpdate.csproj

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,35 +65,33 @@
6565
<ItemGroup>
6666
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
6767
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
68-
<Private>True</Private>
68+
<SpecificVersion>False</SpecificVersion>
6969
</Reference>
7070
<Reference Include="Microsoft.Threading.Tasks.Extensions, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
7171
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
72-
<Private>True</Private>
72+
<SpecificVersion>False</SpecificVersion>
7373
</Reference>
7474
<Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop, Version=1.0.168.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
7575
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
76-
<Private>True</Private>
76+
<SpecificVersion>False</SpecificVersion>
7777
</Reference>
78-
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
78+
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
7979
<SpecificVersion>False</SpecificVersion>
80-
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
80+
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
8181
<Private>True</Private>
8282
</Reference>
8383
<Reference Include="System" />
8484
<Reference Include="System.Drawing" />
8585
<Reference Include="System.IO, Version=2.6.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
8686
<HintPath>..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.IO.dll</HintPath>
87-
<Private>True</Private>
8887
</Reference>
8988
<Reference Include="System.Net" />
9089
<Reference Include="System.Runtime, Version=2.6.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
9190
<HintPath>..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Runtime.dll</HintPath>
92-
<Private>True</Private>
91+
<SpecificVersion>False</SpecificVersion>
9392
</Reference>
9493
<Reference Include="System.Threading.Tasks, Version=2.6.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
9594
<HintPath>..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Threading.Tasks.dll</HintPath>
96-
<Private>True</Private>
9795
</Reference>
9896
<Reference Include="System.Windows.Forms" />
9997
</ItemGroup>

‎nUpdate/packages.config

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
32
<packages>
43
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net40" />
54
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40" />
65
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net40" />
7-
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net40" />
6+
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net40" />
87
</packages>

0 commit comments

Comments
 (0)