From fe81bb169c704b763adc90e2e409d938d98d17f2 Mon Sep 17 00:00:00 2001 From: Tomek Melissa Date: Tue, 18 Sep 2018 15:27:35 +0200 Subject: [PATCH] Upgrade of Polly and PortableSettingsProvider --- Common/Common.csproj | 4 +- Common/packages.config | 2 +- Job.Download/Job.Download.csproj | 4 +- Job.Download/packages.config | 2 +- .../Job.ExecutionMonitor.csproj | 4 +- Job.ExecutionMonitor/packages.config | 2 +- Job.Export/Job.Export.csproj | 4 +- Job.Export/packages.config | 2 +- Job.Import/Job.Import.csproj | 4 +- Job.Import/packages.config | 2 +- .../Job.ProcessingMonitor.csproj | 4 +- Job.ProcessingMonitor/packages.config | 2 +- Job.Upload/Job.Upload.csproj | 4 +- Job.Upload/packages.config | 2 +- Scheduler/Scheduler.csproj | 8 +- Scheduler/packages.config | 4 +- Setup/README.md | 2 +- Setup/Recurring Integrations Scheduler.iss | 97 ++++++++++ Third Party Notices.txt | 175 +++++++++++++++++- Version.cs | 2 +- 20 files changed, 299 insertions(+), 31 deletions(-) diff --git a/Common/Common.csproj b/Common/Common.csproj index e36e0fd..3484acf 100644 --- a/Common/Common.csproj +++ b/Common/Common.csproj @@ -43,8 +43,8 @@ ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - - ..\packages\Polly.5.8.0\lib\net45\Polly.dll + + ..\packages\Polly.6.1.0\lib\netstandard2.0\Polly.dll ..\packages\Quartz.3.0.6\lib\net452\Quartz.dll diff --git a/Common/packages.config b/Common/packages.config index 8fd880c..3d86585 100644 --- a/Common/packages.config +++ b/Common/packages.config @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/Job.Download/Job.Download.csproj b/Job.Download/Job.Download.csproj index c155d1c..c9fe39d 100644 --- a/Job.Download/Job.Download.csproj +++ b/Job.Download/Job.Download.csproj @@ -42,8 +42,8 @@ ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - - ..\packages\Polly.5.8.0\lib\net45\Polly.dll + + ..\packages\Polly.6.1.0\lib\netstandard2.0\Polly.dll ..\packages\Quartz.3.0.6\lib\net452\Quartz.dll diff --git a/Job.Download/packages.config b/Job.Download/packages.config index b1ea373..71b714f 100644 --- a/Job.Download/packages.config +++ b/Job.Download/packages.config @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/Job.ExecutionMonitor/Job.ExecutionMonitor.csproj b/Job.ExecutionMonitor/Job.ExecutionMonitor.csproj index 1a82744..2575238 100644 --- a/Job.ExecutionMonitor/Job.ExecutionMonitor.csproj +++ b/Job.ExecutionMonitor/Job.ExecutionMonitor.csproj @@ -39,8 +39,8 @@ ..\packages\log4net.2.0.8\lib\net45-full\log4net.dll - - ..\packages\Polly.5.8.0\lib\net45\Polly.dll + + ..\packages\Polly.6.1.0\lib\netstandard2.0\Polly.dll ..\packages\Quartz.3.0.6\lib\net452\Quartz.dll diff --git a/Job.ExecutionMonitor/packages.config b/Job.ExecutionMonitor/packages.config index 202e8ab..a47c457 100644 --- a/Job.ExecutionMonitor/packages.config +++ b/Job.ExecutionMonitor/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/Job.Export/Job.Export.csproj b/Job.Export/Job.Export.csproj index 69cc6b9..5927ec6 100644 --- a/Job.Export/Job.Export.csproj +++ b/Job.Export/Job.Export.csproj @@ -39,8 +39,8 @@ ..\packages\log4net.2.0.8\lib\net45-full\log4net.dll - - ..\packages\Polly.5.8.0\lib\net45\Polly.dll + + ..\packages\Polly.6.1.0\lib\netstandard2.0\Polly.dll ..\packages\Quartz.3.0.6\lib\net452\Quartz.dll diff --git a/Job.Export/packages.config b/Job.Export/packages.config index 202e8ab..a47c457 100644 --- a/Job.Export/packages.config +++ b/Job.Export/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/Job.Import/Job.Import.csproj b/Job.Import/Job.Import.csproj index 5077096..83b540b 100644 --- a/Job.Import/Job.Import.csproj +++ b/Job.Import/Job.Import.csproj @@ -42,8 +42,8 @@ ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - - ..\packages\Polly.5.8.0\lib\net45\Polly.dll + + ..\packages\Polly.6.1.0\lib\netstandard2.0\Polly.dll ..\packages\Quartz.3.0.6\lib\net452\Quartz.dll diff --git a/Job.Import/packages.config b/Job.Import/packages.config index b1ea373..71b714f 100644 --- a/Job.Import/packages.config +++ b/Job.Import/packages.config @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/Job.ProcessingMonitor/Job.ProcessingMonitor.csproj b/Job.ProcessingMonitor/Job.ProcessingMonitor.csproj index 1b5c2e9..bb39347 100644 --- a/Job.ProcessingMonitor/Job.ProcessingMonitor.csproj +++ b/Job.ProcessingMonitor/Job.ProcessingMonitor.csproj @@ -42,8 +42,8 @@ ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - - ..\packages\Polly.5.8.0\lib\net45\Polly.dll + + ..\packages\Polly.6.1.0\lib\netstandard2.0\Polly.dll ..\packages\Quartz.3.0.6\lib\net452\Quartz.dll diff --git a/Job.ProcessingMonitor/packages.config b/Job.ProcessingMonitor/packages.config index b1ea373..71b714f 100644 --- a/Job.ProcessingMonitor/packages.config +++ b/Job.ProcessingMonitor/packages.config @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/Job.Upload/Job.Upload.csproj b/Job.Upload/Job.Upload.csproj index 4560744..73aabef 100644 --- a/Job.Upload/Job.Upload.csproj +++ b/Job.Upload/Job.Upload.csproj @@ -39,8 +39,8 @@ ..\packages\log4net.2.0.8\lib\net45-full\log4net.dll - - ..\packages\Polly.5.8.0\lib\net45\Polly.dll + + ..\packages\Polly.6.1.0\lib\netstandard2.0\Polly.dll ..\packages\Quartz.3.0.6\lib\net452\Quartz.dll diff --git a/Job.Upload/packages.config b/Job.Upload/packages.config index 202e8ab..a47c457 100644 --- a/Job.Upload/packages.config +++ b/Job.Upload/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/Scheduler/Scheduler.csproj b/Scheduler/Scheduler.csproj index 2c0a6e7..096570f 100644 --- a/Scheduler/Scheduler.csproj +++ b/Scheduler/Scheduler.csproj @@ -66,11 +66,11 @@ ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - - ..\packages\Polly.5.8.0\lib\net45\Polly.dll + + ..\packages\Polly.6.1.0\lib\netstandard2.0\Polly.dll - - ..\packages\PortableSettingsProvider.0.1.0\lib\net45\PortableSettingsProvider.dll + + ..\packages\PortableSettingsProvider.0.1.1\lib\net45\PortableSettingsProvider.dll ..\packages\Quartz.3.0.6\lib\net452\Quartz.dll diff --git a/Scheduler/packages.config b/Scheduler/packages.config index 1ed3c91..438d5be 100644 --- a/Scheduler/packages.config +++ b/Scheduler/packages.config @@ -2,7 +2,7 @@ - - + + \ No newline at end of file diff --git a/Setup/README.md b/Setup/README.md index 6a601df..24a8120 100644 --- a/Setup/README.md +++ b/Setup/README.md @@ -8,7 +8,7 @@ Please download the following Quartz.NET server binaries and copy those files to * Quartz.Serialization.Json.dll * Topshelf.dll -This version of Recurring Integrations Scheduler requires Quartz.NET 3.0.4 +This version of Recurring Integrations Scheduler requires Quartz.NET 3.0.6 Download zip archive from https://github.com/quartznet/quartznet/releases diff --git a/Setup/Recurring Integrations Scheduler.iss b/Setup/Recurring Integrations Scheduler.iss index 10d8627..27d05d9 100644 --- a/Setup/Recurring Integrations Scheduler.iss +++ b/Setup/Recurring Integrations Scheduler.iss @@ -58,6 +58,103 @@ Source: "..\Output\Release\Newtonsoft.Json.dll"; DestDir: "{app}"; Flags: ignore Source: "..\Output\Release\System.Linq.Dynamic.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler Source: "..\Output\Release\Polly.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler Source: "..\Output\Release\PortableSettingsProvider.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\Microsoft.Win32.Primitives.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\netstandard.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.AppContext.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Collections.Concurrent.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Collections.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Collections.NonGeneric.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Collections.Specialized.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.ComponentModel.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.ComponentModel.EventBasedAsync.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.ComponentModel.Primitives.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.ComponentModel.TypeConverter.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Console.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Data.Common.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Diagnostics.Contracts.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Diagnostics.Debug.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Diagnostics.FileVersionInfo.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Diagnostics.Process.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Diagnostics.StackTrace.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Diagnostics.TextWriterTraceListener.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Diagnostics.Tools.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Diagnostics.TraceSource.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Diagnostics.Tracing.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Drawing.Primitives.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Dynamic.Runtime.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Globalization.Calendars.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Globalization.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Globalization.Extensions.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.IO.Compression.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.IO.Compression.ZipFile.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.IO.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.IO.FileSystem.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.IO.FileSystem.DriveInfo.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.IO.FileSystem.Primitives.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.IO.FileSystem.Watcher.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.IO.IsolatedStorage.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.IO.MemoryMappedFiles.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.IO.Pipes.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.IO.UnmanagedMemoryStream.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Linq.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Linq.Expressions.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Linq.Parallel.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Linq.Queryable.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Net.Http.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Net.NameResolution.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Net.NetworkInformation.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Net.Ping.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Net.Primitives.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Net.Requests.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Net.Security.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Net.Sockets.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Net.WebHeaderCollection.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Net.WebSockets.Client.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Net.WebSockets.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.ObjectModel.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Reflection.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Reflection.Extensions.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Reflection.Primitives.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Resources.Reader.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Resources.ResourceManager.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Resources.Writer.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Runtime.CompilerServices.VisualC.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Runtime.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Runtime.Extensions.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Runtime.Handles.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Runtime.InteropServices.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Runtime.InteropServices.RuntimeInformation.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Runtime.Numerics.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Runtime.Serialization.Formatters.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Runtime.Serialization.Json.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Runtime.Serialization.Primitives.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Runtime.Serialization.Xml.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Security.Claims.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Security.Cryptography.Algorithms.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Security.Cryptography.Csp.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Security.Cryptography.Encoding.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Security.Cryptography.Primitives.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Security.Cryptography.X509Certificates.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Security.Principal.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Security.SecureString.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Text.Encoding.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Text.Encoding.Extensions.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Text.RegularExpressions.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Threading.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Threading.Overlapped.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Threading.Tasks.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Threading.Tasks.Parallel.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Threading.Thread.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Threading.ThreadPool.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Threading.Timer.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.ValueTuple.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Xml.ReaderWriter.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Xml.XDocument.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Xml.XmlDocument.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Xml.XmlSerializer.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Xml.XPath.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler +Source: "..\Output\Release\System.Xml.XPath.XDocument.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: App Scheduler + ; App Source: "..\Output\Release\RecurringIntegrationsScheduler.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: App Source: "..\Output\Release\RecurringIntegrationsScheduler.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: App diff --git a/Third Party Notices.txt b/Third Party Notices.txt index da166a5..a23637a 100644 --- a/Third Party Notices.txt +++ b/Third Party Notices.txt @@ -122,7 +122,7 @@ purpose and non-infringement. -------------------------------- END OF LICENSE -------------------------------- ------------------------------- START OF LICENSE ------------------------------- -Polly, ver. / 5.8.0 / https://www.nuget.org/packages/Polly/5.8.0 +Polly, ver. / 6.1.0 / https://www.nuget.org/packages/Polly/5.8.0 Copyright (c) 2015-2018, App vNext, All rights reserved. PROVIDED FOR INFORMATIONAL PURPOSE ONLY @@ -322,4 +322,175 @@ se peut que la limitation ou l EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous pourriez avoir d’autres droits prévus par les lois de votre pays. Le présent contrat ne modifie pas les droits que vous conferent les lois de votre pays si -celles-ci ne le permettent pas. \ No newline at end of file +celles-ci ne le permettent pas. +-------------------------------- END OF LICENSE -------------------------------- + +------------------------------- START OF LICENSE ------------------------------- +PortableSettingsProvider, ver. / 1.1.0 / https://www.codeproject.com/Articles/1238550/Making-Application-Settings-Portable +Preamble +This License governs Your use of the Work. This License is intended to allow +developers to use the Source Code and Executable Files provided as part of +the Work in any application in any form. +The main points subject to the terms of the License are: +* Source Code and Executable Files can be used in commercial applications; +* Source Code and Executable Files can be redistributed; and +* Source Code can be modified to create derivative works. +* No claim of suitability, guarantee, or any warranty whatsoever is provided. + The software is provided "as-is". +* The Article(s) accompanying the Work may not be distributed or republished + without the Author's consent +This License is entered between You, the individual or other entity reading +or otherwise making use of the Work licensed pursuant to this License and +the individual or other entity which offers the Work under the terms of +this License ("Author"). + +License + +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CODE PROJECT +OPEN LICENSE ("LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER +APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE +OR COPYRIGHT LAW IS PROHIBITED. +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HEREIN, YOU ACCEPT AND AGREE +TO BE BOUND BY THE TERMS OF THIS LICENSE. THE AUTHOR GRANTS YOU THE RIGHTS +CONTAINED HEREIN IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. +IF YOU DO NOT AGREE TO ACCEPT AND BE BOUND BY THE TERMS OF THIS LICENSE, +YOU CANNOT MAKE ANY USE OF THE WORK. + +1)Definitions. + + a)"Articles" means, collectively, all articles written by Author which describes + how the Source Code and Executable Files for the Work may be used by a user. + b)"Author" means the individual or entity that offers the Work under the terms of + this License. + c)"Derivative Work" means a work based upon the Work or upon the Work and other + pre-existing works. + d)"Executable Files" refer to the executables, binary files, configuration and + any required data files included in the Work. + e)"Publisher" means the provider of the website, magazine, CD-ROM, DVD or other + medium from or by which the Work is obtained by You. + f)"Source Code" refers to the collection of source code and configuration files + used to create the Executable Files. + g)"Standard Version" refers to such a Work if it has not been modified, or has been + modified in accordance with the consent of the Author, such consent being in the + full discretion of the Author. + h)"Work" refers to the collection of files distributed by the Publisher, including + the Source Code, Executable Files, binaries, data files, documentation, whitepapers + and the Articles. + i)"You" is you, an individual or entity wishing to use the Work and exercise your + rights under this License. +2)Fair Use/Fair Use Rights. Nothing in this License is intended to reduce, limit, + or restrict any rights arising from fair use, fair dealing, first sale or other + limitations on the exclusive rights of the copyright owner under copyright law or + other applicable laws. +3)License Grant. Subject to the terms and conditions of this License, the Author hereby + grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration + of the applicable copyright) license to exercise the rights in the Work as stated + below: + a)You may use the standard version of the Source Code or Executable Files in Your + own applications. + b)You may apply bug fixes, portability fixes and other modifications obtained + from the Public Domain or from the Author. A Work modified in such a way shall + still be considered the standard version and will be subject to this License. + c)You may otherwise modify Your copy of this Work (excluding the Articles) in any + way to create a Derivative Work, provided that You insert a prominent notice in + each changed file stating how, when and where You changed that file. + d)You may distribute the standard version of the Executable Files and Source Code + or Derivative Work in aggregate with other (possibly commercial) programs as part + of a larger (possibly commercial) software distribution. + e)The Articles discussing the Work published in any form by the author may not + be distributed or republished without the Author's consent. The author retains + copyright to any such Articles. You may use the Executable Files and Source Code + pursuant to this License but you may not repost or republish or otherwise distribute + or make available the Articles, without the prior written consent of the Author. + Any subroutines or modules supplied by You and linked into the Source Code or + Executable Files of this Work shall not be considered part of this Work and will + not be subject to the terms of this License. +4)Patent License. Subject to the terms and conditions of this License, each Author + hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, + irrevocable (except as stated in this section) patent license to make, have made, use, + import, and otherwise transfer the Work. +5)Restrictions. The license granted in Section 3 above is expressly made subject to + and limited by the following restrictions: + a)You agree not to remove any of the original copyright, patent, trademark, and + attribution notices and associated disclaimers that may appear in the Source Code or + Executable Files. + b)You agree not to advertise or in any way imply that this Work is a product of Your own. + c)The name of the Author may not be used to endorse or promote products derived + from the Work without the prior written consent of the Author. + d)You agree not to sell, lease, or rent any part of the Work. This does not restrict + you from including the Work or any part of the Work inside a larger software + distribution that itself is being sold. The Work by itself, though, cannot be sold, + leased or rented. + e)You may distribute the Executable Files and Source Code only under the terms of + this License, and You must include a copy of, or the Uniform Resource Identifier for, + this License with every copy of the Executable Files or Source Code You distribute + and ensure that anyone receiving such Executable Files and Source Code agrees that + the terms of this License apply to such Executable Files and/or Source Code. + You may not offer or impose any terms on the Work that alter or restrict the terms of + this License or the recipients' exercise of the rights granted hereunder. + You may not sublicense the Work. You must keep intact all notices that refer to this + License and to the disclaimer of warranties. You may not distribute the Executable + Files or Source Code with any technological measures that control access or use of + the Work in a manner inconsistent with the terms of this License. + f)You agree not to use the Work for illegal, immoral or improper purposes, or on + pages containing illegal, immoral or improper material. The Work is subject to + applicable export laws. You agree to comply with all such laws and regulations that + may apply to the Work after Your receipt of the Work. +6)Representations, Warranties and Disclaimer. THIS WORK IS PROVIDED "AS IS", "WHERE IS" + AND "AS AVAILABLE", WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES OR CONDITIONS OR GUARANTEES. + YOU, THE USER, ASSUME ALL RISK IN ITS USE, INCLUDING COPYRIGHT INFRINGEMENT, + PATENT INFRINGEMENT, SUITABILITY, ETC. AUTHOR EXPRESSLY DISCLAIMS ALL EXPRESS, + IMPLIED OR STATUTORY WARRANTIES OR CONDITIONS, INCLUDING WITHOUT LIMITATION, + WARRANTIES OR CONDITIONS OF MERCHANTABILITY, MERCHANTABLE QUALITY OR FITNESS + FOR A PARTICULAR PURPOSE, OR ANY WARRANTY OF TITLE OR NON-INFRINGEMENT, OR THAT + THE WORK (OR ANY PORTION THEREOF) IS CORRECT, USEFUL, BUG-FREE OR FREE OF VIRUSES. + YOU MUST PASS THIS DISCLAIMER ON WHENEVER YOU DISTRIBUTE THE WORK OR DERIVATIVE WORKS. +7)Indemnity. You agree to defend, indemnify and hold harmless the Author and the + Publisher from and against any claims, suits, losses, damages, liabilities, costs, and + expenses (including reasonable legal or attorneys’ fees) resulting from or relating to + any use of the Work by You. +8)Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO + EVENT WILL THE AUTHOR OR THE PUBLISHER BE LIABLE TO YOU ON ANY LEGAL THEORY FOR + ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF + THIS LICENSE OR THE USE OF THE WORK OR OTHERWISE, EVEN IF THE AUTHOR OR THE PUBLISHER + HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. +9)Termination. + a)This License and the rights granted hereunder will terminate automatically upon any + breach by You of any term of this License. Individuals or entities who have received + Derivative Works from You under this License, however, will not have their licenses + terminated provided such individuals or entities remain in full compliance with those + licenses. Sections 1, 2, 6, 7, 8, 9, 10 and 11 will survive any termination of this License. + b)If You bring a copyright, trademark, patent or any other infringement claim against + any contributor over infringements You claim are made by the Work, your License from + such contributor to the Work ends automatically. + c)Subject to the above terms and conditions, this License is perpetual (for the duration + of the applicable copyright in the Work). Notwithstanding the above, the Author reserves + the right to release the Work under different license terms or to stop distributing + the Work at any time; provided, however that any such election will not serve to withdraw + this License (or any other license that has been, or is required to be, granted under + the terms of this License), and this License will continue in full force and effect + unless terminated as stated above. +10)Publisher. The parties hereby confirm that the Publisher shall not, under any + circumstances, be responsible for and shall not have any liability in respect of the + subject matter of this License. The Publisher makes no warranty whatsoever in connection + with the Work and shall not be liable to You or any party on any legal theory for any + damages whatsoever, including without limitation any general, special, incidental or + consequential damages arising in connection to this license. The Publisher reserves + the right to cease making the Work available to You at any time without notice +11)Miscellaneous + a)This License shall be governed by the laws of the location of the head office of + the Author or if the Author is an individual, the laws of location of the principal + place of residence of the Author. + b)If any provision of this License is invalid or unenforceable under applicable law, + it shall not affect the validity or enforceability of the remainder of the terms of + this License, and without further action by the parties to this License, such + provision shall be reformed to the minimum extent necessary to make such provision + valid and enforceable. + c)No term or provision of this License shall be deemed waived and no breach consented + to unless such waiver or consent shall be in writing and signed by the party to be + charged with such waiver or consent. + d)This License constitutes the entire agreement between the parties with respect to + the Work licensed herein. There are no understandings, agreements or representations + with respect to the Work not specified herein. The Author shall not be bound by any + additional provisions that may appear in any communication from You. This License may + not be modified without the mutual written agreement of the Author and You. \ No newline at end of file diff --git a/Version.cs b/Version.cs index 3e66c5a..b7608ad 100644 --- a/Version.cs +++ b/Version.cs @@ -2,4 +2,4 @@ Licensed under the MIT License. */ using System.Reflection; -[assembly: AssemblyVersion("2.4.0.0")] \ No newline at end of file +[assembly: AssemblyVersion("2.5.0.0")] \ No newline at end of file