diff --git a/RuckZuck_Tool/MainWindow.xaml b/RuckZuck_Tool/MainWindow.xaml index 746f3ae..f570f18 100644 --- a/RuckZuck_Tool/MainWindow.xaml +++ b/RuckZuck_Tool/MainWindow.xaml @@ -90,7 +90,7 @@ - Version:{0} Copyright (c) 2022 by Roger Zander + Version:{0} Copyright (c) 2023 by Roger Zander diff --git a/RuckZuck_Tool/NewSWPanelxaml.xaml.cs b/RuckZuck_Tool/NewSWPanelxaml.xaml.cs index eaa379d..8444a72 100644 --- a/RuckZuck_Tool/NewSWPanelxaml.xaml.cs +++ b/RuckZuck_Tool/NewSWPanelxaml.xaml.cs @@ -919,7 +919,7 @@ private void SaveAsJSON(string sFile) oSoftware.Image = imgIcon.Tag as byte[]; //Convert to JSON - JavaScriptSerializer ser = new JavaScriptSerializer(); + RuckZuck.Base.JavaScriptSerializer ser = new RuckZuck.Base.JavaScriptSerializer(); string sJson = ser.Serialize(oSoftware); File.WriteAllText(sFile, sJson); } diff --git a/RuckZuck_Tool/Properties/AssemblyInfo.cs b/RuckZuck_Tool/Properties/AssemblyInfo.cs index 9c19e8a..bf2bf60 100644 --- a/RuckZuck_Tool/Properties/AssemblyInfo.cs +++ b/RuckZuck_Tool/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Zander - Tools")] [assembly: AssemblyProduct("RuckZuck")] -[assembly: AssemblyCopyright("Copyright © 2022 by Roger Zander")] +[assembly: AssemblyCopyright("Copyright © 2023 by Roger Zander")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -49,5 +49,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.7.2.*")] -[assembly: AssemblyFileVersion("1.7.2.5")] +[assembly: AssemblyVersion("1.7.3.*")] +[assembly: AssemblyFileVersion("1.7.3.0")] diff --git a/RuckZuck_Tool/Properties/Resources.Designer.cs b/RuckZuck_Tool/Properties/Resources.Designer.cs index 6091ef8..d936834 100644 --- a/RuckZuck_Tool/Properties/Resources.Designer.cs +++ b/RuckZuck_Tool/Properties/Resources.Designer.cs @@ -70,7 +70,7 @@ internal Resources() { ///[assembly: AssemblyConfiguration("")] ///[assembly: AssemblyCompany("RuckZuck.tools")] ///[assembly: AssemblyProduct("RZRZRZ")] - ///[assembly: AssemblyCopyright("Copyright © 2022 by Roger Zander")] + ///[assembly: AssemblyCopyright("Copyright © 2023 by Roger Zander")] ///[assembly: AssemblyTrademark("")] ///[assembly: AssemblyCulture("")] ///[ [rest of string was truncated]";. diff --git a/RuckZuck_Tool/Properties/Resources.resx b/RuckZuck_Tool/Properties/Resources.resx index 8510973..8b7824c 100644 --- a/RuckZuck_Tool/Properties/Resources.resx +++ b/RuckZuck_Tool/Properties/Resources.resx @@ -127,7 +127,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("RuckZuck.tools")] [assembly: AssemblyProduct("RZRZRZ")] -[assembly: AssemblyCopyright("Copyright © 2022 by Roger Zander")] +[assembly: AssemblyCopyright("Copyright © 2023 by Roger Zander")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/RuckZuck_Tool/RuckZuck_Tool.csproj b/RuckZuck_Tool/RuckZuck_Tool.csproj index 9799329..fb00a78 100644 --- a/RuckZuck_Tool/RuckZuck_Tool.csproj +++ b/RuckZuck_Tool/RuckZuck_Tool.csproj @@ -107,8 +107,7 @@ True - packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - True + packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll @@ -121,9 +120,8 @@ packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll False - - packages\System.CodeDom.6.0.0\lib\net461\System.CodeDom.dll - False + + packages\System.CodeDom.7.0.0\lib\net462\System.CodeDom.dll @@ -133,9 +131,8 @@ - - packages\System.Diagnostics.DiagnosticSource.6.0.0\lib\net461\System.Diagnostics.DiagnosticSource.dll - False + + packages\System.Diagnostics.DiagnosticSource.7.0.0\lib\net462\System.Diagnostics.DiagnosticSource.dll packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll @@ -431,7 +428,7 @@ if "$(ConfigurationName)"=="Debug" GOTO end - "C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\Bin\SignTool.exe" sign /i "Sectigo RSA Code Signing CA" /n "Zander - Tools" /t "http://timestamp.comodoca.com/authenticode" /q "$(TargetPath)" + "C:\tools\signtool.exe" sign /i "Sectigo RSA Code Signing CA" /n "Zander - Tools" /t "http://timestamp.comodoca.com/authenticode" /q "$(TargetPath)" :end @@ -441,9 +438,9 @@ - + - + \ No newline at end of file diff --git a/RuckZuck_Tool/UpdateSwPanel.xaml.cs b/RuckZuck_Tool/UpdateSwPanel.xaml.cs index ea11cec..0657be5 100644 --- a/RuckZuck_Tool/UpdateSwPanel.xaml.cs +++ b/RuckZuck_Tool/UpdateSwPanel.xaml.cs @@ -81,7 +81,8 @@ private void InstallSW(List lSW) { oSW.ProgressDetails += OSW_ProgressDetails; oSW.downloadTask.AutoInstall = true; - oSW.DownloadAsync(false).ConfigureAwait(false); + //oSW.DownloadAsync(false).ConfigureAwait(false); + _ = oSW.DownloadAsync(false); dm.lDLTasks.Add(oSW.downloadTask); if (oSW.SW.PreRequisites != null) @@ -96,7 +97,8 @@ private void InstallSW(List lSW) { oPreReq.ProgressDetails += OSW_ProgressDetails; oPreReq.downloadTask.AutoInstall = true; - oPreReq.DownloadAsync(false).ConfigureAwait(false); + //oPreReq.DownloadAsync(false).ConfigureAwait(false); + _ = oPreReq.DownloadAsync(false); dm.lDLTasks.Add(oPreReq.downloadTask); } diff --git a/RuckZuck_Tool/packages.config b/RuckZuck_Tool/packages.config index 1853c52..68fdbe4 100644 --- a/RuckZuck_Tool/packages.config +++ b/RuckZuck_Tool/packages.config @@ -1,20 +1,20 @@  - + - + - + - + - +