diff --git a/Documents/Help/Changelog.md b/Documents/Help/Changelog.md
index d76595a30..f13794956 100644
--- a/Documents/Help/Changelog.md
+++ b/Documents/Help/Changelog.md
@@ -4,6 +4,11 @@
=======
+## 2023-01-05 - Build 2301 - January 2023
+* Resolved [#382](https://github.com/Krypton-Suite/Extended-Toolkit/issues/382), Update / Remove use of `NewtonSoft`
+
+=======
+
## 2022-11-08 - Build 2211 - November 2022
* Implemented [#311](https://github.com/Krypton-Suite/Extended-Toolkit/issues/331), One Krypton Extended Toolkit NuGet package to rule them all
* New `KryptonDialogButtonExtended` control. Uses the strings configured in `KryptonManager` to create dialog buttons
diff --git a/LICENSE b/LICENSE
index 2cd3d01bd..cfc13a72a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
BSD 3-Clause License
-Copyright (c) 2020 - 2022, Krypton Suite
+Copyright (c) 2020 - 2023, Krypton Suite
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/Source/Krypton Toolkit/Directory.Build.props b/Source/Krypton Toolkit/Directory.Build.props
index c0ec52148..bdc2c0a11 100644
--- a/Source/Krypton Toolkit/Directory.Build.props
+++ b/Source/Krypton Toolkit/Directory.Build.props
@@ -6,7 +6,7 @@
true
en
Peter Wagner (A.K.A Wagnerp) and Simon Coghlan (A.K.A Smurf-IV), et al.
- © Component Factory Pty Ltd, 2006 - 2016. Then modifications by Peter Wagner (aka Wagnerp) and Simon Coghlan (aka Smurf-IV) 2017 - 2022. All rights reserved.
+ © Component Factory Pty Ltd, 2006 - 2016. Then modifications by Peter Wagner (aka Wagnerp) and Simon Coghlan (aka Smurf-IV) 2017 - 2023. All rights reserved.
diff --git a/Source/Krypton Toolkit/Directory.Build.targets b/Source/Krypton Toolkit/Directory.Build.targets
index 467f6e3ea..2d535eb3c 100644
--- a/Source/Krypton Toolkit/Directory.Build.targets
+++ b/Source/Krypton Toolkit/Directory.Build.targets
@@ -8,7 +8,7 @@
@@ -98,7 +98,7 @@
@@ -125,7 +125,7 @@
$([System.DateTime]::Now.get_DayOfYear().ToString())
@@ -152,7 +152,7 @@
@@ -178,7 +178,7 @@
true
en
Peter Wagner (A.K.A Wagnerp) and Simon Coghlan (A.K.A Smurf-IV), Phil Wright (A.K.A ComponentFactory)
- © Krypton Suite (Peter Wagner (Wagnerp) and Simon Coghlan (Smurf-IV)), 2017 - 2022. Component Factory Pty Ltd (Phil Wright), 2006 - 2016. All rights reserved.
+ © Krypton Suite (Peter Wagner (Wagnerp) and Simon Coghlan (Smurf-IV)), 2017 - 2023. Component Factory Pty Ltd (Phil Wright), 2006 - 2016. All rights reserved.
@@ -222,9 +222,9 @@
$(PackageId).Lite
- An extension to the Standard Toolkit, which supports .NET Framework 4.8 & 4.8.1, .NET Core 3.1 and .NET 5 - 7. $(Description)
+ An extension to the Standard Toolkit, which supports .NET Framework 4.8 and 4.8.1, .NET Core 3.1 and .NET 5 - 7. $(Description)
- This package supports all .NET Framework versions starting .NET Framework 4.8 & 4.8.1, .NET Core 3.1 and .NET 5 - 7.
+ This package supports all .NET Framework versions starting .NET Framework 4.8 and 4.8.1, .NET Core 3.1 and .NET 5 - 7.
Also, all libraries are included targeting each specific framework version for performance purposes.
To view all of the standard toolkit package latest version information, please visit: https://github.com/Krypton-Suite/Krypton-Toolkit-Suite-Version-Dashboard/blob/main/Documents/Modules/Standard/Krypton-Toolkit-Suite-Standard-Modules.md
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Buttons/Controls Toolkit/General/KryptonBrowseButton.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Buttons/Controls Toolkit/General/KryptonBrowseButton.cs
index ef7340a10..bcbcdb97b 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Buttons/Controls Toolkit/General/KryptonBrowseButton.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Buttons/Controls Toolkit/General/KryptonBrowseButton.cs
@@ -6,6 +6,9 @@
*/
#endregion
+using OpenFileDialog = System.Windows.Forms.OpenFileDialog;
+using SaveFileDialog = System.Windows.Forms.SaveFileDialog;
+
namespace Krypton.Toolkit.Suite.Extended.Buttons
{
public class KryptonBrowseButton : KryptonButton
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Buttons/Krypton.Toolkit.Suite.Extended.Buttons 2022.csproj b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Buttons/Krypton.Toolkit.Suite.Extended.Buttons 2022.csproj
index 84d993f2d..3a014a722 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Buttons/Krypton.Toolkit.Suite.Extended.Buttons 2022.csproj
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Buttons/Krypton.Toolkit.Suite.Extended.Buttons 2022.csproj
@@ -164,9 +164,9 @@
-
+
-
+
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Circular.ProgressBar/Controls/CircularProgressBar.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Circular.ProgressBar/Controls/CircularProgressBar.cs
index 0abf8aa5a..8d1e7cca6 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Circular.ProgressBar/Controls/CircularProgressBar.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Circular.ProgressBar/Controls/CircularProgressBar.cs
@@ -326,7 +326,7 @@ protected virtual void InitialiseContinues(bool firstTime)
}
_animator.Paths =
- new WinFormAnimation_NET5.Path(_animatedValue ?? Value, Value, (ulong)AnimationSpeed, CustomAnimationFunction).ToArray();
+ new Path(_animatedValue ?? Value, Value, (ulong)AnimationSpeed, CustomAnimationFunction).ToArray();
_animator.Repeat = false;
_animator.Play(
new SafeInvoker(
@@ -370,7 +370,7 @@ protected virtual void InitialiseMarquee(bool firstTime)
return;
}
- _animator.Paths = new WinFormAnimation_NET5.Path(0, 359, (ulong)MarqueeAnimationSpeed, CustomAnimationFunction).ToArray();
+ _animator.Paths = new Path(0, 359, (ulong)MarqueeAnimationSpeed, CustomAnimationFunction).ToArray();
_animator.Repeat = true;
_animator.Play(
new SafeInvoker(
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Circular.ProgressBar/Globals/GlobalDeclarations.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Circular.ProgressBar/Globals/GlobalDeclarations.cs
index 109fa3527..0c7332502 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Circular.ProgressBar/Globals/GlobalDeclarations.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Circular.ProgressBar/Globals/GlobalDeclarations.cs
@@ -15,4 +15,4 @@
global using Krypton.Toolkit.Suite.Extended.Developer.Utilities;
-global using WinFormAnimation_NET5;
\ No newline at end of file
+global using WinFormAnimation;
\ No newline at end of file
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Circular.ProgressBar/Krypton.Toolkit.Suite.Extended.Circular.ProgressBar 2022.csproj b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Circular.ProgressBar/Krypton.Toolkit.Suite.Extended.Circular.ProgressBar 2022.csproj
index c8912195c..93fe2940f 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Circular.ProgressBar/Krypton.Toolkit.Suite.Extended.Circular.ProgressBar 2022.csproj
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Circular.ProgressBar/Krypton.Toolkit.Suite.Extended.Circular.ProgressBar 2022.csproj
@@ -189,7 +189,7 @@
-
+
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Krypton.Toolkit.Suite.Extended.Core 2022.csproj b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Krypton.Toolkit.Suite.Extended.Core 2022.csproj
index fcd876bc9..5020dd80b 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Krypton.Toolkit.Suite.Extended.Core 2022.csproj
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Krypton.Toolkit.Suite.Extended.Core 2022.csproj
@@ -212,7 +212,7 @@
-
+
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Developer.Utilities/Krypton.Toolkit.Suite.Extended.Developer.Utilities 2022.csproj b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Developer.Utilities/Krypton.Toolkit.Suite.Extended.Developer.Utilities 2022.csproj
index 51f9359ef..91b5fdb7b 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Developer.Utilities/Krypton.Toolkit.Suite.Extended.Developer.Utilities 2022.csproj
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Developer.Utilities/Krypton.Toolkit.Suite.Extended.Developer.Utilities 2022.csproj
@@ -168,7 +168,7 @@
..\..\..\Bin\$(configuration)\Krypton.Toolkit.Suite.Extended.Developer.Utilities\
-
+
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Dialogs/Krypton.Toolkit.Suite.Extended.Dialogs 2022.csproj b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Dialogs/Krypton.Toolkit.Suite.Extended.Dialogs 2022.csproj
index d143cac95..033c35080 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Dialogs/Krypton.Toolkit.Suite.Extended.Dialogs 2022.csproj
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Dialogs/Krypton.Toolkit.Suite.Extended.Dialogs 2022.csproj
@@ -170,7 +170,7 @@
-
+
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Error.Reporting/Krypton.Toolkit.Suite.Extended.Error.Reporting 2022.csproj b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Error.Reporting/Krypton.Toolkit.Suite.Extended.Error.Reporting 2022.csproj
index 1f7656c3b..070d76ddf 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Error.Reporting/Krypton.Toolkit.Suite.Extended.Error.Reporting 2022.csproj
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Error.Reporting/Krypton.Toolkit.Suite.Extended.Error.Reporting 2022.csproj
@@ -180,8 +180,8 @@
-
-
+
+
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.File.Copier/Krypton.Toolkit.Suite.Extended.File.Copier 2022.csproj b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.File.Copier/Krypton.Toolkit.Suite.Extended.File.Copier 2022.csproj
index b093ddc95..a7986a5c2 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.File.Copier/Krypton.Toolkit.Suite.Extended.File.Copier 2022.csproj
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.File.Copier/Krypton.Toolkit.Suite.Extended.File.Copier 2022.csproj
@@ -194,7 +194,7 @@
-
+
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Networking/Krypton.Toolkit.Suite.Extended.Networking 2022.csproj b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Networking/Krypton.Toolkit.Suite.Extended.Networking 2022.csproj
index 5d94e379b..5caa4c9e9 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Networking/Krypton.Toolkit.Suite.Extended.Networking 2022.csproj
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Networking/Krypton.Toolkit.Suite.Extended.Networking 2022.csproj
@@ -164,7 +164,7 @@
-
+
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Settings/Krypton.Toolkit.Suite.Extended.Settings 2022.csproj b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Settings/Krypton.Toolkit.Suite.Extended.Settings 2022.csproj
index 48295679f..0cc1701bb 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Settings/Krypton.Toolkit.Suite.Extended.Settings 2022.csproj
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Settings/Krypton.Toolkit.Suite.Extended.Settings 2022.csproj
@@ -215,7 +215,7 @@
-
+
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Software.Updater/Krypton.Toolkit.Suite.Extended.Software.Updater 2022.csproj b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Software.Updater/Krypton.Toolkit.Suite.Extended.Software.Updater 2022.csproj
index 7ceaa37b1..4cb699c49 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Software.Updater/Krypton.Toolkit.Suite.Extended.Software.Updater 2022.csproj
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Software.Updater/Krypton.Toolkit.Suite.Extended.Software.Updater 2022.csproj
@@ -170,17 +170,17 @@
-
+
-
+
-
+
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Specialised.Dialogs/UX/Run/KryptonRunDialog.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Specialised.Dialogs/UX/Run/KryptonRunDialog.cs
index 16f0a162b..8645e8040 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Specialised.Dialogs/UX/Run/KryptonRunDialog.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Specialised.Dialogs/UX/Run/KryptonRunDialog.cs
@@ -6,6 +6,8 @@
*/
#endregion
+using OpenFileDialog = System.Windows.Forms.OpenFileDialog;
+
namespace Krypton.Toolkit.Suite.Extended.Specialised.Dialogs
{
public class KryptonRunDialog : CommonExtendedKryptonForm
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tool.Strip.Items/Controls/General/MRUOpenFileMenuItem.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tool.Strip.Items/Controls/General/MRUOpenFileMenuItem.cs
index acbdc18b1..a253d39d4 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tool.Strip.Items/Controls/General/MRUOpenFileMenuItem.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tool.Strip.Items/Controls/General/MRUOpenFileMenuItem.cs
@@ -6,6 +6,8 @@
*/
#endregion
+using OpenFileDialog = System.Windows.Forms.OpenFileDialog;
+
namespace Krypton.Toolkit.Suite.Extended.Tool.Strip.Items
{
[ToolboxItem(false), ToolStripItemDesignerAvailability(ToolStripItemDesignerAvailability.MenuStrip)]
@@ -32,7 +34,7 @@ public class MRUOpenFileMenuItem : ToolStripMenuItem
private string _startingDirectory;
private MRUMenuItem _parentMruMenuItem;
-
+
private MostRecentlyUsedFileManager _recentlyUsedFileManager = null;
#endregion
@@ -125,7 +127,7 @@ public MRUOpenFileMenuItem()
public MRUOpenFileMenuItem(string defaultText)
{
-
+
}
#endregion