From 0e67f0bff4eb8a0cfdf1823dd840e449fa4132e7 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Fri, 26 Sep 2025 15:20:49 -0400 Subject: [PATCH] Move wrapper interfaces to better namespace --- README.MD | 4 ++-- SabreTools.Serialization/Printer.cs | 7 +++---- SabreTools.Serialization/WrapperFactory.cs | 1 - SabreTools.Serialization/Wrappers/BFPK.Extraction.cs | 1 - SabreTools.Serialization/Wrappers/BSP.Extraction.cs | 1 - SabreTools.Serialization/Wrappers/BZip2.Extraction.cs | 1 - SabreTools.Serialization/Wrappers/CFB.Extraction.cs | 1 - SabreTools.Serialization/Wrappers/GCF.Extraction.cs | 1 - SabreTools.Serialization/Wrappers/GZip.Extraction.cs | 1 - .../{Interfaces => Wrappers}/IExtractable.cs | 2 +- .../{Interfaces => Wrappers}/IWrapper.cs | 2 +- .../{Interfaces => Wrappers}/IWrapperT.cs | 2 +- .../Wrappers/InstallShieldArchiveV3.Extraction.cs | 1 - .../Wrappers/InstallShieldCabinet.Extraction.cs | 3 +-- SabreTools.Serialization/Wrappers/LZKWAJ.Extraction.cs | 1 - SabreTools.Serialization/Wrappers/LZQBasic.Extraction.cs | 1 - SabreTools.Serialization/Wrappers/LZSZDD.Extraction.cs | 1 - .../Wrappers/MicrosoftCabinet.Extraction.cs | 1 - SabreTools.Serialization/Wrappers/MoPaQ.Extraction.cs | 1 - .../Wrappers/NewExecutable.Extraction.cs | 1 - SabreTools.Serialization/Wrappers/PAK.Extraction.cs | 1 - SabreTools.Serialization/Wrappers/PFF.Extraction.cs | 1 - SabreTools.Serialization/Wrappers/PKZIP.Extraction.cs | 1 - .../Wrappers/PortableExecutable.Extraction.cs | 1 - SabreTools.Serialization/Wrappers/Quantum.Extraction.cs | 1 - SabreTools.Serialization/Wrappers/RAR.Extraction.cs | 1 - SabreTools.Serialization/Wrappers/SGA.Extraction.cs | 1 - .../Wrappers/SecuROMMatroschkaPackage.Extraction.cs | 1 - SabreTools.Serialization/Wrappers/SevenZip.Extraction.cs | 1 - .../Wrappers/TapeArchive.Extraction.cs | 1 - SabreTools.Serialization/Wrappers/VBSP.Extraction.cs | 1 - SabreTools.Serialization/Wrappers/VPK.Extraction.cs | 1 - SabreTools.Serialization/Wrappers/WAD3.Extraction.cs | 1 - .../Wrappers/WiseSectionHeader.Extraction.cs | 1 - SabreTools.Serialization/Wrappers/WrapperBase.cs | 1 - SabreTools.Serialization/Wrappers/WrapperBaseT.cs | 1 - SabreTools.Serialization/Wrappers/XZ.Extraction.cs | 1 - SabreTools.Serialization/Wrappers/XZP.Extraction.cs | 1 - 38 files changed, 9 insertions(+), 43 deletions(-) rename SabreTools.Serialization/{Interfaces => Wrappers}/IExtractable.cs (92%) rename SabreTools.Serialization/{Interfaces => Wrappers}/IWrapper.cs (90%) rename SabreTools.Serialization/{Interfaces => Wrappers}/IWrapperT.cs (88%) diff --git a/README.MD b/README.MD index 87f2c784..30fafa8f 100644 --- a/README.MD +++ b/README.MD @@ -99,8 +99,8 @@ Below is a table representing the various non-conversion interfaces that are imp | Interface Name | Purpose | | --- | --- | | `SabreTools.Data.Printers.IPrinter` | Provides a formatted output for a model | -| `SabreTools.Serialization.Interfaces.IExtractable` | Marks a wrapper as able to be extracted | -| `SabreTools.Serialization.Interfaces.IWrapper` / `SabreTools.Serialization.Interfaces.IWrapper` | Wraps a model or set of models to provide additional functionality | +| `SabreTools.Serialization.Wrappers.IExtractable` | Marks a wrapper as able to be extracted | +| `SabreTools.Serialization.Wrappers.IWrapper` / `SabreTools.Serialization.Wrappers.IWrapper` | Wraps a model or set of models to provide additional functionality | ## Namespaces diff --git a/SabreTools.Serialization/Printer.cs b/SabreTools.Serialization/Printer.cs index ab781735..2287912c 100644 --- a/SabreTools.Serialization/Printer.cs +++ b/SabreTools.Serialization/Printer.cs @@ -1,7 +1,6 @@ using System; using System.Text; using SabreTools.Data.Printers; -using SabreTools.Serialization.Interfaces; using Wrapper = SabreTools.Serialization.Wrappers; namespace SabreTools.Serialization @@ -15,7 +14,7 @@ namespace SabreTools.Serialization /// Print the item information from a wrapper to console as /// pretty-printed text /// - public static void PrintToConsole(this IWrapper wrapper) + public static void PrintToConsole(this Wrapper.IWrapper wrapper) { var sb = wrapper.ExportStringBuilder(); if (sb == null) @@ -30,7 +29,7 @@ namespace SabreTools.Serialization /// /// Export the item information as a StringBuilder /// - public static StringBuilder? ExportStringBuilder(this IWrapper wrapper) + public static StringBuilder? ExportStringBuilder(this Wrapper.IWrapper wrapper) { return wrapper switch { @@ -85,7 +84,7 @@ namespace SabreTools.Serialization /// /// Export the item information as JSON /// - public static string ExportJSON(this IWrapper wrapper) + public static string ExportJSON(this Wrapper.IWrapper wrapper) { return wrapper switch { diff --git a/SabreTools.Serialization/WrapperFactory.cs b/SabreTools.Serialization/WrapperFactory.cs index 1df0acbb..806ef83c 100644 --- a/SabreTools.Serialization/WrapperFactory.cs +++ b/SabreTools.Serialization/WrapperFactory.cs @@ -1,7 +1,6 @@ using System; using System.IO; using SabreTools.IO.Extensions; -using SabreTools.Serialization.Interfaces; using SabreTools.Serialization.Wrappers; namespace SabreTools.Serialization diff --git a/SabreTools.Serialization/Wrappers/BFPK.Extraction.cs b/SabreTools.Serialization/Wrappers/BFPK.Extraction.cs index b9eb3d20..ace180da 100644 --- a/SabreTools.Serialization/Wrappers/BFPK.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/BFPK.Extraction.cs @@ -1,7 +1,6 @@ using System; using System.IO; using SabreTools.IO.Compression.Deflate; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Serialization.Wrappers { diff --git a/SabreTools.Serialization/Wrappers/BSP.Extraction.cs b/SabreTools.Serialization/Wrappers/BSP.Extraction.cs index b0c1c3ad..99ec1e2a 100644 --- a/SabreTools.Serialization/Wrappers/BSP.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/BSP.Extraction.cs @@ -1,7 +1,6 @@ using System; using System.IO; using SabreTools.Data.Models.BSP; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Serialization.Wrappers { diff --git a/SabreTools.Serialization/Wrappers/BZip2.Extraction.cs b/SabreTools.Serialization/Wrappers/BZip2.Extraction.cs index c96153c9..e2e0e56b 100644 --- a/SabreTools.Serialization/Wrappers/BZip2.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/BZip2.Extraction.cs @@ -1,7 +1,6 @@ using System; using System.IO; using SabreTools.IO.Compression.BZip2; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Serialization.Wrappers { diff --git a/SabreTools.Serialization/Wrappers/CFB.Extraction.cs b/SabreTools.Serialization/Wrappers/CFB.Extraction.cs index 0f7bdcff..bbe6ca13 100644 --- a/SabreTools.Serialization/Wrappers/CFB.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/CFB.Extraction.cs @@ -5,7 +5,6 @@ using SabreTools.Data.Models.CFB; #if NETFRAMEWORK || NETSTANDARD using SabreTools.IO.Extensions; #endif -using SabreTools.Serialization.Interfaces; namespace SabreTools.Serialization.Wrappers { diff --git a/SabreTools.Serialization/Wrappers/GCF.Extraction.cs b/SabreTools.Serialization/Wrappers/GCF.Extraction.cs index cce80c14..85fa7f27 100644 --- a/SabreTools.Serialization/Wrappers/GCF.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/GCF.Extraction.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.IO; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Serialization.Wrappers { diff --git a/SabreTools.Serialization/Wrappers/GZip.Extraction.cs b/SabreTools.Serialization/Wrappers/GZip.Extraction.cs index 542caf71..1e20dd2c 100644 --- a/SabreTools.Serialization/Wrappers/GZip.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/GZip.Extraction.cs @@ -2,7 +2,6 @@ using System; using System.IO; using SabreTools.Data.Models.GZIP; using SabreTools.IO.Compression.Deflate; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Serialization.Wrappers { diff --git a/SabreTools.Serialization/Interfaces/IExtractable.cs b/SabreTools.Serialization/Wrappers/IExtractable.cs similarity index 92% rename from SabreTools.Serialization/Interfaces/IExtractable.cs rename to SabreTools.Serialization/Wrappers/IExtractable.cs index 728885cc..f64a8af4 100644 --- a/SabreTools.Serialization/Interfaces/IExtractable.cs +++ b/SabreTools.Serialization/Wrappers/IExtractable.cs @@ -1,4 +1,4 @@ -namespace SabreTools.Serialization.Interfaces +namespace SabreTools.Serialization.Wrappers { /// /// Represents an item that is extractable diff --git a/SabreTools.Serialization/Interfaces/IWrapper.cs b/SabreTools.Serialization/Wrappers/IWrapper.cs similarity index 90% rename from SabreTools.Serialization/Interfaces/IWrapper.cs rename to SabreTools.Serialization/Wrappers/IWrapper.cs index f9c6c6c9..35f9a61d 100644 --- a/SabreTools.Serialization/Interfaces/IWrapper.cs +++ b/SabreTools.Serialization/Wrappers/IWrapper.cs @@ -1,4 +1,4 @@ -namespace SabreTools.Serialization.Interfaces +namespace SabreTools.Serialization.Wrappers { /// /// Represents a wrapper around a top-level model diff --git a/SabreTools.Serialization/Interfaces/IWrapperT.cs b/SabreTools.Serialization/Wrappers/IWrapperT.cs similarity index 88% rename from SabreTools.Serialization/Interfaces/IWrapperT.cs rename to SabreTools.Serialization/Wrappers/IWrapperT.cs index f4f6b32e..47fa5bfd 100644 --- a/SabreTools.Serialization/Interfaces/IWrapperT.cs +++ b/SabreTools.Serialization/Wrappers/IWrapperT.cs @@ -1,4 +1,4 @@ -namespace SabreTools.Serialization.Interfaces +namespace SabreTools.Serialization.Wrappers { /// /// Represents a wrapper around a top-level model diff --git a/SabreTools.Serialization/Wrappers/InstallShieldArchiveV3.Extraction.cs b/SabreTools.Serialization/Wrappers/InstallShieldArchiveV3.Extraction.cs index fe7b1cec..25560ea8 100644 --- a/SabreTools.Serialization/Wrappers/InstallShieldArchiveV3.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/InstallShieldArchiveV3.Extraction.cs @@ -1,7 +1,6 @@ using System; using System.IO; using SabreTools.IO.Compression.Blast; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Serialization.Wrappers { diff --git a/SabreTools.Serialization/Wrappers/InstallShieldCabinet.Extraction.cs b/SabreTools.Serialization/Wrappers/InstallShieldCabinet.Extraction.cs index 6eecc88a..236ee2e9 100644 --- a/SabreTools.Serialization/Wrappers/InstallShieldCabinet.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/InstallShieldCabinet.Extraction.cs @@ -4,12 +4,11 @@ using System.Text.RegularExpressions; using SabreTools.Data.Models.InstallShieldCabinet; using SabreTools.Hashing; using SabreTools.IO.Compression.zlib; -using SabreTools.Serialization.Interfaces; using static SabreTools.Data.Models.InstallShieldCabinet.Constants; namespace SabreTools.Serialization.Wrappers { - public partial class InstallShieldCabinet : WrapperBase, IExtractable + public partial class InstallShieldCabinet : IExtractable { #region Extension Properties diff --git a/SabreTools.Serialization/Wrappers/LZKWAJ.Extraction.cs b/SabreTools.Serialization/Wrappers/LZKWAJ.Extraction.cs index 1d0cab05..ac1165d6 100644 --- a/SabreTools.Serialization/Wrappers/LZKWAJ.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/LZKWAJ.Extraction.cs @@ -1,7 +1,6 @@ using System; using System.IO; using SabreTools.IO.Compression.SZDD; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Serialization.Wrappers { diff --git a/SabreTools.Serialization/Wrappers/LZQBasic.Extraction.cs b/SabreTools.Serialization/Wrappers/LZQBasic.Extraction.cs index ff40417c..3a2ba50f 100644 --- a/SabreTools.Serialization/Wrappers/LZQBasic.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/LZQBasic.Extraction.cs @@ -1,7 +1,6 @@ using System; using System.IO; using SabreTools.IO.Compression.SZDD; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Serialization.Wrappers { diff --git a/SabreTools.Serialization/Wrappers/LZSZDD.Extraction.cs b/SabreTools.Serialization/Wrappers/LZSZDD.Extraction.cs index 68099964..f16a9dae 100644 --- a/SabreTools.Serialization/Wrappers/LZSZDD.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/LZSZDD.Extraction.cs @@ -1,7 +1,6 @@ using System; using System.IO; using SabreTools.IO.Compression.SZDD; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Serialization.Wrappers { diff --git a/SabreTools.Serialization/Wrappers/MicrosoftCabinet.Extraction.cs b/SabreTools.Serialization/Wrappers/MicrosoftCabinet.Extraction.cs index 3f82e375..1663cf2c 100644 --- a/SabreTools.Serialization/Wrappers/MicrosoftCabinet.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/MicrosoftCabinet.Extraction.cs @@ -2,7 +2,6 @@ using System.IO; using SabreTools.Data.Models.MicrosoftCabinet; using SabreTools.IO.Extensions; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Serialization.Wrappers { diff --git a/SabreTools.Serialization/Wrappers/MoPaQ.Extraction.cs b/SabreTools.Serialization/Wrappers/MoPaQ.Extraction.cs index 3cb5ebde..b22985be 100644 --- a/SabreTools.Serialization/Wrappers/MoPaQ.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/MoPaQ.Extraction.cs @@ -1,5 +1,4 @@ using System; -using SabreTools.Serialization.Interfaces; #if (NET452_OR_GREATER || NETCOREAPP) && (WINX86 || WINX64) using System.IO; using StormLibSharp; diff --git a/SabreTools.Serialization/Wrappers/NewExecutable.Extraction.cs b/SabreTools.Serialization/Wrappers/NewExecutable.Extraction.cs index fa3dde99..dbb2147a 100644 --- a/SabreTools.Serialization/Wrappers/NewExecutable.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/NewExecutable.Extraction.cs @@ -1,7 +1,6 @@ using System; using System.IO; using SabreTools.IO.Extensions; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Serialization.Wrappers { diff --git a/SabreTools.Serialization/Wrappers/PAK.Extraction.cs b/SabreTools.Serialization/Wrappers/PAK.Extraction.cs index ea295a84..c0523da1 100644 --- a/SabreTools.Serialization/Wrappers/PAK.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/PAK.Extraction.cs @@ -1,6 +1,5 @@ using System; using System.IO; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Serialization.Wrappers { diff --git a/SabreTools.Serialization/Wrappers/PFF.Extraction.cs b/SabreTools.Serialization/Wrappers/PFF.Extraction.cs index ec8e85aa..e287fad3 100644 --- a/SabreTools.Serialization/Wrappers/PFF.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/PFF.Extraction.cs @@ -1,6 +1,5 @@ using System; using System.IO; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Serialization.Wrappers { diff --git a/SabreTools.Serialization/Wrappers/PKZIP.Extraction.cs b/SabreTools.Serialization/Wrappers/PKZIP.Extraction.cs index 68d8461d..3311699a 100644 --- a/SabreTools.Serialization/Wrappers/PKZIP.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/PKZIP.Extraction.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using System.IO; using System.Text.RegularExpressions; -using SabreTools.Serialization.Interfaces; #if NET462_OR_GREATER || NETCOREAPP using SharpCompress.Archives; using SharpCompress.Archives.Zip; diff --git a/SabreTools.Serialization/Wrappers/PortableExecutable.Extraction.cs b/SabreTools.Serialization/Wrappers/PortableExecutable.Extraction.cs index 0661bc06..7e51a5c5 100644 --- a/SabreTools.Serialization/Wrappers/PortableExecutable.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/PortableExecutable.Extraction.cs @@ -2,7 +2,6 @@ using System.IO; using SabreTools.IO.Compression.zlib; using SabreTools.IO.Extensions; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Serialization.Wrappers { diff --git a/SabreTools.Serialization/Wrappers/Quantum.Extraction.cs b/SabreTools.Serialization/Wrappers/Quantum.Extraction.cs index 5466f94f..3e0963a2 100644 --- a/SabreTools.Serialization/Wrappers/Quantum.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/Quantum.Extraction.cs @@ -1,5 +1,4 @@ using System; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Serialization.Wrappers { diff --git a/SabreTools.Serialization/Wrappers/RAR.Extraction.cs b/SabreTools.Serialization/Wrappers/RAR.Extraction.cs index 327640ea..3d61e34d 100644 --- a/SabreTools.Serialization/Wrappers/RAR.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/RAR.Extraction.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using System.IO; using System.Text.RegularExpressions; -using SabreTools.Serialization.Interfaces; #if NET462_OR_GREATER || NETCOREAPP using SharpCompress.Archives; using SharpCompress.Archives.Rar; diff --git a/SabreTools.Serialization/Wrappers/SGA.Extraction.cs b/SabreTools.Serialization/Wrappers/SGA.Extraction.cs index 3e9ecc10..6e2a774a 100644 --- a/SabreTools.Serialization/Wrappers/SGA.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/SGA.Extraction.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using System.IO; using SabreTools.IO.Compression.zlib; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Serialization.Wrappers { diff --git a/SabreTools.Serialization/Wrappers/SecuROMMatroschkaPackage.Extraction.cs b/SabreTools.Serialization/Wrappers/SecuROMMatroschkaPackage.Extraction.cs index 7ea1ade3..4e71cad3 100644 --- a/SabreTools.Serialization/Wrappers/SecuROMMatroschkaPackage.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/SecuROMMatroschkaPackage.Extraction.cs @@ -2,7 +2,6 @@ using System; using System.IO; using SabreTools.Data.Models.SecuROM; using SabreTools.Hashing; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Serialization.Wrappers { diff --git a/SabreTools.Serialization/Wrappers/SevenZip.Extraction.cs b/SabreTools.Serialization/Wrappers/SevenZip.Extraction.cs index a11d6345..f83336b3 100644 --- a/SabreTools.Serialization/Wrappers/SevenZip.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/SevenZip.Extraction.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using System.IO; using System.Text.RegularExpressions; -using SabreTools.Serialization.Interfaces; #if NET462_OR_GREATER || NETCOREAPP using SharpCompress.Archives; using SharpCompress.Archives.SevenZip; diff --git a/SabreTools.Serialization/Wrappers/TapeArchive.Extraction.cs b/SabreTools.Serialization/Wrappers/TapeArchive.Extraction.cs index 12e397b6..4df0bbac 100644 --- a/SabreTools.Serialization/Wrappers/TapeArchive.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/TapeArchive.Extraction.cs @@ -1,7 +1,6 @@ using System; using System.IO; using SabreTools.Data.Models.TAR; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Serialization.Wrappers { diff --git a/SabreTools.Serialization/Wrappers/VBSP.Extraction.cs b/SabreTools.Serialization/Wrappers/VBSP.Extraction.cs index afd91f4e..31ea4fe3 100644 --- a/SabreTools.Serialization/Wrappers/VBSP.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/VBSP.Extraction.cs @@ -1,7 +1,6 @@ using System; using System.IO; using SabreTools.Data.Models.BSP; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Serialization.Wrappers { diff --git a/SabreTools.Serialization/Wrappers/VPK.Extraction.cs b/SabreTools.Serialization/Wrappers/VPK.Extraction.cs index df1cb887..99f93362 100644 --- a/SabreTools.Serialization/Wrappers/VPK.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/VPK.Extraction.cs @@ -1,7 +1,6 @@ using System; using System.IO; using SabreTools.IO.Extensions; -using SabreTools.Serialization.Interfaces; using static SabreTools.Data.Models.VPK.Constants; namespace SabreTools.Serialization.Wrappers diff --git a/SabreTools.Serialization/Wrappers/WAD3.Extraction.cs b/SabreTools.Serialization/Wrappers/WAD3.Extraction.cs index 093e3eb8..c8a6f1c1 100644 --- a/SabreTools.Serialization/Wrappers/WAD3.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/WAD3.Extraction.cs @@ -1,6 +1,5 @@ using System; using System.IO; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Serialization.Wrappers { diff --git a/SabreTools.Serialization/Wrappers/WiseSectionHeader.Extraction.cs b/SabreTools.Serialization/Wrappers/WiseSectionHeader.Extraction.cs index d5bd8a07..a56079c6 100644 --- a/SabreTools.Serialization/Wrappers/WiseSectionHeader.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/WiseSectionHeader.Extraction.cs @@ -3,7 +3,6 @@ using System.IO; using SabreTools.Hashing; using SabreTools.IO.Compression.Deflate; using SabreTools.IO.Extensions; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Serialization.Wrappers { diff --git a/SabreTools.Serialization/Wrappers/WrapperBase.cs b/SabreTools.Serialization/Wrappers/WrapperBase.cs index 9b50f9f3..25d0649f 100644 --- a/SabreTools.Serialization/Wrappers/WrapperBase.cs +++ b/SabreTools.Serialization/Wrappers/WrapperBase.cs @@ -2,7 +2,6 @@ using System; using System.IO; using SabreTools.IO.Extensions; using SabreTools.IO.Streams; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Serialization.Wrappers { diff --git a/SabreTools.Serialization/Wrappers/WrapperBaseT.cs b/SabreTools.Serialization/Wrappers/WrapperBaseT.cs index ee7fcd6e..46f7363f 100644 --- a/SabreTools.Serialization/Wrappers/WrapperBaseT.cs +++ b/SabreTools.Serialization/Wrappers/WrapperBaseT.cs @@ -1,5 +1,4 @@ using System.IO; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Serialization.Wrappers { diff --git a/SabreTools.Serialization/Wrappers/XZ.Extraction.cs b/SabreTools.Serialization/Wrappers/XZ.Extraction.cs index be953f1b..47088fa0 100644 --- a/SabreTools.Serialization/Wrappers/XZ.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/XZ.Extraction.cs @@ -2,7 +2,6 @@ using System; #if NET462_OR_GREATER || NETCOREAPP using System.IO; #endif -using SabreTools.Serialization.Interfaces; #if NET462_OR_GREATER || NETCOREAPP using SharpCompress.Compressors.Xz; #endif diff --git a/SabreTools.Serialization/Wrappers/XZP.Extraction.cs b/SabreTools.Serialization/Wrappers/XZP.Extraction.cs index 5c98c28d..6ae8c0d7 100644 --- a/SabreTools.Serialization/Wrappers/XZP.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/XZP.Extraction.cs @@ -1,6 +1,5 @@ using System; using System.IO; -using SabreTools.Serialization.Interfaces; namespace SabreTools.Serialization.Wrappers {