Update packages

Author: mnadareski

BinaryObjectScanner.Test/BinaryObjectScanner.Test.csproj

@@ -12,12 +12,12 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="coverlet.collector" Version="6.0.4">
+        <PackageReference Include="coverlet.collector" Version="8.0.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
-        <PackageReference Include="SabreTools.Serialization" Version="[2.2.1]" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
+        <PackageReference Include="SabreTools.Serialization" Version="[2.3.0]" />
         <PackageReference Include="xunit" Version="2.9.3" />
         <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

BinaryObjectScanner/BinaryObjectScanner.csproj

@@ -46,12 +46,12 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="GrindCore.SharpCompress" Version="0.41.1" Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))" />
+        <PackageReference Include="GrindCore.SharpCompress" Version="0.46.2" Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))" />
         <PackageReference Include="MinThreadingBridge" Version="0.11.4" Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`)) OR $(TargetFramework.StartsWith(`net40`))" />
-        <PackageReference Include="SabreTools.Hashing" Version="[1.6.0]" />
-        <PackageReference Include="SabreTools.IO" Version="[1.9.0]" />
-        <PackageReference Include="SabreTools.Serialization" Version="[2.2.1]" />
-        <PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.0" Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))" />
+        <PackageReference Include="SabreTools.Hashing" Version="[1.6.1]" />
+        <PackageReference Include="SabreTools.IO" Version="[1.9.1]" />
+        <PackageReference Include="SabreTools.Serialization" Version="[2.3.0]" />
+        <PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.5" Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))" />
     </ItemGroup>
 
 </Project>

BinaryObjectScanner/Packer/EmbeddedFile.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using BinaryObjectScanner.Interfaces;
+using SabreTools.Data.Models.PortableExecutable.Resource.Entries;
 using SabreTools.IO.Extensions;
 using SabreTools.Serialization.Wrappers;
 
@@ -116,7 +117,11 @@ public class EmbeddedFile : IExecutableCheck<NewExecutable>, IExecutableCheck<Po
                 // Get the resources that have an archive signature
                 foreach (var value in resourceData.Values)
                 {
-                    if (value is null || value is not byte[] ba || ba.Length == 0)
+                    if (value is null || value is not GenericResourceEntry gre)
+                        continue;
+
+                    byte[] ba = gre.Data;
+                    if (ba.Length == 0)
                         continue;
 
                     // Set the output variables

BinaryObjectScanner/Protection/DiscGuard.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using BinaryObjectScanner.Interfaces;
+using SabreTools.Data.Models.PortableExecutable.Resource.Entries;
 using SabreTools.IO;
 using SabreTools.IO.Extensions;
 using SabreTools.IO.Matching;
@@ -63,7 +64,7 @@ public class DiscGuard : IExecutableCheck<PortableExecutable>, IPathCheck
                 return "DiscGuard";
 
             // Found in "Alternate.exe" (Redump entry 31914) and "Alt.exe" (Redump entries 46743, 46961, 79284, and 79374).
-            List<Dictionary<int, string?>?> resources =
+            List<StringTableResource?> resources =
             [
                 .. exe.FindStringTableByEntry("DiscGuard"),
                 .. exe.FindStringTableByEntry("The file Dg.vbn was not found."),

ProtectionScan/ProtectionScan.csproj

@@ -33,7 +33,7 @@
 
     <ItemGroup>
         <PackageReference Include="SabreTools.CommandLine" Version="[1.4.0]" />
-        <PackageReference Include="SabreTools.Serialization" Version="[2.2.1]" />
+        <PackageReference Include="SabreTools.Serialization" Version="[2.3.0]" />
     </ItemGroup>
 
 </Project>