Update packages

BinaryObjectScanner/BinaryObjectScanner.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <!-- Assembly Properties -->
@@ -82,14 +82,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SabreTools.Compression" Version="0.5.1" />
-    <PackageReference Include="SabreTools.Hashing" Version="1.2.0" />
-    <PackageReference Include="SabreTools.IO" Version="1.4.11" />
-    <PackageReference Include="SabreTools.Matching" Version="1.3.1" />
-    <PackageReference Include="SabreTools.Models" Version="1.4.8" />
-    <PackageReference Include="SabreTools.Serialization" Version="1.6.7" />
-    <PackageReference Include="UnshieldSharp" Version="1.8.3" />
-    <PackageReference Include="WiseUnpacker" Version="1.4.2" />
+    <PackageReference Include="SabreTools.Compression" Version="0.5.2" />
+    <PackageReference Include="SabreTools.Hashing" Version="1.2.1" />
+    <PackageReference Include="SabreTools.IO" Version="1.4.12" />
+    <PackageReference Include="SabreTools.Matching" Version="1.3.2" />
+    <PackageReference Include="SabreTools.Models" Version="1.4.10" />
+    <PackageReference Include="SabreTools.Serialization" Version="1.6.8" />
+    <PackageReference Include="UnshieldSharp" Version="1.8.4" />
+    <PackageReference Include="WiseUnpacker" Version="1.4.3" />
   </ItemGroup>
 
 </Project>

BinaryObjectScanner/FileType/InstallShieldArchiveV3.cs

@@ -38,7 +38,7 @@ namespace BinaryObjectScanner.FileType
                         if (directoryName != null && !Directory.Exists(directoryName))
                             Directory.CreateDirectory(directoryName);
 
-                        (byte[]? fileContents, string? error) = archive.Extract(cfile.Key);
+                        byte[]? fileContents = archive.Extract(cfile.Key, out string? error);
                         if (fileContents == null || !string.IsNullOrEmpty(error))
                             continue;
 

BinaryObjectScanner/FileType/MPQ.cs

@@ -1,7 +1,6 @@
-using System;
-using System.IO;
+using System.IO;
 using BinaryObjectScanner.Interfaces;
-#if ((NETFRAMEWORK && !NET20 && !NET35 && !NET40) || NETCOREAPP) && WIN
+#if (NET452_OR_GREATER || NETCOREAPP) && WIN
 using StormLibSharp;
 #endif
 

BinaryObjectScanner/FileType/MicrosoftCAB.cs

@@ -1,8 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
+using System.IO;
 using BinaryObjectScanner.Interfaces;
-#if ((NETFRAMEWORK && !NET20 && !NET35 && !NET40) || NETCOREAPP) && WIN
+#if (NET452_OR_GREATER || NETCOREAPP) && WIN
 using LibMSPackN;
 #endif
 

BinaryObjectScanner/Packer/ASPack.cs

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using System.Text;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Content;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Packer

BinaryObjectScanner/Packer/CExe.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Compression.zlib;
 using SabreTools.Matching;
+using SabreTools.Matching.Content;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Packer

BinaryObjectScanner/Packer/EXEStealth.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Content;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Packer

BinaryObjectScanner/Packer/InnoSetup.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Content;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Packer

BinaryObjectScanner/Packer/NeoLite.cs

@@ -1,5 +1,4 @@
-using System.IO;
-using BinaryObjectScanner.Interfaces;
+using BinaryObjectScanner.Interfaces;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Packer

BinaryObjectScanner/Packer/WiseInstaller.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.IO.Extensions;
 using SabreTools.Matching;
+using SabreTools.Matching.Content;
 using SabreTools.Serialization.Wrappers;
 using WiseUnpacker;
 using WiseUnpacker.EWISE;

BinaryObjectScanner/Protection/ActiveMARK.cs

@@ -3,6 +3,7 @@ using System.Linq;
 using System.Text;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Content;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/AegiSoft.cs

@@ -5,6 +5,8 @@ using System.Collections.Generic;
 using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Content;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/AlphaDVD.cs

@@ -4,6 +4,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 
 namespace BinaryObjectScanner.Protection
 {

BinaryObjectScanner/Protection/AlphaROM.cs

@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Serialization.Wrappers;
 

BinaryObjectScanner/Protection/Bitpool.cs

@@ -4,6 +4,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 
 namespace BinaryObjectScanner.Protection
 {

BinaryObjectScanner/Protection/ByteShield.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/CDDVDCops.cs

@@ -7,7 +7,8 @@ using System.Linq;
 using System.Text;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
-using SabreTools.Models.PortableExecutable;
+using SabreTools.Matching.Content;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/CDGuard.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/CDLock.cs

@@ -4,6 +4,8 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Content;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/CDProtector.cs

@@ -4,6 +4,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 
 namespace BinaryObjectScanner.Protection
 {

BinaryObjectScanner/Protection/CDSHiELDSE.cs

@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Serialization.Wrappers;
 

BinaryObjectScanner/Protection/CDX.cs

@@ -4,6 +4,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 
 namespace BinaryObjectScanner.Protection
 {

BinaryObjectScanner/Protection/CactusDataShield.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Content;
 
 namespace BinaryObjectScanner.Protection
 {

BinaryObjectScanner/Protection/CenegaProtectDVD.cs

@@ -5,6 +5,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/Channelware.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.IO;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/ChosenBytesCodeLock.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/CopyKiller.cs

@@ -5,6 +5,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/CrypKey.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/Cucko.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Content;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/DVDCrypt.cs

@@ -4,6 +4,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 
 namespace BinaryObjectScanner.Protection
 {

BinaryObjectScanner/Protection/Denuvo.cs

@@ -5,6 +5,8 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Content;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection
@@ -28,7 +30,6 @@ namespace BinaryObjectScanner.Protection
 
     public class Denuvo : IPathCheck, IPortableExecutableCheck
     {
-
         // TODO: Investigate possible filename checks for Denuvo Anti-Tamper.
         // https://www.pcgamingwiki.com/wiki/Denuvo#Redeem.exe
 

BinaryObjectScanner/Protection/DigiGuard.cs

@@ -2,9 +2,9 @@
 using System.Collections.Concurrent;
 #endif
 using System.Collections.Generic;
-using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/DinamicMultimedia.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.IO;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 
 namespace BinaryObjectScanner.Protection
 {

BinaryObjectScanner/Protection/DiscGuard.cs

@@ -7,6 +7,8 @@ using System.IO;
 using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Content;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/EAAntiCheat.cs

@@ -4,6 +4,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/EasyAntiCheat.cs

@@ -4,6 +4,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/ElectronicArts.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Serialization.Wrappers;

BinaryObjectScanner/Protection/Engine32.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/FreeLock.cs

@@ -4,6 +4,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 
 namespace BinaryObjectScanner.Protection
 {

BinaryObjectScanner/Protection/GFWL.cs

@@ -6,9 +6,10 @@ using System.Collections.Generic;
 using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
-namespace BinaryObjectScanner.ProtectionType
+namespace BinaryObjectScanner.Protection
 {
     public class GFWL : IPathCheck, IPortableExecutableCheck
     {

BinaryObjectScanner/Protection/Gefest.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/HexaLock.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/ImpulseReactor.cs

@@ -6,6 +6,7 @@ using System.IO;
 using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/IndyVCD.cs

@@ -4,6 +4,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 
 namespace BinaryObjectScanner.Protection
 {

BinaryObjectScanner/Protection/JoWood.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Content;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/KalypsoLauncher.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection
@@ -23,7 +24,6 @@ namespace BinaryObjectScanner.Protection
     /// </summary>
     public class KalypsoLauncher : IPathCheck, IPortableExecutableCheck
     {
-
         /// <inheritdoc/>
         public string? CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug)
         {

BinaryObjectScanner/Protection/KeyLock.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Content;
 
 namespace BinaryObjectScanner.Protection
 {

BinaryObjectScanner/Protection/LabelGate.cs

@@ -7,6 +7,7 @@ using System.IO;
 using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/LaserLok.cs

@@ -7,6 +7,7 @@ using System.IO;
 using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/Macrovision.CDilla.cs

@@ -5,6 +5,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/Macrovision.CactusDataShield.cs

@@ -7,6 +7,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/Macrovision.FLEXnet.cs

@@ -4,8 +4,8 @@ using System.Collections.Concurrent;
 #endif
 using System.Collections.Generic;
 using System.Linq;
-using System.Security.Principal;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/Macrovision.RipGuard.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using SabreTools.Hashing;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/Macrovision.SafeCast.cs

@@ -6,6 +6,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using SabreTools.Matching;
+using SabreTools.Matching.Content;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/Macrovision.SafeDisc.cs

@@ -7,6 +7,7 @@ using System.IO;
 using System.Linq;
 using SabreTools.Hashing;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/Macrovision.cs

@@ -9,6 +9,8 @@ using BinaryObjectScanner.Interfaces;
 using BinaryObjectScanner.Utilities;
 using SabreTools.IO.Extensions;
 using SabreTools.Matching;
+using SabreTools.Matching.Content;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/MediaCloQ.cs

@@ -5,6 +5,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/MediaMaxCD3.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/NEACProtect.cs

@@ -4,6 +4,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/OnlineRegistration.cs

@@ -2,7 +2,7 @@
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Serialization.Wrappers;
 
-namespace BinaryObjectScanner.ProtectionType
+namespace BinaryObjectScanner.Protection
 {
     public class OnlineRegistration : IPortableExecutableCheck
     {

BinaryObjectScanner/Protection/OpenMG.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/Origin.cs

@@ -5,6 +5,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/PSXAntiModchip.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Content;
 
 namespace BinaryObjectScanner.Protection
 {

BinaryObjectScanner/Protection/PlayJ.cs

@@ -5,6 +5,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/ProtectDisc.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Content;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/RainbowSentinel.cs

@@ -7,6 +7,8 @@ using System.Linq;
 using System.Text;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Content;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/RealArcade.cs

@@ -1,11 +1,11 @@
-using System;
-#if NET40_OR_GREATER || NETCOREAPP
+#if NET40_OR_GREATER || NETCOREAPP
 using System.Collections.Concurrent;
 #endif
 using System.Collections.Generic;
 using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/RingPROTECH.cs

@@ -4,6 +4,8 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Content;
+using SabreTools.Matching.Paths;
 
 namespace BinaryObjectScanner.Protection
 {

BinaryObjectScanner/Protection/Roxxe.cs

@@ -1,11 +1,11 @@
-using System;
-#if NET40_OR_GREATER || NETCOREAPP
+#if NET40_OR_GREATER || NETCOREAPP
 using System.Collections.Concurrent;
 #endif
 using System.Collections.Generic;
 using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/SVKP.cs

@@ -4,6 +4,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/SafeLock.cs

@@ -4,6 +4,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 
 namespace BinaryObjectScanner.Protection
 {

BinaryObjectScanner/Protection/SecuROM.cs

@@ -7,6 +7,8 @@ using System.Linq;
 using System.Text;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Content;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection
@@ -289,10 +291,10 @@ namespace BinaryObjectScanner.Protection
                 0x82, 0xD8, 0x0C, 0xAC
             ]);
 
-            (bool success, int position) = matcher.Match(dataSectionRaw);
+            int position = matcher.Match(dataSectionRaw);
 
             // If we can't find the string, we default to generic
-            if (!success)
+            if (position < 0)
                 return "8";
 
 #if NETFRAMEWORK

BinaryObjectScanner/Protection/SmartE.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/SoftLock.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/SolidShield.cs

@@ -6,9 +6,11 @@ using System.Collections.Generic;
 using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Content;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
-namespace BinaryObjectScanner.ProtectionType
+namespace BinaryObjectScanner.Protection
 {
     // TODO: Not matching all SolidShield Wrapper v1 (See JackKeane)
     // TODO: Not matching all SolidShield Wrapper v1 (See NFS11)

BinaryObjectScanner/Protection/StarForce.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/Steam.cs

@@ -4,6 +4,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/TZCopyProtection.cs

@@ -4,6 +4,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 
 namespace BinaryObjectScanner.Protection
 {

BinaryObjectScanner/Protection/Tages.cs

@@ -6,9 +6,11 @@ using System.Collections.Generic;
 using System.IO;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Content;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
-namespace BinaryObjectScanner.ProtectionType
+namespace BinaryObjectScanner.Protection
 {
     public class TAGES : IPathCheck, IPortableExecutableCheck
     {

BinaryObjectScanner/Protection/TivolaRingProtection.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.IO;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 
 namespace BinaryObjectScanner.Protection
 {

BinaryObjectScanner/Protection/Uplay.cs

@@ -4,6 +4,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/WMDS.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/WTMCDProtect.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

BinaryObjectScanner/Protection/WinLock.cs

@@ -4,6 +4,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 
 namespace BinaryObjectScanner.Protection
 {

BinaryObjectScanner/Protection/Zzxzz.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.IO;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 
 namespace BinaryObjectScanner.Protection
 {

BinaryObjectScanner/Protection/nProtect.cs

@@ -4,6 +4,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Matching;
+using SabreTools.Matching.Paths;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Protection

Test/Extractor.cs

@@ -377,7 +377,7 @@ namespace Test
                             if (!string.IsNullOrEmpty(directoryName) && !Directory.Exists(directoryName))
                                 Directory.CreateDirectory(directoryName);
 
-                            (byte[]? fileContents, string? error) = archive.Extract(cfile.Key);
+                            byte[]? fileContents = archive.Extract(cfile.Key, out string? error);
                             if (!string.IsNullOrEmpty(error))
                                 continue;
 

Test/Test.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
@@ -40,12 +40,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SabreTools.Compression" Version="0.5.1" />
-    <PackageReference Include="SabreTools.IO" Version="1.4.11" />
-    <PackageReference Include="SabreTools.Matching" Version="1.3.1" />
-    <PackageReference Include="SabreTools.Models" Version="1.4.8" />
-    <PackageReference Include="SabreTools.Serialization" Version="1.6.7" />
-    <PackageReference Include="UnshieldSharp" Version="1.8.3" />
+    <PackageReference Include="SabreTools.Compression" Version="0.5.2" />
+    <PackageReference Include="SabreTools.IO" Version="1.4.12" />
+    <PackageReference Include="SabreTools.Matching" Version="1.3.2" />
+    <PackageReference Include="SabreTools.Models" Version="1.4.10" />
+    <PackageReference Include="SabreTools.Serialization" Version="1.6.8" />
+    <PackageReference Include="UnshieldSharp" Version="1.8.4" />
   </ItemGroup>
 
 </Project>