Skip to content

Commit

Permalink
Merge branch 'release/v3.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
Dominic Beger committed Sep 12, 2017
2 parents 3b48230 + 0049d8e commit 00cd403
Show file tree
Hide file tree
Showing 186 changed files with 4,471 additions and 3,058 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -190,3 +190,4 @@ FakesAssemblies/

# Visual Studio 6 workspace options file
*.opt
.vs/
1,030 changes: 0 additions & 1,030 deletions .vs/config/applicationhost.config

This file was deleted.

10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

# nUpdate - .NET Update Solution

[![Release](https://img.shields.io/badge/release-v3.1.8-blue.svg)](https://github.com/ProgTrade/nUpdate/releases)
[![NuGet](https://img.shields.io/badge/nuget%20nUpdate.ProvideTAP-v3.1.8-red.svg)](https://www.nuget.org/packages/nUpdate.ProvideTAP/)
[![NuGet](https://img.shields.io/badge/nuget%20nUpdate.WithoutTAP-v3.1.8-red.svg)](https://www.nuget.org/packages/nUpdate.WithoutTAP/)
[![Release](https://img.shields.io/badge/release-v/pseminardemo/-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/)
[![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)
Expand Down Expand Up @@ -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.8
PM> Install-Package nUpdate.ProvideTAP -Version 3.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.8
PM> Install-Package nUpdate.WithoutTAP -Version 3.2
```

## Web
Expand Down
2 changes: 1 addition & 1 deletion nUpdate.Administration/Core/Application/UpdateProject.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.IO;
using System.Net;
using nUpdate.Administration.Core.History;
using nUpdate.Core;
using nUpdate.Internal.Core;
using Starksoft.Aspen.Ftps;

namespace nUpdate.Administration.Core.Application
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using System.Linq;
using System.Windows.Forms;
using nUpdate.Administration.UI.Popups;
using nUpdate.Core.Operations;
using nUpdate.Internal.Core.Operations;

namespace nUpdate.Administration.Core.Operations.Panels
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using System.Windows.Forms;
using nUpdate.Administration.UI.Controls;
using nUpdate.Administration.UI.Popups;
using nUpdate.Core.Operations;
using nUpdate.Internal.Core.Operations;

namespace nUpdate.Administration.Core.Operations.Panels
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Author: Dominic Beger (Trade/ProgTrade) 2016

using nUpdate.Core.Operations;
using nUpdate.Internal.Core.Operations;

namespace nUpdate.Administration.Core.Operations.Panels
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Drawing;
using System.Windows.Forms;
using nUpdate.Administration.UI.Popups;
using nUpdate.Core.Operations;
using nUpdate.Internal.Core.Operations;

namespace nUpdate.Administration.Core.Operations.Panels
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Drawing;
using System.Windows.Forms;
using nUpdate.Administration.UI.Popups;
using nUpdate.Core.Operations;
using nUpdate.Internal.Core.Operations;

namespace nUpdate.Administration.Core.Operations.Panels
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.ComponentModel;
using System.Linq;
using System.Windows.Forms;
using nUpdate.Core.Operations;
using nUpdate.Internal.Core.Operations;

namespace nUpdate.Administration.Core.Operations.Panels
{
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Linq;
using System.Windows.Forms;
using Microsoft.Win32;
using nUpdate.Core.Operations;
using nUpdate.Internal.Core.Operations;

namespace nUpdate.Administration.Core.Operations.Panels
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.ComponentModel;
using System.Linq;
using System.Windows.Forms;
using nUpdate.Core.Operations;
using nUpdate.Internal.Core.Operations;

namespace nUpdate.Administration.Core.Operations.Panels
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.ComponentModel;
using System.Linq;
using System.Windows.Forms;
using nUpdate.Core.Operations;
using nUpdate.Internal.Core.Operations;

namespace nUpdate.Administration.Core.Operations.Panels
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
using System.Windows.Forms;
using FastColoredTextBoxNS;
using nUpdate.Administration.UI.Popups;
using nUpdate.Core.Operations;
using nUpdate.Internal.Core.Operations;

namespace nUpdate.Administration.Core.Operations.Panels
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Windows.Forms;
using nUpdate.Core.Operations;
using nUpdate.Internal.Core.Operations;

namespace nUpdate.Administration.Core.Operations.Panels
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Author: Dominic Beger (Trade/ProgTrade) 2016

using System.Windows.Forms;
using nUpdate.Core.Operations;
using nUpdate.Internal.Core.Operations;

namespace nUpdate.Administration.Core.Operations.Panels
{
Expand Down
2 changes: 1 addition & 1 deletion nUpdate.Administration/Core/ProjectConfiguration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using nUpdate.Core;
using nUpdate.Internal.Core;

namespace nUpdate.Administration.Core
{
Expand Down
2 changes: 1 addition & 1 deletion nUpdate.Administration/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.8";
public static string VersionString => "nUpdate Administration v3.2.0";

public static string AesKeyPassword => "VZh7mLRPNI";
public static string AesIvPassword => "cOijH2vgwR";
Expand Down
4 changes: 2 additions & 2 deletions nUpdate.Administration/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]

[assembly: AssemblyVersion("3.1.8.0")]
[assembly: AssemblyFileVersion("3.1.8.0")]
[assembly: AssemblyVersion("3.2.0.0")]
[assembly: AssemblyFileVersion("3.2.0.0")]
[assembly: NeutralResourcesLanguage("")]

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions nUpdate.Administration/UI/Dialogs/FeedbackDialog.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nUpdate.Administration/UI/Dialogs/FeedbackDialog.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Net.Mail;
using nUpdate.Administration.Core;
using nUpdate.Administration.UI.Popups;
using nUpdate.Core;
using nUpdate.Internal.Core;

namespace nUpdate.Administration.UI.Dialogs
{
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 12 additions & 10 deletions nUpdate.Administration/UI/Dialogs/InfoDialog.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 00cd403

Please sign in to comment.