Fix: Deadlock on SW download

rzander · Dec 12, 2022 · 68432f3 · 68432f3
1 parent f7ae1fc
commit 68432f3
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 25 deletions.
diff --git a/RuckZuck_Tool/MainWindow.xaml b/RuckZuck_Tool/MainWindow.xaml
@@ -90,7 +90,7 @@
                             </DockPanel>
                             <DockPanel DockPanel.Dock="Bottom">
                                 <TextBlock Name="tbVersion">
-                                    Version:{0}  Copyright (c) 2022 by Roger Zander
+                                    Version:{0}  Copyright (c) 2023 by Roger Zander
                                 </TextBlock>
                             </DockPanel>
                             <DockPanel DockPanel.Dock="Top" VerticalAlignment="Top">

diff --git 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
@@ -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
diff --git 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
@@ -107,8 +107,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="PresentationUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System" />
@@ -121,9 +120,8 @@
       <HintPath>packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.CodeDom, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\System.CodeDom.6.0.0\lib\net461\System.CodeDom.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="System.CodeDom, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\System.CodeDom.7.0.0\lib\net462\System.CodeDom.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Console, Version=4.0.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -133,9 +131,8 @@
     </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Deployment" />
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\System.Diagnostics.DiagnosticSource.6.0.0\lib\net461\System.Diagnostics.DiagnosticSource.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\System.Diagnostics.DiagnosticSource.7.0.0\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.Diagnostics.Tracing, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll</HintPath>
@@ -431,7 +428,7 @@
   </Target>
   <PropertyGroup>
     <PostBuildEvent>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</PostBuildEvent>
   </PropertyGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -441,9 +438,9 @@
     <Error Condition="!Exists('packages\Costura.Fody.5.7.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Costura.Fody.5.7.0\build\Costura.Fody.props'))" />
     <Error Condition="!Exists('packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Costura.Fody.5.7.0\build\Costura.Fody.targets'))" />
     <Error Condition="!Exists('packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
-    <Error Condition="!Exists('packages\Fody.6.6.3\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Fody.6.6.3\build\Fody.targets'))" />
+    <Error Condition="!Exists('packages\Fody.6.6.4\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Fody.6.6.4\build\Fody.targets'))" />
   </Target>
   <Import Project="packages\Costura.Fody.5.7.0\build\Costura.Fody.targets" Condition="Exists('packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" />
   <Import Project="packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
-  <Import Project="packages\Fody.6.6.3\build\Fody.targets" Condition="Exists('packages\Fody.6.6.3\build\Fody.targets')" />
+  <Import Project="packages\Fody.6.6.4\build\Fody.targets" Condition="Exists('packages\Fody.6.6.4\build\Fody.targets')" />
 </Project>
diff --git a/RuckZuck_Tool/UpdateSwPanel.xaml.cs b/RuckZuck_Tool/UpdateSwPanel.xaml.cs
@@ -81,7 +81,8 @@ private void InstallSW(List<AddSoftware> 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<AddSoftware> 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
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Costura.Fody" version="5.7.0" targetFramework="net48" developmentDependency="true" />
-  <package id="Fody" version="6.6.3" targetFramework="net48" developmentDependency="true" />
+  <package id="Fody" version="6.6.4" targetFramework="net48" developmentDependency="true" />
   <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net48" />
-  <package id="Microsoft.NETCore.Platforms" version="6.0.5" targetFramework="net48" />
+  <package id="Microsoft.NETCore.Platforms" version="7.0.0" targetFramework="net48" />
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net48" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="net48" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
+  <package id="Newtonsoft.Json" version="13.0.2" targetFramework="net48" />
   <package id="System.AppContext" version="4.3.0" targetFramework="net48" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
-  <package id="System.CodeDom" version="6.0.0" targetFramework="net48" />
+  <package id="System.CodeDom" version="7.0.0" targetFramework="net48" />
   <package id="System.Collections" version="4.3.0" targetFramework="net48" />
   <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net48" />
   <package id="System.Console" version="4.3.1" targetFramework="net48" />
   <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net48" />
-  <package id="System.Diagnostics.DiagnosticSource" version="6.0.0" targetFramework="net48" />
+  <package id="System.Diagnostics.DiagnosticSource" version="7.0.0" targetFramework="net48" />
   <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net48" />
   <package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net48" />
   <package id="System.Globalization" version="4.3.0" targetFramework="net48" />