diff --git a/BinaryObjectScanner.Test/BinaryObjectScanner.Test.csproj b/BinaryObjectScanner.Test/BinaryObjectScanner.Test.csproj index 755f1bdf..2b6fd073 100644 --- a/BinaryObjectScanner.Test/BinaryObjectScanner.Test.csproj +++ b/BinaryObjectScanner.Test/BinaryObjectScanner.Test.csproj @@ -12,12 +12,12 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/BinaryObjectScanner.Test/FileType/AACSMediaKeyBlockTests.cs b/BinaryObjectScanner.Test/FileType/AACSMediaKeyBlockTests.cs index 541ade84..8ccd7602 100644 --- a/BinaryObjectScanner.Test/FileType/AACSMediaKeyBlockTests.cs +++ b/BinaryObjectScanner.Test/FileType/AACSMediaKeyBlockTests.cs @@ -6,7 +6,7 @@ namespace BinaryObjectScanner.Test.FileType { public class AACSMediaKeyBlockTests { - private static readonly SabreTools.Serialization.Wrappers.AACSMediaKeyBlock wrapper + private static readonly SabreTools.Wrappers.AACSMediaKeyBlock wrapper = new(new SabreTools.Data.Models.AACS.MediaKeyBlock(), new MemoryStream(new byte[1024])); [Fact] diff --git a/BinaryObjectScanner.Test/FileType/BDPlusSVMTests.cs b/BinaryObjectScanner.Test/FileType/BDPlusSVMTests.cs index d66e3643..18f79b0f 100644 --- a/BinaryObjectScanner.Test/FileType/BDPlusSVMTests.cs +++ b/BinaryObjectScanner.Test/FileType/BDPlusSVMTests.cs @@ -6,7 +6,7 @@ namespace BinaryObjectScanner.Test.FileType { public class BDPlusSVMTests { - private static readonly SabreTools.Serialization.Wrappers.BDPlusSVM wrapper + private static readonly SabreTools.Wrappers.BDPlusSVM wrapper = new(new SabreTools.Data.Models.BDPlus.SVM(), new MemoryStream(new byte[1024])); [Fact] diff --git a/BinaryObjectScanner.Test/FileType/DiskImageTests.cs b/BinaryObjectScanner.Test/FileType/DiskImageTests.cs index 4e573a3b..3976738d 100644 --- a/BinaryObjectScanner.Test/FileType/DiskImageTests.cs +++ b/BinaryObjectScanner.Test/FileType/DiskImageTests.cs @@ -6,7 +6,7 @@ namespace BinaryObjectScanner.Test.FileType { public class DiskImageTests { - private static readonly SabreTools.Serialization.Wrappers.ISO9660 wrapper + private static readonly SabreTools.Wrappers.ISO9660 wrapper = new(new SabreTools.Data.Models.ISO9660.Volume(), new MemoryStream(new byte[1024])); [Fact] diff --git a/BinaryObjectScanner.Test/FileType/GCFTests.cs b/BinaryObjectScanner.Test/FileType/GCFTests.cs index 8598e903..0ea89f63 100644 --- a/BinaryObjectScanner.Test/FileType/GCFTests.cs +++ b/BinaryObjectScanner.Test/FileType/GCFTests.cs @@ -6,7 +6,7 @@ namespace BinaryObjectScanner.Test.FileType { public class GCFTests { - private static readonly SabreTools.Serialization.Wrappers.GCF wrapper + private static readonly SabreTools.Wrappers.GCF wrapper = new(new SabreTools.Data.Models.GCF.File(), new MemoryStream(new byte[1024])); [Fact] diff --git a/BinaryObjectScanner.Test/FileType/LDSCRYPTTests.cs b/BinaryObjectScanner.Test/FileType/LDSCRYPTTests.cs index f4bca804..a857d27f 100644 --- a/BinaryObjectScanner.Test/FileType/LDSCRYPTTests.cs +++ b/BinaryObjectScanner.Test/FileType/LDSCRYPTTests.cs @@ -6,7 +6,7 @@ namespace BinaryObjectScanner.Test.FileType { public class LDSCRYPTTests { - private static readonly SabreTools.Serialization.Wrappers.LDSCRYPT wrapper + private static readonly SabreTools.Wrappers.LDSCRYPT wrapper = new(new SabreTools.Data.Models.LDSCRYPT.EncryptedFile(), new MemoryStream(new byte[1024])); [Fact] diff --git a/BinaryObjectScanner.Test/FileType/LinearExecutableTests.cs b/BinaryObjectScanner.Test/FileType/LinearExecutableTests.cs index 397c48f1..547da14e 100644 --- a/BinaryObjectScanner.Test/FileType/LinearExecutableTests.cs +++ b/BinaryObjectScanner.Test/FileType/LinearExecutableTests.cs @@ -6,7 +6,7 @@ namespace BinaryObjectScanner.Test.FileType { public class LinearExecutableTests { - private static readonly SabreTools.Serialization.Wrappers.LinearExecutable wrapper + private static readonly SabreTools.Wrappers.LinearExecutable wrapper = new(new SabreTools.Data.Models.LinearExecutable.Executable(), new MemoryStream(new byte[1024])); [Fact] diff --git a/BinaryObjectScanner.Test/FileType/MSDOSTests.cs b/BinaryObjectScanner.Test/FileType/MSDOSTests.cs index 47759ee3..aedb3cb8 100644 --- a/BinaryObjectScanner.Test/FileType/MSDOSTests.cs +++ b/BinaryObjectScanner.Test/FileType/MSDOSTests.cs @@ -6,7 +6,7 @@ namespace BinaryObjectScanner.Test.FileType { public class MSDOSTests { - private static readonly SabreTools.Serialization.Wrappers.MSDOS wrapper + private static readonly SabreTools.Wrappers.MSDOS wrapper = new(new SabreTools.Data.Models.MSDOS.Executable(), new MemoryStream(new byte[1024])); [Fact] diff --git a/BinaryObjectScanner.Test/FileType/NewExecutableTests.cs b/BinaryObjectScanner.Test/FileType/NewExecutableTests.cs index f828905b..d5443111 100644 --- a/BinaryObjectScanner.Test/FileType/NewExecutableTests.cs +++ b/BinaryObjectScanner.Test/FileType/NewExecutableTests.cs @@ -6,7 +6,7 @@ namespace BinaryObjectScanner.Test.FileType { public class NewExecutableTests { - private static readonly SabreTools.Serialization.Wrappers.NewExecutable wrapper + private static readonly SabreTools.Wrappers.NewExecutable wrapper = new(new SabreTools.Data.Models.NewExecutable.Executable(), new MemoryStream(new byte[1024])); [Fact] diff --git a/BinaryObjectScanner.Test/FileType/PLJTests.cs b/BinaryObjectScanner.Test/FileType/PLJTests.cs index 1ea2d5d7..a12ea5fc 100644 --- a/BinaryObjectScanner.Test/FileType/PLJTests.cs +++ b/BinaryObjectScanner.Test/FileType/PLJTests.cs @@ -6,7 +6,7 @@ namespace BinaryObjectScanner.Test.FileType { public class PLJTests { - private static readonly SabreTools.Serialization.Wrappers.PlayJAudioFile wrapper + private static readonly SabreTools.Wrappers.PlayJAudioFile wrapper = new(new SabreTools.Data.Models.PlayJ.AudioFile(), new MemoryStream(new byte[1024])); [Fact] diff --git a/BinaryObjectScanner.Test/FileType/PortableExecutableTests.cs b/BinaryObjectScanner.Test/FileType/PortableExecutableTests.cs index 063580dd..f91eeb79 100644 --- a/BinaryObjectScanner.Test/FileType/PortableExecutableTests.cs +++ b/BinaryObjectScanner.Test/FileType/PortableExecutableTests.cs @@ -6,7 +6,7 @@ namespace BinaryObjectScanner.Test.FileType { public class PortableExecutableTests { - private static readonly SabreTools.Serialization.Wrappers.PortableExecutable wrapper + private static readonly SabreTools.Wrappers.PortableExecutable wrapper = new(new SabreTools.Data.Models.PortableExecutable.Executable(), new MemoryStream(new byte[1024])); [Fact] diff --git a/BinaryObjectScanner.Test/FileType/RealArcadeInstallerTests.cs b/BinaryObjectScanner.Test/FileType/RealArcadeInstallerTests.cs index 7ce91fc2..0f9a9411 100644 --- a/BinaryObjectScanner.Test/FileType/RealArcadeInstallerTests.cs +++ b/BinaryObjectScanner.Test/FileType/RealArcadeInstallerTests.cs @@ -6,7 +6,7 @@ namespace BinaryObjectScanner.Test.FileType { public class RealArcadeInstallerTests { - private static readonly SabreTools.Serialization.Wrappers.RealArcadeInstaller wrapper + private static readonly SabreTools.Wrappers.RealArcadeInstaller wrapper = new(new SabreTools.Data.Models.RealArcade.RgsFile(), new MemoryStream(new byte[1024])); [Fact] diff --git a/BinaryObjectScanner.Test/FileType/RealArcadeMezzanineTests.cs b/BinaryObjectScanner.Test/FileType/RealArcadeMezzanineTests.cs index 455cc569..e619c7b9 100644 --- a/BinaryObjectScanner.Test/FileType/RealArcadeMezzanineTests.cs +++ b/BinaryObjectScanner.Test/FileType/RealArcadeMezzanineTests.cs @@ -6,7 +6,7 @@ namespace BinaryObjectScanner.Test.FileType { public class RealArcadeMezzanineTests { - private static readonly SabreTools.Serialization.Wrappers.RealArcadeMezzanine wrapper + private static readonly SabreTools.Wrappers.RealArcadeMezzanine wrapper = new(new SabreTools.Data.Models.RealArcade.Mezzanine(), new MemoryStream(new byte[1024])); [Fact] diff --git a/BinaryObjectScanner.Test/FileType/SFFSTests.cs b/BinaryObjectScanner.Test/FileType/SFFSTests.cs index 28dbe175..43edbf56 100644 --- a/BinaryObjectScanner.Test/FileType/SFFSTests.cs +++ b/BinaryObjectScanner.Test/FileType/SFFSTests.cs @@ -6,7 +6,7 @@ namespace BinaryObjectScanner.Test.FileType { public class SFFSTests { - private static readonly SabreTools.Serialization.Wrappers.SFFS wrapper + private static readonly SabreTools.Wrappers.SFFS wrapper = new(new SabreTools.Data.Models.StarForce.FileSystem(), new MemoryStream(new byte[1024])); [Fact] diff --git a/BinaryObjectScanner.Test/GameEngine/RenderWareTests.cs b/BinaryObjectScanner.Test/GameEngine/RenderWareTests.cs index b566807a..6ee93c1a 100644 --- a/BinaryObjectScanner.Test/GameEngine/RenderWareTests.cs +++ b/BinaryObjectScanner.Test/GameEngine/RenderWareTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.GameEngine string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new RenderWare(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Packer/ASPackTests.cs b/BinaryObjectScanner.Test/Packer/ASPackTests.cs index f631176b..70487808 100644 --- a/BinaryObjectScanner.Test/Packer/ASPackTests.cs +++ b/BinaryObjectScanner.Test/Packer/ASPackTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Packer string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new ASPack(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Packer/AdvancedInstallerTests.cs b/BinaryObjectScanner.Test/Packer/AdvancedInstallerTests.cs index a640fff8..bcf0c1a7 100644 --- a/BinaryObjectScanner.Test/Packer/AdvancedInstallerTests.cs +++ b/BinaryObjectScanner.Test/Packer/AdvancedInstallerTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Packer string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new AdvancedInstaller(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Packer/AutoPlayMediaStudioTests.cs b/BinaryObjectScanner.Test/Packer/AutoPlayMediaStudioTests.cs index f26408c3..84b39b2c 100644 --- a/BinaryObjectScanner.Test/Packer/AutoPlayMediaStudioTests.cs +++ b/BinaryObjectScanner.Test/Packer/AutoPlayMediaStudioTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Packer string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new AutoPlayMediaStudio(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Packer/CExeTests.cs b/BinaryObjectScanner.Test/Packer/CExeTests.cs index 26ebc0e5..3d6884be 100644 --- a/BinaryObjectScanner.Test/Packer/CExeTests.cs +++ b/BinaryObjectScanner.Test/Packer/CExeTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Packer string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new CExe(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Packer/CrunchTests.cs b/BinaryObjectScanner.Test/Packer/CrunchTests.cs index fba1f282..056f0bb3 100644 --- a/BinaryObjectScanner.Test/Packer/CrunchTests.cs +++ b/BinaryObjectScanner.Test/Packer/CrunchTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Packer string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new Crunch(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Packer/DotFuscatorTests.cs b/BinaryObjectScanner.Test/Packer/DotFuscatorTests.cs index df39ee41..95b5f2bb 100644 --- a/BinaryObjectScanner.Test/Packer/DotFuscatorTests.cs +++ b/BinaryObjectScanner.Test/Packer/DotFuscatorTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Packer string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new DotFuscator(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Packer/DotNetReactorTests.cs b/BinaryObjectScanner.Test/Packer/DotNetReactorTests.cs index 29dcc606..734f9211 100644 --- a/BinaryObjectScanner.Test/Packer/DotNetReactorTests.cs +++ b/BinaryObjectScanner.Test/Packer/DotNetReactorTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Packer string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new DotNetReactor(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Packer/EXEStealthTests.cs b/BinaryObjectScanner.Test/Packer/EXEStealthTests.cs index ae98b807..fcdbed0e 100644 --- a/BinaryObjectScanner.Test/Packer/EXEStealthTests.cs +++ b/BinaryObjectScanner.Test/Packer/EXEStealthTests.cs @@ -23,7 +23,7 @@ namespace BinaryObjectScanner.Test.Packer string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new EXEStealth(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Packer/EmbeddedFileTests.cs b/BinaryObjectScanner.Test/Packer/EmbeddedFileTests.cs index 6e458d76..9597b5f0 100644 --- a/BinaryObjectScanner.Test/Packer/EmbeddedFileTests.cs +++ b/BinaryObjectScanner.Test/Packer/EmbeddedFileTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Packer string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new EmbeddedFile(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Packer/GenteeInstallerTests.cs b/BinaryObjectScanner.Test/Packer/GenteeInstallerTests.cs index 3b1aba0c..40536160 100644 --- a/BinaryObjectScanner.Test/Packer/GenteeInstallerTests.cs +++ b/BinaryObjectScanner.Test/Packer/GenteeInstallerTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Packer string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new GenteeInstaller(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Packer/HyperTechCrackProofTests.cs b/BinaryObjectScanner.Test/Packer/HyperTechCrackProofTests.cs index d533246f..27055375 100644 --- a/BinaryObjectScanner.Test/Packer/HyperTechCrackProofTests.cs +++ b/BinaryObjectScanner.Test/Packer/HyperTechCrackProofTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Packer string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new HyperTechCrackProof(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Packer/InnoSetupTests.cs b/BinaryObjectScanner.Test/Packer/InnoSetupTests.cs index 7e0a24fe..145cfa14 100644 --- a/BinaryObjectScanner.Test/Packer/InnoSetupTests.cs +++ b/BinaryObjectScanner.Test/Packer/InnoSetupTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Packer string file = "filename"; SabreTools.Data.Models.NewExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.NewExecutable exe = new(model, source); + SabreTools.Wrappers.NewExecutable exe = new(model, source); var checker = new InnoSetup(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); @@ -25,7 +25,7 @@ namespace BinaryObjectScanner.Test.Packer string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new InnoSetup(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Packer/InstallAnywhereTests.cs b/BinaryObjectScanner.Test/Packer/InstallAnywhereTests.cs index 1f376649..279785aa 100644 --- a/BinaryObjectScanner.Test/Packer/InstallAnywhereTests.cs +++ b/BinaryObjectScanner.Test/Packer/InstallAnywhereTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Packer string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new InstallAnywhere(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Packer/InstallerVISETests.cs b/BinaryObjectScanner.Test/Packer/InstallerVISETests.cs index 7a73020a..8eb39b45 100644 --- a/BinaryObjectScanner.Test/Packer/InstallerVISETests.cs +++ b/BinaryObjectScanner.Test/Packer/InstallerVISETests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Packer string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new InstallerVISE(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Packer/IntelInstallationFrameworkTests.cs b/BinaryObjectScanner.Test/Packer/IntelInstallationFrameworkTests.cs index 680e0b5d..063abe29 100644 --- a/BinaryObjectScanner.Test/Packer/IntelInstallationFrameworkTests.cs +++ b/BinaryObjectScanner.Test/Packer/IntelInstallationFrameworkTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Packer string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new IntelInstallationFramework(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Packer/MicrosoftCABSFXTests.cs b/BinaryObjectScanner.Test/Packer/MicrosoftCABSFXTests.cs index c9428c95..92713cdb 100644 --- a/BinaryObjectScanner.Test/Packer/MicrosoftCABSFXTests.cs +++ b/BinaryObjectScanner.Test/Packer/MicrosoftCABSFXTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Packer string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new MicrosoftCABSFX(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Packer/NSISTests.cs b/BinaryObjectScanner.Test/Packer/NSISTests.cs index 0aebdd88..9e44b26a 100644 --- a/BinaryObjectScanner.Test/Packer/NSISTests.cs +++ b/BinaryObjectScanner.Test/Packer/NSISTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Packer string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new NSIS(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Packer/NeoLiteTests.cs b/BinaryObjectScanner.Test/Packer/NeoLiteTests.cs index eac0c92f..f97545a5 100644 --- a/BinaryObjectScanner.Test/Packer/NeoLiteTests.cs +++ b/BinaryObjectScanner.Test/Packer/NeoLiteTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Packer string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new NeoLite(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Packer/PECompactTests.cs b/BinaryObjectScanner.Test/Packer/PECompactTests.cs index a1033370..1275c93d 100644 --- a/BinaryObjectScanner.Test/Packer/PECompactTests.cs +++ b/BinaryObjectScanner.Test/Packer/PECompactTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Packer string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new PECompact(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Packer/PEtiteTests.cs b/BinaryObjectScanner.Test/Packer/PEtiteTests.cs index 886a94b5..33360143 100644 --- a/BinaryObjectScanner.Test/Packer/PEtiteTests.cs +++ b/BinaryObjectScanner.Test/Packer/PEtiteTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Packer string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new PEtite(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Packer/SetupFactoryTests.cs b/BinaryObjectScanner.Test/Packer/SetupFactoryTests.cs index 8b2dd47a..74ab6830 100644 --- a/BinaryObjectScanner.Test/Packer/SetupFactoryTests.cs +++ b/BinaryObjectScanner.Test/Packer/SetupFactoryTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Packer string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new SetupFactory(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Packer/SevenZipSFXTests.cs b/BinaryObjectScanner.Test/Packer/SevenZipSFXTests.cs index cd555e47..40a66979 100644 --- a/BinaryObjectScanner.Test/Packer/SevenZipSFXTests.cs +++ b/BinaryObjectScanner.Test/Packer/SevenZipSFXTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Packer string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new SevenZipSFX(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Packer/ShrinkerTests.cs b/BinaryObjectScanner.Test/Packer/ShrinkerTests.cs index 0ed8a3cb..9ac2abc8 100644 --- a/BinaryObjectScanner.Test/Packer/ShrinkerTests.cs +++ b/BinaryObjectScanner.Test/Packer/ShrinkerTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Packer string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new Shrinker(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Packer/UPXTests.cs b/BinaryObjectScanner.Test/Packer/UPXTests.cs index be30dd64..ac1adedb 100644 --- a/BinaryObjectScanner.Test/Packer/UPXTests.cs +++ b/BinaryObjectScanner.Test/Packer/UPXTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Packer string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new UPX(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Packer/WinRARSFXTests.cs b/BinaryObjectScanner.Test/Packer/WinRARSFXTests.cs index a9b5d36f..614b75e6 100644 --- a/BinaryObjectScanner.Test/Packer/WinRARSFXTests.cs +++ b/BinaryObjectScanner.Test/Packer/WinRARSFXTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Packer string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new WinRARSFX(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Packer/WinZipSFXTests.cs b/BinaryObjectScanner.Test/Packer/WinZipSFXTests.cs index ca4fd8ce..aec83402 100644 --- a/BinaryObjectScanner.Test/Packer/WinZipSFXTests.cs +++ b/BinaryObjectScanner.Test/Packer/WinZipSFXTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Packer string file = "filename"; SabreTools.Data.Models.NewExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.NewExecutable exe = new(model, source); + SabreTools.Wrappers.NewExecutable exe = new(model, source); var checker = new WinZipSFX(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); @@ -25,7 +25,7 @@ namespace BinaryObjectScanner.Test.Packer string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new WinZipSFX(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Packer/WiseInstallerTests.cs b/BinaryObjectScanner.Test/Packer/WiseInstallerTests.cs index b613f1cc..e2ee09e8 100644 --- a/BinaryObjectScanner.Test/Packer/WiseInstallerTests.cs +++ b/BinaryObjectScanner.Test/Packer/WiseInstallerTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Packer string file = "filename"; SabreTools.Data.Models.NewExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.NewExecutable exe = new(model, source); + SabreTools.Wrappers.NewExecutable exe = new(model, source); var checker = new WiseInstaller(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); @@ -25,7 +25,7 @@ namespace BinaryObjectScanner.Test.Packer string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new WiseInstaller(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/ActiveMARKTests.cs b/BinaryObjectScanner.Test/Protection/ActiveMARKTests.cs index 79517aea..1ae26396 100644 --- a/BinaryObjectScanner.Test/Protection/ActiveMARKTests.cs +++ b/BinaryObjectScanner.Test/Protection/ActiveMARKTests.cs @@ -23,7 +23,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new ActiveMARK(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/AegiSoftTests.cs b/BinaryObjectScanner.Test/Protection/AegiSoftTests.cs index cc289d1f..6fa4b87b 100644 --- a/BinaryObjectScanner.Test/Protection/AegiSoftTests.cs +++ b/BinaryObjectScanner.Test/Protection/AegiSoftTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new AegiSoft(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/AlphaROMTests.cs b/BinaryObjectScanner.Test/Protection/AlphaROMTests.cs index 060dfade..947f6ec8 100644 --- a/BinaryObjectScanner.Test/Protection/AlphaROMTests.cs +++ b/BinaryObjectScanner.Test/Protection/AlphaROMTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new AlphaROM(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); @@ -25,7 +25,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.ISO9660.Volume model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.ISO9660 iso = new(model, source); + SabreTools.Wrappers.ISO9660 iso = new(model, source); var checker = new AlphaROM(); string? actual = checker.CheckDiskImage(file, iso, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/ArmadilloTests.cs b/BinaryObjectScanner.Test/Protection/ArmadilloTests.cs index 05c0d886..6b6a9907 100644 --- a/BinaryObjectScanner.Test/Protection/ArmadilloTests.cs +++ b/BinaryObjectScanner.Test/Protection/ArmadilloTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new Armadillo(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/ByteShieldTests.cs b/BinaryObjectScanner.Test/Protection/ByteShieldTests.cs index 0e8fff55..0952dd50 100644 --- a/BinaryObjectScanner.Test/Protection/ByteShieldTests.cs +++ b/BinaryObjectScanner.Test/Protection/ByteShieldTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new ByteShield(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/CDCheckTests.cs b/BinaryObjectScanner.Test/Protection/CDCheckTests.cs index dd3e331d..ccf83214 100644 --- a/BinaryObjectScanner.Test/Protection/CDCheckTests.cs +++ b/BinaryObjectScanner.Test/Protection/CDCheckTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new CDCheck(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/CDDVDCopsTests.cs b/BinaryObjectScanner.Test/Protection/CDDVDCopsTests.cs index 8b15178c..ae38ceb1 100644 --- a/BinaryObjectScanner.Test/Protection/CDDVDCopsTests.cs +++ b/BinaryObjectScanner.Test/Protection/CDDVDCopsTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.NewExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.NewExecutable exe = new(model, source); + SabreTools.Wrappers.NewExecutable exe = new(model, source); var checker = new CDDVDCops(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); @@ -26,7 +26,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new CDDVDCops(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/CDGuardTests.cs b/BinaryObjectScanner.Test/Protection/CDGuardTests.cs index 3af725d9..9a877ee0 100644 --- a/BinaryObjectScanner.Test/Protection/CDGuardTests.cs +++ b/BinaryObjectScanner.Test/Protection/CDGuardTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new CDGuard(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/CDKeyTests.cs b/BinaryObjectScanner.Test/Protection/CDKeyTests.cs index cc81d9e6..5f06d97b 100644 --- a/BinaryObjectScanner.Test/Protection/CDKeyTests.cs +++ b/BinaryObjectScanner.Test/Protection/CDKeyTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new CDKey(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/CDLockTests.cs b/BinaryObjectScanner.Test/Protection/CDLockTests.cs index b3934227..25844270 100644 --- a/BinaryObjectScanner.Test/Protection/CDLockTests.cs +++ b/BinaryObjectScanner.Test/Protection/CDLockTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new CDLock(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/CDSHiELDSETests.cs b/BinaryObjectScanner.Test/Protection/CDSHiELDSETests.cs index d4fec7e6..8510e76c 100644 --- a/BinaryObjectScanner.Test/Protection/CDSHiELDSETests.cs +++ b/BinaryObjectScanner.Test/Protection/CDSHiELDSETests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new CDSHiELDSE(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/CEGTests.cs b/BinaryObjectScanner.Test/Protection/CEGTests.cs index 75575e36..24ace4dc 100644 --- a/BinaryObjectScanner.Test/Protection/CEGTests.cs +++ b/BinaryObjectScanner.Test/Protection/CEGTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new CEG(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/CenegaProtectDVDTests.cs b/BinaryObjectScanner.Test/Protection/CenegaProtectDVDTests.cs index 1d90d236..15fee779 100644 --- a/BinaryObjectScanner.Test/Protection/CenegaProtectDVDTests.cs +++ b/BinaryObjectScanner.Test/Protection/CenegaProtectDVDTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new CenegaProtectDVD(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/ChannelwareTests.cs b/BinaryObjectScanner.Test/Protection/ChannelwareTests.cs index 7eca30ec..6acae309 100644 --- a/BinaryObjectScanner.Test/Protection/ChannelwareTests.cs +++ b/BinaryObjectScanner.Test/Protection/ChannelwareTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new Channelware(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/ChosenBytesCodeLockTests.cs b/BinaryObjectScanner.Test/Protection/ChosenBytesCodeLockTests.cs index 66c40b86..ceee9658 100644 --- a/BinaryObjectScanner.Test/Protection/ChosenBytesCodeLockTests.cs +++ b/BinaryObjectScanner.Test/Protection/ChosenBytesCodeLockTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new ChosenBytesCodeLock(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/CopyKillerTests.cs b/BinaryObjectScanner.Test/Protection/CopyKillerTests.cs index f7f406d7..272cfe9c 100644 --- a/BinaryObjectScanner.Test/Protection/CopyKillerTests.cs +++ b/BinaryObjectScanner.Test/Protection/CopyKillerTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new CopyKiller(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/CopyLokTests.cs b/BinaryObjectScanner.Test/Protection/CopyLokTests.cs index d7e699ca..c8d9ee91 100644 --- a/BinaryObjectScanner.Test/Protection/CopyLokTests.cs +++ b/BinaryObjectScanner.Test/Protection/CopyLokTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new CopyLok(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); @@ -25,7 +25,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.ISO9660.Volume model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.ISO9660 iso = new(model, source); + SabreTools.Wrappers.ISO9660 iso = new(model, source); var checker = new CopyLok(); string? actual = checker.CheckDiskImage(file, iso, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/CopyXTests.cs b/BinaryObjectScanner.Test/Protection/CopyXTests.cs index 6c275e18..f89e3a1f 100644 --- a/BinaryObjectScanner.Test/Protection/CopyXTests.cs +++ b/BinaryObjectScanner.Test/Protection/CopyXTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new CopyX(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/CrypKeyTests.cs b/BinaryObjectScanner.Test/Protection/CrypKeyTests.cs index 658b832f..72713324 100644 --- a/BinaryObjectScanner.Test/Protection/CrypKeyTests.cs +++ b/BinaryObjectScanner.Test/Protection/CrypKeyTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new CrypKey(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/CuckoTests.cs b/BinaryObjectScanner.Test/Protection/CuckoTests.cs index ae0af3cf..94c1c2d3 100644 --- a/BinaryObjectScanner.Test/Protection/CuckoTests.cs +++ b/BinaryObjectScanner.Test/Protection/CuckoTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new Cucko(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/DenuvoTests.cs b/BinaryObjectScanner.Test/Protection/DenuvoTests.cs index fa6eb669..bfd488e8 100644 --- a/BinaryObjectScanner.Test/Protection/DenuvoTests.cs +++ b/BinaryObjectScanner.Test/Protection/DenuvoTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new Denuvo(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/DigiGuardTests.cs b/BinaryObjectScanner.Test/Protection/DigiGuardTests.cs index 9abf079b..cda77e3c 100644 --- a/BinaryObjectScanner.Test/Protection/DigiGuardTests.cs +++ b/BinaryObjectScanner.Test/Protection/DigiGuardTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new DigiGuard(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/DiscGuardTests.cs b/BinaryObjectScanner.Test/Protection/DiscGuardTests.cs index 5ce87b2c..5328cca5 100644 --- a/BinaryObjectScanner.Test/Protection/DiscGuardTests.cs +++ b/BinaryObjectScanner.Test/Protection/DiscGuardTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new DiscGuard(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/EAAntiCheatTests.cs b/BinaryObjectScanner.Test/Protection/EAAntiCheatTests.cs index 7d67b1a8..0ba78ace 100644 --- a/BinaryObjectScanner.Test/Protection/EAAntiCheatTests.cs +++ b/BinaryObjectScanner.Test/Protection/EAAntiCheatTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new EAAntiCheat(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/EasyAntiCheatTests.cs b/BinaryObjectScanner.Test/Protection/EasyAntiCheatTests.cs index 1d1be249..ff7368e2 100644 --- a/BinaryObjectScanner.Test/Protection/EasyAntiCheatTests.cs +++ b/BinaryObjectScanner.Test/Protection/EasyAntiCheatTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new EasyAntiCheat(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/ElectronicArtsTests.cs b/BinaryObjectScanner.Test/Protection/ElectronicArtsTests.cs index 8c1b7403..90e84162 100644 --- a/BinaryObjectScanner.Test/Protection/ElectronicArtsTests.cs +++ b/BinaryObjectScanner.Test/Protection/ElectronicArtsTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new ElectronicArts(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/Engine32Tests.cs b/BinaryObjectScanner.Test/Protection/Engine32Tests.cs index d9310c4e..06224c40 100644 --- a/BinaryObjectScanner.Test/Protection/Engine32Tests.cs +++ b/BinaryObjectScanner.Test/Protection/Engine32Tests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new Engine32(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/GFWLTests.cs b/BinaryObjectScanner.Test/Protection/GFWLTests.cs index e9379d7d..20ef917d 100644 --- a/BinaryObjectScanner.Test/Protection/GFWLTests.cs +++ b/BinaryObjectScanner.Test/Protection/GFWLTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new GFWL(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/GefestTests.cs b/BinaryObjectScanner.Test/Protection/GefestTests.cs index 9e30dced..6e904ca6 100644 --- a/BinaryObjectScanner.Test/Protection/GefestTests.cs +++ b/BinaryObjectScanner.Test/Protection/GefestTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new Gefest(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/HexalockAutoLockTests.cs b/BinaryObjectScanner.Test/Protection/HexalockAutoLockTests.cs index 604867d5..ac899604 100644 --- a/BinaryObjectScanner.Test/Protection/HexalockAutoLockTests.cs +++ b/BinaryObjectScanner.Test/Protection/HexalockAutoLockTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new HexalockAutoLock(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/ImpulseReactorTests.cs b/BinaryObjectScanner.Test/Protection/ImpulseReactorTests.cs index 4496d94c..8902b4bc 100644 --- a/BinaryObjectScanner.Test/Protection/ImpulseReactorTests.cs +++ b/BinaryObjectScanner.Test/Protection/ImpulseReactorTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new ImpulseReactor(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/InteniumTests.cs b/BinaryObjectScanner.Test/Protection/InteniumTests.cs index f64e5973..49a40a29 100644 --- a/BinaryObjectScanner.Test/Protection/InteniumTests.cs +++ b/BinaryObjectScanner.Test/Protection/InteniumTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new Intenium(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/InterLokTests.cs b/BinaryObjectScanner.Test/Protection/InterLokTests.cs index 64fb35b9..cc741e4c 100644 --- a/BinaryObjectScanner.Test/Protection/InterLokTests.cs +++ b/BinaryObjectScanner.Test/Protection/InterLokTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new InterLok(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/JoWoodTests.cs b/BinaryObjectScanner.Test/Protection/JoWoodTests.cs index 50e3f308..260f9ed6 100644 --- a/BinaryObjectScanner.Test/Protection/JoWoodTests.cs +++ b/BinaryObjectScanner.Test/Protection/JoWoodTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new JoWood(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/KalypsoLauncherTests.cs b/BinaryObjectScanner.Test/Protection/KalypsoLauncherTests.cs index 0b9828aa..6474e744 100644 --- a/BinaryObjectScanner.Test/Protection/KalypsoLauncherTests.cs +++ b/BinaryObjectScanner.Test/Protection/KalypsoLauncherTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new KalypsoLauncher(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/LabelGateTests.cs b/BinaryObjectScanner.Test/Protection/LabelGateTests.cs index 41c49a25..6da1a354 100644 --- a/BinaryObjectScanner.Test/Protection/LabelGateTests.cs +++ b/BinaryObjectScanner.Test/Protection/LabelGateTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new LabelGate(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/LaserLokTests.cs b/BinaryObjectScanner.Test/Protection/LaserLokTests.cs index e85b9514..1ee72067 100644 --- a/BinaryObjectScanner.Test/Protection/LaserLokTests.cs +++ b/BinaryObjectScanner.Test/Protection/LaserLokTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new LaserLok(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); @@ -47,7 +47,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.ISO9660.Volume model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.ISO9660 iso = new(model, source); + SabreTools.Wrappers.ISO9660 iso = new(model, source); var checker = new LaserLok(); string? actual = checker.CheckDiskImage(file, iso, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/MGIRegistrationTests.cs b/BinaryObjectScanner.Test/Protection/MGIRegistrationTests.cs index 2c362440..fbbeb730 100644 --- a/BinaryObjectScanner.Test/Protection/MGIRegistrationTests.cs +++ b/BinaryObjectScanner.Test/Protection/MGIRegistrationTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new MGIRegistration(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/MacrovisionTests.cs b/BinaryObjectScanner.Test/Protection/MacrovisionTests.cs index e6cf75c4..50cc18f3 100644 --- a/BinaryObjectScanner.Test/Protection/MacrovisionTests.cs +++ b/BinaryObjectScanner.Test/Protection/MacrovisionTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.NewExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.NewExecutable exe = new(model, source); + SabreTools.Wrappers.NewExecutable exe = new(model, source); var checker = new Macrovision(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); @@ -26,7 +26,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new Macrovision(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); @@ -60,7 +60,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.ISO9660.Volume model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.ISO9660 iso = new(model, source); + SabreTools.Wrappers.ISO9660 iso = new(model, source); var checker = new Macrovision(); string? actual = checker.CheckDiskImage(file, iso, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/MediaCloQTests.cs b/BinaryObjectScanner.Test/Protection/MediaCloQTests.cs index 7e2b216a..732e056f 100644 --- a/BinaryObjectScanner.Test/Protection/MediaCloQTests.cs +++ b/BinaryObjectScanner.Test/Protection/MediaCloQTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new MediaCloQ(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/MediaMaxTests.cs b/BinaryObjectScanner.Test/Protection/MediaMaxTests.cs index f094f9b4..7e36b20a 100644 --- a/BinaryObjectScanner.Test/Protection/MediaMaxTests.cs +++ b/BinaryObjectScanner.Test/Protection/MediaMaxTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new MediaMax(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/NEACProtectTests.cs b/BinaryObjectScanner.Test/Protection/NEACProtectTests.cs index 47044793..538af11a 100644 --- a/BinaryObjectScanner.Test/Protection/NEACProtectTests.cs +++ b/BinaryObjectScanner.Test/Protection/NEACProtectTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new NEACProtect(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/NProtectTests.cs b/BinaryObjectScanner.Test/Protection/NProtectTests.cs index bd455d1c..f2a44148 100644 --- a/BinaryObjectScanner.Test/Protection/NProtectTests.cs +++ b/BinaryObjectScanner.Test/Protection/NProtectTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new NProtect(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/OnlineRegistrationTests.cs b/BinaryObjectScanner.Test/Protection/OnlineRegistrationTests.cs index 02a0d1b4..a92eef50 100644 --- a/BinaryObjectScanner.Test/Protection/OnlineRegistrationTests.cs +++ b/BinaryObjectScanner.Test/Protection/OnlineRegistrationTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new OnlineRegistration(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/OpenMGTests.cs b/BinaryObjectScanner.Test/Protection/OpenMGTests.cs index 86913c4d..223eb749 100644 --- a/BinaryObjectScanner.Test/Protection/OpenMGTests.cs +++ b/BinaryObjectScanner.Test/Protection/OpenMGTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new OpenMG(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/OriginTests.cs b/BinaryObjectScanner.Test/Protection/OriginTests.cs index cb028f7a..3d63fee1 100644 --- a/BinaryObjectScanner.Test/Protection/OriginTests.cs +++ b/BinaryObjectScanner.Test/Protection/OriginTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new Origin(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/PlayJTests.cs b/BinaryObjectScanner.Test/Protection/PlayJTests.cs index da5143d9..a86e507c 100644 --- a/BinaryObjectScanner.Test/Protection/PlayJTests.cs +++ b/BinaryObjectScanner.Test/Protection/PlayJTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new PlayJ(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/ProtectDiscTests.cs b/BinaryObjectScanner.Test/Protection/ProtectDiscTests.cs index b0d3ba7b..3c04413d 100644 --- a/BinaryObjectScanner.Test/Protection/ProtectDiscTests.cs +++ b/BinaryObjectScanner.Test/Protection/ProtectDiscTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new ProtectDISC(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); @@ -47,7 +47,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.ISO9660.Volume model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.ISO9660 iso = new(model, source); + SabreTools.Wrappers.ISO9660 iso = new(model, source); var checker = new ProtectDISC(); string? actual = checker.CheckDiskImage(file, iso, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/RainbowSentinelTests.cs b/BinaryObjectScanner.Test/Protection/RainbowSentinelTests.cs index da8f15e1..d422041f 100644 --- a/BinaryObjectScanner.Test/Protection/RainbowSentinelTests.cs +++ b/BinaryObjectScanner.Test/Protection/RainbowSentinelTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.NewExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.NewExecutable exe = new(model, source); + SabreTools.Wrappers.NewExecutable exe = new(model, source); var checker = new RainbowSentinel(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); @@ -26,7 +26,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new RainbowSentinel(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/RealArcadeTests.cs b/BinaryObjectScanner.Test/Protection/RealArcadeTests.cs index b4000419..691d98fa 100644 --- a/BinaryObjectScanner.Test/Protection/RealArcadeTests.cs +++ b/BinaryObjectScanner.Test/Protection/RealArcadeTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new RealArcade(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/RoxxeTests.cs b/BinaryObjectScanner.Test/Protection/RoxxeTests.cs index a6a1c24c..57998e7f 100644 --- a/BinaryObjectScanner.Test/Protection/RoxxeTests.cs +++ b/BinaryObjectScanner.Test/Protection/RoxxeTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new Roxxe(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/SVKProtectorTests.cs b/BinaryObjectScanner.Test/Protection/SVKProtectorTests.cs index 30e506d2..80ffd8e9 100644 --- a/BinaryObjectScanner.Test/Protection/SVKProtectorTests.cs +++ b/BinaryObjectScanner.Test/Protection/SVKProtectorTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new SVKProtector(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/SecuROMTests.cs b/BinaryObjectScanner.Test/Protection/SecuROMTests.cs index b2c402ec..c87b7c43 100644 --- a/BinaryObjectScanner.Test/Protection/SecuROMTests.cs +++ b/BinaryObjectScanner.Test/Protection/SecuROMTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new SecuROM(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); @@ -47,7 +47,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.ISO9660.Volume model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.ISO9660 iso = new(model, source); + SabreTools.Wrappers.ISO9660 iso = new(model, source); var checker = new SecuROM(); string? actual = checker.CheckDiskImage(file, iso, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/SmartETests.cs b/BinaryObjectScanner.Test/Protection/SmartETests.cs index e51af9b3..9dcd8a56 100644 --- a/BinaryObjectScanner.Test/Protection/SmartETests.cs +++ b/BinaryObjectScanner.Test/Protection/SmartETests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new SmartE(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/SoftLockTests.cs b/BinaryObjectScanner.Test/Protection/SoftLockTests.cs index b05122f0..4040fd85 100644 --- a/BinaryObjectScanner.Test/Protection/SoftLockTests.cs +++ b/BinaryObjectScanner.Test/Protection/SoftLockTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new SoftLock(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/SolidShieldTests.cs b/BinaryObjectScanner.Test/Protection/SolidShieldTests.cs index 9e2120e9..2f01d5eb 100644 --- a/BinaryObjectScanner.Test/Protection/SolidShieldTests.cs +++ b/BinaryObjectScanner.Test/Protection/SolidShieldTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new SolidShield(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/StarForceTests.cs b/BinaryObjectScanner.Test/Protection/StarForceTests.cs index 1f4ce000..30208966 100644 --- a/BinaryObjectScanner.Test/Protection/StarForceTests.cs +++ b/BinaryObjectScanner.Test/Protection/StarForceTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new StarForce(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); @@ -47,7 +47,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.ISO9660.Volume model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.ISO9660 iso = new(model, source); + SabreTools.Wrappers.ISO9660 iso = new(model, source); var checker = new StarForce(); string? actual = checker.CheckDiskImage(file, iso, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/SteamTests.cs b/BinaryObjectScanner.Test/Protection/SteamTests.cs index 28c3b6f9..6dbce77f 100644 --- a/BinaryObjectScanner.Test/Protection/SteamTests.cs +++ b/BinaryObjectScanner.Test/Protection/SteamTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new Steam(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/SysiphusTests.cs b/BinaryObjectScanner.Test/Protection/SysiphusTests.cs index 3f106f06..5cc4bdc6 100644 --- a/BinaryObjectScanner.Test/Protection/SysiphusTests.cs +++ b/BinaryObjectScanner.Test/Protection/SysiphusTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new Sysiphus(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/TAGESTests.cs b/BinaryObjectScanner.Test/Protection/TAGESTests.cs index b9890759..23f163e4 100644 --- a/BinaryObjectScanner.Test/Protection/TAGESTests.cs +++ b/BinaryObjectScanner.Test/Protection/TAGESTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new TAGES(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); @@ -47,7 +47,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.ISO9660.Volume model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.ISO9660 iso = new(model, source); + SabreTools.Wrappers.ISO9660 iso = new(model, source); var checker = new TAGES(); string? actual = checker.CheckDiskImage(file, iso, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/ThemidaTests.cs b/BinaryObjectScanner.Test/Protection/ThemidaTests.cs index aaba06e0..f5eae9c4 100644 --- a/BinaryObjectScanner.Test/Protection/ThemidaTests.cs +++ b/BinaryObjectScanner.Test/Protection/ThemidaTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new Themida(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/ThreePLockTests.cs b/BinaryObjectScanner.Test/Protection/ThreePLockTests.cs index c8b665eb..a291f964 100644 --- a/BinaryObjectScanner.Test/Protection/ThreePLockTests.cs +++ b/BinaryObjectScanner.Test/Protection/ThreePLockTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new ThreePLock(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/ThreeTwoOneStudiosTests.cs b/BinaryObjectScanner.Test/Protection/ThreeTwoOneStudiosTests.cs index 2cbf5add..dfbae56c 100644 --- a/BinaryObjectScanner.Test/Protection/ThreeTwoOneStudiosTests.cs +++ b/BinaryObjectScanner.Test/Protection/ThreeTwoOneStudiosTests.cs @@ -12,7 +12,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new ThreeTwoOneStudios(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/UplayTests.cs b/BinaryObjectScanner.Test/Protection/UplayTests.cs index 131eb57d..7ad35066 100644 --- a/BinaryObjectScanner.Test/Protection/UplayTests.cs +++ b/BinaryObjectScanner.Test/Protection/UplayTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new Uplay(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/WMDSTests.cs b/BinaryObjectScanner.Test/Protection/WMDSTests.cs index 2e8eec7d..21dc950d 100644 --- a/BinaryObjectScanner.Test/Protection/WMDSTests.cs +++ b/BinaryObjectScanner.Test/Protection/WMDSTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new WMDS(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/WTMCDProtectTests.cs b/BinaryObjectScanner.Test/Protection/WTMCDProtectTests.cs index 8fbbcb3a..8774b6a5 100644 --- a/BinaryObjectScanner.Test/Protection/WTMCDProtectTests.cs +++ b/BinaryObjectScanner.Test/Protection/WTMCDProtectTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new WTMCDProtect(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner.Test/Protection/XCPTests.cs b/BinaryObjectScanner.Test/Protection/XCPTests.cs index 09ddb50f..51a1a16a 100644 --- a/BinaryObjectScanner.Test/Protection/XCPTests.cs +++ b/BinaryObjectScanner.Test/Protection/XCPTests.cs @@ -13,7 +13,7 @@ namespace BinaryObjectScanner.Test.Protection string file = "filename"; SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); - SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); + SabreTools.Wrappers.PortableExecutable exe = new(model, source); var checker = new XCP(); string? actual = checker.CheckExecutable(file, exe, includeDebug: false); diff --git a/BinaryObjectScanner/BinaryObjectScanner.csproj b/BinaryObjectScanner/BinaryObjectScanner.csproj index 009f6d30..983bc95f 100644 --- a/BinaryObjectScanner/BinaryObjectScanner.csproj +++ b/BinaryObjectScanner/BinaryObjectScanner.csproj @@ -46,12 +46,12 @@ - + - - - - + + + + \ No newline at end of file diff --git a/BinaryObjectScanner/Data/StaticChecks.cs b/BinaryObjectScanner/Data/StaticChecks.cs index d7f565ce..99212b83 100644 --- a/BinaryObjectScanner/Data/StaticChecks.cs +++ b/BinaryObjectScanner/Data/StaticChecks.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Reflection; using BinaryObjectScanner.Interfaces; -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Data { diff --git a/BinaryObjectScanner/FileType/AACSMediaKeyBlock.cs b/BinaryObjectScanner/FileType/AACSMediaKeyBlock.cs index fa262f22..44d1d0e4 100644 --- a/BinaryObjectScanner/FileType/AACSMediaKeyBlock.cs +++ b/BinaryObjectScanner/FileType/AACSMediaKeyBlock.cs @@ -6,10 +6,10 @@ namespace BinaryObjectScanner.FileType /// /// AACS media key block /// - public class AACSMediaKeyBlock : DetectableBase + public class AACSMediaKeyBlock : DetectableBase { /// - public AACSMediaKeyBlock(SabreTools.Serialization.Wrappers.AACSMediaKeyBlock wrapper) : base(wrapper) { } + public AACSMediaKeyBlock(SabreTools.Wrappers.AACSMediaKeyBlock wrapper) : base(wrapper) { } /// public override string? Detect(Stream stream, string file, bool includeDebug) diff --git a/BinaryObjectScanner/FileType/BDPlusSVM.cs b/BinaryObjectScanner/FileType/BDPlusSVM.cs index 73d3f64d..83281dd7 100644 --- a/BinaryObjectScanner/FileType/BDPlusSVM.cs +++ b/BinaryObjectScanner/FileType/BDPlusSVM.cs @@ -6,10 +6,10 @@ namespace BinaryObjectScanner.FileType /// /// BD+ SVM /// - public class BDPlusSVM : DetectableBase + public class BDPlusSVM : DetectableBase { /// - public BDPlusSVM(SabreTools.Serialization.Wrappers.BDPlusSVM wrapper) : base(wrapper) { } + public BDPlusSVM(SabreTools.Wrappers.BDPlusSVM wrapper) : base(wrapper) { } /// public override string? Detect(Stream stream, string file, bool includeDebug) diff --git a/BinaryObjectScanner/FileType/DetectableBaseT.cs b/BinaryObjectScanner/FileType/DetectableBaseT.cs index 6599d416..c195e7ad 100644 --- a/BinaryObjectScanner/FileType/DetectableBaseT.cs +++ b/BinaryObjectScanner/FileType/DetectableBaseT.cs @@ -1,5 +1,5 @@ using BinaryObjectScanner.Interfaces; -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; #pragma warning disable IDE0290 // Use primary constructor namespace BinaryObjectScanner.FileType diff --git a/BinaryObjectScanner/FileType/DiskImage.cs b/BinaryObjectScanner/FileType/DiskImage.cs index 6114413a..17423ade 100644 --- a/BinaryObjectScanner/FileType/DiskImage.cs +++ b/BinaryObjectScanner/FileType/DiskImage.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using BinaryObjectScanner.Data; using BinaryObjectScanner.Interfaces; -using SabreTools.IO.Extensions; -using SabreTools.Serialization.Wrappers; +using SabreTools.Collections.Extensions; +using SabreTools.Wrappers; #pragma warning disable IDE0290 // Use primary constructor namespace BinaryObjectScanner.FileType diff --git a/BinaryObjectScanner/FileType/Executable.cs b/BinaryObjectScanner/FileType/Executable.cs index 79ecf418..dda3bc21 100644 --- a/BinaryObjectScanner/FileType/Executable.cs +++ b/BinaryObjectScanner/FileType/Executable.cs @@ -3,8 +3,10 @@ using System.Collections.Generic; using System.IO; using BinaryObjectScanner.Data; using BinaryObjectScanner.Interfaces; +using SabreTools.Collections.Extensions; using SabreTools.IO.Extensions; -using SabreTools.Serialization.Wrappers; +using SabreTools.Numerics.Extensions; +using SabreTools.Wrappers; #pragma warning disable IDE0290 // Use primary constructor namespace BinaryObjectScanner.FileType diff --git a/BinaryObjectScanner/FileType/GCF.cs b/BinaryObjectScanner/FileType/GCF.cs index f04a50fb..a48b8750 100644 --- a/BinaryObjectScanner/FileType/GCF.cs +++ b/BinaryObjectScanner/FileType/GCF.cs @@ -5,10 +5,10 @@ namespace BinaryObjectScanner.FileType /// /// Game Cache File (GCF) /// - public class GCF : DetectableBase + public class GCF : DetectableBase { /// - public GCF(SabreTools.Serialization.Wrappers.GCF wrapper) : base(wrapper) { } + public GCF(SabreTools.Wrappers.GCF wrapper) : base(wrapper) { } /// public override string? Detect(Stream stream, string file, bool includeDebug) diff --git a/BinaryObjectScanner/FileType/ISO9660.cs b/BinaryObjectScanner/FileType/ISO9660.cs index 0de6ad6f..973c551d 100644 --- a/BinaryObjectScanner/FileType/ISO9660.cs +++ b/BinaryObjectScanner/FileType/ISO9660.cs @@ -5,7 +5,7 @@ using System.Text; using System.Text.RegularExpressions; using BinaryObjectScanner.Data; using SabreTools.Data.Models.ISO9660; -using SabreTools.IO.Extensions; +using SabreTools.Text.Extensions; #pragma warning disable IDE0290 // Use primary constructor namespace BinaryObjectScanner.FileType @@ -13,10 +13,10 @@ namespace BinaryObjectScanner.FileType /// /// ISO9660 /// - public class ISO9660 : DiskImage + public class ISO9660 : DiskImage { /// - public ISO9660(SabreTools.Serialization.Wrappers.ISO9660 wrapper) : base(wrapper) { } + public ISO9660(SabreTools.Wrappers.ISO9660 wrapper) : base(wrapper) { } /// public override string? Detect(Stream stream, string file, bool includeDebug) diff --git a/BinaryObjectScanner/FileType/LDSCRYPT.cs b/BinaryObjectScanner/FileType/LDSCRYPT.cs index aa21034c..6ad7ed0b 100644 --- a/BinaryObjectScanner/FileType/LDSCRYPT.cs +++ b/BinaryObjectScanner/FileType/LDSCRYPT.cs @@ -6,10 +6,10 @@ namespace BinaryObjectScanner.FileType /// /// Link Data Security encrypted file /// - public class LDSCRYPT : DetectableBase + public class LDSCRYPT : DetectableBase { /// - public LDSCRYPT(SabreTools.Serialization.Wrappers.LDSCRYPT wrapper) : base(wrapper) { } + public LDSCRYPT(SabreTools.Wrappers.LDSCRYPT wrapper) : base(wrapper) { } /// public override string? Detect(Stream stream, string file, bool includeDebug) diff --git a/BinaryObjectScanner/FileType/LinearExecutable.cs b/BinaryObjectScanner/FileType/LinearExecutable.cs index cae878f2..0edb9541 100644 --- a/BinaryObjectScanner/FileType/LinearExecutable.cs +++ b/BinaryObjectScanner/FileType/LinearExecutable.cs @@ -8,10 +8,10 @@ namespace BinaryObjectScanner.FileType /// /// Linear executable (LE/LX) /// - public class LinearExecutable : Executable + public class LinearExecutable : Executable { /// - public LinearExecutable(SabreTools.Serialization.Wrappers.LinearExecutable wrapper) : base(wrapper) { } + public LinearExecutable(SabreTools.Wrappers.LinearExecutable wrapper) : base(wrapper) { } /// public override string? Detect(Stream stream, string file, bool includeDebug) diff --git a/BinaryObjectScanner/FileType/MSDOS.cs b/BinaryObjectScanner/FileType/MSDOS.cs index dc2c47a0..84cb53ee 100644 --- a/BinaryObjectScanner/FileType/MSDOS.cs +++ b/BinaryObjectScanner/FileType/MSDOS.cs @@ -8,10 +8,10 @@ namespace BinaryObjectScanner.FileType /// /// MS-DOS executable (MZ) /// - public class MSDOS : Executable + public class MSDOS : Executable { /// - public MSDOS(SabreTools.Serialization.Wrappers.MSDOS wrapper) : base(wrapper) { } + public MSDOS(SabreTools.Wrappers.MSDOS wrapper) : base(wrapper) { } /// public override string? Detect(Stream stream, string file, bool includeDebug) diff --git a/BinaryObjectScanner/FileType/NewExecutable.cs b/BinaryObjectScanner/FileType/NewExecutable.cs index 6c35c61e..a54fff12 100644 --- a/BinaryObjectScanner/FileType/NewExecutable.cs +++ b/BinaryObjectScanner/FileType/NewExecutable.cs @@ -8,10 +8,10 @@ namespace BinaryObjectScanner.FileType /// /// New executable (NE) /// - public class NewExecutable : Executable + public class NewExecutable : Executable { /// - public NewExecutable(SabreTools.Serialization.Wrappers.NewExecutable wrapper) : base(wrapper) { } + public NewExecutable(SabreTools.Wrappers.NewExecutable wrapper) : base(wrapper) { } /// public override string? Detect(Stream stream, string file, bool includeDebug) diff --git a/BinaryObjectScanner/FileType/PLJ.cs b/BinaryObjectScanner/FileType/PLJ.cs index 0c1f2fbe..01eb7381 100644 --- a/BinaryObjectScanner/FileType/PLJ.cs +++ b/BinaryObjectScanner/FileType/PLJ.cs @@ -1,5 +1,5 @@ using System.IO; -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; #pragma warning disable IDE0290 // Use primary constructor namespace BinaryObjectScanner.FileType diff --git a/BinaryObjectScanner/FileType/PortableExecutable.cs b/BinaryObjectScanner/FileType/PortableExecutable.cs index d8baf413..b2389622 100644 --- a/BinaryObjectScanner/FileType/PortableExecutable.cs +++ b/BinaryObjectScanner/FileType/PortableExecutable.cs @@ -8,10 +8,10 @@ namespace BinaryObjectScanner.FileType /// /// Portable executable (PE) /// - public class PortableExecutable : Executable + public class PortableExecutable : Executable { /// - public PortableExecutable(SabreTools.Serialization.Wrappers.PortableExecutable wrapper) : base(wrapper) { } + public PortableExecutable(SabreTools.Wrappers.PortableExecutable wrapper) : base(wrapper) { } /// public override string? Detect(Stream stream, string file, bool includeDebug) diff --git a/BinaryObjectScanner/FileType/RealArcadeInstaller.cs b/BinaryObjectScanner/FileType/RealArcadeInstaller.cs index 6b1ba742..356b9f45 100644 --- a/BinaryObjectScanner/FileType/RealArcadeInstaller.cs +++ b/BinaryObjectScanner/FileType/RealArcadeInstaller.cs @@ -8,10 +8,10 @@ namespace BinaryObjectScanner.FileType /// /// TODO: Add further parsing, game ID and name should be possible to parse. /// - public class RealArcadeInstaller : DetectableBase + public class RealArcadeInstaller : DetectableBase { /// - public RealArcadeInstaller(SabreTools.Serialization.Wrappers.RealArcadeInstaller wrapper) : base(wrapper) { } + public RealArcadeInstaller(SabreTools.Wrappers.RealArcadeInstaller wrapper) : base(wrapper) { } /// public override string? Detect(Stream stream, string file, bool includeDebug) diff --git a/BinaryObjectScanner/FileType/RealArcadeMezzanine.cs b/BinaryObjectScanner/FileType/RealArcadeMezzanine.cs index 3448a409..1f795251 100644 --- a/BinaryObjectScanner/FileType/RealArcadeMezzanine.cs +++ b/BinaryObjectScanner/FileType/RealArcadeMezzanine.cs @@ -8,10 +8,10 @@ namespace BinaryObjectScanner.FileType /// /// TODO: Add further parsing, game ID should be possible to parse. /// - public class RealArcadeMezzanine : DetectableBase + public class RealArcadeMezzanine : DetectableBase { /// - public RealArcadeMezzanine(SabreTools.Serialization.Wrappers.RealArcadeMezzanine wrapper) : base(wrapper) { } + public RealArcadeMezzanine(SabreTools.Wrappers.RealArcadeMezzanine wrapper) : base(wrapper) { } /// public override string? Detect(Stream stream, string file, bool includeDebug) diff --git a/BinaryObjectScanner/FileType/SFFS.cs b/BinaryObjectScanner/FileType/SFFS.cs index 0c30f1c9..1280829e 100644 --- a/BinaryObjectScanner/FileType/SFFS.cs +++ b/BinaryObjectScanner/FileType/SFFS.cs @@ -8,10 +8,10 @@ namespace BinaryObjectScanner.FileType /// /// /// TODO: Implement extraction - public class SFFS : DetectableBase + public class SFFS : DetectableBase { /// - public SFFS(SabreTools.Serialization.Wrappers.SFFS wrapper) : base(wrapper) { } + public SFFS(SabreTools.Wrappers.SFFS wrapper) : base(wrapper) { } /// public override string? Detect(Stream stream, string file, bool includeDebug) diff --git a/BinaryObjectScanner/GameEngine/RenderWare.cs b/BinaryObjectScanner/GameEngine/RenderWare.cs index eb5b56c6..a930e36c 100644 --- a/BinaryObjectScanner/GameEngine/RenderWare.cs +++ b/BinaryObjectScanner/GameEngine/RenderWare.cs @@ -1,5 +1,5 @@ using BinaryObjectScanner.Interfaces; -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; namespace BinaryObjectScanner.GameEngine { diff --git a/BinaryObjectScanner/Interfaces/IDetectableT.cs b/BinaryObjectScanner/Interfaces/IDetectableT.cs index bbdcf90b..97dd0b66 100644 --- a/BinaryObjectScanner/Interfaces/IDetectableT.cs +++ b/BinaryObjectScanner/Interfaces/IDetectableT.cs @@ -1,4 +1,4 @@ -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Interfaces { diff --git a/BinaryObjectScanner/Interfaces/IDiskImageCheck.cs b/BinaryObjectScanner/Interfaces/IDiskImageCheck.cs index 850d4460..8a6516dc 100644 --- a/BinaryObjectScanner/Interfaces/IDiskImageCheck.cs +++ b/BinaryObjectScanner/Interfaces/IDiskImageCheck.cs @@ -1,4 +1,4 @@ -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Interfaces { diff --git a/BinaryObjectScanner/Interfaces/IExecutableCheck.cs b/BinaryObjectScanner/Interfaces/IExecutableCheck.cs index 517f9597..da62cfad 100644 --- a/BinaryObjectScanner/Interfaces/IExecutableCheck.cs +++ b/BinaryObjectScanner/Interfaces/IExecutableCheck.cs @@ -1,4 +1,4 @@ -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Interfaces { diff --git a/BinaryObjectScanner/Packer/ASPack.cs b/BinaryObjectScanner/Packer/ASPack.cs index dc3cecd2..3ca85ef2 100644 --- a/BinaryObjectScanner/Packer/ASPack.cs +++ b/BinaryObjectScanner/Packer/ASPack.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/AdvancedInstaller.cs b/BinaryObjectScanner/Packer/AdvancedInstaller.cs index eaa2aeef..ad019f77 100644 --- a/BinaryObjectScanner/Packer/AdvancedInstaller.cs +++ b/BinaryObjectScanner/Packer/AdvancedInstaller.cs @@ -1,5 +1,5 @@ using BinaryObjectScanner.Interfaces; -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/AutoPlayMediaStudio.cs b/BinaryObjectScanner/Packer/AutoPlayMediaStudio.cs index b07c7772..0ab79a21 100644 --- a/BinaryObjectScanner/Packer/AutoPlayMediaStudio.cs +++ b/BinaryObjectScanner/Packer/AutoPlayMediaStudio.cs @@ -1,7 +1,7 @@ using System; using BinaryObjectScanner.Interfaces; -using SabreTools.IO.Extensions; -using SabreTools.Serialization.Wrappers; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/CExe.cs b/BinaryObjectScanner/Packer/CExe.cs index a11d7e50..da2b479a 100644 --- a/BinaryObjectScanner/Packer/CExe.cs +++ b/BinaryObjectScanner/Packer/CExe.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/Crunch.cs b/BinaryObjectScanner/Packer/Crunch.cs index c813569d..05fb0f1b 100644 --- a/BinaryObjectScanner/Packer/Crunch.cs +++ b/BinaryObjectScanner/Packer/Crunch.cs @@ -1,5 +1,5 @@ using BinaryObjectScanner.Interfaces; -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/DotFuscator.cs b/BinaryObjectScanner/Packer/DotFuscator.cs index 08227660..e5dce30f 100644 --- a/BinaryObjectScanner/Packer/DotFuscator.cs +++ b/BinaryObjectScanner/Packer/DotFuscator.cs @@ -1,5 +1,5 @@ using BinaryObjectScanner.Interfaces; -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/DotNetReactor.cs b/BinaryObjectScanner/Packer/DotNetReactor.cs index 2b023dba..e1731adc 100644 --- a/BinaryObjectScanner/Packer/DotNetReactor.cs +++ b/BinaryObjectScanner/Packer/DotNetReactor.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/EXEStealth.cs b/BinaryObjectScanner/Packer/EXEStealth.cs index f11878a9..c5edb2c1 100644 --- a/BinaryObjectScanner/Packer/EXEStealth.cs +++ b/BinaryObjectScanner/Packer/EXEStealth.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/EmbeddedFile.cs b/BinaryObjectScanner/Packer/EmbeddedFile.cs index 42d9d40e..d5a9f179 100644 --- a/BinaryObjectScanner/Packer/EmbeddedFile.cs +++ b/BinaryObjectScanner/Packer/EmbeddedFile.cs @@ -2,7 +2,9 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using SabreTools.Data.Models.PortableExecutable.Resource.Entries; using SabreTools.IO.Extensions; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Numerics.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/GPInstall.cs b/BinaryObjectScanner/Packer/GPInstall.cs index e6385dbf..6185b759 100644 --- a/BinaryObjectScanner/Packer/GPInstall.cs +++ b/BinaryObjectScanner/Packer/GPInstall.cs @@ -1,6 +1,6 @@ using BinaryObjectScanner.Interfaces; -using SabreTools.IO.Extensions; -using SabreTools.Serialization.Wrappers; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/GenteeInstaller.cs b/BinaryObjectScanner/Packer/GenteeInstaller.cs index 23006253..16832fa9 100644 --- a/BinaryObjectScanner/Packer/GenteeInstaller.cs +++ b/BinaryObjectScanner/Packer/GenteeInstaller.cs @@ -1,6 +1,6 @@ using BinaryObjectScanner.Interfaces; -using SabreTools.IO.Extensions; -using SabreTools.Serialization.Wrappers; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/GhostInstaller.cs b/BinaryObjectScanner/Packer/GhostInstaller.cs index 99b12b58..c974679b 100644 --- a/BinaryObjectScanner/Packer/GhostInstaller.cs +++ b/BinaryObjectScanner/Packer/GhostInstaller.cs @@ -1,6 +1,6 @@ using BinaryObjectScanner.Interfaces; -using SabreTools.IO.Extensions; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/GkWareSFX.cs b/BinaryObjectScanner/Packer/GkWareSFX.cs index ef8aab98..6492659b 100644 --- a/BinaryObjectScanner/Packer/GkWareSFX.cs +++ b/BinaryObjectScanner/Packer/GkWareSFX.cs @@ -1,6 +1,6 @@ using BinaryObjectScanner.Interfaces; -using SabreTools.IO.Extensions; -using SabreTools.Serialization.Wrappers; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/HyperTechCrackProof.cs b/BinaryObjectScanner/Packer/HyperTechCrackProof.cs index 08741649..bb58e254 100644 --- a/BinaryObjectScanner/Packer/HyperTechCrackProof.cs +++ b/BinaryObjectScanner/Packer/HyperTechCrackProof.cs @@ -1,6 +1,6 @@ using System; using BinaryObjectScanner.Interfaces; -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/InnoSetup.cs b/BinaryObjectScanner/Packer/InnoSetup.cs index 39b7bfb5..67650b7a 100644 --- a/BinaryObjectScanner/Packer/InnoSetup.cs +++ b/BinaryObjectScanner/Packer/InnoSetup.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/InstallAnywhere.cs b/BinaryObjectScanner/Packer/InstallAnywhere.cs index 54b9627d..a35ad875 100644 --- a/BinaryObjectScanner/Packer/InstallAnywhere.cs +++ b/BinaryObjectScanner/Packer/InstallAnywhere.cs @@ -1,7 +1,7 @@ using System; using BinaryObjectScanner.Interfaces; -using SabreTools.IO.Extensions; -using SabreTools.Serialization.Wrappers; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/InstallerVISE.cs b/BinaryObjectScanner/Packer/InstallerVISE.cs index 624cc63a..8b1da249 100644 --- a/BinaryObjectScanner/Packer/InstallerVISE.cs +++ b/BinaryObjectScanner/Packer/InstallerVISE.cs @@ -1,5 +1,5 @@ using BinaryObjectScanner.Interfaces; -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/IntelInstallationFramework.cs b/BinaryObjectScanner/Packer/IntelInstallationFramework.cs index 804ff79f..41ba948c 100644 --- a/BinaryObjectScanner/Packer/IntelInstallationFramework.cs +++ b/BinaryObjectScanner/Packer/IntelInstallationFramework.cs @@ -1,7 +1,7 @@ using System; using BinaryObjectScanner.Interfaces; -using SabreTools.IO.Extensions; -using SabreTools.Serialization.Wrappers; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/MPRESS.cs b/BinaryObjectScanner/Packer/MPRESS.cs index 193b701b..82fb9aef 100644 --- a/BinaryObjectScanner/Packer/MPRESS.cs +++ b/BinaryObjectScanner/Packer/MPRESS.cs @@ -1,5 +1,5 @@ using BinaryObjectScanner.Interfaces; -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/MicrosoftCABSFX.cs b/BinaryObjectScanner/Packer/MicrosoftCABSFX.cs index a30d2886..260e4247 100644 --- a/BinaryObjectScanner/Packer/MicrosoftCABSFX.cs +++ b/BinaryObjectScanner/Packer/MicrosoftCABSFX.cs @@ -1,7 +1,7 @@ using System; using BinaryObjectScanner.Interfaces; -using SabreTools.IO.Extensions; -using SabreTools.Serialization.Wrappers; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/NSIS.cs b/BinaryObjectScanner/Packer/NSIS.cs index 2a95dedf..f2a26f6b 100644 --- a/BinaryObjectScanner/Packer/NSIS.cs +++ b/BinaryObjectScanner/Packer/NSIS.cs @@ -1,6 +1,6 @@ using BinaryObjectScanner.Interfaces; -using SabreTools.IO.Extensions; -using SabreTools.Serialization.Wrappers; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/NeoLite.cs b/BinaryObjectScanner/Packer/NeoLite.cs index 09a7b23d..c7795fb2 100644 --- a/BinaryObjectScanner/Packer/NeoLite.cs +++ b/BinaryObjectScanner/Packer/NeoLite.cs @@ -1,5 +1,5 @@ using BinaryObjectScanner.Interfaces; -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/PECompact.cs b/BinaryObjectScanner/Packer/PECompact.cs index c1dba8e8..df251733 100644 --- a/BinaryObjectScanner/Packer/PECompact.cs +++ b/BinaryObjectScanner/Packer/PECompact.cs @@ -1,5 +1,5 @@ using BinaryObjectScanner.Interfaces; -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/PEtite.cs b/BinaryObjectScanner/Packer/PEtite.cs index 7feea437..85122c02 100644 --- a/BinaryObjectScanner/Packer/PEtite.cs +++ b/BinaryObjectScanner/Packer/PEtite.cs @@ -1,5 +1,5 @@ using BinaryObjectScanner.Interfaces; -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/PKLite.cs b/BinaryObjectScanner/Packer/PKLite.cs index a6204491..f55389dd 100644 --- a/BinaryObjectScanner/Packer/PKLite.cs +++ b/BinaryObjectScanner/Packer/PKLite.cs @@ -1,5 +1,5 @@ using BinaryObjectScanner.Interfaces; -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/ReflexiveArcadeInstaller.cs b/BinaryObjectScanner/Packer/ReflexiveArcadeInstaller.cs index 6e2c0ddb..71d9d4a1 100644 --- a/BinaryObjectScanner/Packer/ReflexiveArcadeInstaller.cs +++ b/BinaryObjectScanner/Packer/ReflexiveArcadeInstaller.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/SetupFactory.cs b/BinaryObjectScanner/Packer/SetupFactory.cs index 9fd1ea8c..f54a0078 100644 --- a/BinaryObjectScanner/Packer/SetupFactory.cs +++ b/BinaryObjectScanner/Packer/SetupFactory.cs @@ -1,7 +1,7 @@ -using System; +using System; using BinaryObjectScanner.Interfaces; -using SabreTools.IO.Extensions; -using SabreTools.Serialization.Wrappers; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/SevenZipSFX.cs b/BinaryObjectScanner/Packer/SevenZipSFX.cs index 2e9b6746..84c4588d 100644 --- a/BinaryObjectScanner/Packer/SevenZipSFX.cs +++ b/BinaryObjectScanner/Packer/SevenZipSFX.cs @@ -1,6 +1,6 @@ using BinaryObjectScanner.Interfaces; -using SabreTools.IO.Extensions; -using SabreTools.Serialization.Wrappers; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/Shrinker.cs b/BinaryObjectScanner/Packer/Shrinker.cs index 08a6b43a..9226849e 100644 --- a/BinaryObjectScanner/Packer/Shrinker.cs +++ b/BinaryObjectScanner/Packer/Shrinker.cs @@ -1,5 +1,5 @@ using BinaryObjectScanner.Interfaces; -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/SmartInstallMaker.cs b/BinaryObjectScanner/Packer/SmartInstallMaker.cs index f5a396d1..806881a4 100644 --- a/BinaryObjectScanner/Packer/SmartInstallMaker.cs +++ b/BinaryObjectScanner/Packer/SmartInstallMaker.cs @@ -1,6 +1,6 @@ using BinaryObjectScanner.Interfaces; -using SabreTools.IO.Extensions; -using SabreTools.Serialization.Wrappers; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/SpoonInstaller.cs b/BinaryObjectScanner/Packer/SpoonInstaller.cs index 5d350e08..3ee41e9b 100644 --- a/BinaryObjectScanner/Packer/SpoonInstaller.cs +++ b/BinaryObjectScanner/Packer/SpoonInstaller.cs @@ -1,6 +1,6 @@ using BinaryObjectScanner.Interfaces; -using SabreTools.IO.Extensions; -using SabreTools.Serialization.Wrappers; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/UPX.cs b/BinaryObjectScanner/Packer/UPX.cs index b7384666..5636141f 100644 --- a/BinaryObjectScanner/Packer/UPX.cs +++ b/BinaryObjectScanner/Packer/UPX.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; using System.Text.RegularExpressions; using BinaryObjectScanner.Interfaces; -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; #pragma warning disable IDE0060 // Remove unused parameter #pragma warning disable SYSLIB1045 // Convert to 'GeneratedRegexAttribute' diff --git a/BinaryObjectScanner/Packer/WinRARSFX.cs b/BinaryObjectScanner/Packer/WinRARSFX.cs index e9b67821..0087d6e2 100644 --- a/BinaryObjectScanner/Packer/WinRARSFX.cs +++ b/BinaryObjectScanner/Packer/WinRARSFX.cs @@ -1,6 +1,6 @@ using BinaryObjectScanner.Interfaces; -using SabreTools.IO.Extensions; -using SabreTools.Serialization.Wrappers; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/WinZipSFX.cs b/BinaryObjectScanner/Packer/WinZipSFX.cs index d5d6a5ea..831e6865 100644 --- a/BinaryObjectScanner/Packer/WinZipSFX.cs +++ b/BinaryObjectScanner/Packer/WinZipSFX.cs @@ -1,7 +1,7 @@ using System; using System.Text; using BinaryObjectScanner.Interfaces; -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/WiseInstaller.cs b/BinaryObjectScanner/Packer/WiseInstaller.cs index 4759db79..42e67ad5 100644 --- a/BinaryObjectScanner/Packer/WiseInstaller.cs +++ b/BinaryObjectScanner/Packer/WiseInstaller.cs @@ -1,5 +1,5 @@ using BinaryObjectScanner.Interfaces; -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Packer/ZylomWrapper.cs b/BinaryObjectScanner/Packer/ZylomWrapper.cs index 9b2f9b1d..5fc7215c 100644 --- a/BinaryObjectScanner/Packer/ZylomWrapper.cs +++ b/BinaryObjectScanner/Packer/ZylomWrapper.cs @@ -1,5 +1,5 @@ using BinaryObjectScanner.Interfaces; -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Packer { diff --git a/BinaryObjectScanner/Protection/ActiveMARK.cs b/BinaryObjectScanner/Protection/ActiveMARK.cs index ecf9e7aa..4fee1acc 100644 --- a/BinaryObjectScanner/Protection/ActiveMARK.cs +++ b/BinaryObjectScanner/Protection/ActiveMARK.cs @@ -1,10 +1,8 @@ using System.Collections.Generic; using System.Text; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/AegiSoft.cs b/BinaryObjectScanner/Protection/AegiSoft.cs index 8f80181f..1d9b6b94 100644 --- a/BinaryObjectScanner/Protection/AegiSoft.cs +++ b/BinaryObjectScanner/Protection/AegiSoft.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/AlphaDVD.cs b/BinaryObjectScanner/Protection/AlphaDVD.cs index 64c9686c..14e5335c 100644 --- a/BinaryObjectScanner/Protection/AlphaDVD.cs +++ b/BinaryObjectScanner/Protection/AlphaDVD.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; +using SabreTools.Matching; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/AlphaROM.cs b/BinaryObjectScanner/Protection/AlphaROM.cs index 72a6c213..a4864266 100644 --- a/BinaryObjectScanner/Protection/AlphaROM.cs +++ b/BinaryObjectScanner/Protection/AlphaROM.cs @@ -3,8 +3,8 @@ using System.Text; using System.Text.RegularExpressions; using BinaryObjectScanner.Interfaces; using SabreTools.Data.Models.ISO9660; -using SabreTools.IO.Extensions; -using SabreTools.Serialization.Wrappers; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; #pragma warning disable SYSLIB1045 // Convert to 'GeneratedRegexAttribute' namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/Armadillo.cs b/BinaryObjectScanner/Protection/Armadillo.cs index 209ac89a..5aaec24f 100644 --- a/BinaryObjectScanner/Protection/Armadillo.cs +++ b/BinaryObjectScanner/Protection/Armadillo.cs @@ -1,7 +1,7 @@ using System; using BinaryObjectScanner.Interfaces; -using SabreTools.IO.Extensions; -using SabreTools.Serialization.Wrappers; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/Bitpool.cs b/BinaryObjectScanner/Protection/Bitpool.cs index c77336d8..e9e88590 100644 --- a/BinaryObjectScanner/Protection/Bitpool.cs +++ b/BinaryObjectScanner/Protection/Bitpool.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; +using SabreTools.Matching; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/ByteShield.cs b/BinaryObjectScanner/Protection/ByteShield.cs index 7edfae79..002cd142 100644 --- a/BinaryObjectScanner/Protection/ByteShield.cs +++ b/BinaryObjectScanner/Protection/ByteShield.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/CDCheck.cs b/BinaryObjectScanner/Protection/CDCheck.cs index 0bce1de2..d30bee67 100644 --- a/BinaryObjectScanner/Protection/CDCheck.cs +++ b/BinaryObjectScanner/Protection/CDCheck.cs @@ -1,6 +1,6 @@ using BinaryObjectScanner.Interfaces; -using SabreTools.IO.Extensions; -using SabreTools.Serialization.Wrappers; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/CDDVDCops.cs b/BinaryObjectScanner/Protection/CDDVDCops.cs index f8970f0f..31561047 100644 --- a/BinaryObjectScanner/Protection/CDDVDCops.cs +++ b/BinaryObjectScanner/Protection/CDDVDCops.cs @@ -3,10 +3,9 @@ using System.Collections.Generic; using System.Text; using System.Text.RegularExpressions; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Wrappers; #pragma warning disable SYSLIB1045 // Convert to 'GeneratedRegexAttribute' namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/CDGuard.cs b/BinaryObjectScanner/Protection/CDGuard.cs index bfe1d284..f920146e 100644 --- a/BinaryObjectScanner/Protection/CDGuard.cs +++ b/BinaryObjectScanner/Protection/CDGuard.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/CDKey.cs b/BinaryObjectScanner/Protection/CDKey.cs index 22f9a631..3c0ac0c2 100644 --- a/BinaryObjectScanner/Protection/CDKey.cs +++ b/BinaryObjectScanner/Protection/CDKey.cs @@ -1,7 +1,7 @@ using System; using BinaryObjectScanner.Interfaces; -using SabreTools.IO.Extensions; -using SabreTools.Serialization.Wrappers; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/CDLock.cs b/BinaryObjectScanner/Protection/CDLock.cs index 6ce1daab..9f96ceb6 100644 --- a/BinaryObjectScanner/Protection/CDLock.cs +++ b/BinaryObjectScanner/Protection/CDLock.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/CDProtector.cs b/BinaryObjectScanner/Protection/CDProtector.cs index 98e39cd6..f68fd39e 100644 --- a/BinaryObjectScanner/Protection/CDProtector.cs +++ b/BinaryObjectScanner/Protection/CDProtector.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; +using SabreTools.Matching; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/CDSHiELDSE.cs b/BinaryObjectScanner/Protection/CDSHiELDSE.cs index d3bdcb51..77501c4b 100644 --- a/BinaryObjectScanner/Protection/CDSHiELDSE.cs +++ b/BinaryObjectScanner/Protection/CDSHiELDSE.cs @@ -1,5 +1,5 @@ using BinaryObjectScanner.Interfaces; -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/CDX.cs b/BinaryObjectScanner/Protection/CDX.cs index 810c01f2..97deee7f 100644 --- a/BinaryObjectScanner/Protection/CDX.cs +++ b/BinaryObjectScanner/Protection/CDX.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; +using SabreTools.Matching; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/CEG.cs b/BinaryObjectScanner/Protection/CEG.cs index dd588da9..41f258ac 100644 --- a/BinaryObjectScanner/Protection/CEG.cs +++ b/BinaryObjectScanner/Protection/CEG.cs @@ -1,6 +1,6 @@ using BinaryObjectScanner.Interfaces; -using SabreTools.IO.Extensions; -using SabreTools.Serialization.Wrappers; +using SabreTools.Numerics.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/CactusDataShield.cs b/BinaryObjectScanner/Protection/CactusDataShield.cs index 4c99a42b..eac9bc47 100644 --- a/BinaryObjectScanner/Protection/CactusDataShield.cs +++ b/BinaryObjectScanner/Protection/CactusDataShield.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; +using SabreTools.Matching; #pragma warning disable IDE0230 // Use UTF-8 string literal namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/CenegaProtectDVD.cs b/BinaryObjectScanner/Protection/CenegaProtectDVD.cs index 382a132b..51f686ac 100644 --- a/BinaryObjectScanner/Protection/CenegaProtectDVD.cs +++ b/BinaryObjectScanner/Protection/CenegaProtectDVD.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/Channelware.cs b/BinaryObjectScanner/Protection/Channelware.cs index 49c3ef53..280399b5 100644 --- a/BinaryObjectScanner/Protection/Channelware.cs +++ b/BinaryObjectScanner/Protection/Channelware.cs @@ -1,10 +1,9 @@ using System.Collections.Generic; using System.IO; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/ChosenBytesCodeLock.cs b/BinaryObjectScanner/Protection/ChosenBytesCodeLock.cs index 35b18feb..983c3b17 100644 --- a/BinaryObjectScanner/Protection/ChosenBytesCodeLock.cs +++ b/BinaryObjectScanner/Protection/ChosenBytesCodeLock.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/CopyKiller.cs b/BinaryObjectScanner/Protection/CopyKiller.cs index 5ed40045..dcf942f2 100644 --- a/BinaryObjectScanner/Protection/CopyKiller.cs +++ b/BinaryObjectScanner/Protection/CopyKiller.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/CopyLok.cs b/BinaryObjectScanner/Protection/CopyLok.cs index d62e83da..86481004 100644 --- a/BinaryObjectScanner/Protection/CopyLok.cs +++ b/BinaryObjectScanner/Protection/CopyLok.cs @@ -2,7 +2,8 @@ using System; using BinaryObjectScanner.Interfaces; using SabreTools.Data.Models.ISO9660; using SabreTools.IO.Extensions; -using SabreTools.Serialization.Wrappers; +using SabreTools.Numerics.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/CopyX.cs b/BinaryObjectScanner/Protection/CopyX.cs index 132deecd..e724644f 100644 --- a/BinaryObjectScanner/Protection/CopyX.cs +++ b/BinaryObjectScanner/Protection/CopyX.cs @@ -2,10 +2,10 @@ using System; using System.Collections.Generic; using System.IO; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Numerics.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/CrypKey.cs b/BinaryObjectScanner/Protection/CrypKey.cs index 78addaf2..044ec961 100644 --- a/BinaryObjectScanner/Protection/CrypKey.cs +++ b/BinaryObjectScanner/Protection/CrypKey.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/Cucko.cs b/BinaryObjectScanner/Protection/Cucko.cs index ed46f34d..c1a31b06 100644 --- a/BinaryObjectScanner/Protection/Cucko.cs +++ b/BinaryObjectScanner/Protection/Cucko.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/DVDCrypt.cs b/BinaryObjectScanner/Protection/DVDCrypt.cs index 780929a7..0e3bf4ea 100644 --- a/BinaryObjectScanner/Protection/DVDCrypt.cs +++ b/BinaryObjectScanner/Protection/DVDCrypt.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; +using SabreTools.Matching; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/Denuvo.cs b/BinaryObjectScanner/Protection/Denuvo.cs index d4bab097..22fcc2c6 100644 --- a/BinaryObjectScanner/Protection/Denuvo.cs +++ b/BinaryObjectScanner/Protection/Denuvo.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; using OHMN = SabreTools.Data.Models.COFF.OptionalHeaderMagicNumber; #pragma warning disable IDE0230 // Use UTF-8 string literal diff --git a/BinaryObjectScanner/Protection/DigiGuard.cs b/BinaryObjectScanner/Protection/DigiGuard.cs index b0a3a568..e37b64b3 100644 --- a/BinaryObjectScanner/Protection/DigiGuard.cs +++ b/BinaryObjectScanner/Protection/DigiGuard.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/DinamicMultimedia.cs b/BinaryObjectScanner/Protection/DinamicMultimedia.cs index 12f633c2..26b9abf9 100644 --- a/BinaryObjectScanner/Protection/DinamicMultimedia.cs +++ b/BinaryObjectScanner/Protection/DinamicMultimedia.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using System.IO; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; +using SabreTools.Matching; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/DiscGuard.cs b/BinaryObjectScanner/Protection/DiscGuard.cs index f2897ba9..698c2dc6 100644 --- a/BinaryObjectScanner/Protection/DiscGuard.cs +++ b/BinaryObjectScanner/Protection/DiscGuard.cs @@ -3,10 +3,9 @@ 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; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/EAAntiCheat.cs b/BinaryObjectScanner/Protection/EAAntiCheat.cs index 24fad095..09469302 100644 --- a/BinaryObjectScanner/Protection/EAAntiCheat.cs +++ b/BinaryObjectScanner/Protection/EAAntiCheat.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/EasyAntiCheat.cs b/BinaryObjectScanner/Protection/EasyAntiCheat.cs index 4c46021d..b894f78b 100644 --- a/BinaryObjectScanner/Protection/EasyAntiCheat.cs +++ b/BinaryObjectScanner/Protection/EasyAntiCheat.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/ElectronicArts.cs b/BinaryObjectScanner/Protection/ElectronicArts.cs index b8aa09c2..94e3d1c2 100644 --- a/BinaryObjectScanner/Protection/ElectronicArts.cs +++ b/BinaryObjectScanner/Protection/ElectronicArts.cs @@ -1,7 +1,7 @@ using System; using BinaryObjectScanner.Interfaces; -using SabreTools.IO.Extensions; -using SabreTools.Serialization.Wrappers; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/Engine32.cs b/BinaryObjectScanner/Protection/Engine32.cs index ae1e3f4e..6174e391 100644 --- a/BinaryObjectScanner/Protection/Engine32.cs +++ b/BinaryObjectScanner/Protection/Engine32.cs @@ -1,9 +1,8 @@ using System; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/FreeLock.cs b/BinaryObjectScanner/Protection/FreeLock.cs index 211aa915..ae88fa20 100644 --- a/BinaryObjectScanner/Protection/FreeLock.cs +++ b/BinaryObjectScanner/Protection/FreeLock.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; +using SabreTools.Matching; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/GFWL.cs b/BinaryObjectScanner/Protection/GFWL.cs index af7b1571..0ccfa14a 100644 --- a/BinaryObjectScanner/Protection/GFWL.cs +++ b/BinaryObjectScanner/Protection/GFWL.cs @@ -2,10 +2,9 @@ using System.Collections.Generic; using System.IO; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/Gefest.cs b/BinaryObjectScanner/Protection/Gefest.cs index 7b7c0713..e5dabddc 100644 --- a/BinaryObjectScanner/Protection/Gefest.cs +++ b/BinaryObjectScanner/Protection/Gefest.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/HexalockAutoLock.cs b/BinaryObjectScanner/Protection/HexalockAutoLock.cs index 247567e4..158473c7 100644 --- a/BinaryObjectScanner/Protection/HexalockAutoLock.cs +++ b/BinaryObjectScanner/Protection/HexalockAutoLock.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/HudsonHuPPPX.cs b/BinaryObjectScanner/Protection/HudsonHuPPPX.cs index 4fdfcb93..4ebd4561 100644 --- a/BinaryObjectScanner/Protection/HudsonHuPPPX.cs +++ b/BinaryObjectScanner/Protection/HudsonHuPPPX.cs @@ -1,9 +1,8 @@ using System; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/ImpulseReactor.cs b/BinaryObjectScanner/Protection/ImpulseReactor.cs index 692d25eb..aaff1f16 100644 --- a/BinaryObjectScanner/Protection/ImpulseReactor.cs +++ b/BinaryObjectScanner/Protection/ImpulseReactor.cs @@ -2,10 +2,9 @@ using System.Collections.Generic; using System.IO; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/IndyVCD.cs b/BinaryObjectScanner/Protection/IndyVCD.cs index b6978260..3f403acf 100644 --- a/BinaryObjectScanner/Protection/IndyVCD.cs +++ b/BinaryObjectScanner/Protection/IndyVCD.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; +using SabreTools.Matching; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/Intenium.cs b/BinaryObjectScanner/Protection/Intenium.cs index b3e5a876..94c27872 100644 --- a/BinaryObjectScanner/Protection/Intenium.cs +++ b/BinaryObjectScanner/Protection/Intenium.cs @@ -1,5 +1,5 @@ using BinaryObjectScanner.Interfaces; -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/InterLok.cs b/BinaryObjectScanner/Protection/InterLok.cs index c87367c3..fbd2dbe3 100644 --- a/BinaryObjectScanner/Protection/InterLok.cs +++ b/BinaryObjectScanner/Protection/InterLok.cs @@ -1,6 +1,6 @@ using System.Text.RegularExpressions; using BinaryObjectScanner.Interfaces; -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; #pragma warning disable SYSLIB1045 // Convert to 'GeneratedRegexAttribute' namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/JoWood.cs b/BinaryObjectScanner/Protection/JoWood.cs index 5a5e85c8..c4ac8222 100644 --- a/BinaryObjectScanner/Protection/JoWood.cs +++ b/BinaryObjectScanner/Protection/JoWood.cs @@ -2,9 +2,8 @@ using System.Collections.Generic; using System.Text; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/KalypsoLauncher.cs b/BinaryObjectScanner/Protection/KalypsoLauncher.cs index 83281f25..fbadc46a 100644 --- a/BinaryObjectScanner/Protection/KalypsoLauncher.cs +++ b/BinaryObjectScanner/Protection/KalypsoLauncher.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/KeyLock.cs b/BinaryObjectScanner/Protection/KeyLock.cs index 33d5a906..73bfe046 100644 --- a/BinaryObjectScanner/Protection/KeyLock.cs +++ b/BinaryObjectScanner/Protection/KeyLock.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; +using SabreTools.Matching; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/LabelGate.cs b/BinaryObjectScanner/Protection/LabelGate.cs index 785efa8e..e297ab33 100644 --- a/BinaryObjectScanner/Protection/LabelGate.cs +++ b/BinaryObjectScanner/Protection/LabelGate.cs @@ -2,10 +2,9 @@ using System; using System.Collections.Generic; using System.IO; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/LaserLok.cs b/BinaryObjectScanner/Protection/LaserLok.cs index 53a1924d..4854c6a2 100644 --- a/BinaryObjectScanner/Protection/LaserLok.cs +++ b/BinaryObjectScanner/Protection/LaserLok.cs @@ -4,10 +4,11 @@ using System.IO; using System.Text; using BinaryObjectScanner.Interfaces; using SabreTools.Data.Models.ISO9660; -using SabreTools.IO; using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Numerics.Extensions; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/MGIRegistration.cs b/BinaryObjectScanner/Protection/MGIRegistration.cs index f9837d59..a7edda87 100644 --- a/BinaryObjectScanner/Protection/MGIRegistration.cs +++ b/BinaryObjectScanner/Protection/MGIRegistration.cs @@ -1,7 +1,7 @@ using System; using BinaryObjectScanner.Interfaces; -using SabreTools.IO.Extensions; -using SabreTools.Serialization.Wrappers; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/Macrovision.CDilla.cs b/BinaryObjectScanner/Protection/Macrovision.CDilla.cs index 358b1d5e..07babf54 100644 --- a/BinaryObjectScanner/Protection/Macrovision.CDilla.cs +++ b/BinaryObjectScanner/Protection/Macrovision.CDilla.cs @@ -1,9 +1,8 @@ using System; using System.Collections.Generic; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; #pragma warning disable IDE0060 // Remove unused parameter namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/Macrovision.CactusDataShield.cs b/BinaryObjectScanner/Protection/Macrovision.CactusDataShield.cs index 99498238..6de9b995 100644 --- a/BinaryObjectScanner/Protection/Macrovision.CactusDataShield.cs +++ b/BinaryObjectScanner/Protection/Macrovision.CactusDataShield.cs @@ -2,10 +2,9 @@ using System.Collections.Generic; using System.IO; using System.Text; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; #pragma warning disable IDE0060 // Remove unused parameter namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/Macrovision.FLEXnet.cs b/BinaryObjectScanner/Protection/Macrovision.FLEXnet.cs index 0cfcda13..4c4aaf4e 100644 --- a/BinaryObjectScanner/Protection/Macrovision.FLEXnet.cs +++ b/BinaryObjectScanner/Protection/Macrovision.FLEXnet.cs @@ -1,9 +1,8 @@ using System; using System.Collections.Generic; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; #pragma warning disable IDE0060 // Remove unused parameter namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/Macrovision.RipGuard.cs b/BinaryObjectScanner/Protection/Macrovision.RipGuard.cs index 2671072c..601db0e3 100644 --- a/BinaryObjectScanner/Protection/Macrovision.RipGuard.cs +++ b/BinaryObjectScanner/Protection/Macrovision.RipGuard.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; using SabreTools.Hashing; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; #pragma warning disable IDE0060 // Remove unused parameter namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/Macrovision.SafeCast.cs b/BinaryObjectScanner/Protection/Macrovision.SafeCast.cs index c9119de2..f63d0dcc 100644 --- a/BinaryObjectScanner/Protection/Macrovision.SafeCast.cs +++ b/BinaryObjectScanner/Protection/Macrovision.SafeCast.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; using System.Text; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; #pragma warning disable IDE0060 // Remove unused parameter namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/Macrovision.SafeDisc.cs b/BinaryObjectScanner/Protection/Macrovision.SafeDisc.cs index 00a7050c..5b60d702 100644 --- a/BinaryObjectScanner/Protection/Macrovision.SafeDisc.cs +++ b/BinaryObjectScanner/Protection/Macrovision.SafeDisc.cs @@ -2,10 +2,9 @@ using System.Collections.Generic; using System.IO; using SabreTools.Hashing; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; #pragma warning disable IDE0060 // Remove unused parameter namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/Macrovision.SafeWrap.cs b/BinaryObjectScanner/Protection/Macrovision.SafeWrap.cs index 36cdde0a..2865479c 100644 --- a/BinaryObjectScanner/Protection/Macrovision.SafeWrap.cs +++ b/BinaryObjectScanner/Protection/Macrovision.SafeWrap.cs @@ -1,4 +1,4 @@ -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; #pragma warning disable CA1822 // Mark members as static #pragma warning disable IDE0060 // Remove unused parameter diff --git a/BinaryObjectScanner/Protection/Macrovision.cs b/BinaryObjectScanner/Protection/Macrovision.cs index dceb7c76..8fe75f2f 100644 --- a/BinaryObjectScanner/Protection/Macrovision.cs +++ b/BinaryObjectScanner/Protection/Macrovision.cs @@ -3,10 +3,11 @@ using System.Collections.Generic; using System.IO; using BinaryObjectScanner.Interfaces; using SabreTools.Data.Models.ISO9660; -using SabreTools.IO; using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Numerics.Extensions; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; #pragma warning disable IDE0060 // Remove unused parameter namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/MediaCloQ.cs b/BinaryObjectScanner/Protection/MediaCloQ.cs index 74f9b238..e0bd1625 100644 --- a/BinaryObjectScanner/Protection/MediaCloQ.cs +++ b/BinaryObjectScanner/Protection/MediaCloQ.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/MediaMax.cs b/BinaryObjectScanner/Protection/MediaMax.cs index ecc907f7..e08d7671 100644 --- a/BinaryObjectScanner/Protection/MediaMax.cs +++ b/BinaryObjectScanner/Protection/MediaMax.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/NEACProtect.cs b/BinaryObjectScanner/Protection/NEACProtect.cs index 9e8d6d93..821808a7 100644 --- a/BinaryObjectScanner/Protection/NEACProtect.cs +++ b/BinaryObjectScanner/Protection/NEACProtect.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/NProtect.cs b/BinaryObjectScanner/Protection/NProtect.cs index d91e0426..b9958e62 100644 --- a/BinaryObjectScanner/Protection/NProtect.cs +++ b/BinaryObjectScanner/Protection/NProtect.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/OnlineRegistration.cs b/BinaryObjectScanner/Protection/OnlineRegistration.cs index 986d919f..8cbe5ae9 100644 --- a/BinaryObjectScanner/Protection/OnlineRegistration.cs +++ b/BinaryObjectScanner/Protection/OnlineRegistration.cs @@ -1,7 +1,7 @@ using System; using BinaryObjectScanner.Interfaces; -using SabreTools.IO.Extensions; -using SabreTools.Serialization.Wrappers; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/OpenMG.cs b/BinaryObjectScanner/Protection/OpenMG.cs index a797fcf4..182df13e 100644 --- a/BinaryObjectScanner/Protection/OpenMG.cs +++ b/BinaryObjectScanner/Protection/OpenMG.cs @@ -2,10 +2,9 @@ using System; using System.Collections.Generic; using System.IO; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/Origin.cs b/BinaryObjectScanner/Protection/Origin.cs index c39ed6bc..321a8eb5 100644 --- a/BinaryObjectScanner/Protection/Origin.cs +++ b/BinaryObjectScanner/Protection/Origin.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/PSXAntiModchip.cs b/BinaryObjectScanner/Protection/PSXAntiModchip.cs index 1c900532..62ac21f2 100644 --- a/BinaryObjectScanner/Protection/PSXAntiModchip.cs +++ b/BinaryObjectScanner/Protection/PSXAntiModchip.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; +using SabreTools.Matching; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/PlayJ.cs b/BinaryObjectScanner/Protection/PlayJ.cs index 5f2b8fd3..958a4803 100644 --- a/BinaryObjectScanner/Protection/PlayJ.cs +++ b/BinaryObjectScanner/Protection/PlayJ.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/ProtectDISC.cs b/BinaryObjectScanner/Protection/ProtectDISC.cs index 470c34b1..49cdd6b2 100644 --- a/BinaryObjectScanner/Protection/ProtectDISC.cs +++ b/BinaryObjectScanner/Protection/ProtectDISC.cs @@ -4,10 +4,9 @@ using System.Text; using System.Text.RegularExpressions; using BinaryObjectScanner.Interfaces; using SabreTools.Data.Models.ISO9660; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; #pragma warning disable SYSLIB1045 // Convert to 'GeneratedRegexAttribute' namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/RainbowSentinel.cs b/BinaryObjectScanner/Protection/RainbowSentinel.cs index e6518de5..20f58746 100644 --- a/BinaryObjectScanner/Protection/RainbowSentinel.cs +++ b/BinaryObjectScanner/Protection/RainbowSentinel.cs @@ -2,10 +2,9 @@ using System.Collections.Generic; using System.Text; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/RealArcade.cs b/BinaryObjectScanner/Protection/RealArcade.cs index 36f40ccd..bcb270fa 100644 --- a/BinaryObjectScanner/Protection/RealArcade.cs +++ b/BinaryObjectScanner/Protection/RealArcade.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/RingPROTECH.cs b/BinaryObjectScanner/Protection/RingPROTECH.cs index cb44d2a0..34be40bd 100644 --- a/BinaryObjectScanner/Protection/RingPROTECH.cs +++ b/BinaryObjectScanner/Protection/RingPROTECH.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; +using SabreTools.Matching; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/Roxxe.cs b/BinaryObjectScanner/Protection/Roxxe.cs index a3467980..1478cc49 100644 --- a/BinaryObjectScanner/Protection/Roxxe.cs +++ b/BinaryObjectScanner/Protection/Roxxe.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/SVKProtector.cs b/BinaryObjectScanner/Protection/SVKProtector.cs index e0a62390..5353fd41 100644 --- a/BinaryObjectScanner/Protection/SVKProtector.cs +++ b/BinaryObjectScanner/Protection/SVKProtector.cs @@ -1,9 +1,7 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/SafeLock.cs b/BinaryObjectScanner/Protection/SafeLock.cs index 2475caf9..23505bd8 100644 --- a/BinaryObjectScanner/Protection/SafeLock.cs +++ b/BinaryObjectScanner/Protection/SafeLock.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; +using SabreTools.Matching; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/SecuROM.cs b/BinaryObjectScanner/Protection/SecuROM.cs index 8a3c1897..a04b33e4 100644 --- a/BinaryObjectScanner/Protection/SecuROM.cs +++ b/BinaryObjectScanner/Protection/SecuROM.cs @@ -3,10 +3,11 @@ using System.Collections.Generic; using System.Text; using BinaryObjectScanner.Interfaces; using SabreTools.Data.Models.ISO9660; -using SabreTools.IO; using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Numerics.Extensions; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; using static SabreTools.Data.Models.SecuROM.Constants; #pragma warning disable IDE0059 // Unnecessary assignment of value diff --git a/BinaryObjectScanner/Protection/SmartE.cs b/BinaryObjectScanner/Protection/SmartE.cs index 91398cd7..bd73181b 100644 --- a/BinaryObjectScanner/Protection/SmartE.cs +++ b/BinaryObjectScanner/Protection/SmartE.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/SoftLock.cs b/BinaryObjectScanner/Protection/SoftLock.cs index c7e0001e..b60c7ea3 100644 --- a/BinaryObjectScanner/Protection/SoftLock.cs +++ b/BinaryObjectScanner/Protection/SoftLock.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/SolidShield.cs b/BinaryObjectScanner/Protection/SolidShield.cs index 67e9973e..ec5e7a16 100644 --- a/BinaryObjectScanner/Protection/SolidShield.cs +++ b/BinaryObjectScanner/Protection/SolidShield.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/StarForce.cs b/BinaryObjectScanner/Protection/StarForce.cs index d712c502..811bb12c 100644 --- a/BinaryObjectScanner/Protection/StarForce.cs +++ b/BinaryObjectScanner/Protection/StarForce.cs @@ -3,10 +3,11 @@ using System.Collections.Generic; using System.Text.RegularExpressions; using BinaryObjectScanner.Interfaces; using SabreTools.Data.Models.ISO9660; -using SabreTools.IO; using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Numerics.Extensions; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; #pragma warning disable SYSLIB1045 // Convert to 'GeneratedRegexAttribute' namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/Steam.cs b/BinaryObjectScanner/Protection/Steam.cs index 260d4546..448ce361 100644 --- a/BinaryObjectScanner/Protection/Steam.cs +++ b/BinaryObjectScanner/Protection/Steam.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/Sysiphus.cs b/BinaryObjectScanner/Protection/Sysiphus.cs index 0df89854..ceda115e 100644 --- a/BinaryObjectScanner/Protection/Sysiphus.cs +++ b/BinaryObjectScanner/Protection/Sysiphus.cs @@ -1,6 +1,6 @@ using System; using BinaryObjectScanner.Interfaces; -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/TZCopyProtection.cs b/BinaryObjectScanner/Protection/TZCopyProtection.cs index 20e5c0b9..fe7c3763 100644 --- a/BinaryObjectScanner/Protection/TZCopyProtection.cs +++ b/BinaryObjectScanner/Protection/TZCopyProtection.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; +using SabreTools.Matching; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/Tages.cs b/BinaryObjectScanner/Protection/Tages.cs index 868aa98e..3466326b 100644 --- a/BinaryObjectScanner/Protection/Tages.cs +++ b/BinaryObjectScanner/Protection/Tages.cs @@ -3,10 +3,11 @@ using System.Collections.Generic; using System.IO; using BinaryObjectScanner.Interfaces; using SabreTools.Data.Models.ISO9660; -using SabreTools.IO; using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Numerics.Extensions; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/Themida.cs b/BinaryObjectScanner/Protection/Themida.cs index 057c2b08..4895d4e3 100644 --- a/BinaryObjectScanner/Protection/Themida.cs +++ b/BinaryObjectScanner/Protection/Themida.cs @@ -1,5 +1,5 @@ using BinaryObjectScanner.Interfaces; -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/ThreePLock.cs b/BinaryObjectScanner/Protection/ThreePLock.cs index 53b50ce3..d15c2ccb 100644 --- a/BinaryObjectScanner/Protection/ThreePLock.cs +++ b/BinaryObjectScanner/Protection/ThreePLock.cs @@ -1,5 +1,5 @@ using BinaryObjectScanner.Interfaces; -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/ThreeTwoOneStudios.cs b/BinaryObjectScanner/Protection/ThreeTwoOneStudios.cs index e58f8d57..0d4b1b56 100644 --- a/BinaryObjectScanner/Protection/ThreeTwoOneStudios.cs +++ b/BinaryObjectScanner/Protection/ThreeTwoOneStudios.cs @@ -1,5 +1,5 @@ using BinaryObjectScanner.Interfaces; -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/UbisoftOrbit.cs b/BinaryObjectScanner/Protection/UbisoftOrbit.cs index 7479aebd..2a2e1845 100644 --- a/BinaryObjectScanner/Protection/UbisoftOrbit.cs +++ b/BinaryObjectScanner/Protection/UbisoftOrbit.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; +using SabreTools.Matching; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/UnilocSoftAnchor.cs b/BinaryObjectScanner/Protection/UnilocSoftAnchor.cs index 20d7e7b7..d1df9b2d 100644 --- a/BinaryObjectScanner/Protection/UnilocSoftAnchor.cs +++ b/BinaryObjectScanner/Protection/UnilocSoftAnchor.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/Uplay.cs b/BinaryObjectScanner/Protection/Uplay.cs index 4cf915ec..00348c9d 100644 --- a/BinaryObjectScanner/Protection/Uplay.cs +++ b/BinaryObjectScanner/Protection/Uplay.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/WMDS.cs b/BinaryObjectScanner/Protection/WMDS.cs index dd17dec0..b4c775bb 100644 --- a/BinaryObjectScanner/Protection/WMDS.cs +++ b/BinaryObjectScanner/Protection/WMDS.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/WTMCDProtect.cs b/BinaryObjectScanner/Protection/WTMCDProtect.cs index 3d904a2c..6bb4a2f7 100644 --- a/BinaryObjectScanner/Protection/WTMCDProtect.cs +++ b/BinaryObjectScanner/Protection/WTMCDProtect.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Extensions; -using SabreTools.IO.Matching; -using SabreTools.Serialization.Wrappers; +using SabreTools.Matching; +using SabreTools.Text.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/WinLock.cs b/BinaryObjectScanner/Protection/WinLock.cs index 31eb33c2..cf4b3ec3 100644 --- a/BinaryObjectScanner/Protection/WinLock.cs +++ b/BinaryObjectScanner/Protection/WinLock.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; +using SabreTools.Matching; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/XCP.cs b/BinaryObjectScanner/Protection/XCP.cs index 6115236c..1f7d91e9 100644 --- a/BinaryObjectScanner/Protection/XCP.cs +++ b/BinaryObjectScanner/Protection/XCP.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.IO; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.Serialization.Wrappers; +using SabreTools.Text.INI; +using SabreTools.Wrappers; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/YuPlay.cs b/BinaryObjectScanner/Protection/YuPlay.cs index 828dcdf4..244eb0c1 100644 --- a/BinaryObjectScanner/Protection/YuPlay.cs +++ b/BinaryObjectScanner/Protection/YuPlay.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; +using SabreTools.Matching; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/Zzxzz.cs b/BinaryObjectScanner/Protection/Zzxzz.cs index ef25bd08..7015005f 100644 --- a/BinaryObjectScanner/Protection/Zzxzz.cs +++ b/BinaryObjectScanner/Protection/Zzxzz.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using System.IO; using BinaryObjectScanner.Interfaces; -using SabreTools.IO; -using SabreTools.IO.Matching; +using SabreTools.Matching; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Scanner.cs b/BinaryObjectScanner/Scanner.cs index 503442ca..de1f27c3 100644 --- a/BinaryObjectScanner/Scanner.cs +++ b/BinaryObjectScanner/Scanner.cs @@ -3,9 +3,10 @@ using System.Collections.Generic; using System.IO; using BinaryObjectScanner.Data; using BinaryObjectScanner.Interfaces; +using SabreTools.Collections.Extensions; using SabreTools.IO.Extensions; -using SabreTools.Serialization; -using SabreTools.Serialization.Wrappers; +using SabreTools.Numerics.Extensions; +using SabreTools.Wrappers; namespace BinaryObjectScanner { diff --git a/Developer Guide.md b/Developer Guide.md index cb73e865..26b1f6ab 100644 --- a/Developer Guide.md +++ b/Developer Guide.md @@ -36,7 +36,7 @@ Adding a new checker or format should happen in a few distinct steps: - If it is a new supported game engine or standard library, create the file in `BinaryObjectScanner.GameEngine`. By default, you will need to implement `BinaryObjectScanner.Interfaces.IExecutableCheck`. It is exceptionally rare to need to implement `BinaryObjectScanner.Interfaces.IPathCheck`. - - If it is a new supported executable packer, compressor, or installer format, create the file in `BinaryObjectScanner.Packer`. By default, you will need to implement a new Wrapper in `SabreTools.Serialization.Wrappers`. It is exceptionally rare to need to implement `BinaryObjectScanner.Interfaces.IPathCheck`. + - If it is a new supported executable packer, compressor, or installer format, create the file in `BinaryObjectScanner.Packer`. By default, you will need to implement a new Wrapper in `SabreTools.Wrappers`. It is exceptionally rare to need to implement `BinaryObjectScanner.Interfaces.IPathCheck`. - If it is a new supported DRM scheme, copy protection, or obfuscator, create the file in `BinaryObjectScanner.Protection`. By default, you will need to implement at least one of: `BinaryObjectScanner.Interfaces.IExecutableCheck` or `BinaryObjectScanner.Interfaces.IPathCheck`. diff --git a/ProtectionScan/ProtectionScan.csproj b/ProtectionScan/ProtectionScan.csproj index ee469fd5..9813b73b 100644 --- a/ProtectionScan/ProtectionScan.csproj +++ b/ProtectionScan/ProtectionScan.csproj @@ -33,7 +33,7 @@ - + \ No newline at end of file