Add BinaryStreamReader convenience constructors. Deprecate ByteArrayD…

…ataSource.CreateReader.
Washi1337 · Oct 18, 2022 · 54c65ee · 54c65ee
1 parent e9d9e5d
commit 54c65ee
Show file tree

Hide file tree

Showing 33 changed files with 77 additions and 60 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -4,7 +4,7 @@
       - master
 
   image: Visual Studio 2022
-  version: 4.11.2-master-build.{build}
+  version: 5.0.0-master-build.{build}
   configuration: Release
 
   skip_commits:

diff --git a/src/AsmResolver.DotNet.Dynamic/DynamicCilOperandResolver.cs b/src/AsmResolver.DotNet.Dynamic/DynamicCilOperandResolver.cs
@@ -95,7 +95,7 @@ public DynamicCilOperandResolver(SerializedModuleDefinition contextModule, CilMe
                     break;
 
                 case TableIndex.StandAloneSig:
-                    var reader = ByteArrayDataSource.CreateReader((byte[])_tokens[(int)token.Rid]!);
+                    var reader = new BinaryStreamReader((byte[])_tokens[(int)token.Rid]!);
                     return CallingConventionSignature.FromReader(new BlobReadContext(_readerContext), ref reader);
             }
 

diff --git a/src/AsmResolver.DotNet.Dynamic/DynamicMethodDefinition.cs b/src/AsmResolver.DotNet.Dynamic/DynamicMethodDefinition.cs
@@ -103,7 +103,7 @@ private static CilMethodBody CreateDynamicMethodBody(MethodDefinition method, ob
             DynamicMethodHelper.ReadLocalVariables(result, method, localSig);
 
             // Read raw instructions.
-            var reader = ByteArrayDataSource.CreateReader(code);
+            var reader = new BinaryStreamReader(code);
             var disassembler = new CilDisassembler(reader, new DynamicCilOperandResolver(module, result, tokenList));
             result.Instructions.AddRange(disassembler.ReadInstructions());
 

diff --git a/src/AsmResolver.DotNet.Dynamic/DynamicMethodHelper.cs b/src/AsmResolver.DotNet.Dynamic/DynamicMethodHelper.cs
@@ -30,13 +30,12 @@ static DynamicMethodHelper()
 
         public static void ReadLocalVariables(CilMethodBody methodBody, MethodDefinition method, byte[] localSig)
         {
-            if (!(method.Module is SerializedModuleDefinition module))
+            if (method.Module is not SerializedModuleDefinition module)
                 throw new ArgumentException("Method body should reference a serialized module.");
 
-            var reader = ByteArrayDataSource.CreateReader(localSig);
-            if (ReadLocalVariableSignature(
-                    new BlobReadContext(module.ReaderContext),
-                    ref reader) is not LocalVariablesSignature localsSignature)
+            var reader = new BinaryStreamReader(localSig);
+            if (ReadLocalVariableSignature(new BlobReadContext(module.ReaderContext), ref reader)
+                is not { } localsSignature)
             {
                 throw new ArgumentException("Invalid local variables signature.");
             }

diff --git a/src/AsmResolver.DotNet/Code/Cil/CilMethodBody.cs b/src/AsmResolver.DotNet/Code/Cil/CilMethodBody.cs
@@ -227,7 +227,7 @@ public bool VerifyLabelsOnBuild
                     var section = fatBody.ExtraSections[i];
                     if (section.IsEHTable)
                     {
-                        var reader = ByteArrayDataSource.CreateReader(section.Data);
+                        var reader = new BinaryStreamReader(section.Data);
                         uint size = section.IsFat
                             ? CilExceptionHandler.FatExceptionHandlerSize
                             : CilExceptionHandler.TinyExceptionHandlerSize;

diff --git a/src/AsmResolver.DotNet/Signatures/DataBlobSignature.cs b/src/AsmResolver.DotNet/Signatures/DataBlobSignature.cs
@@ -43,7 +43,7 @@ public byte[] Data
         /// <returns>The deserialized literal.</returns>
         public object InterpretData(ElementType elementType)
         {
-            var reader = ByteArrayDataSource.CreateReader(Data);
+            var reader = new BinaryStreamReader(Data);
 
             return elementType switch
             {

diff --git a/src/AsmResolver.PE.File/PEFile.cs b/src/AsmResolver.PE.File/PEFile.cs
@@ -135,7 +135,7 @@ public static PEFile FromFile(IInputFile file)
         /// <param name="raw">The raw bytes representing the contents of the PE file to read.</param>
         /// <returns>The PE file that was read.</returns>
         /// <exception cref="BadImageFormatException">Occurs when the file does not follow the PE file format.</exception>
-        public static PEFile FromBytes(byte[] raw) => FromReader(ByteArrayDataSource.CreateReader(raw));
+        public static PEFile FromBytes(byte[] raw) => FromReader(new BinaryStreamReader(raw));
 
         /// <summary>
         /// Reads a mapped PE file starting at the provided module base address (HINSTANCE).

diff --git a/src/AsmResolver.PE/DotNet/Metadata/Blob/SerializedBlobStream.cs b/src/AsmResolver.PE/DotNet/Metadata/Blob/SerializedBlobStream.cs
@@ -15,7 +15,7 @@ public class SerializedBlobStream : BlobStream
         /// </summary>
         /// <param name="rawData">The raw contents of the stream.</param>
         public SerializedBlobStream(byte[] rawData)
-            : this(DefaultName, ByteArrayDataSource.CreateReader(rawData))
+            : this(DefaultName, new BinaryStreamReader(rawData))
         {
         }
 
@@ -25,7 +25,7 @@ public SerializedBlobStream(byte[] rawData)
         /// <param name="name">The name of the stream.</param>
         /// <param name="rawData">The raw contents of the stream.</param>
         public SerializedBlobStream(string name, byte[] rawData)
-            : this(name, ByteArrayDataSource.CreateReader(rawData))
+            : this(name, new BinaryStreamReader(rawData))
         {
         }
 

diff --git a/src/AsmResolver.PE/DotNet/Metadata/Guid/SerializedGuidStream.cs b/src/AsmResolver.PE/DotNet/Metadata/Guid/SerializedGuidStream.cs
@@ -18,7 +18,7 @@ public class SerializedGuidStream : GuidStream
         /// </summary>
         /// <param name="rawData">The raw contents of the stream.</param>
         public SerializedGuidStream(byte[] rawData)
-            : this(DefaultName, ByteArrayDataSource.CreateReader(rawData))
+            : this(DefaultName, new BinaryStreamReader(rawData))
         {
         }
 
@@ -28,7 +28,7 @@ public SerializedGuidStream(byte[] rawData)
         /// <param name="name">The name of the stream.</param>
         /// <param name="rawData">The raw contents of the stream.</param>
         public SerializedGuidStream(string name, byte[] rawData)
-            : this(name, ByteArrayDataSource.CreateReader(rawData))
+            : this(name, new BinaryStreamReader(rawData))
         {
         }
 

diff --git a/src/AsmResolver.PE/DotNet/Metadata/Metadata.cs b/src/AsmResolver.PE/DotNet/Metadata/Metadata.cs
@@ -81,7 +81,7 @@ public IList<IMetadataStream> Streams
         /// </summary>
         /// <param name="data">The raw data.</param>
         /// <returns>The read metadata.</returns>
-        public static Metadata FromBytes(byte[] data) => FromReader(ByteArrayDataSource.CreateReader(data));
+        public static Metadata FromBytes(byte[] data) => FromReader(new BinaryStreamReader(data));
 
         /// <summary>
         /// Reads a .NET metadata directory from a file.

diff --git a/src/AsmResolver.PE/DotNet/Metadata/Pdb/SerializedPdbStream.cs b/src/AsmResolver.PE/DotNet/Metadata/Pdb/SerializedPdbStream.cs
@@ -14,7 +14,7 @@ public class SerializedPdbStream : PdbStream
         /// </summary>
         /// <param name="rawData">The raw contents of the stream.</param>
         public SerializedPdbStream(byte[] rawData)
-            : this(DefaultName, ByteArrayDataSource.CreateReader(rawData))
+            : this(DefaultName, new BinaryStreamReader(rawData))
         {
         }
 
@@ -24,7 +24,7 @@ public SerializedPdbStream(byte[] rawData)
         /// <param name="name">The name of the stream.</param>
         /// <param name="rawData">The raw contents of the stream.</param>
         public SerializedPdbStream(string name, byte[] rawData)
-            : this(name, ByteArrayDataSource.CreateReader(rawData))
+            : this(name, new BinaryStreamReader(rawData))
         {
         }
 

diff --git a/src/AsmResolver.PE/DotNet/Metadata/Strings/SerializedStringsStream.cs b/src/AsmResolver.PE/DotNet/Metadata/Strings/SerializedStringsStream.cs
@@ -17,7 +17,7 @@ public class SerializedStringsStream : StringsStream
         /// </summary>
         /// <param name="rawData">The raw contents of the stream.</param>
         public SerializedStringsStream(byte[] rawData)
-            : this(DefaultName, ByteArrayDataSource.CreateReader(rawData))
+            : this(DefaultName, new BinaryStreamReader(rawData))
         {
         }
 
@@ -27,7 +27,7 @@ public SerializedStringsStream(byte[] rawData)
         /// <param name="name">The name of the stream.</param>
         /// <param name="rawData">The raw contents of the stream.</param>
         public SerializedStringsStream(string name, byte[] rawData)
-            : this(name, ByteArrayDataSource.CreateReader(rawData))
+            : this(name, new BinaryStreamReader(rawData))
         {
         }
 

diff --git a/src/AsmResolver.PE/DotNet/Metadata/Tables/SerializedTableStream.cs b/src/AsmResolver.PE/DotNet/Metadata/Tables/SerializedTableStream.cs
@@ -38,7 +38,7 @@ public class SerializedTableStream : TablesStream, ILazyMetadataStream
         /// <param name="name">The name of the stream.</param>
         /// <param name="rawData">The raw contents of the stream.</param>
         public SerializedTableStream(MetadataReaderContext context, string name, byte[] rawData)
-            : this(context, name, ByteArrayDataSource.CreateReader(rawData))
+            : this(context, name, new BinaryStreamReader(rawData))
         {
         }
 

diff --git a/src/AsmResolver.PE/DotNet/Metadata/UserStrings/SerializedUserStringsStream.cs b/src/AsmResolver.PE/DotNet/Metadata/UserStrings/SerializedUserStringsStream.cs
@@ -17,7 +17,7 @@ public class SerializedUserStringsStream : UserStringsStream
         /// </summary>
         /// <param name="rawData">The raw contents of the stream.</param>
         public SerializedUserStringsStream(byte[] rawData)
-            : this(DefaultName, ByteArrayDataSource.CreateReader(rawData))
+            : this(DefaultName, new BinaryStreamReader(rawData))
         {
         }
 
@@ -27,7 +27,7 @@ public SerializedUserStringsStream(byte[] rawData)
         /// <param name="name">The name of the stream.</param>
         /// <param name="rawData">The raw contents of the stream.</param>
         public SerializedUserStringsStream(string name, byte[] rawData)
-            : this(name, ByteArrayDataSource.CreateReader(rawData))
+            : this(name, new BinaryStreamReader(rawData))
         {
         }
 

diff --git a/src/AsmResolver.PE/DotNet/StrongName/StrongNamePrivateKey.cs b/src/AsmResolver.PE/DotNet/StrongName/StrongNamePrivateKey.cs
@@ -22,7 +22,7 @@ public class StrongNamePrivateKey : StrongNamePublicKey
         /// <exception cref="NotSupportedException">Occurs when an invalid or unsupported algorithm is specified.</exception>
         public new static StrongNamePrivateKey FromFile(string path)
         {
-            var reader = ByteArrayDataSource.CreateReader(System.IO.File.ReadAllBytes(path));
+            var reader = new BinaryStreamReader(System.IO.File.ReadAllBytes(path));
             return FromReader(ref reader);
         }
 

diff --git a/src/AsmResolver.PE/DotNet/StrongName/StrongNamePublicKey.cs b/src/AsmResolver.PE/DotNet/StrongName/StrongNamePublicKey.cs
@@ -24,7 +24,7 @@ public class StrongNamePublicKey : StrongNameKeyStructure
         /// <exception cref="NotSupportedException">Occurs when an invalid or unsupported algorithm is specified.</exception>
         public static StrongNamePublicKey FromFile(string path)
         {
-            var reader = ByteArrayDataSource.CreateReader(System.IO.File.ReadAllBytes(path));
+            var reader = new BinaryStreamReader(System.IO.File.ReadAllBytes(path));
             return FromReader(ref reader);
         }
 

diff --git a/src/AsmResolver.Symbols.Pdb/Msf/MsfFile.cs b/src/AsmResolver.Symbols.Pdb/Msf/MsfFile.cs
@@ -88,7 +88,7 @@ public MsfFile(uint blockSize)
     /// </summary>
     /// <param name="data">The data to interpret.</param>
     /// <returns>The read MSF file.</returns>
-    public static MsfFile FromBytes(byte[] data) => FromReader(ByteArrayDataSource.CreateReader(data));
+    public static MsfFile FromBytes(byte[] data) => FromReader(new BinaryStreamReader(data));
 
     /// <summary>
     /// Reads an MSF file from the provided input stream reader.

diff --git a/src/AsmResolver/IO/BinaryStreamReader.cs b/src/AsmResolver/IO/BinaryStreamReader.cs
@@ -13,6 +13,24 @@ public struct BinaryStreamReader
         [ThreadStatic]
         private static int[]? _buffer;
 
+        /// <summary>
+        /// Creates a new binary stream reader on the provided data source.
+        /// </summary>
+        /// <param name="data">The data to read from.</param>
+        public BinaryStreamReader(byte[] data)
+            : this(new ByteArrayDataSource(data))
+        {
+        }
+
+        /// <summary>
+        /// Creates a new binary stream reader on the provided data source.
+        /// </summary>
+        /// <param name="dataSource">The object to get the data from.</param>
+        public BinaryStreamReader(IDataSource dataSource)
+            : this(dataSource, 0, 0, (uint) dataSource.Length)
+        {
+        }
+
         /// <summary>
         /// Creates a new binary stream reader on the provided data source.
         /// </summary>

diff --git a/src/AsmResolver/IO/ByteArrayDataSource.cs b/src/AsmResolver/IO/ByteArrayDataSource.cs
@@ -46,8 +46,8 @@ public ulong BaseAddress
         /// </summary>
         /// <param name="data">The byte array to read.</param>
         /// <returns>The stream reader.</returns>
-        public static BinaryStreamReader CreateReader(byte[] data) =>
-            new(new ByteArrayDataSource(data), 0, 0, (uint) data.Length);
+        [Obsolete("Use the constructor of AsmResolver.IO.BinaryStreamReader instead.")]
+        public static BinaryStreamReader CreateReader(byte[] data) => new(data);
 
         /// <inheritdoc />
         public bool IsValidAddress(ulong address) => address - BaseAddress < (ulong) _data.Length;

diff --git a/test/AsmResolver.DotNet.Tests/AssemblyDefinitionTest.cs b/test/AsmResolver.DotNet.Tests/AssemblyDefinitionTest.cs
@@ -13,7 +13,7 @@ private static AssemblyDefinition Rebuild(AssemblyDefinition assembly)
         {
             using var stream = new MemoryStream();
             assembly.ManifestModule.Write(stream);
-            return AssemblyDefinition.FromReader(ByteArrayDataSource.CreateReader(stream.ToArray()));
+            return AssemblyDefinition.FromReader(new BinaryStreamReader(stream.ToArray()));
         }
 
         [Fact]

diff --git a/test/AsmResolver.DotNet.Tests/Bundles/BundleManifestTest.cs b/test/AsmResolver.DotNet.Tests/Bundles/BundleManifestTest.cs
@@ -103,7 +103,7 @@ public void MarkFilesAsCompressed()
             using var stream = new MemoryStream();
             ulong address = manifest.WriteManifest(new BinaryStreamWriter(stream), false);
 
-            var reader = ByteArrayDataSource.CreateReader(stream.ToArray());
+            var reader = new BinaryStreamReader(stream.ToArray());
             reader.Offset = address;
             var newManifest = BundleManifest.FromReader(reader);
             AssertBundlesAreEqual(manifest, newManifest);

diff --git a/test/AsmResolver.DotNet.Tests/CustomAttributeTest.cs b/test/AsmResolver.DotNet.Tests/CustomAttributeTest.cs
@@ -34,7 +34,7 @@ public void PersistentConstructor()
             using var stream = new MemoryStream();
             module.Write(stream);
 
-            module = ModuleDefinition.FromReader(ByteArrayDataSource.CreateReader(stream.ToArray()));
+            module = ModuleDefinition.FromReader(new BinaryStreamReader(stream.ToArray()));
 
             var type = module.TopLevelTypes.First(t => t.Name == nameof(CustomAttributesTestClass));
             Assert.All(type.CustomAttributes, a =>

diff --git a/test/AsmResolver.DotNet.Tests/ModuleDefinitionTest.cs b/test/AsmResolver.DotNet.Tests/ModuleDefinitionTest.cs
@@ -24,7 +24,7 @@ private static ModuleDefinition Rebuild(ModuleDefinition module)
         {
             using var stream = new MemoryStream();
             module.Write(stream);
-            return ModuleDefinition.FromReader(ByteArrayDataSource.CreateReader(stream.ToArray()));
+            return ModuleDefinition.FromReader(new BinaryStreamReader(stream.ToArray()));
         }
 
         [SkippableFact]
@@ -285,7 +285,7 @@ public void PersistentResources()
             // Write and rebuild.
             using var stream = new MemoryStream();
             module.Write(stream);
-            var newModule = ModuleDefinition.FromReader(ByteArrayDataSource.CreateReader(stream.ToArray()));
+            var newModule = ModuleDefinition.FromReader(new BinaryStreamReader(stream.ToArray()));
 
             // Assert contents.
             var newDirectory = (IResourceDirectory)newModule.NativeResourceDirectory.Entries

diff --git a/test/AsmResolver.DotNet.Tests/Resources/ResourceSetTest.cs b/test/AsmResolver.DotNet.Tests/Resources/ResourceSetTest.cs
@@ -87,7 +87,7 @@ public void PersistentIntrinsicElement(string key, ResourceTypeCode type, object
             using var stream = new MemoryStream();
             set.Write(new BinaryStreamWriter(stream));
 
-            var actualSet = ResourceSet.FromReader(ByteArrayDataSource.CreateReader(stream.ToArray()));
+            var actualSet = ResourceSet.FromReader(new BinaryStreamReader(stream.ToArray()));
             var actualEntry = actualSet.First(e => e.Name == key);
             Assert.Equal(entry.Type, actualEntry.Type);
             Assert.Equal(entry.Data, actualEntry.Data);
@@ -110,7 +110,7 @@ public void PersistentUserDefinedTypeElement()
             using var stream = new MemoryStream();
             set.Write(new BinaryStreamWriter(stream));
 
-            var actualSet = ResourceSet.FromReader(ByteArrayDataSource.CreateReader(stream.ToArray()));
+            var actualSet = ResourceSet.FromReader(new BinaryStreamReader(stream.ToArray()));
             var actualEntry = actualSet.First(e => e.Name == "Point");
             Assert.Equal(entry.Type.FullName, actualEntry.Type.FullName);
             Assert.Equal(entry.Data, actualEntry.Data);
@@ -134,7 +134,7 @@ public void PersistentSetMultipleEntries()
 
             var resourceReader = new ResourceReader(stream);
 
-            var actualSet = ResourceSet.FromReader(ByteArrayDataSource.CreateReader(stream.ToArray()));
+            var actualSet = ResourceSet.FromReader(new BinaryStreamReader(stream.ToArray()));
             Assert.Equal(set.Count, actualSet.Count);
             for (int i = 0; i < set.Count; i++)
             {

diff --git a/test/AsmResolver.DotNet.Tests/SecurityDeclarationTest.cs b/test/AsmResolver.DotNet.Tests/SecurityDeclarationTest.cs
@@ -16,7 +16,7 @@ private static MethodDefinition LookupMethod(string methodName, bool rebuild)
             {
                 var stream = new MemoryStream();
                 module.Write(stream);
-                module = ModuleDefinition.FromReader(ByteArrayDataSource.CreateReader(stream.ToArray()));
+                module = ModuleDefinition.FromReader(new BinaryStreamReader(stream.ToArray()));
             }
 
             var type = module.TopLevelTypes.First(t => t.Name == nameof(SecurityAttributes));

diff --git a/test/AsmResolver.PE.Tests/DotNet/Metadata/MetadataTest.cs b/test/AsmResolver.PE.Tests/DotNet/Metadata/MetadataTest.cs
@@ -103,7 +103,7 @@ public void PreserveMetadataNoChange()
             using var tempStream = new MemoryStream();
             metadata.Write(new BinaryStreamWriter(tempStream));
 
-            var reader = ByteArrayDataSource.CreateReader(tempStream.ToArray());
+            var reader = new BinaryStreamReader(tempStream.ToArray());
             var context = MetadataReaderContext.FromReaderContext(new PEReaderContext(peFile));
             var newMetadata = new SerializedMetadata(context, ref reader);
 

diff --git a/test/AsmResolver.PE.Tests/DotNet/Metadata/Tables/Rows/RowTestUtils.cs b/test/AsmResolver.PE.Tests/DotNet/Metadata/Tables/Rows/RowTestUtils.cs
@@ -21,7 +21,7 @@ internal static class RowTestUtils
 
             using var tempStream = new MemoryStream();
             expected.Write(new BinaryStreamWriter(tempStream), table.Layout);
-            var reader = ByteArrayDataSource.CreateReader(tempStream.ToArray());
+            var reader = new BinaryStreamReader(tempStream.ToArray());
             var newRow = readRow(ref reader, table.Layout);
 
             Assert.Equal(expected, newRow);
@@ -36,7 +36,7 @@ internal static class RowTestUtils
 
             using var tempStream = new MemoryStream();
             expected.Write(new BinaryStreamWriter(tempStream), table.Layout);
-            var reader = ByteArrayDataSource.CreateReader(tempStream.ToArray());
+            var reader = new BinaryStreamReader(tempStream.ToArray());
             var newRow = readRow(new MetadataReaderContext(VirtualAddressFactory.Instance), ref reader, table.Layout);
 
             Assert.Equal(expected, newRow);

diff --git a/test/AsmResolver.PE.Tests/DotNet/StrongName/StrongNamePublicKeyTest.cs b/test/AsmResolver.PE.Tests/DotNet/StrongName/StrongNamePublicKeyTest.cs
@@ -18,7 +18,7 @@ public void PersistentStrongNamePublicKey()
             using var tempStream = new MemoryStream();
             publicKey.Write(new BinaryStreamWriter(tempStream));
 
-            var reader = ByteArrayDataSource.CreateReader(tempStream.ToArray());
+            var reader = new BinaryStreamReader(tempStream.ToArray());
             var newPublicKey = StrongNamePublicKey.FromReader(ref reader);
 
             Assert.Equal(publicKey.Modulus, newPublicKey.Modulus);

diff --git a/test/AsmResolver.PE.Win32Resources.Tests/Version/VersionInfoResourceTest.cs b/test/AsmResolver.PE.Win32Resources.Tests/Version/VersionInfoResourceTest.cs
@@ -45,7 +45,7 @@ public void PersistentFixedVersionInfo()
             versionInfo.Write(new BinaryStreamWriter(tempStream));
 
             // Reload.
-            var infoReader = ByteArrayDataSource.CreateReader(tempStream.ToArray());
+            var infoReader = new BinaryStreamReader(tempStream.ToArray());
             var newVersionInfo = VersionInfoResource.FromReader(ref infoReader);
             var newFixedVersionInfo = newVersionInfo.FixedVersionInfo;
 
@@ -117,7 +117,7 @@ public void PersistentVarFileInfo()
             versionInfo.Write(new BinaryStreamWriter(tempStream));
 
             // Reload.
-            var infoReader = ByteArrayDataSource.CreateReader(tempStream.ToArray());
+            var infoReader = new BinaryStreamReader(tempStream.ToArray());
             var newVersionInfo = VersionInfoResource.FromReader(ref infoReader);
 
             // Verify.
@@ -152,7 +152,7 @@ public void PersistentStringFileInfo()
             versionInfo.Write(new BinaryStreamWriter(tempStream));
 
             // Reload.
-            var infoReader = ByteArrayDataSource.CreateReader(tempStream.ToArray());
+            var infoReader = new BinaryStreamReader(tempStream.ToArray());
             var newVersionInfo = VersionInfoResource.FromReader(ref infoReader);
 
             // Verify.

diff --git a/test/AsmResolver.Symbols.Pdb.Tests/Metadata/Dbi/DbiStreamTest.cs b/test/AsmResolver.Symbols.Pdb.Tests/Metadata/Dbi/DbiStreamTest.cs
@@ -20,7 +20,7 @@ private DbiStream GetDbiStream(bool rebuild)
         {
             using var stream = new MemoryStream();
             dbiStream.Write(new BinaryStreamWriter(stream));
-            dbiStream = DbiStream.FromReader(ByteArrayDataSource.CreateReader(stream.ToArray()));
+            dbiStream = DbiStream.FromReader(new BinaryStreamReader(stream.ToArray()));
         }
 
         return dbiStream;