From 5001c4a881b78f2b98657a198896967665536881 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Sat, 16 Sep 2023 02:04:47 -0400 Subject: [PATCH] Fix build from previous updates --- BinaryObjectScanner.FileType/AACSMediaKeyBlock.cs | 2 +- BinaryObjectScanner.FileType/BDPlusSVM.cs | 2 +- BinaryObjectScanner.FileType/BFPK.cs | 3 ++- BinaryObjectScanner.FileType/BSP.cs | 3 ++- BinaryObjectScanner.FileType/Executable.cs | 1 + BinaryObjectScanner.FileType/GCF.cs | 3 ++- BinaryObjectScanner.FileType/MicrosoftCAB.cs | 2 +- BinaryObjectScanner.FileType/PAK.cs | 3 ++- BinaryObjectScanner.FileType/PFF.cs | 3 ++- BinaryObjectScanner.FileType/SGA.cs | 3 ++- BinaryObjectScanner.FileType/VBSP.cs | 3 ++- BinaryObjectScanner.FileType/VPK.cs | 3 ++- BinaryObjectScanner.FileType/WAD.cs | 3 ++- BinaryObjectScanner.FileType/XZP.cs | 3 ++- BinaryObjectScanner.GameEngine/RenderWare.cs | 2 +- BinaryObjectScanner.Packer/ASPack.cs | 2 +- BinaryObjectScanner.Packer/AdvancedInstaller.cs | 2 +- BinaryObjectScanner.Packer/Armadillo.cs | 2 +- BinaryObjectScanner.Packer/AutoPlayMediaStudio.cs | 2 +- BinaryObjectScanner.Packer/CExe.cs | 2 +- BinaryObjectScanner.Packer/EXEStealth.cs | 2 +- BinaryObjectScanner.Packer/EmbeddedExecutable.cs | 2 +- BinaryObjectScanner.Packer/GenteeInstaller.cs | 2 +- BinaryObjectScanner.Packer/HyperTechCrackProof.cs | 2 +- BinaryObjectScanner.Packer/InnoSetup.cs | 2 +- BinaryObjectScanner.Packer/InstallAnywhere.cs | 2 +- BinaryObjectScanner.Packer/InstallerVISE.cs | 2 +- BinaryObjectScanner.Packer/IntelInstallationFramework.cs | 2 +- BinaryObjectScanner.Packer/MicrosoftCABSFX.cs | 2 +- BinaryObjectScanner.Packer/NSIS.cs | 2 +- BinaryObjectScanner.Packer/NeoLite.cs | 2 +- BinaryObjectScanner.Packer/PECompact.cs | 2 +- BinaryObjectScanner.Packer/Petite.cs | 2 +- BinaryObjectScanner.Packer/SetupFactory.cs | 2 +- BinaryObjectScanner.Packer/SevenZipSFX.cs | 2 +- BinaryObjectScanner.Packer/Shrinker.cs | 2 +- BinaryObjectScanner.Packer/UPX.cs | 2 +- BinaryObjectScanner.Packer/WinRARSFX.cs | 2 +- BinaryObjectScanner.Packer/WinZipSFX.cs | 2 +- BinaryObjectScanner.Packer/WiseInstaller.cs | 2 +- BinaryObjectScanner.Packer/dotFuscator.cs | 2 +- BinaryObjectScanner.Protection/ActiveMARK.cs | 2 +- BinaryObjectScanner.Protection/AegiSoft.cs | 2 +- BinaryObjectScanner.Protection/AlphaROM.cs | 2 +- BinaryObjectScanner.Protection/ByteShield.cs | 2 +- BinaryObjectScanner.Protection/CDCheck.cs | 2 +- BinaryObjectScanner.Protection/CDDVDCops.cs | 2 +- BinaryObjectScanner.Protection/CDGuard.cs | 2 +- BinaryObjectScanner.Protection/CDKey.cs | 2 +- BinaryObjectScanner.Protection/CDLock.cs | 2 +- BinaryObjectScanner.Protection/CDSHiELDSE.cs | 2 +- BinaryObjectScanner.Protection/CenegaProtectDVD.cs | 2 +- BinaryObjectScanner.Protection/ChosenBytesCodeLock.cs | 2 +- BinaryObjectScanner.Protection/CopyLok.cs | 2 +- BinaryObjectScanner.Protection/CrypKey.cs | 2 +- BinaryObjectScanner.Protection/Cucko.cs | 2 +- BinaryObjectScanner.Protection/Denuvo.cs | 2 +- BinaryObjectScanner.Protection/DiscGuard.cs | 2 +- BinaryObjectScanner.Protection/EasyAntiCheat.cs | 2 +- BinaryObjectScanner.Protection/ElectronicArts.cs | 2 +- BinaryObjectScanner.Protection/Engine32.cs | 2 +- BinaryObjectScanner.Protection/GFWL.cs | 2 +- BinaryObjectScanner.Protection/Gefest.cs | 2 +- BinaryObjectScanner.Protection/HexaLock.cs | 2 +- BinaryObjectScanner.Protection/ImpulseReactor.cs | 2 +- BinaryObjectScanner.Protection/Intenium.cs | 2 +- BinaryObjectScanner.Protection/JoWood.cs | 2 +- BinaryObjectScanner.Protection/LabelGate.cs | 2 +- BinaryObjectScanner.Protection/LaserLok.cs | 2 +- BinaryObjectScanner.Protection/MGIRegistration.cs | 2 +- BinaryObjectScanner.Protection/Macrovision.CDilla.cs | 2 +- BinaryObjectScanner.Protection/Macrovision.CactusDataShield.cs | 2 +- BinaryObjectScanner.Protection/Macrovision.FLEXnet.cs | 2 +- BinaryObjectScanner.Protection/Macrovision.RipGuard.cs | 2 +- BinaryObjectScanner.Protection/Macrovision.SafeCast.cs | 2 +- BinaryObjectScanner.Protection/Macrovision.SafeDisc.cs | 2 +- BinaryObjectScanner.Protection/Macrovision.SafeWrap.cs | 2 +- BinaryObjectScanner.Protection/Macrovision.cs | 2 +- BinaryObjectScanner.Protection/MediaCloQ.cs | 2 +- BinaryObjectScanner.Protection/MediaMaxCD3.cs | 2 +- BinaryObjectScanner.Protection/NEACProtect.cs | 2 +- BinaryObjectScanner.Protection/OnlineRegistration.cs | 2 +- BinaryObjectScanner.Protection/OpenMG.cs | 2 +- BinaryObjectScanner.Protection/Origin.cs | 2 +- BinaryObjectScanner.Protection/PlayJ.cs | 2 +- BinaryObjectScanner.Protection/ProtectDisc.cs | 2 +- BinaryObjectScanner.Protection/RainbowSentinel.cs | 2 +- BinaryObjectScanner.Protection/SVKP.cs | 2 +- BinaryObjectScanner.Protection/SecuROM.cs | 2 +- BinaryObjectScanner.Protection/SmartE.cs | 2 +- BinaryObjectScanner.Protection/SoftLock.cs | 2 +- BinaryObjectScanner.Protection/SolidShield.cs | 2 +- BinaryObjectScanner.Protection/StarForce.cs | 2 +- BinaryObjectScanner.Protection/Steam.cs | 2 +- BinaryObjectScanner.Protection/Sysiphus.cs | 2 +- BinaryObjectScanner.Protection/Tages.cs | 2 +- BinaryObjectScanner.Protection/Themida.cs | 2 +- BinaryObjectScanner.Protection/ThreePLock.cs | 2 +- BinaryObjectScanner.Protection/ThreeTwoOneStudios.cs | 2 +- BinaryObjectScanner.Protection/Uplay.cs | 2 +- BinaryObjectScanner.Protection/WMDS.cs | 2 +- BinaryObjectScanner.Protection/WTMCDProtect.cs | 2 +- BinaryObjectScanner.Protection/XCP.cs | 2 +- BinaryObjectScanner.Protection/nProtect.cs | 2 +- BurnOutSharp/BurnOutSharp.csproj | 1 + BurnOutSharp/Scanner.cs | 1 + Test/Extractor.cs | 1 + 107 files changed, 117 insertions(+), 103 deletions(-) diff --git a/BinaryObjectScanner.FileType/AACSMediaKeyBlock.cs b/BinaryObjectScanner.FileType/AACSMediaKeyBlock.cs index 03f26267..66a2288f 100644 --- a/BinaryObjectScanner.FileType/AACSMediaKeyBlock.cs +++ b/BinaryObjectScanner.FileType/AACSMediaKeyBlock.cs @@ -29,7 +29,7 @@ namespace BinaryObjectScanner.FileType try { // Create the wrapper - Wrappers.AACSMediaKeyBlock mkb = Wrappers.AACSMediaKeyBlock.Create(stream); + SabreTools.Serialization.Wrappers.AACSMediaKeyBlock mkb = SabreTools.Serialization.Wrappers.AACSMediaKeyBlock.Create(stream); if (mkb == null) return null; diff --git a/BinaryObjectScanner.FileType/BDPlusSVM.cs b/BinaryObjectScanner.FileType/BDPlusSVM.cs index 01e657ed..94a3e470 100644 --- a/BinaryObjectScanner.FileType/BDPlusSVM.cs +++ b/BinaryObjectScanner.FileType/BDPlusSVM.cs @@ -28,7 +28,7 @@ namespace BinaryObjectScanner.FileType try { // Create the wrapper - Wrappers.BDPlusSVM svm = Wrappers.BDPlusSVM.Create(stream); + SabreTools.Serialization.Wrappers.BDPlusSVM svm = SabreTools.Serialization.Wrappers.BDPlusSVM.Create(stream); if (svm == null) return null; diff --git a/BinaryObjectScanner.FileType/BFPK.cs b/BinaryObjectScanner.FileType/BFPK.cs index 415e77eb..d5088e60 100644 --- a/BinaryObjectScanner.FileType/BFPK.cs +++ b/BinaryObjectScanner.FileType/BFPK.cs @@ -1,6 +1,7 @@ using System; using System.IO; using BinaryObjectScanner.Interfaces; +using BinaryObjectScanner.Wrappers; namespace BinaryObjectScanner.FileType { @@ -27,7 +28,7 @@ namespace BinaryObjectScanner.FileType try { // Create the wrapper - Wrappers.BFPK bfpk = Wrappers.BFPK.Create(stream); + SabreTools.Serialization.Wrappers.BFPK bfpk = SabreTools.Serialization.Wrappers.BFPK.Create(stream); if (bfpk == null) return null; diff --git a/BinaryObjectScanner.FileType/BSP.cs b/BinaryObjectScanner.FileType/BSP.cs index b259b355..7e709cd2 100644 --- a/BinaryObjectScanner.FileType/BSP.cs +++ b/BinaryObjectScanner.FileType/BSP.cs @@ -1,6 +1,7 @@ using System; using System.IO; using BinaryObjectScanner.Interfaces; +using BinaryObjectScanner.Wrappers; namespace BinaryObjectScanner.FileType { @@ -27,7 +28,7 @@ namespace BinaryObjectScanner.FileType try { // Create the wrapper - Wrappers.BSP bsp = Wrappers.BSP.Create(stream); + SabreTools.Serialization.Wrappers.BSP bsp = SabreTools.Serialization.Wrappers.BSP.Create(stream); if (bsp == null) return null; diff --git a/BinaryObjectScanner.FileType/Executable.cs b/BinaryObjectScanner.FileType/Executable.cs index ee13bb25..85267463 100644 --- a/BinaryObjectScanner.FileType/Executable.cs +++ b/BinaryObjectScanner.FileType/Executable.cs @@ -9,6 +9,7 @@ using System.Threading.Tasks; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Utilities; using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.FileType { diff --git a/BinaryObjectScanner.FileType/GCF.cs b/BinaryObjectScanner.FileType/GCF.cs index 2eaf0f9f..7ec31e13 100644 --- a/BinaryObjectScanner.FileType/GCF.cs +++ b/BinaryObjectScanner.FileType/GCF.cs @@ -1,6 +1,7 @@ using System; using System.IO; using BinaryObjectScanner.Interfaces; +using BinaryObjectScanner.Wrappers; namespace BinaryObjectScanner.FileType { @@ -27,7 +28,7 @@ namespace BinaryObjectScanner.FileType try { // Create the wrapper - Wrappers.GCF gcf = Wrappers.GCF.Create(stream); + SabreTools.Serialization.Wrappers.GCF gcf = SabreTools.Serialization.Wrappers.GCF.Create(stream); if (gcf == null) return null; diff --git a/BinaryObjectScanner.FileType/MicrosoftCAB.cs b/BinaryObjectScanner.FileType/MicrosoftCAB.cs index 9a010724..01431d84 100644 --- a/BinaryObjectScanner.FileType/MicrosoftCAB.cs +++ b/BinaryObjectScanner.FileType/MicrosoftCAB.cs @@ -33,7 +33,7 @@ namespace BinaryObjectScanner.FileType return null; // Open the cab file - var cabFile = MicrosoftCabinet.Create(stream); + var cabFile = SabreTools.Serialization.Wrappers.MicrosoftCabinet.Create(stream); if (cabFile == null) return null; diff --git a/BinaryObjectScanner.FileType/PAK.cs b/BinaryObjectScanner.FileType/PAK.cs index 9e6a4157..6a49b37f 100644 --- a/BinaryObjectScanner.FileType/PAK.cs +++ b/BinaryObjectScanner.FileType/PAK.cs @@ -1,6 +1,7 @@ using System; using System.IO; using BinaryObjectScanner.Interfaces; +using BinaryObjectScanner.Wrappers; namespace BinaryObjectScanner.FileType { @@ -27,7 +28,7 @@ namespace BinaryObjectScanner.FileType try { // Create the wrapper - Wrappers.PAK pak = Wrappers.PAK.Create(stream); + SabreTools.Serialization.Wrappers.PAK pak = SabreTools.Serialization.Wrappers.PAK.Create(stream); if (pak == null) return null; diff --git a/BinaryObjectScanner.FileType/PFF.cs b/BinaryObjectScanner.FileType/PFF.cs index eef2f973..c7273f48 100644 --- a/BinaryObjectScanner.FileType/PFF.cs +++ b/BinaryObjectScanner.FileType/PFF.cs @@ -1,6 +1,7 @@ using System; using System.IO; using BinaryObjectScanner.Interfaces; +using BinaryObjectScanner.Wrappers; namespace BinaryObjectScanner.FileType { @@ -27,7 +28,7 @@ namespace BinaryObjectScanner.FileType try { // Create the wrapper - Wrappers.PFF pff = Wrappers.PFF.Create(stream); + SabreTools.Serialization.Wrappers.PFF pff = SabreTools.Serialization.Wrappers.PFF.Create(stream); if (pff == null) return null; diff --git a/BinaryObjectScanner.FileType/SGA.cs b/BinaryObjectScanner.FileType/SGA.cs index 9da85e0a..6ac18636 100644 --- a/BinaryObjectScanner.FileType/SGA.cs +++ b/BinaryObjectScanner.FileType/SGA.cs @@ -1,6 +1,7 @@ using System; using System.IO; using BinaryObjectScanner.Interfaces; +using BinaryObjectScanner.Wrappers; namespace BinaryObjectScanner.FileType { @@ -27,7 +28,7 @@ namespace BinaryObjectScanner.FileType try { // Create the wrapper - Wrappers.SGA sga = Wrappers.SGA.Create(stream); + SabreTools.Serialization.Wrappers.SGA sga = SabreTools.Serialization.Wrappers.SGA.Create(stream); if (sga == null) return null; diff --git a/BinaryObjectScanner.FileType/VBSP.cs b/BinaryObjectScanner.FileType/VBSP.cs index 99d3d031..19983e4e 100644 --- a/BinaryObjectScanner.FileType/VBSP.cs +++ b/BinaryObjectScanner.FileType/VBSP.cs @@ -1,6 +1,7 @@ using System; using System.IO; using BinaryObjectScanner.Interfaces; +using BinaryObjectScanner.Wrappers; namespace BinaryObjectScanner.FileType { @@ -27,7 +28,7 @@ namespace BinaryObjectScanner.FileType try { // Create the wrapper - Wrappers.VBSP vbsp = Wrappers.VBSP.Create(stream); + SabreTools.Serialization.Wrappers.VBSP vbsp = SabreTools.Serialization.Wrappers.VBSP.Create(stream); if (vbsp == null) return null; diff --git a/BinaryObjectScanner.FileType/VPK.cs b/BinaryObjectScanner.FileType/VPK.cs index 3a6ba94a..79574f54 100644 --- a/BinaryObjectScanner.FileType/VPK.cs +++ b/BinaryObjectScanner.FileType/VPK.cs @@ -1,6 +1,7 @@ using System; using System.IO; using BinaryObjectScanner.Interfaces; +using BinaryObjectScanner.Wrappers; namespace BinaryObjectScanner.FileType { @@ -27,7 +28,7 @@ namespace BinaryObjectScanner.FileType try { // Create the wrapper - Wrappers.VPK vpk = Wrappers.VPK.Create(stream); + SabreTools.Serialization.Wrappers.VPK vpk = SabreTools.Serialization.Wrappers.VPK.Create(stream); if (vpk == null) return null; diff --git a/BinaryObjectScanner.FileType/WAD.cs b/BinaryObjectScanner.FileType/WAD.cs index ca6cd65a..9c72f6f4 100644 --- a/BinaryObjectScanner.FileType/WAD.cs +++ b/BinaryObjectScanner.FileType/WAD.cs @@ -1,6 +1,7 @@ using System; using System.IO; using BinaryObjectScanner.Interfaces; +using BinaryObjectScanner.Wrappers; namespace BinaryObjectScanner.FileType { @@ -27,7 +28,7 @@ namespace BinaryObjectScanner.FileType try { // Create the wrapper - Wrappers.WAD wad = Wrappers.WAD.Create(stream); + SabreTools.Serialization.Wrappers.WAD wad = SabreTools.Serialization.Wrappers.WAD.Create(stream); if (wad == null) return null; diff --git a/BinaryObjectScanner.FileType/XZP.cs b/BinaryObjectScanner.FileType/XZP.cs index 6e05f52f..49e675f5 100644 --- a/BinaryObjectScanner.FileType/XZP.cs +++ b/BinaryObjectScanner.FileType/XZP.cs @@ -1,6 +1,7 @@ using System; using System.IO; using BinaryObjectScanner.Interfaces; +using BinaryObjectScanner.Wrappers; namespace BinaryObjectScanner.FileType { @@ -27,7 +28,7 @@ namespace BinaryObjectScanner.FileType try { // Create the wrapper - Wrappers.XZP xzp = Wrappers.XZP.Create(stream); + SabreTools.Serialization.Wrappers.XZP xzp = SabreTools.Serialization.Wrappers.XZP.Create(stream); if (xzp == null) return null; diff --git a/BinaryObjectScanner.GameEngine/RenderWare.cs b/BinaryObjectScanner.GameEngine/RenderWare.cs index b92b32a7..ebef7268 100644 --- a/BinaryObjectScanner.GameEngine/RenderWare.cs +++ b/BinaryObjectScanner.GameEngine/RenderWare.cs @@ -1,5 +1,5 @@ using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.GameEngine { diff --git a/BinaryObjectScanner.Packer/ASPack.cs b/BinaryObjectScanner.Packer/ASPack.cs index f0920d37..18da75ef 100644 --- a/BinaryObjectScanner.Packer/ASPack.cs +++ b/BinaryObjectScanner.Packer/ASPack.cs @@ -3,7 +3,7 @@ using System.IO; using System.Text; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner.Packer/AdvancedInstaller.cs b/BinaryObjectScanner.Packer/AdvancedInstaller.cs index 0059cce8..db867c5f 100644 --- a/BinaryObjectScanner.Packer/AdvancedInstaller.cs +++ b/BinaryObjectScanner.Packer/AdvancedInstaller.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner.Packer/Armadillo.cs b/BinaryObjectScanner.Packer/Armadillo.cs index e5e9cb0a..389da3e9 100644 --- a/BinaryObjectScanner.Packer/Armadillo.cs +++ b/BinaryObjectScanner.Packer/Armadillo.cs @@ -2,7 +2,7 @@ using System.IO; using System.Linq; using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner.Packer/AutoPlayMediaStudio.cs b/BinaryObjectScanner.Packer/AutoPlayMediaStudio.cs index d39e36b8..5b5f146e 100644 --- a/BinaryObjectScanner.Packer/AutoPlayMediaStudio.cs +++ b/BinaryObjectScanner.Packer/AutoPlayMediaStudio.cs @@ -1,7 +1,7 @@ using System; using System.IO; using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner.Packer/CExe.cs b/BinaryObjectScanner.Packer/CExe.cs index 98d84321..3974f5ac 100644 --- a/BinaryObjectScanner.Packer/CExe.cs +++ b/BinaryObjectScanner.Packer/CExe.cs @@ -5,8 +5,8 @@ using System.Linq; using BinaryObjectScanner.Compression; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; using ICSharpCode.SharpZipLib.Zip.Compression; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner.Packer/EXEStealth.cs b/BinaryObjectScanner.Packer/EXEStealth.cs index 6acbd266..16235c89 100644 --- a/BinaryObjectScanner.Packer/EXEStealth.cs +++ b/BinaryObjectScanner.Packer/EXEStealth.cs @@ -2,7 +2,7 @@ using System.IO; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner.Packer/EmbeddedExecutable.cs b/BinaryObjectScanner.Packer/EmbeddedExecutable.cs index 60003889..0c767125 100644 --- a/BinaryObjectScanner.Packer/EmbeddedExecutable.cs +++ b/BinaryObjectScanner.Packer/EmbeddedExecutable.cs @@ -3,7 +3,7 @@ using System.IO; using System.Linq; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner.Packer/GenteeInstaller.cs b/BinaryObjectScanner.Packer/GenteeInstaller.cs index aff6daf8..f32a1a49 100644 --- a/BinaryObjectScanner.Packer/GenteeInstaller.cs +++ b/BinaryObjectScanner.Packer/GenteeInstaller.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner.Packer/HyperTechCrackProof.cs b/BinaryObjectScanner.Packer/HyperTechCrackProof.cs index 4db6fad3..715a21cf 100644 --- a/BinaryObjectScanner.Packer/HyperTechCrackProof.cs +++ b/BinaryObjectScanner.Packer/HyperTechCrackProof.cs @@ -1,7 +1,7 @@ using System.IO; using System.Linq; using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner.Packer/InnoSetup.cs b/BinaryObjectScanner.Packer/InnoSetup.cs index a91dca99..24a148e9 100644 --- a/BinaryObjectScanner.Packer/InnoSetup.cs +++ b/BinaryObjectScanner.Packer/InnoSetup.cs @@ -3,7 +3,7 @@ using System.IO; using System.Linq; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner.Packer/InstallAnywhere.cs b/BinaryObjectScanner.Packer/InstallAnywhere.cs index 84c8e86d..93fdc30e 100644 --- a/BinaryObjectScanner.Packer/InstallAnywhere.cs +++ b/BinaryObjectScanner.Packer/InstallAnywhere.cs @@ -1,7 +1,7 @@ using System; using System.IO; using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner.Packer/InstallerVISE.cs b/BinaryObjectScanner.Packer/InstallerVISE.cs index cd1a3601..e0a1abab 100644 --- a/BinaryObjectScanner.Packer/InstallerVISE.cs +++ b/BinaryObjectScanner.Packer/InstallerVISE.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner.Packer/IntelInstallationFramework.cs b/BinaryObjectScanner.Packer/IntelInstallationFramework.cs index b8f2b02c..e7ae4587 100644 --- a/BinaryObjectScanner.Packer/IntelInstallationFramework.cs +++ b/BinaryObjectScanner.Packer/IntelInstallationFramework.cs @@ -1,7 +1,7 @@ using System; using System.IO; using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner.Packer/MicrosoftCABSFX.cs b/BinaryObjectScanner.Packer/MicrosoftCABSFX.cs index 33a8f861..6f4f9a3c 100644 --- a/BinaryObjectScanner.Packer/MicrosoftCABSFX.cs +++ b/BinaryObjectScanner.Packer/MicrosoftCABSFX.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner.Packer/NSIS.cs b/BinaryObjectScanner.Packer/NSIS.cs index 95b60328..17834cac 100644 --- a/BinaryObjectScanner.Packer/NSIS.cs +++ b/BinaryObjectScanner.Packer/NSIS.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner.Packer/NeoLite.cs b/BinaryObjectScanner.Packer/NeoLite.cs index a167b3ee..9d2b2830 100644 --- a/BinaryObjectScanner.Packer/NeoLite.cs +++ b/BinaryObjectScanner.Packer/NeoLite.cs @@ -1,6 +1,6 @@ using System.IO; using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner.Packer/PECompact.cs b/BinaryObjectScanner.Packer/PECompact.cs index 72506ff5..438bda13 100644 --- a/BinaryObjectScanner.Packer/PECompact.cs +++ b/BinaryObjectScanner.Packer/PECompact.cs @@ -1,6 +1,6 @@ using System.IO; using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner.Packer/Petite.cs b/BinaryObjectScanner.Packer/Petite.cs index 00fed95c..b673b90c 100644 --- a/BinaryObjectScanner.Packer/Petite.cs +++ b/BinaryObjectScanner.Packer/Petite.cs @@ -1,6 +1,6 @@ using System.IO; using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner.Packer/SetupFactory.cs b/BinaryObjectScanner.Packer/SetupFactory.cs index 332ec73a..ff50fc51 100644 --- a/BinaryObjectScanner.Packer/SetupFactory.cs +++ b/BinaryObjectScanner.Packer/SetupFactory.cs @@ -1,7 +1,7 @@ using System; using System.IO; using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner.Packer/SevenZipSFX.cs b/BinaryObjectScanner.Packer/SevenZipSFX.cs index ad898c8b..d0125f68 100644 --- a/BinaryObjectScanner.Packer/SevenZipSFX.cs +++ b/BinaryObjectScanner.Packer/SevenZipSFX.cs @@ -1,7 +1,7 @@ using System.IO; using System.Linq; using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner.Packer/Shrinker.cs b/BinaryObjectScanner.Packer/Shrinker.cs index 89c1d990..34b9d0a2 100644 --- a/BinaryObjectScanner.Packer/Shrinker.cs +++ b/BinaryObjectScanner.Packer/Shrinker.cs @@ -1,6 +1,6 @@ using System.IO; using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner.Packer/UPX.cs b/BinaryObjectScanner.Packer/UPX.cs index 554c97de..505023f5 100644 --- a/BinaryObjectScanner.Packer/UPX.cs +++ b/BinaryObjectScanner.Packer/UPX.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Text.RegularExpressions; using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner.Packer/WinRARSFX.cs b/BinaryObjectScanner.Packer/WinRARSFX.cs index ffd369e2..92553d47 100644 --- a/BinaryObjectScanner.Packer/WinRARSFX.cs +++ b/BinaryObjectScanner.Packer/WinRARSFX.cs @@ -2,7 +2,7 @@ using System; using System.IO; using System.Linq; using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; using SharpCompress.Archives; using SharpCompress.Archives.Rar; using SharpCompress.Readers; diff --git a/BinaryObjectScanner.Packer/WinZipSFX.cs b/BinaryObjectScanner.Packer/WinZipSFX.cs index 0b4a1328..f00069d3 100644 --- a/BinaryObjectScanner.Packer/WinZipSFX.cs +++ b/BinaryObjectScanner.Packer/WinZipSFX.cs @@ -3,7 +3,7 @@ using System.IO; using System.Linq; using System.Text; using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; using SharpCompress.Archives; using SharpCompress.Archives.Zip; diff --git a/BinaryObjectScanner.Packer/WiseInstaller.cs b/BinaryObjectScanner.Packer/WiseInstaller.cs index 4d0faa89..163e63c4 100644 --- a/BinaryObjectScanner.Packer/WiseInstaller.cs +++ b/BinaryObjectScanner.Packer/WiseInstaller.cs @@ -4,8 +4,8 @@ using System.IO; using System.Linq; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; using SabreTools.IO; +using SabreTools.Serialization.Wrappers; using Wise = WiseUnpacker.WiseUnpacker; namespace BinaryObjectScanner.Packer diff --git a/BinaryObjectScanner.Packer/dotFuscator.cs b/BinaryObjectScanner.Packer/dotFuscator.cs index 179fea5a..3392f7ab 100644 --- a/BinaryObjectScanner.Packer/dotFuscator.cs +++ b/BinaryObjectScanner.Packer/dotFuscator.cs @@ -2,7 +2,7 @@ using System.IO; using System.Linq; using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner.Protection/ActiveMARK.cs b/BinaryObjectScanner.Protection/ActiveMARK.cs index 1a679319..e46eac0b 100644 --- a/BinaryObjectScanner.Protection/ActiveMARK.cs +++ b/BinaryObjectScanner.Protection/ActiveMARK.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Text; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/AegiSoft.cs b/BinaryObjectScanner.Protection/AegiSoft.cs index 3ca4953d..014257c9 100644 --- a/BinaryObjectScanner.Protection/AegiSoft.cs +++ b/BinaryObjectScanner.Protection/AegiSoft.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/AlphaROM.cs b/BinaryObjectScanner.Protection/AlphaROM.cs index 196521f0..bba17db5 100644 --- a/BinaryObjectScanner.Protection/AlphaROM.cs +++ b/BinaryObjectScanner.Protection/AlphaROM.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/ByteShield.cs b/BinaryObjectScanner.Protection/ByteShield.cs index e32a6d52..6cce8d57 100644 --- a/BinaryObjectScanner.Protection/ByteShield.cs +++ b/BinaryObjectScanner.Protection/ByteShield.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/CDCheck.cs b/BinaryObjectScanner.Protection/CDCheck.cs index 6d31544c..8b9eaa31 100644 --- a/BinaryObjectScanner.Protection/CDCheck.cs +++ b/BinaryObjectScanner.Protection/CDCheck.cs @@ -1,5 +1,5 @@ using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/CDDVDCops.cs b/BinaryObjectScanner.Protection/CDDVDCops.cs index 6b16524c..c69c61b7 100644 --- a/BinaryObjectScanner.Protection/CDDVDCops.cs +++ b/BinaryObjectScanner.Protection/CDDVDCops.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/CDGuard.cs b/BinaryObjectScanner.Protection/CDGuard.cs index 2b4f5383..a9203ab1 100644 --- a/BinaryObjectScanner.Protection/CDGuard.cs +++ b/BinaryObjectScanner.Protection/CDGuard.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/CDKey.cs b/BinaryObjectScanner.Protection/CDKey.cs index 8c3a4af0..c6dcedfa 100644 --- a/BinaryObjectScanner.Protection/CDKey.cs +++ b/BinaryObjectScanner.Protection/CDKey.cs @@ -1,6 +1,6 @@ using System; using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/CDLock.cs b/BinaryObjectScanner.Protection/CDLock.cs index 227fac11..10090a68 100644 --- a/BinaryObjectScanner.Protection/CDLock.cs +++ b/BinaryObjectScanner.Protection/CDLock.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/CDSHiELDSE.cs b/BinaryObjectScanner.Protection/CDSHiELDSE.cs index a2dd5e34..87ed7ffa 100644 --- a/BinaryObjectScanner.Protection/CDSHiELDSE.cs +++ b/BinaryObjectScanner.Protection/CDSHiELDSE.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/CenegaProtectDVD.cs b/BinaryObjectScanner.Protection/CenegaProtectDVD.cs index 8a3a3a72..39db84cf 100644 --- a/BinaryObjectScanner.Protection/CenegaProtectDVD.cs +++ b/BinaryObjectScanner.Protection/CenegaProtectDVD.cs @@ -3,7 +3,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/ChosenBytesCodeLock.cs b/BinaryObjectScanner.Protection/ChosenBytesCodeLock.cs index ae1250e1..4128f9bd 100644 --- a/BinaryObjectScanner.Protection/ChosenBytesCodeLock.cs +++ b/BinaryObjectScanner.Protection/ChosenBytesCodeLock.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/CopyLok.cs b/BinaryObjectScanner.Protection/CopyLok.cs index 07eb4799..99a11fce 100644 --- a/BinaryObjectScanner.Protection/CopyLok.cs +++ b/BinaryObjectScanner.Protection/CopyLok.cs @@ -1,6 +1,6 @@ using System.Linq; using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/CrypKey.cs b/BinaryObjectScanner.Protection/CrypKey.cs index b07fd83b..8d17a82a 100644 --- a/BinaryObjectScanner.Protection/CrypKey.cs +++ b/BinaryObjectScanner.Protection/CrypKey.cs @@ -1,5 +1,5 @@ using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/Cucko.cs b/BinaryObjectScanner.Protection/Cucko.cs index 73398b5c..d49a555d 100644 --- a/BinaryObjectScanner.Protection/Cucko.cs +++ b/BinaryObjectScanner.Protection/Cucko.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/Denuvo.cs b/BinaryObjectScanner.Protection/Denuvo.cs index e850efbd..d1e4df51 100644 --- a/BinaryObjectScanner.Protection/Denuvo.cs +++ b/BinaryObjectScanner.Protection/Denuvo.cs @@ -3,7 +3,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/DiscGuard.cs b/BinaryObjectScanner.Protection/DiscGuard.cs index d448acd1..15af78d6 100644 --- a/BinaryObjectScanner.Protection/DiscGuard.cs +++ b/BinaryObjectScanner.Protection/DiscGuard.cs @@ -5,7 +5,7 @@ using System.IO; using System.Linq; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/EasyAntiCheat.cs b/BinaryObjectScanner.Protection/EasyAntiCheat.cs index acbe687c..0fa8762b 100644 --- a/BinaryObjectScanner.Protection/EasyAntiCheat.cs +++ b/BinaryObjectScanner.Protection/EasyAntiCheat.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/ElectronicArts.cs b/BinaryObjectScanner.Protection/ElectronicArts.cs index b9a647e8..91d18413 100644 --- a/BinaryObjectScanner.Protection/ElectronicArts.cs +++ b/BinaryObjectScanner.Protection/ElectronicArts.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/Engine32.cs b/BinaryObjectScanner.Protection/Engine32.cs index 6d418c4d..dc1f3a6c 100644 --- a/BinaryObjectScanner.Protection/Engine32.cs +++ b/BinaryObjectScanner.Protection/Engine32.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/GFWL.cs b/BinaryObjectScanner.Protection/GFWL.cs index 1e104f91..b62a7c46 100644 --- a/BinaryObjectScanner.Protection/GFWL.cs +++ b/BinaryObjectScanner.Protection/GFWL.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BurnOutSharp.ProtectionType { diff --git a/BinaryObjectScanner.Protection/Gefest.cs b/BinaryObjectScanner.Protection/Gefest.cs index ff60ba51..0ffaf2b2 100644 --- a/BinaryObjectScanner.Protection/Gefest.cs +++ b/BinaryObjectScanner.Protection/Gefest.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/HexaLock.cs b/BinaryObjectScanner.Protection/HexaLock.cs index f455f726..7d7ffa71 100644 --- a/BinaryObjectScanner.Protection/HexaLock.cs +++ b/BinaryObjectScanner.Protection/HexaLock.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/ImpulseReactor.cs b/BinaryObjectScanner.Protection/ImpulseReactor.cs index 95e8b418..9f39ff18 100644 --- a/BinaryObjectScanner.Protection/ImpulseReactor.cs +++ b/BinaryObjectScanner.Protection/ImpulseReactor.cs @@ -4,7 +4,7 @@ using System.IO; using System.Linq; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/Intenium.cs b/BinaryObjectScanner.Protection/Intenium.cs index 5ae660cc..97e187f0 100644 --- a/BinaryObjectScanner.Protection/Intenium.cs +++ b/BinaryObjectScanner.Protection/Intenium.cs @@ -1,6 +1,6 @@ using System.Linq; using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/JoWood.cs b/BinaryObjectScanner.Protection/JoWood.cs index 1f24aa54..769e73e3 100644 --- a/BinaryObjectScanner.Protection/JoWood.cs +++ b/BinaryObjectScanner.Protection/JoWood.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/LabelGate.cs b/BinaryObjectScanner.Protection/LabelGate.cs index b0da5c7a..aa95bf3a 100644 --- a/BinaryObjectScanner.Protection/LabelGate.cs +++ b/BinaryObjectScanner.Protection/LabelGate.cs @@ -5,7 +5,7 @@ using System.IO; using System.Linq; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/LaserLok.cs b/BinaryObjectScanner.Protection/LaserLok.cs index a55ab0f4..88112f03 100644 --- a/BinaryObjectScanner.Protection/LaserLok.cs +++ b/BinaryObjectScanner.Protection/LaserLok.cs @@ -5,7 +5,7 @@ using System.IO; using System.Linq; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/MGIRegistration.cs b/BinaryObjectScanner.Protection/MGIRegistration.cs index 87dcdeca..2a15e453 100644 --- a/BinaryObjectScanner.Protection/MGIRegistration.cs +++ b/BinaryObjectScanner.Protection/MGIRegistration.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/Macrovision.CDilla.cs b/BinaryObjectScanner.Protection/Macrovision.CDilla.cs index 350c5841..4c983542 100644 --- a/BinaryObjectScanner.Protection/Macrovision.CDilla.cs +++ b/BinaryObjectScanner.Protection/Macrovision.CDilla.cs @@ -3,7 +3,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/Macrovision.CactusDataShield.cs b/BinaryObjectScanner.Protection/Macrovision.CactusDataShield.cs index a076f836..5a7708cb 100644 --- a/BinaryObjectScanner.Protection/Macrovision.CactusDataShield.cs +++ b/BinaryObjectScanner.Protection/Macrovision.CactusDataShield.cs @@ -5,7 +5,7 @@ using System.IO; using System.Linq; using System.Text; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/Macrovision.FLEXnet.cs b/BinaryObjectScanner.Protection/Macrovision.FLEXnet.cs index 318f7609..624c4cd4 100644 --- a/BinaryObjectScanner.Protection/Macrovision.FLEXnet.cs +++ b/BinaryObjectScanner.Protection/Macrovision.FLEXnet.cs @@ -1,5 +1,5 @@ using System; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/Macrovision.RipGuard.cs b/BinaryObjectScanner.Protection/Macrovision.RipGuard.cs index 4914b8e4..939ba1ef 100644 --- a/BinaryObjectScanner.Protection/Macrovision.RipGuard.cs +++ b/BinaryObjectScanner.Protection/Macrovision.RipGuard.cs @@ -3,7 +3,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.IO; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; using static BinaryObjectScanner.Utilities.Hashing; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner.Protection/Macrovision.SafeCast.cs b/BinaryObjectScanner.Protection/Macrovision.SafeCast.cs index 161b9648..af68bc90 100644 --- a/BinaryObjectScanner.Protection/Macrovision.SafeCast.cs +++ b/BinaryObjectScanner.Protection/Macrovision.SafeCast.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/Macrovision.SafeDisc.cs b/BinaryObjectScanner.Protection/Macrovision.SafeDisc.cs index cd52ff6e..952b8254 100644 --- a/BinaryObjectScanner.Protection/Macrovision.SafeDisc.cs +++ b/BinaryObjectScanner.Protection/Macrovision.SafeDisc.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; using static BinaryObjectScanner.Utilities.Hashing; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner.Protection/Macrovision.SafeWrap.cs b/BinaryObjectScanner.Protection/Macrovision.SafeWrap.cs index 0844475a..632f51b9 100644 --- a/BinaryObjectScanner.Protection/Macrovision.SafeWrap.cs +++ b/BinaryObjectScanner.Protection/Macrovision.SafeWrap.cs @@ -1,4 +1,4 @@ -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/Macrovision.cs b/BinaryObjectScanner.Protection/Macrovision.cs index 40d28a68..cd071bd9 100644 --- a/BinaryObjectScanner.Protection/Macrovision.cs +++ b/BinaryObjectScanner.Protection/Macrovision.cs @@ -6,8 +6,8 @@ using System.Linq; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; using BinaryObjectScanner.Utilities; -using BinaryObjectScanner.Wrappers; using SabreTools.IO; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/MediaCloQ.cs b/BinaryObjectScanner.Protection/MediaCloQ.cs index 25cef360..34bc3d9a 100644 --- a/BinaryObjectScanner.Protection/MediaCloQ.cs +++ b/BinaryObjectScanner.Protection/MediaCloQ.cs @@ -3,7 +3,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/MediaMaxCD3.cs b/BinaryObjectScanner.Protection/MediaMaxCD3.cs index 24166862..12f6d05d 100644 --- a/BinaryObjectScanner.Protection/MediaMaxCD3.cs +++ b/BinaryObjectScanner.Protection/MediaMaxCD3.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/NEACProtect.cs b/BinaryObjectScanner.Protection/NEACProtect.cs index ef388045..0fb389c3 100644 --- a/BinaryObjectScanner.Protection/NEACProtect.cs +++ b/BinaryObjectScanner.Protection/NEACProtect.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/OnlineRegistration.cs b/BinaryObjectScanner.Protection/OnlineRegistration.cs index 314f13e1..4d83b26d 100644 --- a/BinaryObjectScanner.Protection/OnlineRegistration.cs +++ b/BinaryObjectScanner.Protection/OnlineRegistration.cs @@ -1,6 +1,6 @@ using System; using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BurnOutSharp.ProtectionType { diff --git a/BinaryObjectScanner.Protection/OpenMG.cs b/BinaryObjectScanner.Protection/OpenMG.cs index 2b78554f..3948eeb7 100644 --- a/BinaryObjectScanner.Protection/OpenMG.cs +++ b/BinaryObjectScanner.Protection/OpenMG.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.IO; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/Origin.cs b/BinaryObjectScanner.Protection/Origin.cs index ecf56936..cc60a784 100644 --- a/BinaryObjectScanner.Protection/Origin.cs +++ b/BinaryObjectScanner.Protection/Origin.cs @@ -3,7 +3,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/PlayJ.cs b/BinaryObjectScanner.Protection/PlayJ.cs index e99fe69b..2fdfd55e 100644 --- a/BinaryObjectScanner.Protection/PlayJ.cs +++ b/BinaryObjectScanner.Protection/PlayJ.cs @@ -3,7 +3,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/ProtectDisc.cs b/BinaryObjectScanner.Protection/ProtectDisc.cs index 6794cc14..0dc957a3 100644 --- a/BinaryObjectScanner.Protection/ProtectDisc.cs +++ b/BinaryObjectScanner.Protection/ProtectDisc.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/RainbowSentinel.cs b/BinaryObjectScanner.Protection/RainbowSentinel.cs index 3714a139..8829a24b 100644 --- a/BinaryObjectScanner.Protection/RainbowSentinel.cs +++ b/BinaryObjectScanner.Protection/RainbowSentinel.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/SVKP.cs b/BinaryObjectScanner.Protection/SVKP.cs index 258ebe26..e1363fba 100644 --- a/BinaryObjectScanner.Protection/SVKP.cs +++ b/BinaryObjectScanner.Protection/SVKP.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/SecuROM.cs b/BinaryObjectScanner.Protection/SecuROM.cs index a9de55a7..4c481436 100644 --- a/BinaryObjectScanner.Protection/SecuROM.cs +++ b/BinaryObjectScanner.Protection/SecuROM.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/SmartE.cs b/BinaryObjectScanner.Protection/SmartE.cs index e3b2469b..295ebce9 100644 --- a/BinaryObjectScanner.Protection/SmartE.cs +++ b/BinaryObjectScanner.Protection/SmartE.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/SoftLock.cs b/BinaryObjectScanner.Protection/SoftLock.cs index 9a1fdaa8..8c88e246 100644 --- a/BinaryObjectScanner.Protection/SoftLock.cs +++ b/BinaryObjectScanner.Protection/SoftLock.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/SolidShield.cs b/BinaryObjectScanner.Protection/SolidShield.cs index 9a7b866a..abf21469 100644 --- a/BinaryObjectScanner.Protection/SolidShield.cs +++ b/BinaryObjectScanner.Protection/SolidShield.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BurnOutSharp.ProtectionType { diff --git a/BinaryObjectScanner.Protection/StarForce.cs b/BinaryObjectScanner.Protection/StarForce.cs index 6d625c34..c4cb6176 100644 --- a/BinaryObjectScanner.Protection/StarForce.cs +++ b/BinaryObjectScanner.Protection/StarForce.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/Steam.cs b/BinaryObjectScanner.Protection/Steam.cs index 3e90ea2d..0f2ac874 100644 --- a/BinaryObjectScanner.Protection/Steam.cs +++ b/BinaryObjectScanner.Protection/Steam.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/Sysiphus.cs b/BinaryObjectScanner.Protection/Sysiphus.cs index 61bc0ed1..fd0673ab 100644 --- a/BinaryObjectScanner.Protection/Sysiphus.cs +++ b/BinaryObjectScanner.Protection/Sysiphus.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/Tages.cs b/BinaryObjectScanner.Protection/Tages.cs index 83b31aa6..dc4abf9d 100644 --- a/BinaryObjectScanner.Protection/Tages.cs +++ b/BinaryObjectScanner.Protection/Tages.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.IO; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BurnOutSharp.ProtectionType { diff --git a/BinaryObjectScanner.Protection/Themida.cs b/BinaryObjectScanner.Protection/Themida.cs index 7bded37d..03ae4146 100644 --- a/BinaryObjectScanner.Protection/Themida.cs +++ b/BinaryObjectScanner.Protection/Themida.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/ThreePLock.cs b/BinaryObjectScanner.Protection/ThreePLock.cs index b4b79b26..ebcf1840 100644 --- a/BinaryObjectScanner.Protection/ThreePLock.cs +++ b/BinaryObjectScanner.Protection/ThreePLock.cs @@ -1,5 +1,5 @@ using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/ThreeTwoOneStudios.cs b/BinaryObjectScanner.Protection/ThreeTwoOneStudios.cs index eeab50e2..9883e94a 100644 --- a/BinaryObjectScanner.Protection/ThreeTwoOneStudios.cs +++ b/BinaryObjectScanner.Protection/ThreeTwoOneStudios.cs @@ -1,6 +1,6 @@ using System.Linq; using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/Uplay.cs b/BinaryObjectScanner.Protection/Uplay.cs index c86f3920..cf1a052f 100644 --- a/BinaryObjectScanner.Protection/Uplay.cs +++ b/BinaryObjectScanner.Protection/Uplay.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/WMDS.cs b/BinaryObjectScanner.Protection/WMDS.cs index c0ce2ca2..d24cf028 100644 --- a/BinaryObjectScanner.Protection/WMDS.cs +++ b/BinaryObjectScanner.Protection/WMDS.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/WTMCDProtect.cs b/BinaryObjectScanner.Protection/WTMCDProtect.cs index 4298eb46..aae218d7 100644 --- a/BinaryObjectScanner.Protection/WTMCDProtect.cs +++ b/BinaryObjectScanner.Protection/WTMCDProtect.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/XCP.cs b/BinaryObjectScanner.Protection/XCP.cs index 538140ca..caf477f4 100644 --- a/BinaryObjectScanner.Protection/XCP.cs +++ b/BinaryObjectScanner.Protection/XCP.cs @@ -4,8 +4,8 @@ using System.Collections.Generic; using System.IO; using System.Linq; using BinaryObjectScanner.Interfaces; -using BinaryObjectScanner.Wrappers; using SabreTools.IO; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner.Protection/nProtect.cs b/BinaryObjectScanner.Protection/nProtect.cs index fff91989..e000f2e9 100644 --- a/BinaryObjectScanner.Protection/nProtect.cs +++ b/BinaryObjectScanner.Protection/nProtect.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Matching; -using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BurnOutSharp/BurnOutSharp.csproj b/BurnOutSharp/BurnOutSharp.csproj index 8a786773..c01321e5 100644 --- a/BurnOutSharp/BurnOutSharp.csproj +++ b/BurnOutSharp/BurnOutSharp.csproj @@ -22,6 +22,7 @@ + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/BurnOutSharp/Scanner.cs b/BurnOutSharp/Scanner.cs index 5c1e5040..ab9c21ca 100644 --- a/BurnOutSharp/Scanner.cs +++ b/BurnOutSharp/Scanner.cs @@ -9,6 +9,7 @@ using BinaryObjectScanner.FileType; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Utilities; using BinaryObjectScanner.Wrappers; +using SabreTools.Serialization.Wrappers; using static BinaryObjectScanner.Utilities.Dictionary; namespace BurnOutSharp diff --git a/Test/Extractor.cs b/Test/Extractor.cs index ea967759..ba4769e9 100644 --- a/Test/Extractor.cs +++ b/Test/Extractor.cs @@ -7,6 +7,7 @@ using BinaryObjectScanner.Utilities; using BinaryObjectScanner.Wrappers; using OpenMcdf; using SabreTools.IO; +using SabreTools.Serialization.Wrappers; using SharpCompress.Archives; using SharpCompress.Archives.GZip; using SharpCompress.Archives.Rar;