Restore warning not as error

* fix

* add comment back

* slight simplification

* Remove newline

* Remove newline

* Fix

.github/workflows/build_and_test.yml

@@ -11,7 +11,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
       with:
-        submodules: recursive
+        fetch-depth: 0
     
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
@@ -27,6 +27,14 @@ jobs:
     - 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.14.0
       with:

BinaryObjectScanner.Test/BinaryObjectScanner.Test.csproj

@@ -16,10 +16,10 @@
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-        <PackageReference Include="SabreTools.Serialization" Version="1.9.5" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
+        <PackageReference Include="SabreTools.Serialization" Version="[2.1.0]" />
         <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

@@ -47,4 +47,4 @@ namespace BinaryObjectScanner.Test.Data
             Assert.Equal(105, actual.Length);
         }
     }
-}
+}

BinaryObjectScanner.Test/ExtensionsTests.cs

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

BinaryObjectScanner.Test/FileType/AACSMediaKeyBlockTests.cs

@@ -7,7 +7,7 @@ namespace BinaryObjectScanner.Test.FileType
     public class AACSMediaKeyBlockTests
     {
         private static readonly SabreTools.Serialization.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()

BinaryObjectScanner.Test/FileType/BDPlusSVMTests.cs

@@ -7,7 +7,7 @@ namespace BinaryObjectScanner.Test.FileType
     public class BDPlusSVMTests
     {
         private static readonly SabreTools.Serialization.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()

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.Serialization.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/LDSCRYPTTests.cs

@@ -6,11 +6,14 @@ namespace BinaryObjectScanner.Test.FileType
 {
     public class LDSCRYPTTests
     {
+        private static readonly SabreTools.Serialization.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,10 +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

@@ -7,7 +7,7 @@ namespace BinaryObjectScanner.Test.FileType
     public class LinearExecutableTests
     {
         private static readonly SabreTools.Serialization.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

@@ -7,7 +7,7 @@ namespace BinaryObjectScanner.Test.FileType
     public class MSDOSTests
     {
         private static readonly SabreTools.Serialization.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

@@ -7,7 +7,7 @@ namespace BinaryObjectScanner.Test.FileType
     public class NewExecutableTests
     {
         private static readonly SabreTools.Serialization.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

@@ -7,7 +7,7 @@ namespace BinaryObjectScanner.Test.FileType
     public class PLJTests
     {
         private static readonly SabreTools.Serialization.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()

BinaryObjectScanner.Test/FileType/PortableExecutableTests.cs

@@ -7,7 +7,7 @@ namespace BinaryObjectScanner.Test.FileType
     public class PortableExecutableTests
     {
         private static readonly SabreTools.Serialization.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.Serialization.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,10 +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.Serialization.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,10 +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.Serialization.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/GameEngine/RenderWareTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.GameEngine
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/ASPackTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Packer
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/AdvancedInstallerTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Packer
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/AutoPlayMediaStudioTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Packer
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/CExeTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Packer
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/CrunchTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Packer
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/DotFuscatorTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Packer
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/DotNetReactorTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Packer
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/EXEStealthTests.cs

@@ -21,7 +21,7 @@ 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);
 
@@ -30,4 +30,4 @@ namespace BinaryObjectScanner.Test.Packer
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/EmbeddedFileTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Packer
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/GenteeInstallerTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Packer
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/HyperTechCrackProofTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Packer
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/InnoSetupTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -23,7 +23,7 @@ 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);
 
@@ -32,4 +32,4 @@ namespace BinaryObjectScanner.Test.Packer
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/InstallAnywhereTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Packer
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/InstallerVISETests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Packer
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/IntelInstallationFrameworkTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Packer
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/MicrosoftCABSFXTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Packer
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/NSISTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Packer
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/NeoLiteTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Packer
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/PECompactTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Packer
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/PEtiteTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Packer
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/SetupFactoryTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Packer
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/SevenZipSFXTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Packer
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/ShrinkerTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Packer
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/UPXTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Packer
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/WinRARSFXTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Packer
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/WinZipSFXTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -18,12 +18,12 @@ namespace BinaryObjectScanner.Test.Packer
             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);
 
@@ -32,4 +32,4 @@ namespace BinaryObjectScanner.Test.Packer
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Packer/WiseInstallerTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -18,12 +18,12 @@ namespace BinaryObjectScanner.Test.Packer
             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);
 
@@ -32,4 +32,4 @@ namespace BinaryObjectScanner.Test.Packer
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/ActiveMARKTests.cs

@@ -21,7 +21,7 @@ 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);
 
@@ -30,4 +30,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/AegiSoftTests.cs

@@ -11,7 +11,7 @@ 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);
 
@@ -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,7 +10,7 @@ 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);
 
@@ -18,5 +18,18 @@ namespace BinaryObjectScanner.Test.Protection
             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.Serialization.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,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Protection
             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,7 +11,7 @@ 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);
 
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/CDCheckTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/CDDVDCopsTests.cs

@@ -11,7 +11,7 @@ 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);
 
@@ -19,12 +19,12 @@ namespace BinaryObjectScanner.Test.Protection
             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);
 
@@ -32,7 +32,7 @@ namespace BinaryObjectScanner.Test.Protection
             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,7 +11,7 @@ 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);
 
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/CDKeyTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/CDLockTests.cs

@@ -11,7 +11,7 @@ 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);
 
@@ -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,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/CDXTests.cs

@@ -27,4 +27,4 @@ namespace BinaryObjectScanner.Test.Protection
             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,7 +11,7 @@ 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);
 
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/ChannelwareTests.cs

@@ -11,7 +11,7 @@ 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);
 
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/ChosenBytesCodeLockTests.cs

@@ -11,7 +11,7 @@ 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);
 
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/CopyKillerTests.cs

@@ -11,7 +11,7 @@ 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);
 
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/CopyLokTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -18,5 +18,18 @@ namespace BinaryObjectScanner.Test.Protection
             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.Serialization.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,7 +11,7 @@ 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);
 
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/CrypKeyTests.cs

@@ -11,7 +11,7 @@ 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);
 
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/CuckoTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Protection
             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,7 +11,7 @@ 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);
 
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/DigiGuardTests.cs

@@ -11,7 +11,7 @@ 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);
 
@@ -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,7 +11,7 @@ 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);
 
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/EAAntiCheatTests.cs

@@ -11,7 +11,7 @@ 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);
 
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/EasyAntiCheatTests.cs

@@ -11,7 +11,7 @@ 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);
 
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/ElectronicArtsTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/Engine32Tests.cs

@@ -11,7 +11,7 @@ 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);
 
@@ -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,7 +11,7 @@ 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);
 
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/GefestTests.cs

@@ -11,7 +11,7 @@ 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);
 
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/HexalockAutoLockTests.cs

@@ -11,7 +11,7 @@ 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);
 
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/ImpulseReactorTests.cs

@@ -11,7 +11,7 @@ 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);
 
@@ -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,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/InterLokTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/JoWoodTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/KalypsoLauncherTests.cs

@@ -11,7 +11,7 @@ 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);
 
@@ -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,7 +11,7 @@ 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);
 
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/LaserLokTests.cs

@@ -11,7 +11,7 @@ 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);
 
@@ -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.Serialization.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,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/MacrovisionTests.cs

@@ -11,7 +11,7 @@ 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);
 
@@ -24,7 +24,7 @@ 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);
 
@@ -53,5 +53,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.Serialization.Wrappers.ISO9660 iso = new(model, source);
+
+            var checker = new Macrovision();
+            string? actual = checker.CheckDiskImage(file, iso, includeDebug: false);
+            Assert.Null(actual);
+        }
     }
-}
+}

BinaryObjectScanner.Test/Protection/MediaCloQTests.cs

@@ -11,7 +11,7 @@ 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);
 
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/MediaMaxTests.cs

@@ -11,7 +11,7 @@ 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);
 
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/NEACProtectTests.cs

@@ -11,7 +11,7 @@ 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);
 
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/NProtectTests.cs

@@ -11,7 +11,7 @@ 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);
 
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/OnlineRegistrationTests.cs

@@ -10,7 +10,7 @@ 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);
 
@@ -19,4 +19,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}

BinaryObjectScanner.Test/Protection/OpenMGTests.cs

@@ -11,7 +11,7 @@ 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);
 
@@ -41,4 +41,4 @@ namespace BinaryObjectScanner.Test.Protection
             Assert.Null(actual);
         }
     }
-}
+}