Add readme to package finally

* Update GCF output string for encrypted GCFs

* Use Array.Exists since some early GCFs have only some files encrypted

.editorconfig

@@ -0,0 +1,167 @@
+# top-most EditorConfig file
+root = true
+
+# C# files
+[*.cs]
+
+# Indentation and spacing
+charset = utf-8
+indent_size = 4
+indent_style = space
+tab_width = 4
+trim_trailing_whitespace = true
+
+# New line preferences
+end_of_line = lf
+insert_final_newline = true
+max_line_length = unset
+
+# using directive preferences
+csharp_using_directive_placement = outside_namespace
+dotnet_diagnostic.IDE0005.severity = error
+
+# Code-block preferences
+csharp_style_namespace_declarations = block_scoped
+csharp_style_prefer_method_group_conversion = true
+csharp_style_prefer_top_level_statements = false
+
+# Expression-level preferences
+csharp_prefer_simple_default_expression = true
+csharp_style_inlined_variable_declaration = true
+csharp_style_unused_value_assignment_preference = discard_variable
+csharp_style_unused_value_expression_statement_preference = discard_variable
+dotnet_diagnostic.IDE0001.severity = warning
+dotnet_diagnostic.IDE0002.severity = warning
+dotnet_diagnostic.IDE0004.severity = warning
+dotnet_diagnostic.IDE0010.severity = error
+dotnet_diagnostic.IDE0051.severity = warning
+dotnet_diagnostic.IDE0052.severity = warning
+dotnet_diagnostic.IDE0072.severity = warning
+dotnet_diagnostic.IDE0080.severity = warning
+dotnet_diagnostic.IDE0100.severity = error
+dotnet_diagnostic.IDE0110.severity = error
+dotnet_diagnostic.IDE0120.severity = warning
+dotnet_diagnostic.IDE0121.severity = warning
+dotnet_diagnostic.IDE0240.severity = error
+dotnet_diagnostic.IDE0241.severity = error
+dotnet_style_coalesce_expression = true
+dotnet_style_namespace_match_folder = false
+dotnet_style_null_propagation = true
+dotnet_style_prefer_auto_properties = true
+dotnet_style_prefer_collection_expression = when_types_loosely_match
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true
+dotnet_style_prefer_compound_assignment = true
+csharp_style_prefer_simple_property_accessors = true
+dotnet_style_prefer_simplified_interpolation = true
+dotnet_style_prefer_simplified_boolean_expressions = true
+csharp_style_prefer_unbound_generic_type_in_nameof = true
+
+# Field preferences
+dotnet_diagnostic.IDE0044.severity = warning
+dotnet_style_readonly_field = true
+
+# Language keyword vs. framework types preferences
+dotnet_diagnostic.IDE0049.severity = error
+dotnet_style_predefined_type_for_locals_parameters_members = true
+dotnet_style_predefined_type_for_member_access = true
+
+# Modifier preferences
+csharp_prefer_static_local_function = true
+csharp_style_prefer_readonly_struct = true
+dotnet_diagnostic.IDE0036.severity = warning
+dotnet_diagnostic.IDE0040.severity = error
+dotnet_diagnostic.IDE0380.severity = error
+dotnet_style_require_accessibility_modifiers = always
+
+# New-line preferences
+dotnet_diagnostic.IDE2000.severity = warning
+dotnet_diagnostic.IDE2002.severity = warning
+dotnet_diagnostic.IDE2003.severity = warning
+dotnet_diagnostic.IDE2004.severity = warning
+dotnet_diagnostic.IDE2005.severity = warning
+dotnet_diagnostic.IDE2006.severity = warning
+csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = false
+csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = false
+csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = false
+csharp_style_allow_blank_lines_between_consecutive_braces_experimental = false
+dotnet_style_allow_multiple_blank_lines_experimental = false
+dotnet_style_allow_statement_immediately_after_block_experimental = false
+
+# Null-checking preferences
+csharp_style_conditional_delegate_call = true
+
+# Parameter preferences
+dotnet_code_quality_unused_parameters = all
+dotnet_diagnostic.IDE0280.severity = error
+
+# Parentheses preferences
+dotnet_diagnostic.IDE0047.severity = warning
+dotnet_diagnostic.IDE0048.severity = warning
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity
+dotnet_style_parentheses_in_other_operators = always_for_clarity
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity
+
+# Pattern-matching preferences
+dotnet_diagnostic.IDE0019.severity = warning
+dotnet_diagnostic.IDE0020.severity = warning
+dotnet_diagnostic.IDE0038.severity = warning
+dotnet_diagnostic.IDE0066.severity = none
+dotnet_diagnostic.IDE0083.severity = warning
+dotnet_diagnostic.IDE0260.severity = warning
+csharp_style_pattern_matching_over_as_with_null_check = true
+csharp_style_pattern_matching_over_is_with_cast_check = true
+csharp_style_prefer_not_pattern = true
+csharp_style_prefer_pattern_matching = true
+
+# this. and Me. preferences
+dotnet_style_qualification_for_event = false
+dotnet_style_qualification_for_field = false
+dotnet_style_qualification_for_method = false
+dotnet_style_qualification_for_property = false
+
+# var preferences
+csharp_style_var_for_built_in_types = false
+csharp_style_var_when_type_is_apparent = true
+
+# .NET formatting options
+dotnet_separate_import_directive_groups = false
+dotnet_sort_system_directives_first = true
+
+# C# formatting options
+csharp_indent_block_contents = true
+csharp_indent_braces = false
+csharp_indent_case_contents = true
+csharp_indent_case_contents_when_block = false
+csharp_indent_labels = one_less_than_current
+csharp_indent_switch_labels = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_else = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_open_brace = all
+csharp_new_line_between_query_expression_clauses = true
+csharp_preserve_single_line_blocks = true
+csharp_preserve_single_line_statements = true
+csharp_space_after_cast = false
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_after_comma = true
+csharp_space_after_dot = false
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_after_semicolon_in_for_statement = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_around_declaration_statements = false
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_before_comma = false
+csharp_space_before_dot = false
+csharp_space_before_open_square_brackets = false
+csharp_space_before_semicolon_in_for_statement = false
+csharp_space_between_empty_square_brackets = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_parentheses = false
+csharp_space_between_square_brackets = false

.github/workflows/build_and_test.yml

@@ -1,40 +1,48 @@
 name: Build and Test
 
 on:
-  push:
+    push:
-    branches: [ "master" ]
+        branches: ["master"]
 
 jobs:
-  build:
+    build:
-    runs-on: ubuntu-latest
+        runs-on: ubuntu-latest
 
-    steps:
+        steps:
-    - uses: actions/checkout@v4
+            - uses: actions/checkout@v5
-      with:
+              with:
-        submodules: recursive
+                  fetch-depth: 0
-    
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: |
-            6.0.x
-            8.0.x
-            9.0.x
-        
-    - name: Run tests
-      run: dotnet test
-      
-    - name: Run publish script
-      run: ./publish-nix.sh -d
 
-    - name: Upload to rolling
+            - name: Setup .NET
-      uses: ncipollo/release-action@v1.14.0
+              uses: actions/setup-dotnet@v5
-      with:
+              with:
-        allowUpdates: True
+                  dotnet-version: |
-        artifacts: "*.nupkg,*.snupkg,*.zip"
+                      8.0.x
-        body: 'Last built commit: ${{ github.sha }}'
+                      9.0.x
-        name: 'Rolling Release'
+                      10.0.x
-        prerelease: True
+
-        replacesArtifacts: True
+            - name: Run tests
-        tag: "rolling"
+              run: dotnet test
-        updateOnlyUnreleased: True
+
+            - name: Run publish script
+              run: ./publish-nix.sh -d
+
+            - name: Update rolling tag
+              run: |
+                  git config user.name "github-actions[bot]"
+                  git config user.email "github-actions[bot]@users.noreply.github.com"
+                  git tag -f rolling
+                  git push origin :refs/tags/rolling || true
+                  git push origin rolling --force
+
+            - name: Upload to rolling
+              uses: ncipollo/release-action@v1.20.0
+              with:
+                  allowUpdates: True
+                  artifacts: "*.nupkg,*.snupkg,*.zip"
+                  body: "Last built commit: ${{ github.sha }}"
+                  name: "Rolling Release"
+                  prerelease: True
+                  replacesArtifacts: True
+                  tag: "rolling"
+                  updateOnlyUnreleased: True

.github/workflows/check_pr.yml

@@ -3,21 +3,21 @@ name: Build PR
 on: [pull_request]
 
 jobs:
-  build:
+    build:
-    runs-on: ubuntu-latest
+        runs-on: ubuntu-latest
-    steps:
+        steps:
-    - uses: actions/checkout@v4
+            - uses: actions/checkout@v5
-    
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: |
-            6.0.x
-            8.0.x
-            9.0.x
-      
-    - name: Build
-      run: dotnet build
 
-    - name: Run tests
+            - name: Setup .NET
-      run: dotnet test
+              uses: actions/setup-dotnet@v5
+              with:
+                  dotnet-version: |
+                      8.0.x
+                      9.0.x
+                      10.0.x
+
+            - name: Build
+              run: dotnet build
+
+            - name: Run tests
+              run: dotnet test

.gitignore

@@ -4,6 +4,7 @@
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
 # User-specific files
+*.lscache
 *.suo
 *.user
 *.userosscache

.vscode/launch.json

@@ -10,7 +10,7 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/ProtectionScan/bin/Debug/net9.0/ProtectionScan.dll",
+            "program": "${workspaceFolder}/ProtectionScan/bin/Debug/net10.0/ProtectionScan.dll",
             "args": [],
             "cwd": "${workspaceFolder}/ProtectionScan",
             // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console

BinaryObjectScanner.Test/BinaryObjectScanner.Test.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
         <IsPackable>false</IsPackable>
         <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
@@ -12,14 +12,14 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="coverlet.collector" Version="6.0.4">
+        <PackageReference Include="coverlet.collector" Version="10.0.1">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
-        <PackageReference Include="SabreTools.Serialization" Version="1.9.5" />
+        <PackageReference Include="SabreTools.Serialization" Version="[3.0.1]" />
         <PackageReference Include="xunit" Version="2.9.3" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>

BinaryObjectScanner.Test/Data/ProtectionDictionaryTests.cs

@@ -42,4 +42,4 @@ namespace BinaryObjectScanner.Test.Data
 
         #endregion
     }
-}
+}

BinaryObjectScanner.Test/Data/StaticChecksTests.cs

@@ -44,7 +44,7 @@ namespace BinaryObjectScanner.Test.Data
         public void PortableExecutableCheckClasses_Populated()
         {
             var actual = StaticChecks.PortableExecutableCheckClasses;
-            Assert.Equal(105, actual.Length);
+            Assert.Equal(106, actual.Length);
         }
     }
-}
+}

BinaryObjectScanner.Test/ExtensionsTests.cs

@@ -1,35 +0,0 @@
-using Xunit;
-
-namespace BinaryObjectScanner.Test
-{
-    public class ExtensionsTests
-    {
-        #region FileSize
-
-        [Fact]
-        public void FileSize_Null_Invalid()
-        {
-            string? filename = null;
-            long actual = filename.FileSize();
-            Assert.Equal(-1, actual);
-        }
-
-        [Fact]
-        public void FileSize_Empty_Invalid()
-        {
-            string? filename = string.Empty;
-            long actual = filename.FileSize();
-            Assert.Equal(-1, actual);
-        }
-
-        [Fact]
-        public void FileSize_Invalid_Invalid()
-        {
-            string? filename = "INVALID";
-            long actual = filename.FileSize();
-            Assert.Equal(-1, actual);
-        }
-
-        #endregion
-    }
-}

BinaryObjectScanner.Test/FileType/AACSMediaKeyBlockTests.cs

@@ -6,8 +6,8 @@ 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.Models.AACS.MediaKeyBlock(), new MemoryStream(new byte[1024]));
+            = new(new SabreTools.Data.Models.AACS.MediaKeyBlock(), new MemoryStream(new byte[1024]));
 
         [Fact]
         public void DetectFile_EmptyString_Null()
@@ -31,4 +31,3 @@ namespace BinaryObjectScanner.Test.FileType
         }
     }
 }
-

BinaryObjectScanner.Test/FileType/BDPlusSVMTests.cs

@@ -6,8 +6,8 @@ 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.Models.BDPlus.SVM(), new MemoryStream(new byte[1024]));
+            = new(new SabreTools.Data.Models.BDPlus.SVM(), new MemoryStream(new byte[1024]));
 
         [Fact]
         public void DetectFile_EmptyString_Null()
@@ -31,4 +31,3 @@ namespace BinaryObjectScanner.Test.FileType
         }
     }
 }
-

BinaryObjectScanner.Test/FileType/DiskImageTests.cs

@@ -0,0 +1,34 @@
+using System.IO;
+using BinaryObjectScanner.FileType;
+using Xunit;
+
+namespace BinaryObjectScanner.Test.FileType
+{
+    public class DiskImageTests
+    {
+        private static readonly SabreTools.Wrappers.ISO9660 wrapper
+            = new(new SabreTools.Data.Models.ISO9660.Volume(), new MemoryStream(new byte[1024]));
+
+        [Fact]
+        public void DetectFile_EmptyString_Null()
+        {
+            string file = string.Empty;
+            var detectable = new ISO9660(wrapper);
+
+            string? actual = detectable.Detect(file, includeDebug: false);
+            Assert.Null(actual);
+        }
+
+        [Fact]
+        public void DetectStream_EmptyStream_Empty()
+        {
+            Stream? stream = new MemoryStream();
+            string file = string.Empty;
+            var detectable = new ISO9660(wrapper);
+
+            string? actual = detectable.Detect(stream, file, includeDebug: false);
+            Assert.NotNull(actual);
+            Assert.Empty(actual);
+        }
+    }
+}

BinaryObjectScanner.Test/FileType/GCFTests.cs

@@ -0,0 +1,33 @@
+using System.IO;
+using BinaryObjectScanner.FileType;
+using Xunit;
+
+namespace BinaryObjectScanner.Test.FileType
+{
+    public class GCFTests
+    {
+        private static readonly SabreTools.Wrappers.GCF wrapper
+            = new(new SabreTools.Data.Models.GCF.File(), new MemoryStream(new byte[1024]));
+
+        [Fact]
+        public void DetectFile_EmptyString_Null()
+        {
+            string file = string.Empty;
+            var detectable = new GCF(wrapper);
+
+            string? actual = detectable.Detect(file, includeDebug: false);
+            Assert.Null(actual);
+        }
+
+        [Fact]
+        public void DetectStream_EmptyStream_DefaultValue()
+        {
+            Stream? stream = new MemoryStream();
+            string file = string.Empty;
+            var detectable = new GCF(wrapper);
+
+            string? actual = detectable.Detect(stream, file, includeDebug: false);
+            Assert.Equal(" - 0 (v0)", actual);
+        }
+    }
+}

BinaryObjectScanner.Test/FileType/LDSCRYPTTests.cs

@@ -6,11 +6,14 @@ namespace BinaryObjectScanner.Test.FileType
 {
     public class LDSCRYPTTests
     {
+        private static readonly SabreTools.Wrappers.LDSCRYPT wrapper
+            = new(new SabreTools.Data.Models.LDSCRYPT.EncryptedFile(), new MemoryStream(new byte[1024]));
+
         [Fact]
         public void DetectFile_EmptyString_Null()
         {
             string file = string.Empty;
-            var detectable = new LDSCRYPT();
+            var detectable = new LDSCRYPT(wrapper);
 
             string? actual = detectable.Detect(file, includeDebug: false);
             Assert.Null(actual);
@@ -21,11 +24,10 @@ namespace BinaryObjectScanner.Test.FileType
         {
             Stream? stream = new MemoryStream();
             string file = string.Empty;
-            var detectable = new LDSCRYPT();
+            var detectable = new LDSCRYPT(wrapper);
 
             string? actual = detectable.Detect(stream, file, includeDebug: false);
-            Assert.Null(actual);
+            Assert.Equal("LDSCRYPT", actual);
         }
     }
 }
-

BinaryObjectScanner.Test/FileType/LinearExecutableTests.cs

@@ -6,8 +6,8 @@ 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.Models.LinearExecutable.Executable(), new MemoryStream(new byte[1024]));
+            = new(new SabreTools.Data.Models.LinearExecutable.Executable(), new MemoryStream(new byte[1024]));
 
         [Fact]
         public void DetectFile_EmptyString_Null()

BinaryObjectScanner.Test/FileType/MSDOSTests.cs

@@ -6,8 +6,8 @@ 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.Models.MSDOS.Executable(), new MemoryStream(new byte[1024]));
+            = new(new SabreTools.Data.Models.MSDOS.Executable(), new MemoryStream(new byte[1024]));
 
         [Fact]
         public void DetectFile_EmptyString_Null()

BinaryObjectScanner.Test/FileType/NewExecutableTests.cs

@@ -6,8 +6,8 @@ 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.Models.NewExecutable.Executable(), new MemoryStream(new byte[1024]));
+            = new(new SabreTools.Data.Models.NewExecutable.Executable(), new MemoryStream(new byte[1024]));
 
         [Fact]
         public void DetectFile_EmptyString_Null()

BinaryObjectScanner.Test/FileType/PLJTests.cs

@@ -6,8 +6,8 @@ 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.Models.PlayJ.AudioFile(), new MemoryStream(new byte[1024]));
+            = new(new SabreTools.Data.Models.PlayJ.AudioFile(), new MemoryStream(new byte[1024]));
 
         [Fact]
         public void DetectFile_EmptyString_Null()
@@ -31,4 +31,3 @@ namespace BinaryObjectScanner.Test.FileType
         }
     }
 }
-

BinaryObjectScanner.Test/FileType/PortableExecutableTests.cs

@@ -6,8 +6,8 @@ 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.Models.PortableExecutable.Executable(), new MemoryStream(new byte[1024]));
+            = new(new SabreTools.Data.Models.PortableExecutable.Executable(), new MemoryStream(new byte[1024]));
 
         [Fact]
         public void DetectFile_EmptyString_Null()

BinaryObjectScanner.Test/FileType/RealArcadeInstallerTests.cs

@@ -6,11 +6,14 @@ namespace BinaryObjectScanner.Test.FileType
 {
     public class RealArcadeInstallerTests
     {
+        private static readonly SabreTools.Wrappers.RealArcadeInstaller wrapper
+            = new(new SabreTools.Data.Models.RealArcade.RgsFile(), new MemoryStream(new byte[1024]));
+
         [Fact]
         public void DetectFile_EmptyString_Null()
         {
             string file = string.Empty;
-            var detectable = new RealArcadeInstaller();
+            var detectable = new RealArcadeInstaller(wrapper);
 
             string? actual = detectable.Detect(file, includeDebug: false);
             Assert.Null(actual);
@@ -21,11 +24,10 @@ namespace BinaryObjectScanner.Test.FileType
         {
             Stream? stream = new MemoryStream();
             string file = string.Empty;
-            var detectable = new RealArcadeInstaller();
+            var detectable = new RealArcadeInstaller(wrapper);
 
             string? actual = detectable.Detect(stream, file, includeDebug: false);
-            Assert.Null(actual);
+            Assert.Equal("RealArcade Installer", actual);
         }
     }
 }
-

BinaryObjectScanner.Test/FileType/RealArcadeMezzanineTests.cs

@@ -6,11 +6,14 @@ namespace BinaryObjectScanner.Test.FileType
 {
     public class RealArcadeMezzanineTests
     {
+        private static readonly SabreTools.Wrappers.RealArcadeMezzanine wrapper
+            = new(new SabreTools.Data.Models.RealArcade.Mezzanine(), new MemoryStream(new byte[1024]));
+
         [Fact]
         public void DetectFile_EmptyString_Null()
         {
             string file = string.Empty;
-            var detectable = new RealArcadeMezzanine();
+            var detectable = new RealArcadeMezzanine(wrapper);
 
             string? actual = detectable.Detect(file, includeDebug: false);
             Assert.Null(actual);
@@ -21,11 +24,10 @@ namespace BinaryObjectScanner.Test.FileType
         {
             Stream? stream = new MemoryStream();
             string file = string.Empty;
-            var detectable = new RealArcadeMezzanine();
+            var detectable = new RealArcadeMezzanine(wrapper);
 
             string? actual = detectable.Detect(stream, file, includeDebug: false);
-            Assert.Null(actual);
+            Assert.Equal("RealArcade Mezzanine", actual);
         }
     }
 }
-

BinaryObjectScanner.Test/FileType/SFFSTests.cs

@@ -6,11 +6,14 @@ namespace BinaryObjectScanner.Test.FileType
 {
     public class SFFSTests
     {
+        private static readonly SabreTools.Wrappers.SFFS wrapper
+            = new(new SabreTools.Data.Models.StarForce.FileSystem(), new MemoryStream(new byte[1024]));
+
         [Fact]
         public void DetectFile_EmptyString_Null()
         {
             string file = string.Empty;
-            var detectable = new SFFS();
+            var detectable = new SFFS(wrapper);
 
             string? actual = detectable.Detect(file, includeDebug: false);
             Assert.Null(actual);
@@ -21,10 +24,10 @@ namespace BinaryObjectScanner.Test.FileType
         {
             Stream? stream = new MemoryStream();
             string file = string.Empty;
-            var detectable = new SFFS();
+            var detectable = new SFFS(wrapper);
 
             string? actual = detectable.Detect(stream, file, includeDebug: false);
-            Assert.Null(actual);
+            Assert.Equal("StarForce Filesystem Container", actual);
         }
     }
 }

BinaryObjectScanner.Test/FileType/TextfileTests.cs

@@ -28,4 +28,3 @@ namespace BinaryObjectScanner.Test.FileType
         }
     }
 }
-

BinaryObjectScanner.Test/GameEngine/RenderWareTests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.GameEngine
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/ASPackTests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/AdvancedInstallerTests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/AutoPlayMediaStudioTests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/CExeTests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/CrunchTests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/DotFuscatorTests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/DotNetReactorTests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/EXEStealthTests.cs

@@ -21,13 +21,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/EmbeddedFileTests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/GenteeInstallerTests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/HyperTechCrackProofTests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/InnoSetupTests.cs

@@ -10,9 +10,9 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckNewExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.NewExecutable.Executable model = new();
+            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);
@@ -23,13 +23,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/InstallAnywhereTests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/InstallerVISETests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/IntelInstallationFrameworkTests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/MicrosoftCABSFXTests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/NSISTests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/NeoLiteTests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/PECompactTests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/PEtiteTests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/SetupFactoryTests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/SevenZipSFXTests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/ShrinkerTests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/UPXTests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/WinRARSFXTests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/WinZipSFXTests.cs

@@ -10,26 +10,26 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckNewExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.NewExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
-    
+
         [Fact]
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/WiseInstallerTests.cs

@@ -10,26 +10,26 @@ namespace BinaryObjectScanner.Test.Packer
         public void CheckNewExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.NewExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
-    
+
         [Fact]
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/ActiveMARKTests.cs

@@ -21,13 +21,13 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/AegiSoftTests.cs

@@ -11,9 +11,9 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/AlphaDVDTests.cs

@@ -27,4 +27,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/AlphaROMTests.cs

@@ -10,13 +10,26 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
+
+        [Fact]
+        public void CheckDiskImageTest()
+        {
+            string file = "filename";
+            SabreTools.Data.Models.ISO9660.Volume model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Wrappers.ISO9660 iso = new(model, source);
+
+            var checker = new AlphaROM();
+            string? actual = checker.CheckDiskImage(file, iso, includeDebug: false);
+            Assert.Null(actual);
+        }
     }
-}
+}

BinaryObjectScanner.Test/Protection/ArmadilloTests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/BitpoolTests.cs

@@ -27,4 +27,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/ByteShieldTests.cs

@@ -11,9 +11,9 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/CDCheckTests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/CDDVDCopsTests.cs

@@ -11,28 +11,28 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckNewExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.NewExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
-    
+
         [Fact]
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
-    
+
         [Fact]
         public void CheckDirectoryPathTest()
         {
@@ -54,4 +54,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/CDGuardTests.cs

@@ -11,9 +11,9 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/CDKeyTests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/CDLockTests.cs

@@ -11,9 +11,9 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/CDProtectorTests.cs

@@ -27,4 +27,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/CDSHiELDSETests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/CDXTests.cs

@@ -27,4 +27,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/CEGTests.cs

@@ -0,0 +1,22 @@
+using System.IO;
+using BinaryObjectScanner.Protection;
+using Xunit;
+
+namespace BinaryObjectScanner.Test.Protection
+{
+    public class CEGTests
+    {
+        [Fact]
+        public void CheckPortableExecutableTest()
+        {
+            string file = "filename";
+            SabreTools.Data.Models.PortableExecutable.Executable model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Wrappers.PortableExecutable exe = new(model, source);
+
+            var checker = new CEG();
+            string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
+            Assert.Null(actual);
+        }
+    }
+}

BinaryObjectScanner.Test/Protection/CactusDataShieldTests.cs

@@ -16,4 +16,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/CenegaProtectDVDTests.cs

@@ -11,9 +11,9 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/ChannelwareTests.cs

@@ -11,9 +11,9 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/ChosenBytesCodeLockTests.cs

@@ -11,9 +11,9 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/CopyKillerTests.cs

@@ -11,9 +11,9 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/CopyLokTests.cs

@@ -10,13 +10,26 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
+
+        [Fact]
+        public void CheckDiskImageTest()
+        {
+            string file = "filename";
+            SabreTools.Data.Models.ISO9660.Volume model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Wrappers.ISO9660 iso = new(model, source);
+
+            var checker = new CopyLok();
+            string? actual = checker.CheckDiskImage(file, iso, includeDebug: false);
+            Assert.Null(actual);
+        }
     }
-}
+}

BinaryObjectScanner.Test/Protection/CopyXTests.cs

@@ -11,9 +11,9 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/CrypKeyTests.cs

@@ -11,9 +11,9 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/CuckoTests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/DVDCryptTests.cs

@@ -27,4 +27,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/DVDMoviePROTECTTests.cs

@@ -27,4 +27,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/DenuvoTests.cs

@@ -11,9 +11,9 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/DigiGuardTests.cs

@@ -11,9 +11,9 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/DinamicMultimediaTests.cs

@@ -27,4 +27,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/DiscGuardTests.cs

@@ -11,9 +11,9 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/EAAntiCheatTests.cs

@@ -11,9 +11,9 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/EasyAntiCheatTests.cs

@@ -11,9 +11,9 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/ElectronicArtsTests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/Engine32Tests.cs

@@ -11,9 +11,9 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/FreeLockTests.cs

@@ -27,4 +27,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/GFWLTests.cs

@@ -11,9 +11,9 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/GefestTests.cs

@@ -11,9 +11,9 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/HexalockAutoLockTests.cs

@@ -11,9 +11,9 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/ImpulseReactorTests.cs

@@ -11,9 +11,9 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/IndyVCDTests.cs

@@ -27,4 +27,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/InteniumTests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/InterLokTests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/JoWoodTests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/KalypsoLauncherTests.cs

@@ -11,9 +11,9 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/KeyLockTests.cs

@@ -16,4 +16,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/LabelGateTests.cs

@@ -11,9 +11,9 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/LaserLokTests.cs

@@ -11,9 +11,9 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
@@ -40,5 +40,18 @@ namespace BinaryObjectScanner.Test.Protection
             string? actual = checker.CheckFilePath(path);
             Assert.Null(actual);
         }
+
+        [Fact]
+        public void CheckDiskImageTest()
+        {
+            string file = "filename";
+            SabreTools.Data.Models.ISO9660.Volume model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Wrappers.ISO9660 iso = new(model, source);
+
+            var checker = new LaserLok();
+            string? actual = checker.CheckDiskImage(file, iso, includeDebug: false);
+            Assert.Null(actual);
+        }
     }
-}
+}

BinaryObjectScanner.Test/Protection/MGIRegistrationTests.cs

@@ -10,13 +10,13 @@ namespace BinaryObjectScanner.Test.Protection
         public void CheckPortableExecutableTest()
         {
             string file = "filename";
-            SabreTools.Models.PortableExecutable.Executable model = new();
+            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);
             Assert.Null(actual);
         }
     }
-}
+}