* Build 2301

Krypton-Suite · Jan 5, 2023 · ac60b40 · ac60b40
1 parent 8973fe6
commit ac60b40
Show file tree

Hide file tree

Showing 19 changed files with 42 additions and 30 deletions.
diff --git 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
@@ -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
@@ -6,7 +6,7 @@
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
 		<NeutralLanguage>en</NeutralLanguage>
 		<Authors>Peter Wagner (A.K.A Wagnerp) and Simon Coghlan (A.K.A Smurf-IV), et al.</Authors>
-		<Copyright>© Component Factory Pty Ltd, 2006 - 2016. Then modifications by Peter Wagner (aka Wagnerp) and Simon Coghlan (aka Smurf-IV) 2017 - 2022. All rights reserved.</Copyright>
+		<Copyright>© Component Factory Pty Ltd, 2006 - 2016. Then modifications by Peter Wagner (aka Wagnerp) and Simon Coghlan (aka Smurf-IV) 2017 - 2023. All rights reserved.</Copyright>
 	</PropertyGroup>
 
 	<PropertyGroup>

diff --git a/Source/Krypton Toolkit/Directory.Build.targets b/Source/Krypton Toolkit/Directory.Build.targets
@@ -8,7 +8,7 @@
 
 				<!--Version layout schema:
 				70 = Major
-				22 = Minor - Year of release
+				23 = Minor - Year of release
 				01 = Build - Month of release
 				1 = Revision - Day of release (day of year)
 				-beta = Indicates a pre-release package
@@ -39,7 +39,7 @@
 
 				<!--Version layout schema:
 				70 = Major
-				22 = Minor - Year of release
+				23 = Minor - Year of release
 				01 = Build - Month of release
 				1 = Revision - Day of release (day of year)
 				-alpha = Indicates a pre-release package
@@ -70,7 +70,7 @@
 
 				<!--Version layout schema:
 				70 = Major
-				22 = Minor - Year of release
+				23 = Minor - Year of release
 				01 = Build - Month of release
 				1 = Revision - Day of release (day of year)
 				-->
@@ -98,7 +98,7 @@
 
 				<!--Version layout schema:
 				70 = Major
-				22 = Minor - Year of release
+				23 = Minor - Year of release
 				01 = Build - Month of release
 				1 = Revision - Day of release (day of year)
 				-->
@@ -125,7 +125,7 @@
 				<Revision>$([System.DateTime]::Now.get_DayOfYear().ToString())</Revision>
 
 				<!--Version layout schema:
-				22 = Minor - Year of release
+				23 = Minor - Year of release
 				01 = Build - Month of release
 				1 = Revision - Day of release (day of year)
 				-->
@@ -152,7 +152,7 @@
 
 				<!--Version layout schema:
 				70 = Major
-				22 = Minor - Year of release
+				23 = Minor - Year of release
 				01 = Build - Month of release
 				1 = Revision - Day of release (day of year)
 				-->
@@ -178,7 +178,7 @@
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
 		<NeutralLanguage>en</NeutralLanguage>
 		<Authors>Peter Wagner (A.K.A Wagnerp) and Simon Coghlan (A.K.A Smurf-IV), Phil Wright (A.K.A ComponentFactory)</Authors>
-		<Copyright>© Krypton Suite (Peter Wagner (Wagnerp) and Simon Coghlan (Smurf-IV)), 2017 - 2022. Component Factory Pty Ltd (Phil Wright), 2006 - 2016. All rights reserved.</Copyright>
+		<Copyright>© Krypton Suite (Peter Wagner (Wagnerp) and Simon Coghlan (Smurf-IV)), 2017 - 2023. Component Factory Pty Ltd (Phil Wright), 2006 - 2016. All rights reserved.</Copyright>
 	</PropertyGroup>
 
 	<Choose>
@@ -222,9 +222,9 @@
 				<PackageId Condition="'$(TFMs)' == 'StableLite'">$(PackageId).Lite</PackageId>
 
 				<Description Condition="'$(TFMs)' == 'StableLite'">
-					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/...it/Krypton.Toolkit.Suite.Extended.Buttons/Controls Toolkit/General/KryptonBrowseButton.cs b/...it/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/...Krypton.Toolkit.Suite.Extended.Buttons/Krypton.Toolkit.Suite.Extended.Buttons 2022.csproj b/...Krypton.Toolkit.Suite.Extended.Buttons/Krypton.Toolkit.Suite.Extended.Buttons 2022.csproj
@@ -164,9 +164,9 @@
 	</Choose>
 
 	<ItemGroup>
-		<PackageReference Include="WindowsAPICodePackShell" Version="1.1.2" />
+		<PackageReference Include="WindowsAPICodePackShell" Version="7.0.1" />
 
-		<PackageReference Include="WindowsAPICodePackShellExtensions" Version="1.1.2" />
+		<PackageReference Include="WindowsAPICodePackShellExtensions" Version="7.0.1" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/...olkit/Krypton.Toolkit.Suite.Extended.Circular.ProgressBar/Controls/CircularProgressBar.cs b/...olkit/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<float>(
@@ -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<float>(

diff --git a/...Toolkit/Krypton.Toolkit.Suite.Extended.Circular.ProgressBar/Globals/GlobalDeclarations.cs b/...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;
+global using WinFormAnimation;
diff --git a/...nded.Circular.ProgressBar/Krypton.Toolkit.Suite.Extended.Circular.ProgressBar 2022.csproj b/...nded.Circular.ProgressBar/Krypton.Toolkit.Suite.Extended.Circular.ProgressBar 2022.csproj
@@ -189,7 +189,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Unofficial.WinFormAnimation-NET" Version="2.0.1" />
+		<PackageReference Include="Unofficial.WinFormAnimation" Version="2.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/...olkit/Krypton.Toolkit.Suite.Extended.Core/Krypton.Toolkit.Suite.Extended.Core 2022.csproj b/...olkit/Krypton.Toolkit.Suite.Extended.Core/Krypton.Toolkit.Suite.Extended.Core 2022.csproj
@@ -212,7 +212,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="EasyScintilla" Version="1.0.5" />
-		<PackageReference Include="WindowsAPICodePack" Version="1.1.2" />
+		<PackageReference Include="WindowsAPICodePack" Version="7.0.1" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/...tended.Developer.Utilities/Krypton.Toolkit.Suite.Extended.Developer.Utilities 2022.csproj b/...tended.Developer.Utilities/Krypton.Toolkit.Suite.Extended.Developer.Utilities 2022.csproj
@@ -168,7 +168,7 @@
 	<OutputPath>..\..\..\Bin\$(configuration)\Krypton.Toolkit.Suite.Extended.Developer.Utilities\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-	<PackageReference Include="WindowsAPICodePackShell" Version="1.1.2" />
+	<PackageReference Include="WindowsAPICodePackShell" Version="7.0.1" />
   </ItemGroup>
   <ItemGroup>
 	<ProjectReference Include="..\Krypton.Toolkit.Suite.Extended.Tools\Krypton.Toolkit.Suite.Extended.Tools 2022.csproj" />

diff --git a/...Krypton.Toolkit.Suite.Extended.Dialogs/Krypton.Toolkit.Suite.Extended.Dialogs 2022.csproj b/...Krypton.Toolkit.Suite.Extended.Dialogs/Krypton.Toolkit.Suite.Extended.Dialogs 2022.csproj
@@ -170,7 +170,7 @@
   </PropertyGroup>
   <ItemGroup>
 	<Reference Include="System.Runtime.InteropServices.RuntimeInformation" />
-	<PackageReference Include="WindowsAPICodePackShell" Version="1.1.2" />
+	<PackageReference Include="WindowsAPICodePackShell" Version="7.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...Suite.Extended.Error.Reporting/Krypton.Toolkit.Suite.Extended.Error.Reporting 2022.csproj b/...Suite.Extended.Error.Reporting/Krypton.Toolkit.Suite.Extended.Error.Reporting 2022.csproj
@@ -180,8 +180,8 @@
 	<ItemGroup>
 	    <PackageReference Include="DotNetZip" Version="1.16.0" />
 	    <PackageReference Include="Handlebars.Net" Version="2.1.2" />
-	    <PackageReference Include="Simple-MAPI.NET" Version="1.2.0" />
-	    <PackageReference Include="System.Management" Version="6.0.0" />
+	    <PackageReference Include="Simple-MAPI.NET" Version="1.2.1" />
+	    <PackageReference Include="System.Management" Version="7.0.0" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0-windows'">

diff --git a/...Toolkit.Suite.Extended.File.Copier/Krypton.Toolkit.Suite.Extended.File.Copier 2022.csproj b/...Toolkit.Suite.Extended.File.Copier/Krypton.Toolkit.Suite.Extended.File.Copier 2022.csproj
@@ -194,7 +194,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="WindowsAPICodePackShell" Version="1.1.2" />
+		<PackageReference Include="WindowsAPICodePackShell" Version="7.0.1" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/...n.Toolkit.Suite.Extended.Networking/Krypton.Toolkit.Suite.Extended.Networking 2022.csproj b/...n.Toolkit.Suite.Extended.Networking/Krypton.Toolkit.Suite.Extended.Networking 2022.csproj
@@ -164,7 +164,7 @@
 	</Choose>
 
 	<ItemGroup>
-		<PackageReference Include="System.DirectoryServices" Version="6.0.0" />
+		<PackageReference Include="System.DirectoryServices" Version="7.0.0" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0-windows'">

diff --git a/...ypton.Toolkit.Suite.Extended.Settings/Krypton.Toolkit.Suite.Extended.Settings 2022.csproj b/...ypton.Toolkit.Suite.Extended.Settings/Krypton.Toolkit.Suite.Extended.Settings 2022.csproj
@@ -215,7 +215,7 @@
   </ItemGroup>
 
   <ItemGroup>
-	  <PackageReference Include="WindowsAPICodePack" Version="1.1.2" />
+	  <PackageReference Include="WindowsAPICodePack" Version="7.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...ite.Extended.Software.Updater/Krypton.Toolkit.Suite.Extended.Software.Updater 2022.csproj b/...ite.Extended.Software.Updater/Krypton.Toolkit.Suite.Extended.Software.Updater 2022.csproj
@@ -170,17 +170,17 @@
 
 	<ItemGroup>
 		<PackageReference Include="ILRepack.Lib.MSBuild.Task" Version="2.0.18.2" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.2-beta1" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
 		<PackageReference Include="System.Net.Http" Version="4.3.4" />
 		<PackageReference Include="ZipStorer" Version="3.8.0" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0-windows'">
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.1-beta1" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0-windows'">
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.1-beta1" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
 	</ItemGroup>
 
 	<!--Binary/Documentation Output-->

diff --git a/...ton Toolkit/Krypton.Toolkit.Suite.Extended.Specialised.Dialogs/UX/Run/KryptonRunDialog.cs b/...ton 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/...t/Krypton.Toolkit.Suite.Extended.Tool.Strip.Items/Controls/General/MRUOpenFileMenuItem.cs b/...t/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