diff --git a/ExtractionTool/Features/MainFeature.cs b/ExtractionTool/Features/MainFeature.cs index 3c4350af..f4dd83f3 100644 --- a/ExtractionTool/Features/MainFeature.cs +++ b/ExtractionTool/Features/MainFeature.cs @@ -4,7 +4,7 @@ using SabreTools.CommandLine; using SabreTools.CommandLine.Inputs; using SabreTools.IO.Extensions; using SabreTools.Serialization; -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; namespace ExtractionTool.Features { diff --git a/InfoPrint/Features/MainFeature.cs b/InfoPrint/Features/MainFeature.cs index 668adcde..69e6c559 100644 --- a/InfoPrint/Features/MainFeature.cs +++ b/InfoPrint/Features/MainFeature.cs @@ -6,7 +6,7 @@ using SabreTools.CommandLine.Inputs; using SabreTools.Hashing; using SabreTools.IO.Extensions; using SabreTools.Serialization; -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; namespace InfoPrint.Features { diff --git a/README.MD b/README.MD index a3fdf6b8..492bb998 100644 --- a/README.MD +++ b/README.MD @@ -103,10 +103,10 @@ Below is a table representing the various non-conversion interfaces that are imp | Interface Name | Purpose | | --- | --- | -| `SabreTools.Serialization.Wrappers.IExtractable` | Marks a wrapper as able to be extracted | -| `SabreTools.Serialization.Wrappers.IPrintable` | Marks a wrapper as able to print model information | -| `SabreTools.Serialization.Wrappers.IWrapper` | Represents an item with a description and JSON serializable state, allowing for extensions | -| `SabreTools.Serialization.Wrappers.IWrapper` | Wraps a model with source data, allowing for extensions | +| `SabreTools.Wrappers.IExtractable` | Marks a wrapper as able to be extracted | +| `SabreTools.Wrappers.IPrintable` | Marks a wrapper as able to print model information | +| `SabreTools.Wrappers.IWrapper` | Represents an item with a description and JSON serializable state, allowing for extensions | +| `SabreTools.Wrappers.IWrapper` | Wraps a `TModel` with source data, allowing for extensions | ## Namespaces @@ -120,5 +120,5 @@ Below is a table of all namespaces within the library and what they represent | `SabreTools.ObjectIdentifier` | Object Identifier (OID) parsing | | `SabreTools.Serialization.CrossModel` | Convert between models; mainly used for metadata files converting to and from a common, `Dictionary`-based model | | `SabreTools.Serialization.Readers` | Convert from external sources to models | -| `SabreTools.Serialization.Wrappers` | Classes that wrap serialization and models to allow for including extension properties | | `SabreTools.Serialization.Writers` | Convert from models to external sources | +| `SabreTools.Wrappers` | Classes that wrap serialization and models to allow for including extension properties | diff --git a/SabreTools.Serialization.Test/SabreTools.Serialization.Test.csproj b/SabreTools.Serialization.Test/SabreTools.Serialization.Test.csproj index a5fa8f62..44fde1d4 100644 --- a/SabreTools.Serialization.Test/SabreTools.Serialization.Test.csproj +++ b/SabreTools.Serialization.Test/SabreTools.Serialization.Test.csproj @@ -11,16 +11,6 @@ - - - - - - - Always - - - runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/SabreTools.Serialization.sln b/SabreTools.Serialization.sln index e213ce7a..05375a53 100644 --- a/SabreTools.Serialization.sln +++ b/SabreTools.Serialization.sln @@ -15,6 +15,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.ObjectIdentifier EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Data.Extensions.Test", "SabreTools.Data.Extensions.Test\SabreTools.Data.Extensions.Test.csproj", "{06842E33-CAE6-4E00-B48B-525DE73DF10E}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Wrappers.Test", "SabreTools.Wrappers.Test\SabreTools.Wrappers.Test.csproj", "{537126F8-3735-460A-A18E-845C42975697}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -97,6 +99,18 @@ Global {06842E33-CAE6-4E00-B48B-525DE73DF10E}.Release|x64.Build.0 = Release|Any CPU {06842E33-CAE6-4E00-B48B-525DE73DF10E}.Release|x86.ActiveCfg = Release|Any CPU {06842E33-CAE6-4E00-B48B-525DE73DF10E}.Release|x86.Build.0 = Release|Any CPU + {537126F8-3735-460A-A18E-845C42975697}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {537126F8-3735-460A-A18E-845C42975697}.Debug|Any CPU.Build.0 = Debug|Any CPU + {537126F8-3735-460A-A18E-845C42975697}.Debug|x64.ActiveCfg = Debug|Any CPU + {537126F8-3735-460A-A18E-845C42975697}.Debug|x64.Build.0 = Debug|Any CPU + {537126F8-3735-460A-A18E-845C42975697}.Debug|x86.ActiveCfg = Debug|Any CPU + {537126F8-3735-460A-A18E-845C42975697}.Debug|x86.Build.0 = Debug|Any CPU + {537126F8-3735-460A-A18E-845C42975697}.Release|Any CPU.ActiveCfg = Release|Any CPU + {537126F8-3735-460A-A18E-845C42975697}.Release|Any CPU.Build.0 = Release|Any CPU + {537126F8-3735-460A-A18E-845C42975697}.Release|x64.ActiveCfg = Release|Any CPU + {537126F8-3735-460A-A18E-845C42975697}.Release|x64.Build.0 = Release|Any CPU + {537126F8-3735-460A-A18E-845C42975697}.Release|x86.ActiveCfg = Release|Any CPU + {537126F8-3735-460A-A18E-845C42975697}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SabreTools.Serialization/Printer.cs b/SabreTools.Serialization/Printer.cs index 778689ae..edc50191 100644 --- a/SabreTools.Serialization/Printer.cs +++ b/SabreTools.Serialization/Printer.cs @@ -1,6 +1,6 @@ using System; using System.Text; -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; namespace SabreTools.Serialization { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/AACSMediaKeyBlock.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/AACSMediaKeyBlock.Printing.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/AACSMediaKeyBlock.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/AACSMediaKeyBlock.Printing.cs index 3993a424..72a5f2df 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/AACSMediaKeyBlock.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/AACSMediaKeyBlock.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.AACS; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class AACSMediaKeyBlock : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/AACSMediaKeyBlock.cs b/SabreTools.Serialization/SabreTools.Wrappers/AACSMediaKeyBlock.cs similarity index 97% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/AACSMediaKeyBlock.cs rename to SabreTools.Serialization/SabreTools.Wrappers/AACSMediaKeyBlock.cs index 340f881f..1b53ea88 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/AACSMediaKeyBlock.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/AACSMediaKeyBlock.cs @@ -2,7 +2,7 @@ using System; using System.IO; using SabreTools.Data.Models.AACS; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class AACSMediaKeyBlock : WrapperBase { @@ -106,7 +106,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.AACS().Deserialize(data); + var model = new Serialization.Readers.AACS().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/Atari7800Cart.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/Atari7800Cart.Extraction.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/Atari7800Cart.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/Atari7800Cart.Extraction.cs index d9326861..c3a0cd5e 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/Atari7800Cart.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/Atari7800Cart.Extraction.cs @@ -3,7 +3,7 @@ using System.IO; using SabreTools.Data.Models.Atari7800; using SabreTools.IO.Extensions; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class Atari7800Cart : IExtractable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/Atari7800Cart.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/Atari7800Cart.Printing.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/Atari7800Cart.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/Atari7800Cart.Printing.cs index e8a0c72a..04afc574 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/Atari7800Cart.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/Atari7800Cart.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.Atari7800; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class Atari7800Cart : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/Atari7800Cart.cs b/SabreTools.Serialization/SabreTools.Wrappers/Atari7800Cart.cs similarity index 97% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/Atari7800Cart.cs rename to SabreTools.Serialization/SabreTools.Wrappers/Atari7800Cart.cs index 0d28253d..d8bc2512 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/Atari7800Cart.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/Atari7800Cart.cs @@ -2,7 +2,7 @@ using System.IO; using System.Text; using SabreTools.Data.Models.Atari7800; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class Atari7800Cart : WrapperBase { @@ -130,7 +130,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.Atari7800Cart().Deserialize(data); + var model = new Serialization.Readers.Atari7800Cart().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/AtariLynxCart.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/AtariLynxCart.Extraction.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/AtariLynxCart.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/AtariLynxCart.Extraction.cs index 22df3212..b96525e8 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/AtariLynxCart.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/AtariLynxCart.Extraction.cs @@ -3,7 +3,7 @@ using System.IO; using SabreTools.Data.Models.AtariLynx; using SabreTools.IO.Extensions; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class AtariLynxCart : IExtractable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/AtariLynxCart.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/AtariLynxCart.Printing.cs similarity index 97% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/AtariLynxCart.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/AtariLynxCart.Printing.cs index d7d55907..09645fc0 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/AtariLynxCart.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/AtariLynxCart.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.AtariLynx; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class AtariLynxCart : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/AtariLynxCart.cs b/SabreTools.Serialization/SabreTools.Wrappers/AtariLynxCart.cs similarity index 97% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/AtariLynxCart.cs rename to SabreTools.Serialization/SabreTools.Wrappers/AtariLynxCart.cs index cd828a2a..35d410cf 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/AtariLynxCart.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/AtariLynxCart.cs @@ -2,7 +2,7 @@ using System.IO; using System.Text; using SabreTools.Data.Models.AtariLynx; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class AtariLynxCart : WrapperBase { @@ -103,7 +103,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.AtariLynxCart().Deserialize(data); + var model = new Serialization.Readers.AtariLynxCart().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/BDPlusSVM.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/BDPlusSVM.Printing.cs similarity index 95% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/BDPlusSVM.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/BDPlusSVM.Printing.cs index 81e0d140..d7223c62 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/BDPlusSVM.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/BDPlusSVM.Printing.cs @@ -1,7 +1,7 @@ using System.Text; using SabreTools.Data.Extensions; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class BDPlusSVM : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/BDPlusSVM.cs b/SabreTools.Serialization/SabreTools.Wrappers/BDPlusSVM.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/BDPlusSVM.cs rename to SabreTools.Serialization/SabreTools.Wrappers/BDPlusSVM.cs index 3eb3c97f..e7284b38 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/BDPlusSVM.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/BDPlusSVM.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.BDPlus; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class BDPlusSVM : WrapperBase { @@ -82,7 +82,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.BDPlus().Deserialize(data); + var model = new Serialization.Readers.BDPlus().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/BFPK.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/BFPK.Extraction.cs similarity index 97% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/BFPK.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/BFPK.Extraction.cs index dbdda6dd..4893e216 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/BFPK.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/BFPK.Extraction.cs @@ -1,8 +1,11 @@ using System; using System.IO; using SabreTools.IO.Compression.Deflate; +#if NET20 || NET35 +using SabreTools.Serialization; +#endif -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class BFPK : IExtractable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/BFPK.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/BFPK.Printing.cs similarity index 97% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/BFPK.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/BFPK.Printing.cs index 2281a178..42c13021 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/BFPK.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/BFPK.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.BFPK; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class BFPK : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/BFPK.cs b/SabreTools.Serialization/SabreTools.Wrappers/BFPK.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/BFPK.cs rename to SabreTools.Serialization/SabreTools.Wrappers/BFPK.cs index 7d4c54ce..ba0b09a1 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/BFPK.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/BFPK.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.BFPK; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class BFPK : WrapperBase { @@ -80,7 +80,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.BFPK().Deserialize(data); + var model = new Serialization.Readers.BFPK().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/BSP.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/BSP.Extraction.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/BSP.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/BSP.Extraction.cs index b3bc4222..ad10f91f 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/BSP.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/BSP.Extraction.cs @@ -2,7 +2,7 @@ using System; using System.IO; using SabreTools.Data.Models.BSP; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class BSP : IExtractable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/BSP.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/BSP.Printing.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/BSP.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/BSP.Printing.cs index ad9d8590..18fb30ae 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/BSP.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/BSP.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.BSP; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class BSP : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/BSP.cs b/SabreTools.Serialization/SabreTools.Wrappers/BSP.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/BSP.cs rename to SabreTools.Serialization/SabreTools.Wrappers/BSP.cs index 60af6e4a..320f92e2 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/BSP.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/BSP.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.BSP; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class BSP : WrapperBase { @@ -80,7 +80,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.BSP().Deserialize(data); + var model = new Serialization.Readers.BSP().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/BZip2.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/BZip2.Extraction.cs similarity index 95% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/BZip2.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/BZip2.Extraction.cs index 2a26077b..97478c5f 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/BZip2.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/BZip2.Extraction.cs @@ -1,8 +1,11 @@ using System; using System.IO; using SabreTools.IO.Compression.BZip2; +#if NET20 || NET35 +using SabreTools.Serialization; +#endif -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { /// /// This is a shell wrapper; one that does not contain diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/BZip2.cs b/SabreTools.Serialization/SabreTools.Wrappers/BZip2.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/BZip2.cs rename to SabreTools.Serialization/SabreTools.Wrappers/BZip2.cs index ffac0807..33c98b2b 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/BZip2.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/BZip2.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.BZip2; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { /// /// This is a shell wrapper; one that does not contain diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/CDROM.cs b/SabreTools.Serialization/SabreTools.Wrappers/CDROM.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/CDROM.cs rename to SabreTools.Serialization/SabreTools.Wrappers/CDROM.cs index f04c3d40..9205b56e 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/CDROM.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/CDROM.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.ISO9660; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class CDROM : ISO9660 { @@ -77,7 +77,7 @@ namespace SabreTools.Serialization.Wrappers long currentOffset = userData.Position; // Deserialize just the sub-stream - var model = new Readers.ISO9660().Deserialize(userData); + var model = new Serialization.Readers.ISO9660().Deserialize(userData); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/CFB.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/CFB.Extraction.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/CFB.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/CFB.Extraction.cs index 25e284de..fd8d191d 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/CFB.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/CFB.Extraction.cs @@ -6,7 +6,7 @@ using SabreTools.Data.Models.CFB; using SabreTools.IO.Extensions; #endif -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class CFB : IExtractable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/CFB.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/CFB.Printing.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/CFB.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/CFB.Printing.cs index 7164f671..737f78f4 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/CFB.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/CFB.Printing.cs @@ -3,7 +3,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.CFB; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class CFB : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/CFB.cs b/SabreTools.Serialization/SabreTools.Wrappers/CFB.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/CFB.cs rename to SabreTools.Serialization/SabreTools.Wrappers/CFB.cs index 02bda399..6dc676d1 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/CFB.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/CFB.cs @@ -4,7 +4,7 @@ using System.IO; using SabreTools.Data.Models.CFB; using SabreTools.IO.Extensions; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class CFB : WrapperBase { @@ -126,7 +126,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.CFB().Deserialize(data); + var model = new Serialization.Readers.CFB().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/CHD.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/CHD.Printing.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/CHD.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/CHD.Printing.cs index 3a4334b3..2e7aa933 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/CHD.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/CHD.Printing.cs @@ -4,7 +4,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.CHD; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class CHD : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/CHD.cs b/SabreTools.Serialization/SabreTools.Wrappers/CHD.cs similarity index 97% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/CHD.cs rename to SabreTools.Serialization/SabreTools.Wrappers/CHD.cs index e3512486..b53ae184 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/CHD.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/CHD.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.CHD; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class CHD : WrapperBase
{ @@ -118,7 +118,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.CHD().Deserialize(data); + var model = new Serialization.Readers.CHD().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/CIA.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/CIA.Printing.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/CIA.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/CIA.Printing.cs index a13f62ea..3a3b0723 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/CIA.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/CIA.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.N3DS; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class CIA : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/CIA.cs b/SabreTools.Serialization/SabreTools.Wrappers/CIA.cs similarity index 97% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/CIA.cs rename to SabreTools.Serialization/SabreTools.Wrappers/CIA.cs index 62ae68b8..0001f5a3 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/CIA.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/CIA.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.N3DS; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class CIA : WrapperBase { @@ -73,7 +73,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.CIA().Deserialize(data); + var model = new Serialization.Readers.CIA().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/ConcreteAbstractSerializer.cs b/SabreTools.Serialization/SabreTools.Wrappers/ConcreteAbstractSerializer.cs similarity index 97% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/ConcreteAbstractSerializer.cs rename to SabreTools.Serialization/SabreTools.Wrappers/ConcreteAbstractSerializer.cs index e7619e50..7a16ec5b 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/ConcreteAbstractSerializer.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/ConcreteAbstractSerializer.cs @@ -5,7 +5,7 @@ using System.Reflection; using System.Text.Json; using System.Text.Json.Serialization; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { /// /// Serializer class for abstract classes diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/ConcreteInterfaceSerializer.cs b/SabreTools.Serialization/SabreTools.Wrappers/ConcreteInterfaceSerializer.cs similarity index 97% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/ConcreteInterfaceSerializer.cs rename to SabreTools.Serialization/SabreTools.Wrappers/ConcreteInterfaceSerializer.cs index 3f8661ab..0acbf724 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/ConcreteInterfaceSerializer.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/ConcreteInterfaceSerializer.cs @@ -5,7 +5,7 @@ using System.Reflection; using System.Text.Json; using System.Text.Json.Serialization; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { /// /// Serializer class for interfaces diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/FDS.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/FDS.Extraction.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/FDS.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/FDS.Extraction.cs index b0af4e69..8b755e8f 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/FDS.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/FDS.Extraction.cs @@ -2,7 +2,7 @@ using System; using System.IO; using SabreTools.IO.Extensions; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class FDS : IExtractable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/FDS.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/FDS.Printing.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/FDS.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/FDS.Printing.cs index fbfd653f..1b28ab60 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/FDS.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/FDS.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.NES; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class FDS : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/FDS.cs b/SabreTools.Serialization/SabreTools.Wrappers/FDS.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/FDS.cs rename to SabreTools.Serialization/SabreTools.Wrappers/FDS.cs index 818cebc9..03b17115 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/FDS.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/FDS.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.NES; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class FDS : WrapperBase { @@ -83,7 +83,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.FDS().Deserialize(data); + var model = new Serialization.Readers.FDS().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/GCF.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/GCF.Extraction.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/GCF.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/GCF.Extraction.cs index 87528f67..897cc776 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/GCF.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/GCF.Extraction.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.IO; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class GCF : IExtractable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/GCF.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/GCF.Printing.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/GCF.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/GCF.Printing.cs index 92f70364..a0309141 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/GCF.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/GCF.Printing.cs @@ -3,7 +3,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.GCF; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class GCF : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/GCF.cs b/SabreTools.Serialization/SabreTools.Wrappers/GCF.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/GCF.cs rename to SabreTools.Serialization/SabreTools.Wrappers/GCF.cs index 6fb33346..e00b9bb3 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/GCF.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/GCF.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; using SabreTools.Data.Models.GCF; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class GCF : WrapperBase { @@ -203,7 +203,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.GCF().Deserialize(data); + var model = new Serialization.Readers.GCF().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/GZip.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/GZip.Extraction.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/GZip.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/GZip.Extraction.cs index 78896253..1ec0a826 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/GZip.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/GZip.Extraction.cs @@ -3,8 +3,11 @@ using System.IO; using SabreTools.Data.Models.GZIP; using SabreTools.IO.Compression.Deflate; using SabreTools.IO.Extensions; +#if NET20 || NET35 +using SabreTools.Serialization; +#endif -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class GZip : IExtractable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/GZip.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/GZip.Printing.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/GZip.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/GZip.Printing.cs index dc63b335..4436d4c3 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/GZip.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/GZip.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.GZIP; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class GZip : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/GZip.cs b/SabreTools.Serialization/SabreTools.Wrappers/GZip.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/GZip.cs rename to SabreTools.Serialization/SabreTools.Wrappers/GZip.cs index e7cdda88..aebc5b35 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/GZip.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/GZip.cs @@ -2,7 +2,7 @@ using System.IO; using SabreTools.Data.Models.GZIP; using SabreTools.IO.Extensions; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class GZip : WrapperBase { @@ -229,7 +229,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.GZip().Deserialize(data); + var model = new Serialization.Readers.GZip().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/IExtractable.cs b/SabreTools.Serialization/SabreTools.Wrappers/IExtractable.cs similarity index 93% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/IExtractable.cs rename to SabreTools.Serialization/SabreTools.Wrappers/IExtractable.cs index d6b062f6..9d53967f 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/IExtractable.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/IExtractable.cs @@ -1,4 +1,4 @@ -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { /// /// Represents an item that is extractable diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/IPrintable.cs b/SabreTools.Serialization/SabreTools.Wrappers/IPrintable.cs similarity index 92% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/IPrintable.cs rename to SabreTools.Serialization/SabreTools.Wrappers/IPrintable.cs index d78f924f..15a41911 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/IPrintable.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/IPrintable.cs @@ -1,6 +1,6 @@ using System.Text; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { /// /// Marks a wrapper as being able to print model information diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/IRD.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/IRD.Printing.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/IRD.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/IRD.Printing.cs index e550a9c4..87d07e6a 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/IRD.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/IRD.Printing.cs @@ -1,7 +1,7 @@ using System.Text; using SabreTools.Data.Extensions; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class IRD : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/IRD.cs b/SabreTools.Serialization/SabreTools.Wrappers/IRD.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/IRD.cs rename to SabreTools.Serialization/SabreTools.Wrappers/IRD.cs index e07ea20a..b1e38988 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/IRD.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/IRD.cs @@ -1,6 +1,6 @@ using System.IO; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class IRD : WrapperBase { @@ -72,7 +72,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.IRD().Deserialize(data); + var model = new Serialization.Readers.IRD().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/ISO9660.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/ISO9660.Extraction.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/ISO9660.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/ISO9660.Extraction.cs index 97c0bb61..1f0403e5 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/ISO9660.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/ISO9660.Extraction.cs @@ -6,7 +6,7 @@ using SabreTools.Data.Extensions; using SabreTools.Data.Models.ISO9660; using SabreTools.IO.Extensions; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class ISO9660 : IExtractable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/ISO9660.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/ISO9660.Printing.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/ISO9660.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/ISO9660.Printing.cs index 99f73e02..09a2ae1c 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/ISO9660.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/ISO9660.Printing.cs @@ -5,7 +5,7 @@ using SabreTools.Data.Extensions; using SabreTools.Data.Models.ISO9660; using SabreTools.IO.Extensions; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class ISO9660 : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/ISO9660.cs b/SabreTools.Serialization/SabreTools.Wrappers/ISO9660.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/ISO9660.cs rename to SabreTools.Serialization/SabreTools.Wrappers/ISO9660.cs index f66a7b03..d856835b 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/ISO9660.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/ISO9660.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; using SabreTools.Data.Models.ISO9660; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class ISO9660 : WrapperBase { @@ -90,7 +90,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.ISO9660().Deserialize(data); + var model = new Serialization.Readers.ISO9660().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/IWrapper.cs b/SabreTools.Serialization/SabreTools.Wrappers/IWrapper.cs similarity index 86% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/IWrapper.cs rename to SabreTools.Serialization/SabreTools.Wrappers/IWrapper.cs index 6462b543..79f6bafd 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/IWrapper.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/IWrapper.cs @@ -1,4 +1,4 @@ -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { /// /// Represents a wrapper around a top-level model diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/IWrapperT.cs b/SabreTools.Serialization/SabreTools.Wrappers/IWrapperT.cs similarity index 88% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/IWrapperT.cs rename to SabreTools.Serialization/SabreTools.Wrappers/IWrapperT.cs index d0595fbe..fb8770a0 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/IWrapperT.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/IWrapperT.cs @@ -1,4 +1,4 @@ -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { /// /// Represents a wrapper around a top-level model diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/InstallShieldArchiveV3.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/InstallShieldArchiveV3.Extraction.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/InstallShieldArchiveV3.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/InstallShieldArchiveV3.Extraction.cs index 103dfe79..08813003 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/InstallShieldArchiveV3.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/InstallShieldArchiveV3.Extraction.cs @@ -2,7 +2,7 @@ using System; using System.IO; using SabreTools.IO.Compression.Blast; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { /// /// Reference (de)compressor: https://www.sac.sk/download/pack/icomp95.zip diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/InstallShieldArchiveV3.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/InstallShieldArchiveV3.Printing.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/InstallShieldArchiveV3.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/InstallShieldArchiveV3.Printing.cs index 9897589b..072e3ac7 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/InstallShieldArchiveV3.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/InstallShieldArchiveV3.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.InstallShieldArchiveV3; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class InstallShieldArchiveV3 : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/InstallShieldArchiveV3.cs b/SabreTools.Serialization/SabreTools.Wrappers/InstallShieldArchiveV3.cs similarity index 97% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/InstallShieldArchiveV3.cs rename to SabreTools.Serialization/SabreTools.Wrappers/InstallShieldArchiveV3.cs index f1e786a3..0e439170 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/InstallShieldArchiveV3.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/InstallShieldArchiveV3.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; using SabreTools.Data.Models.InstallShieldArchiveV3; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { /// /// Reference (de)compressor: https://www.sac.sk/download/pack/icomp95.zip @@ -164,7 +164,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.InstallShieldArchiveV3().Deserialize(data); + var model = new Serialization.Readers.InstallShieldArchiveV3().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/InstallShieldCabinet.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/InstallShieldCabinet.Extraction.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/InstallShieldCabinet.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/InstallShieldCabinet.Extraction.cs index 91ef6d5c..5c2a85e6 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/InstallShieldCabinet.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/InstallShieldCabinet.Extraction.cs @@ -8,7 +8,7 @@ using SabreTools.IO.Extensions; using static SabreTools.Data.Models.InstallShieldCabinet.Constants; #pragma warning disable SYSLIB1045 // Convert to 'GeneratedRegexAttribute' -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class InstallShieldCabinet : IExtractable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/InstallShieldCabinet.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/InstallShieldCabinet.Printing.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/InstallShieldCabinet.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/InstallShieldCabinet.Printing.cs index 23a7e769..d8bda3b8 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/InstallShieldCabinet.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/InstallShieldCabinet.Printing.cs @@ -3,7 +3,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.InstallShieldCabinet; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class InstallShieldCabinet : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/InstallShieldCabinet.cs b/SabreTools.Serialization/SabreTools.Wrappers/InstallShieldCabinet.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/InstallShieldCabinet.cs rename to SabreTools.Serialization/SabreTools.Wrappers/InstallShieldCabinet.cs index 3657d15c..c1d572de 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/InstallShieldCabinet.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/InstallShieldCabinet.cs @@ -3,7 +3,7 @@ using System.IO; using SabreTools.Data.Extensions; using SabreTools.Data.Models.InstallShieldCabinet; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class InstallShieldCabinet : WrapperBase { @@ -127,7 +127,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.InstallShieldCabinet().Deserialize(data); + var model = new Serialization.Readers.InstallShieldCabinet().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/InstallShieldExecutable.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/InstallShieldExecutable.Extraction.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/InstallShieldExecutable.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/InstallShieldExecutable.Extraction.cs index bd2625f9..a80167d7 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/InstallShieldExecutable.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/InstallShieldExecutable.Extraction.cs @@ -2,7 +2,7 @@ using System; using System.IO; using SabreTools.IO.Extensions; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class InstallShieldExecutable : IExtractable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/InstallShieldExecutable.cs b/SabreTools.Serialization/SabreTools.Wrappers/InstallShieldExecutable.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/InstallShieldExecutable.cs rename to SabreTools.Serialization/SabreTools.Wrappers/InstallShieldExecutable.cs index cac68723..174ed6d7 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/InstallShieldExecutable.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/InstallShieldExecutable.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.InstallShieldExecutable; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class InstallShieldExecutable : WrapperBase { @@ -80,7 +80,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.InstallShieldExecutable().Deserialize(data); + var model = new Serialization.Readers.InstallShieldExecutable().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/LDSCRYPT.cs b/SabreTools.Serialization/SabreTools.Wrappers/LDSCRYPT.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/LDSCRYPT.cs rename to SabreTools.Serialization/SabreTools.Wrappers/LDSCRYPT.cs index c35fde38..1deb6a22 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/LDSCRYPT.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/LDSCRYPT.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.LDSCRYPT; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { /// /// This is a shell wrapper; one that does not contain diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/LZKWAJ.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/LZKWAJ.Extraction.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/LZKWAJ.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/LZKWAJ.Extraction.cs index ef118f6a..b5cc0cad 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/LZKWAJ.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/LZKWAJ.Extraction.cs @@ -2,7 +2,7 @@ using System; using System.IO; using SabreTools.IO.Compression.SZDD; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class LZKWAJ : IExtractable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/LZKWAJ.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/LZKWAJ.Printing.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/LZKWAJ.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/LZKWAJ.Printing.cs index ba69f4f9..9f63786f 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/LZKWAJ.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/LZKWAJ.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.LZ; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class LZKWAJ : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/LZKWAJ.cs b/SabreTools.Serialization/SabreTools.Wrappers/LZKWAJ.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/LZKWAJ.cs rename to SabreTools.Serialization/SabreTools.Wrappers/LZKWAJ.cs index 90e925f1..f6ccfcc1 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/LZKWAJ.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/LZKWAJ.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.LZ; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class LZKWAJ : WrapperBase { @@ -89,7 +89,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.LZKWAJ().Deserialize(data); + var model = new Serialization.Readers.LZKWAJ().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/LZQBasic.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/LZQBasic.Extraction.cs similarity index 97% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/LZQBasic.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/LZQBasic.Extraction.cs index af76f1ea..6d08cb0d 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/LZQBasic.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/LZQBasic.Extraction.cs @@ -2,7 +2,7 @@ using System; using System.IO; using SabreTools.IO.Compression.SZDD; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class LZQBasic : IExtractable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/LZQBasic.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/LZQBasic.Printing.cs similarity index 95% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/LZQBasic.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/LZQBasic.Printing.cs index 0fdb3725..cc9cdcaa 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/LZQBasic.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/LZQBasic.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.LZ; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class LZQBasic : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/LZQBasic.cs b/SabreTools.Serialization/SabreTools.Wrappers/LZQBasic.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/LZQBasic.cs rename to SabreTools.Serialization/SabreTools.Wrappers/LZQBasic.cs index f8605e85..4d58aac2 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/LZQBasic.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/LZQBasic.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.LZ; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class LZQBasic : WrapperBase { @@ -73,7 +73,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.LZQBasic().Deserialize(data); + var model = new Serialization.Readers.LZQBasic().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/LZSZDD.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/LZSZDD.Extraction.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/LZSZDD.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/LZSZDD.Extraction.cs index ab3b205d..8e3aef1f 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/LZSZDD.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/LZSZDD.Extraction.cs @@ -3,7 +3,7 @@ using System.IO; using SabreTools.IO.Compression.SZDD; #pragma warning disable CA1866 // Use char overload -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class LZSZDD : IExtractable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/LZSZDD.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/LZSZDD.Printing.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/LZSZDD.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/LZSZDD.Printing.cs index 2f3fd3da..9ede244f 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/LZSZDD.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/LZSZDD.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.LZ; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class LZSZDD : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/LZSZDD.cs b/SabreTools.Serialization/SabreTools.Wrappers/LZSZDD.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/LZSZDD.cs rename to SabreTools.Serialization/SabreTools.Wrappers/LZSZDD.cs index c0b5aca1..d691a7d0 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/LZSZDD.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/LZSZDD.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.LZ; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class LZSZDD : WrapperBase { @@ -80,7 +80,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.LZSZDD().Deserialize(data); + var model = new Serialization.Readers.LZSZDD().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/LinearExecutable.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/LinearExecutable.Printing.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/LinearExecutable.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/LinearExecutable.Printing.cs index 6c7c5ac1..373eaec7 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/LinearExecutable.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/LinearExecutable.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.LinearExecutable; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class LinearExecutable : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/LinearExecutable.cs b/SabreTools.Serialization/SabreTools.Wrappers/LinearExecutable.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/LinearExecutable.cs rename to SabreTools.Serialization/SabreTools.Wrappers/LinearExecutable.cs index 9a58dde8..6b143a61 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/LinearExecutable.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/LinearExecutable.cs @@ -4,7 +4,7 @@ using SabreTools.Data.Models.LinearExecutable; using SabreTools.IO.Extensions; #pragma warning disable IDE0330 // Use 'System.Threading.Lock' -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class LinearExecutable : WrapperBase { @@ -125,7 +125,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.LinearExecutable().Deserialize(data); + var model = new Serialization.Readers.LinearExecutable().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/MSDOS.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/MSDOS.Printing.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/MSDOS.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/MSDOS.Printing.cs index 25557e58..dacf786d 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/MSDOS.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/MSDOS.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.MSDOS; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class MSDOS : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/MSDOS.cs b/SabreTools.Serialization/SabreTools.Wrappers/MSDOS.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/MSDOS.cs rename to SabreTools.Serialization/SabreTools.Wrappers/MSDOS.cs index 91ab27cf..87d002b2 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/MSDOS.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/MSDOS.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.MSDOS; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class MSDOS : WrapperBase { @@ -73,7 +73,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.MSDOS().Deserialize(data); + var model = new Serialization.Readers.MSDOS().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/MicrosoftCabinet.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/MicrosoftCabinet.Extraction.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/MicrosoftCabinet.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/MicrosoftCabinet.Extraction.cs index 40c59f89..d60f4886 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/MicrosoftCabinet.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/MicrosoftCabinet.Extraction.cs @@ -6,7 +6,7 @@ using SabreTools.IO.Compression.MSZIP; using SabreTools.IO.Extensions; #pragma warning disable CA1822 // Mark members as static -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class MicrosoftCabinet : IExtractable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/MicrosoftCabinet.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/MicrosoftCabinet.Printing.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/MicrosoftCabinet.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/MicrosoftCabinet.Printing.cs index 1bda9b41..067d5b1f 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/MicrosoftCabinet.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/MicrosoftCabinet.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.MicrosoftCabinet; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class MicrosoftCabinet : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/MicrosoftCabinet.cs b/SabreTools.Serialization/SabreTools.Wrappers/MicrosoftCabinet.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/MicrosoftCabinet.cs rename to SabreTools.Serialization/SabreTools.Wrappers/MicrosoftCabinet.cs index 3dd6119c..0728b416 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/MicrosoftCabinet.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/MicrosoftCabinet.cs @@ -4,7 +4,7 @@ using SabreTools.Data.Models.MicrosoftCabinet; using SabreTools.IO.Compression.MSZIP; using SabreTools.IO.Extensions; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class MicrosoftCabinet : WrapperBase { @@ -101,7 +101,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.MicrosoftCabinet().Deserialize(data); + var model = new Serialization.Readers.MicrosoftCabinet().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/MoPaQ.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/MoPaQ.Extraction.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/MoPaQ.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/MoPaQ.Extraction.cs index c36cd77a..39b01026 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/MoPaQ.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/MoPaQ.Extraction.cs @@ -3,7 +3,7 @@ using System.IO; using StormLibSharp; using static SabreTools.Data.Models.MoPaQ.Constants; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class MoPaQ : IExtractable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/MoPaQ.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/MoPaQ.Printing.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/MoPaQ.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/MoPaQ.Printing.cs index e3a1c6c1..6eb13b49 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/MoPaQ.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/MoPaQ.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.MoPaQ; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class MoPaQ : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/MoPaQ.cs b/SabreTools.Serialization/SabreTools.Wrappers/MoPaQ.cs similarity index 97% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/MoPaQ.cs rename to SabreTools.Serialization/SabreTools.Wrappers/MoPaQ.cs index 9899e583..229e614a 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/MoPaQ.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/MoPaQ.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.MoPaQ; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class MoPaQ : WrapperBase { @@ -101,7 +101,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.MoPaQ().Deserialize(data); + var model = new Serialization.Readers.MoPaQ().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/N3DS.Encryption.cs b/SabreTools.Serialization/SabreTools.Wrappers/N3DS.Encryption.cs similarity index 97% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/N3DS.Encryption.cs rename to SabreTools.Serialization/SabreTools.Wrappers/N3DS.Encryption.cs index 9946b7b2..7f617b35 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/N3DS.Encryption.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/N3DS.Encryption.cs @@ -1,7 +1,7 @@ using System; using static SabreTools.Data.Models.N3DS.Constants; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class N3DS { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/N3DS.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/N3DS.Printing.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/N3DS.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/N3DS.Printing.cs index 8256cae3..d021137a 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/N3DS.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/N3DS.Printing.cs @@ -3,7 +3,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.N3DS; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class N3DS : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/N3DS.cs b/SabreTools.Serialization/SabreTools.Wrappers/N3DS.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/N3DS.cs rename to SabreTools.Serialization/SabreTools.Wrappers/N3DS.cs index 5a0b1476..d7ae9be0 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/N3DS.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/N3DS.cs @@ -3,7 +3,7 @@ using System.IO; using SabreTools.Data.Models.N3DS; using static SabreTools.Data.Models.N3DS.Constants; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class N3DS : WrapperBase { @@ -259,7 +259,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.N3DS().Deserialize(data); + var model = new Serialization.Readers.N3DS().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/NCF.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/NCF.Printing.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/NCF.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/NCF.Printing.cs index ce613b9d..4b916d4b 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/NCF.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/NCF.Printing.cs @@ -3,7 +3,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.NCF; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class NCF : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/NCF.cs b/SabreTools.Serialization/SabreTools.Wrappers/NCF.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/NCF.cs rename to SabreTools.Serialization/SabreTools.Wrappers/NCF.cs index de9f28e0..08d78fa9 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/NCF.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/NCF.cs @@ -1,6 +1,6 @@ using System.IO; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class NCF : WrapperBase { @@ -72,7 +72,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.NCF().Deserialize(data); + var model = new Serialization.Readers.NCF().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/NESCart.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/NESCart.Extraction.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/NESCart.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/NESCart.Extraction.cs index f1192ecd..d600620d 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/NESCart.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/NESCart.Extraction.cs @@ -3,7 +3,7 @@ using System.IO; using SabreTools.Data.Models.NES; using SabreTools.IO.Extensions; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class NESCart : IExtractable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/NESCart.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/NESCart.Printing.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/NESCart.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/NESCart.Printing.cs index 05ced275..ca983983 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/NESCart.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/NESCart.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.NES; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class NESCart : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/NESCart.cs b/SabreTools.Serialization/SabreTools.Wrappers/NESCart.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/NESCart.cs rename to SabreTools.Serialization/SabreTools.Wrappers/NESCart.cs index c8c4e080..0ed655e6 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/NESCart.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/NESCart.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.NES; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class NESCart : WrapperBase { @@ -436,7 +436,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.NESCart().Deserialize(data); + var model = new Serialization.Readers.NESCart().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/NewExecutable.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/NewExecutable.Extraction.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/NewExecutable.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/NewExecutable.Extraction.cs index b41f6c2d..e0f52275 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/NewExecutable.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/NewExecutable.Extraction.cs @@ -2,7 +2,7 @@ using System.IO; using SabreTools.IO.Extensions; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class NewExecutable : IExtractable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/NewExecutable.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/NewExecutable.Printing.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/NewExecutable.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/NewExecutable.Printing.cs index c255620d..13a60703 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/NewExecutable.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/NewExecutable.Printing.cs @@ -3,7 +3,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.NewExecutable; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class NewExecutable : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/NewExecutable.cs b/SabreTools.Serialization/SabreTools.Wrappers/NewExecutable.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/NewExecutable.cs rename to SabreTools.Serialization/SabreTools.Wrappers/NewExecutable.cs index 6959e202..b7fcadfb 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/NewExecutable.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/NewExecutable.cs @@ -5,7 +5,7 @@ using SabreTools.Data.Models.NewExecutable; using SabreTools.IO.Extensions; #pragma warning disable IDE0330 // Use 'System.Threading.Lock' -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class NewExecutable : WrapperBase { @@ -66,7 +66,7 @@ namespace SabreTools.Serialization.Wrappers lock (_dataSourceLock) { _dataSource.SeekIfPossible(offset, SeekOrigin.Begin); - var relocationData = Readers.NewExecutable.ParsePerSegmentData(_dataSource); + var relocationData = Serialization.Readers.NewExecutable.ParsePerSegmentData(_dataSource); offset = _dataSource.Position; } @@ -366,7 +366,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.NewExecutable().Deserialize(data); + var model = new Serialization.Readers.NewExecutable().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/Nitro.Encryption.cs b/SabreTools.Serialization/SabreTools.Wrappers/Nitro.Encryption.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/Nitro.Encryption.cs rename to SabreTools.Serialization/SabreTools.Wrappers/Nitro.Encryption.cs index 6cc7f867..42967f31 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/Nitro.Encryption.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/Nitro.Encryption.cs @@ -2,7 +2,7 @@ using SabreTools.Data.Models.Nitro; using SabreTools.IO.Extensions; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class Nitro { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/Nitro.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/Nitro.Printing.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/Nitro.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/Nitro.Printing.cs index b918d11e..cd201f0e 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/Nitro.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/Nitro.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.Nitro; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class Nitro : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/Nitro.cs b/SabreTools.Serialization/SabreTools.Wrappers/Nitro.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/Nitro.cs rename to SabreTools.Serialization/SabreTools.Wrappers/Nitro.cs index 6cb0f62c..e4eee669 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/Nitro.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/Nitro.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.Nitro; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class Nitro : WrapperBase { @@ -86,7 +86,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.Nitro().Deserialize(data); + var model = new Serialization.Readers.Nitro().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/ObjectExtensions.cs b/SabreTools.Serialization/SabreTools.Wrappers/ObjectExtensions.cs similarity index 90% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/ObjectExtensions.cs rename to SabreTools.Serialization/SabreTools.Wrappers/ObjectExtensions.cs index ec91a195..4e5989e9 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/ObjectExtensions.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/ObjectExtensions.cs @@ -2,7 +2,7 @@ using System; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { /// /// Extensions for generic object types diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PAK.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/PAK.Extraction.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/PAK.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/PAK.Extraction.cs index 62799044..276babaf 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PAK.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/PAK.Extraction.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class PAK : IExtractable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PAK.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/PAK.Printing.cs similarity index 97% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/PAK.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/PAK.Printing.cs index 647fc9ba..f6b6024a 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PAK.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/PAK.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.PAK; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class PAK : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PAK.cs b/SabreTools.Serialization/SabreTools.Wrappers/PAK.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/PAK.cs rename to SabreTools.Serialization/SabreTools.Wrappers/PAK.cs index d5668e5a..ce290713 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PAK.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/PAK.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.PAK; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class PAK : WrapperBase { @@ -80,7 +80,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.PAK().Deserialize(data); + var model = new Serialization.Readers.PAK().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PFF.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/PFF.Extraction.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/PFF.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/PFF.Extraction.cs index d6c8241a..127372e4 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PFF.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/PFF.Extraction.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class PFF : IExtractable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PFF.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/PFF.Printing.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/PFF.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/PFF.Printing.cs index 3b954bc7..604cf3d6 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PFF.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/PFF.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.PFF; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class PFF : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PFF.cs b/SabreTools.Serialization/SabreTools.Wrappers/PFF.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/PFF.cs rename to SabreTools.Serialization/SabreTools.Wrappers/PFF.cs index 796702e5..1d1e5577 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PFF.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/PFF.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.PFF; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class PFF : WrapperBase { @@ -85,7 +85,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.PFF().Deserialize(data); + var model = new Serialization.Readers.PFF().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PIC.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/PIC.Printing.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/PIC.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/PIC.Printing.cs index d7aa2263..29847733 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PIC.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/PIC.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.PIC; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class PIC : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PIC.cs b/SabreTools.Serialization/SabreTools.Wrappers/PIC.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/PIC.cs rename to SabreTools.Serialization/SabreTools.Wrappers/PIC.cs index ca6acb1b..42008618 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PIC.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/PIC.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.PIC; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class PIC : WrapperBase { @@ -81,7 +81,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.PIC().Deserialize(data); + var model = new Serialization.Readers.PIC().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PKZIP.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/PKZIP.Extraction.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/PKZIP.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/PKZIP.Extraction.cs index f64f75e8..989d1c01 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PKZIP.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/PKZIP.Extraction.cs @@ -9,7 +9,7 @@ using SharpCompress.Readers; #endif #pragma warning disable SYSLIB1045 // Convert to 'GeneratedRegexAttribute' -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class PKZIP : IExtractable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PKZIP.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/PKZIP.Printing.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/PKZIP.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/PKZIP.Printing.cs index 8870a1c3..27801c2a 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PKZIP.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/PKZIP.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.PKZIP; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class PKZIP : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PKZIP.cs b/SabreTools.Serialization/SabreTools.Wrappers/PKZIP.cs similarity index 97% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/PKZIP.cs rename to SabreTools.Serialization/SabreTools.Wrappers/PKZIP.cs index de90f5e9..395b92c5 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PKZIP.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/PKZIP.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.PKZIP; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class PKZIP : WrapperBase { @@ -92,7 +92,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.PKZIP().Deserialize(data); + var model = new Serialization.Readers.PKZIP().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PlayJAudioFile.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/PlayJAudioFile.Printing.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/PlayJAudioFile.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/PlayJAudioFile.Printing.cs index 7f82887c..aa6315bd 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PlayJAudioFile.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/PlayJAudioFile.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.PlayJ; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class PlayJAudioFile : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PlayJAudioFile.cs b/SabreTools.Serialization/SabreTools.Wrappers/PlayJAudioFile.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/PlayJAudioFile.cs rename to SabreTools.Serialization/SabreTools.Wrappers/PlayJAudioFile.cs index 8e0241c0..76bad317 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PlayJAudioFile.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/PlayJAudioFile.cs @@ -1,6 +1,6 @@ using System.IO; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class PlayJAudioFile : WrapperBase { @@ -72,7 +72,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.PlayJAudio().Deserialize(data); + var model = new Serialization.Readers.PlayJAudio().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PlayJPlaylist.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/PlayJPlaylist.Printing.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/PlayJPlaylist.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/PlayJPlaylist.Printing.cs index f15cdd6b..aa7cd1b6 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PlayJPlaylist.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/PlayJPlaylist.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.PlayJ; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class PlayJPlaylist : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PlayJPlaylist.cs b/SabreTools.Serialization/SabreTools.Wrappers/PlayJPlaylist.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/PlayJPlaylist.cs rename to SabreTools.Serialization/SabreTools.Wrappers/PlayJPlaylist.cs index 190c83e5..5ebe98f9 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PlayJPlaylist.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/PlayJPlaylist.cs @@ -1,6 +1,6 @@ using System.IO; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class PlayJPlaylist : WrapperBase { @@ -72,7 +72,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.PlayJPlaylist().Deserialize(data); + var model = new Serialization.Readers.PlayJPlaylist().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PortableExecutable.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/PortableExecutable.Extraction.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/PortableExecutable.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/PortableExecutable.Extraction.cs index 0e1e7a78..aed78df5 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PortableExecutable.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/PortableExecutable.Extraction.cs @@ -4,7 +4,7 @@ using SabreTools.IO.Compression.BZip2; using SabreTools.IO.Compression.zlib; using SabreTools.IO.Extensions; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class PortableExecutable : IExtractable { @@ -60,7 +60,7 @@ namespace SabreTools.Serialization.Wrappers _dataSource.SeekIfPossible(0, SeekOrigin.Begin); // Try to deserialize the source data - var deserializer = new Readers.AdvancedInstaller(); + var deserializer = new Serialization.Readers.AdvancedInstaller(); var sfx = deserializer.Deserialize(_dataSource); if (sfx is null || sfx.Entries.Length == 0) return false; @@ -570,7 +570,7 @@ namespace SabreTools.Serialization.Wrappers _dataSource.SeekIfPossible(0, SeekOrigin.Begin); // Try to deserialize the source data - var deserializer = new Readers.SpoonInstaller(); + var deserializer = new Serialization.Readers.SpoonInstaller(); var sfx = deserializer.Deserialize(_dataSource); if (sfx?.Entries is null) return false; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PortableExecutable.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/PortableExecutable.Printing.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/PortableExecutable.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/PortableExecutable.Printing.cs index 9e79d194..b3f6d7aa 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PortableExecutable.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/PortableExecutable.Printing.cs @@ -9,7 +9,7 @@ using SabreTools.Data.Models.PortableExecutable; using SabreTools.Data.Models.PortableExecutable.Resource.Entries; using SabreTools.IO.Extensions; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class PortableExecutable : IPrintable { @@ -448,7 +448,7 @@ namespace SabreTools.Serialization.Wrappers } // Create the deserializer - var deserializer = new Readers.AbstractSyntaxNotationOne(); + var deserializer = new Serialization.Readers.AbstractSyntaxNotationOne(); for (int i = 0; i < entries.Length; i++) { @@ -1072,7 +1072,7 @@ namespace SabreTools.Serialization.Wrappers string padding = new(' ', (level + 1) * 2); MenuResource? menu = null; - try { menu = Readers.PortableExecutable.ParseMenuResource(entry.Data); } catch { } + try { menu = Serialization.Readers.PortableExecutable.ParseMenuResource(entry.Data); } catch { } if (menu is null) { @@ -1149,7 +1149,7 @@ namespace SabreTools.Serialization.Wrappers string padding = new(' ', (level + 1) * 2); DialogBoxResource? dialogBox = null; - try { dialogBox = Readers.PortableExecutable.ParseDialogBoxResource(entry.Data); } catch { } + try { dialogBox = Serialization.Readers.PortableExecutable.ParseDialogBoxResource(entry.Data); } catch { } if (dialogBox is null) { @@ -1285,7 +1285,7 @@ namespace SabreTools.Serialization.Wrappers string padding = new(' ', (level + 1) * 2); StringTableResource? stringTable = null; - try { stringTable = Readers.PortableExecutable.ParseStringTableResource(entry.Data); } catch { } + try { stringTable = Serialization.Readers.PortableExecutable.ParseStringTableResource(entry.Data); } catch { } if (stringTable is null) { @@ -1318,7 +1318,7 @@ namespace SabreTools.Serialization.Wrappers string padding = new(' ', (level + 1) * 2); AcceleratorTable? acceleratorTable = null; - try { acceleratorTable = Readers.PortableExecutable.ParseAcceleratorTable(entry.Data); } catch { } + try { acceleratorTable = Serialization.Readers.PortableExecutable.ParseAcceleratorTable(entry.Data); } catch { } if (acceleratorTable?.Entries is null) { @@ -1401,7 +1401,7 @@ namespace SabreTools.Serialization.Wrappers string padding = new(' ', (level + 1) * 2); MessageResourceData? messageTable = null; - try { messageTable = Readers.PortableExecutable.ParseMessageResourceData(entry.Data); } catch { } + try { messageTable = Serialization.Readers.PortableExecutable.ParseMessageResourceData(entry.Data); } catch { } if (messageTable is null) { @@ -1480,7 +1480,7 @@ namespace SabreTools.Serialization.Wrappers string padding = new(' ', (level + 1) * 2); VersionInfo? versionInfo = null; - try { versionInfo = Readers.PortableExecutable.ParseVersionInfo(entry.Data); } catch { } + try { versionInfo = Serialization.Readers.PortableExecutable.ParseVersionInfo(entry.Data); } catch { } if (versionInfo is null) { @@ -1645,7 +1645,7 @@ namespace SabreTools.Serialization.Wrappers string padding = new(' ', (level + 1) * 2); AssemblyManifest? assemblyManifest = null; - try { assemblyManifest = Readers.PortableExecutable.ParseAssemblyManifest(entry.Data); } catch { } + try { assemblyManifest = Serialization.Readers.PortableExecutable.ParseAssemblyManifest(entry.Data); } catch { } if (assemblyManifest is null) { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PortableExecutable.cs b/SabreTools.Serialization/SabreTools.Wrappers/PortableExecutable.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/PortableExecutable.cs rename to SabreTools.Serialization/SabreTools.Wrappers/PortableExecutable.cs index 03522574..62d7ed0f 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/PortableExecutable.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/PortableExecutable.cs @@ -9,7 +9,7 @@ using SabreTools.Data.Models.PortableExecutable.Resource.Entries; using SabreTools.IO.Extensions; #pragma warning disable IDE0330 // Use 'System.Threading.Lock' -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class PortableExecutable : WrapperBase { @@ -1262,7 +1262,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.PortableExecutable().Deserialize(data); + var model = new Serialization.Readers.PortableExecutable().Deserialize(data); if (model is null) return null; @@ -1487,7 +1487,7 @@ namespace SabreTools.Serialization.Wrappers // NB10 if (signature == 0x3031424E) { - var nb10ProgramDatabase = Readers.PortableExecutable.ParseNB10ProgramDatabase(entryData, ref offset); + var nb10ProgramDatabase = Serialization.Readers.PortableExecutable.ParseNB10ProgramDatabase(entryData, ref offset); if (nb10ProgramDatabase is not null) { debugData[i] = nb10ProgramDatabase; @@ -1498,7 +1498,7 @@ namespace SabreTools.Serialization.Wrappers // RSDS else if (signature == 0x53445352) { - var rsdsProgramDatabase = Readers.PortableExecutable.ParseRSDSProgramDatabase(entryData, ref offset); + var rsdsProgramDatabase = Serialization.Readers.PortableExecutable.ParseRSDSProgramDatabase(entryData, ref offset); if (rsdsProgramDatabase is not null) { debugData[i] = rsdsProgramDatabase; @@ -1813,7 +1813,7 @@ namespace SabreTools.Serialization.Wrappers // Parse the executable and recurse _dataSource.SeekIfPossible(resourceOffset, SeekOrigin.Begin); - var resourceExe = WrapperFactory.CreateExecutableWrapper(_dataSource); + var resourceExe = Serialization.WrapperFactory.CreateExecutableWrapper(_dataSource); if (resourceExe is not PortableExecutable resourcePex) return -1; @@ -1868,7 +1868,7 @@ namespace SabreTools.Serialization.Wrappers // Create the key and value objects string key = string.Join(", ", Array.ConvertAll([.. types], t => t.ToString())); - ResourceDataType? value = Readers.PortableExecutable.ParseGenericResourceEntry(entry.Data); + ResourceDataType? value = Serialization.Readers.PortableExecutable.ParseGenericResourceEntry(entry.Data); // If we have a known resource type if (types.Count > 0 && types[0] is uint resourceType) @@ -1889,14 +1889,14 @@ namespace SabreTools.Serialization.Wrappers break; case ResourceType.RT_MENU: case ResourceType.RT_NEWMENU: - value = Readers.PortableExecutable.ParseMenuResource(entry.Data); + value = Serialization.Readers.PortableExecutable.ParseMenuResource(entry.Data); break; case ResourceType.RT_DIALOG: case ResourceType.RT_NEWDIALOG: - value = Readers.PortableExecutable.ParseDialogBoxResource(entry.Data); + value = Serialization.Readers.PortableExecutable.ParseDialogBoxResource(entry.Data); break; case ResourceType.RT_STRING: - value = Readers.PortableExecutable.ParseStringTableResource(entry.Data); + value = Serialization.Readers.PortableExecutable.ParseStringTableResource(entry.Data); break; case ResourceType.RT_FONTDIR: // TODO: Implement specific parsing @@ -1905,13 +1905,13 @@ namespace SabreTools.Serialization.Wrappers // TODO: Implement specific parsing break; case ResourceType.RT_ACCELERATOR: - value = Readers.PortableExecutable.ParseAcceleratorTable(entry.Data); + value = Serialization.Readers.PortableExecutable.ParseAcceleratorTable(entry.Data); break; case ResourceType.RT_RCDATA: // TODO: Implement specific parsing break; case ResourceType.RT_MESSAGETABLE: - value = Readers.PortableExecutable.ParseMessageResourceData(entry.Data); + value = Serialization.Readers.PortableExecutable.ParseMessageResourceData(entry.Data); break; case ResourceType.RT_GROUP_CURSOR: // TODO: Implement specific parsing @@ -1920,7 +1920,7 @@ namespace SabreTools.Serialization.Wrappers // TODO: Implement specific parsing break; case ResourceType.RT_VERSION: - _versionInfo = Readers.PortableExecutable.ParseVersionInfo(entry.Data); + _versionInfo = Serialization.Readers.PortableExecutable.ParseVersionInfo(entry.Data); value = _versionInfo; break; case ResourceType.RT_DLGINCLUDE: @@ -1942,7 +1942,7 @@ namespace SabreTools.Serialization.Wrappers // TODO: Implement specific parsing break; case ResourceType.RT_MANIFEST: - _assemblyManifest = Readers.PortableExecutable.ParseAssemblyManifest(entry.Data); + _assemblyManifest = Serialization.Readers.PortableExecutable.ParseAssemblyManifest(entry.Data); value = _assemblyManifest; break; @@ -1963,14 +1963,14 @@ namespace SabreTools.Serialization.Wrappers catch { // Fall back on byte array data for malformed items - value = Readers.PortableExecutable.ParseGenericResourceEntry(entry.Data); + value = Serialization.Readers.PortableExecutable.ParseGenericResourceEntry(entry.Data); } } // If we have a custom resource type else if (types.Count > 0 && types[0] is string) { - value = Readers.PortableExecutable.ParseGenericResourceEntry(entry.Data); + value = Serialization.Readers.PortableExecutable.ParseGenericResourceEntry(entry.Data); } // Add the key and value to the cache diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/QD.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/QD.Printing.cs similarity index 93% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/QD.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/QD.Printing.cs index e288e24d..3a221de5 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/QD.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/QD.Printing.cs @@ -1,7 +1,7 @@ using System.Text; using SabreTools.Data.Extensions; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class QD : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/QD.cs b/SabreTools.Serialization/SabreTools.Wrappers/QD.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/QD.cs rename to SabreTools.Serialization/SabreTools.Wrappers/QD.cs index 0a06a3a3..dd7a4b74 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/QD.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/QD.cs @@ -1,6 +1,6 @@ using System.IO; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class QD : WrapperBase { @@ -72,7 +72,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.QD().Deserialize(data); + var model = new Serialization.Readers.QD().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/Quantum.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/Quantum.Extraction.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/Quantum.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/Quantum.Extraction.cs index b2bb5b31..61147867 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/Quantum.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/Quantum.Extraction.cs @@ -2,7 +2,7 @@ using System; #pragma warning disable IDE0059 // Unnecessary assignment of a value #pragma warning disable IDE0060 // Remove unused parameter -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class Quantum : IExtractable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/Quantum.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/Quantum.Printing.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/Quantum.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/Quantum.Printing.cs index 334014b3..efa8b0c7 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/Quantum.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/Quantum.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.Quantum; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class Quantum : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/Quantum.cs b/SabreTools.Serialization/SabreTools.Wrappers/Quantum.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/Quantum.cs rename to SabreTools.Serialization/SabreTools.Wrappers/Quantum.cs index ea93293a..7fe81bac 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/Quantum.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/Quantum.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.Quantum; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class Quantum : WrapperBase { @@ -89,7 +89,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.Quantum().Deserialize(data); + var model = new Serialization.Readers.Quantum().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/RAR.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/RAR.Extraction.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/RAR.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/RAR.Extraction.cs index 64aaa3c7..507b3233 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/RAR.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/RAR.Extraction.cs @@ -9,7 +9,7 @@ using SharpCompress.Readers; #endif #pragma warning disable SYSLIB1045 // Convert to 'GeneratedRegexAttribute' -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { /// /// This is a shell wrapper; one that does not contain diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/RAR.cs b/SabreTools.Serialization/SabreTools.Wrappers/RAR.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/RAR.cs rename to SabreTools.Serialization/SabreTools.Wrappers/RAR.cs index d611b08c..63f6db57 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/RAR.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/RAR.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.RAR; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { /// /// This is a shell wrapper; one that does not contain diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/RealArcadeInstaller.cs b/SabreTools.Serialization/SabreTools.Wrappers/RealArcadeInstaller.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/RealArcadeInstaller.cs rename to SabreTools.Serialization/SabreTools.Wrappers/RealArcadeInstaller.cs index a69bb7c9..304b6875 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/RealArcadeInstaller.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/RealArcadeInstaller.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.RealArcade; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { /// /// This is a shell wrapper; one that does not contain diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/RealArcadeMezzanine.cs b/SabreTools.Serialization/SabreTools.Wrappers/RealArcadeMezzanine.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/RealArcadeMezzanine.cs rename to SabreTools.Serialization/SabreTools.Wrappers/RealArcadeMezzanine.cs index d7a52b4d..afe4e9f8 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/RealArcadeMezzanine.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/RealArcadeMezzanine.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.RealArcade; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { /// /// This is a shell wrapper; one that does not contain diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/SFFS.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/SFFS.Printing.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/SFFS.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/SFFS.Printing.cs index 5faef9a9..f4bbce49 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/SFFS.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/SFFS.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.StarForce; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class SFFS : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/SFFS.cs b/SabreTools.Serialization/SabreTools.Wrappers/SFFS.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/SFFS.cs rename to SabreTools.Serialization/SabreTools.Wrappers/SFFS.cs index 5b482733..dbf9a370 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/SFFS.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/SFFS.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.StarForce; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { /// /// This is a shell wrapper; one that does not contain diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/SGA.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/SGA.Extraction.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/SGA.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/SGA.Extraction.cs index 862489ef..552b6d52 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/SGA.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/SGA.Extraction.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; using SabreTools.IO.Compression.zlib; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class SGA : IExtractable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/SGA.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/SGA.Printing.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/SGA.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/SGA.Printing.cs index 5336fad5..53468ef6 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/SGA.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/SGA.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.SGA; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class SGA : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/SGA.cs b/SabreTools.Serialization/SabreTools.Wrappers/SGA.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/SGA.cs rename to SabreTools.Serialization/SabreTools.Wrappers/SGA.cs index 343254ee..48258584 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/SGA.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/SGA.cs @@ -2,7 +2,7 @@ using System; using System.IO; using SabreTools.Data.Models.SGA; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class SGA : WrapperBase { @@ -117,7 +117,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.SGA().Deserialize(data); + var model = new Serialization.Readers.SGA().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/SecuROMDFA.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/SecuROMDFA.Printing.cs similarity index 97% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/SecuROMDFA.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/SecuROMDFA.Printing.cs index 5944a1d3..7122c313 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/SecuROMDFA.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/SecuROMDFA.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.SecuROM; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class SecuROMDFA : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/SecuROMDFA.cs b/SabreTools.Serialization/SabreTools.Wrappers/SecuROMDFA.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/SecuROMDFA.cs rename to SabreTools.Serialization/SabreTools.Wrappers/SecuROMDFA.cs index a5bf4f01..195e8441 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/SecuROMDFA.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/SecuROMDFA.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.SecuROM; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class SecuROMDFA : WrapperBase { @@ -73,7 +73,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.SecuROMDFA().Deserialize(data); + var model = new Serialization.Readers.SecuROMDFA().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/SecuROMMatroschkaPackage.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/SecuROMMatroschkaPackage.Extraction.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/SecuROMMatroschkaPackage.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/SecuROMMatroschkaPackage.Extraction.cs index 53f22771..227e4632 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/SecuROMMatroschkaPackage.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/SecuROMMatroschkaPackage.Extraction.cs @@ -3,7 +3,7 @@ using System.IO; using SabreTools.Data.Models.SecuROM; using SabreTools.Hashing; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class SecuROMMatroschkaPackage : IExtractable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/SecuROMMatroschkaPackage.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/SecuROMMatroschkaPackage.Printing.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/SecuROMMatroschkaPackage.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/SecuROMMatroschkaPackage.Printing.cs index 1424b872..d1ce3993 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/SecuROMMatroschkaPackage.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/SecuROMMatroschkaPackage.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.SecuROM; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class SecuROMMatroschkaPackage : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/SecuROMMatroschkaPackage.cs b/SabreTools.Serialization/SabreTools.Wrappers/SecuROMMatroschkaPackage.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/SecuROMMatroschkaPackage.cs rename to SabreTools.Serialization/SabreTools.Wrappers/SecuROMMatroschkaPackage.cs index f84a1b46..272b1f7a 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/SecuROMMatroschkaPackage.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/SecuROMMatroschkaPackage.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.SecuROM; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class SecuROMMatroschkaPackage : WrapperBase { @@ -101,7 +101,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.SecuROMMatroschkaPackage().Deserialize(data); + var model = new Serialization.Readers.SecuROMMatroschkaPackage().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/SevenZip.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/SevenZip.Extraction.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/SevenZip.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/SevenZip.Extraction.cs index 09441107..4ee39c30 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/SevenZip.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/SevenZip.Extraction.cs @@ -9,7 +9,7 @@ using SharpCompress.Readers; #endif #pragma warning disable SYSLIB1045 // Convert to 'GeneratedRegexAttribute' -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { /// /// This is a shell wrapper; one that does not contain diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/SevenZip.cs b/SabreTools.Serialization/SabreTools.Wrappers/SevenZip.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/SevenZip.cs rename to SabreTools.Serialization/SabreTools.Wrappers/SevenZip.cs index d44342bc..8ba6e894 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/SevenZip.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/SevenZip.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.SevenZip; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { /// /// This is a shell wrapper; one that does not contain diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/Skeleton.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/Skeleton.Extraction.cs similarity index 81% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/Skeleton.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/Skeleton.Extraction.cs index 99dac699..6b03765e 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/Skeleton.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/Skeleton.Extraction.cs @@ -1,4 +1,4 @@ -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class Skeleton : IExtractable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/Skeleton.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/Skeleton.Printing.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/Skeleton.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/Skeleton.Printing.cs index 0a7ab80a..c3b0a88d 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/Skeleton.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/Skeleton.Printing.cs @@ -2,7 +2,7 @@ using System; using System.Text; using SabreTools.Data.Extensions; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class Skeleton : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/Skeleton.cs b/SabreTools.Serialization/SabreTools.Wrappers/Skeleton.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/Skeleton.cs rename to SabreTools.Serialization/SabreTools.Wrappers/Skeleton.cs index 82fbcd39..36eaeb0b 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/Skeleton.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/Skeleton.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.ISO9660; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class Skeleton : ISO9660 { @@ -73,7 +73,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.ISO9660().Deserialize(data); + var model = new Serialization.Readers.ISO9660().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/SkuSis.cs b/SabreTools.Serialization/SabreTools.Wrappers/SkuSis.cs similarity index 97% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/SkuSis.cs rename to SabreTools.Serialization/SabreTools.Wrappers/SkuSis.cs index a1bde7fc..a3248324 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/SkuSis.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/SkuSis.cs @@ -3,7 +3,7 @@ using System.IO; using Newtonsoft.Json.Linq; using SabreTools.Data.Models.VDF; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class SkuSis : WrapperBase { @@ -123,7 +123,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.SkuSis().Deserialize(data); + var model = new Serialization.Readers.SkuSis().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/TapeArchive.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/TapeArchive.Extraction.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/TapeArchive.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/TapeArchive.Extraction.cs index fca1605f..27b0d9e7 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/TapeArchive.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/TapeArchive.Extraction.cs @@ -2,7 +2,7 @@ using System; using System.IO; using SabreTools.Data.Models.TAR; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class TapeArchive : IExtractable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/TapeArchive.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/TapeArchive.Printing.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/TapeArchive.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/TapeArchive.Printing.cs index c5add49c..bab43c14 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/TapeArchive.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/TapeArchive.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.TAR; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class TapeArchive : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/TapeArchive.cs b/SabreTools.Serialization/SabreTools.Wrappers/TapeArchive.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/TapeArchive.cs rename to SabreTools.Serialization/SabreTools.Wrappers/TapeArchive.cs index 98318b74..8b45b2f0 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/TapeArchive.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/TapeArchive.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.TAR; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class TapeArchive : WrapperBase { @@ -80,7 +80,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.TapeArchive().Deserialize(data); + var model = new Serialization.Readers.TapeArchive().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/VBSP.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/VBSP.Extraction.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/VBSP.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/VBSP.Extraction.cs index 08304036..a7296fd1 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/VBSP.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/VBSP.Extraction.cs @@ -2,7 +2,7 @@ using System; using System.IO; using SabreTools.Data.Models.BSP; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class VBSP : IExtractable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/VBSP.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/VBSP.Printing.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/VBSP.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/VBSP.Printing.cs index 15187fed..e5f7fb72 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/VBSP.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/VBSP.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.BSP; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class VBSP : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/VBSP.cs b/SabreTools.Serialization/SabreTools.Wrappers/VBSP.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/VBSP.cs rename to SabreTools.Serialization/SabreTools.Wrappers/VBSP.cs index a8543717..5d755f73 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/VBSP.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/VBSP.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.BSP; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class VBSP : WrapperBase { @@ -80,7 +80,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.VBSP().Deserialize(data); + var model = new Serialization.Readers.VBSP().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/VPK.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/VPK.Extraction.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/VPK.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/VPK.Extraction.cs index c9b85936..b407f250 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/VPK.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/VPK.Extraction.cs @@ -3,7 +3,7 @@ using System.IO; using SabreTools.IO.Extensions; using static SabreTools.Data.Models.VPK.Constants; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class VPK : IExtractable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/VPK.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/VPK.Printing.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/VPK.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/VPK.Printing.cs index 6b495dbd..fe76c1f6 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/VPK.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/VPK.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.VPK; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class VPK : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/VPK.cs b/SabreTools.Serialization/SabreTools.Wrappers/VPK.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/VPK.cs rename to SabreTools.Serialization/SabreTools.Wrappers/VPK.cs index b2f28c71..1490b4a9 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/VPK.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/VPK.cs @@ -2,7 +2,7 @@ using System; using System.IO; using static SabreTools.Data.Models.VPK.Constants; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class VPK : WrapperBase { @@ -151,7 +151,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.VPK().Deserialize(data); + var model = new Serialization.Readers.VPK().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/WAD3.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/WAD3.Extraction.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/WAD3.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/WAD3.Extraction.cs index 35b45bf1..5c8c55fb 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/WAD3.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/WAD3.Extraction.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class WAD3 : IExtractable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/WAD3.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/WAD3.Printing.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/WAD3.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/WAD3.Printing.cs index 5fc9fffe..a06de2c1 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/WAD3.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/WAD3.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.WAD3; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class WAD3 : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/WAD3.cs b/SabreTools.Serialization/SabreTools.Wrappers/WAD3.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/WAD3.cs rename to SabreTools.Serialization/SabreTools.Wrappers/WAD3.cs index e7b5fcd1..f100b7d0 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/WAD3.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/WAD3.cs @@ -1,6 +1,6 @@ using System.IO; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class WAD3 : WrapperBase { @@ -79,7 +79,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.WAD3().Deserialize(data); + var model = new Serialization.Readers.WAD3().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/WiseOverlayHeader.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/WiseOverlayHeader.Extraction.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/WiseOverlayHeader.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/WiseOverlayHeader.Extraction.cs index 9fbaec0a..3e54f425 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/WiseOverlayHeader.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/WiseOverlayHeader.Extraction.cs @@ -5,7 +5,7 @@ using SabreTools.IO.Compression.Deflate; using SabreTools.IO.Extensions; using SabreTools.IO.Streams; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class WiseOverlayHeader { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/WiseOverlayHeader.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/WiseOverlayHeader.Printing.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/WiseOverlayHeader.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/WiseOverlayHeader.Printing.cs index bb3eb77f..e9fad334 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/WiseOverlayHeader.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/WiseOverlayHeader.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.WiseInstaller; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class WiseOverlayHeader : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/WiseOverlayHeader.cs b/SabreTools.Serialization/SabreTools.Wrappers/WiseOverlayHeader.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/WiseOverlayHeader.cs rename to SabreTools.Serialization/SabreTools.Wrappers/WiseOverlayHeader.cs index ed328ce4..ab6b8d7c 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/WiseOverlayHeader.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/WiseOverlayHeader.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.WiseInstaller; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class WiseOverlayHeader : WrapperBase { @@ -214,7 +214,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.WiseOverlayHeader().Deserialize(data); + var model = new Serialization.Readers.WiseOverlayHeader().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/WiseScript.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/WiseScript.Printing.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/WiseScript.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/WiseScript.Printing.cs index 79f309f2..8a39c4d1 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/WiseScript.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/WiseScript.Printing.cs @@ -4,7 +4,7 @@ using SabreTools.Data.Models.WiseInstaller; using SabreTools.Data.Models.WiseInstaller.Actions; #pragma warning disable IDE0060 // Remove unused parameter -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class WiseScript : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/WiseScript.cs b/SabreTools.Serialization/SabreTools.Wrappers/WiseScript.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/WiseScript.cs rename to SabreTools.Serialization/SabreTools.Wrappers/WiseScript.cs index def4f1d5..8625db5d 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/WiseScript.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/WiseScript.cs @@ -8,7 +8,7 @@ using SabreTools.Data.Models.WiseInstaller.Actions; using SabreTools.IO.Extensions; #endif -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class WiseScript : WrapperBase { @@ -120,7 +120,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.WiseScript().Deserialize(data); + var model = new Serialization.Readers.WiseScript().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/WiseSectionHeader.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/WiseSectionHeader.Extraction.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/WiseSectionHeader.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/WiseSectionHeader.Extraction.cs index e16305b5..ec5f9b18 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/WiseSectionHeader.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/WiseSectionHeader.Extraction.cs @@ -4,7 +4,7 @@ using SabreTools.Hashing; using SabreTools.IO.Compression.Deflate; using SabreTools.IO.Extensions; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class WiseSectionHeader : IExtractable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/WiseSectionHeader.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/WiseSectionHeader.Printing.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/WiseSectionHeader.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/WiseSectionHeader.Printing.cs index ce03fa51..12f756db 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/WiseSectionHeader.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/WiseSectionHeader.Printing.cs @@ -1,7 +1,7 @@ using System.Text; using SabreTools.Data.Extensions; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class WiseSectionHeader : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/WiseSectionHeader.cs b/SabreTools.Serialization/SabreTools.Wrappers/WiseSectionHeader.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/WiseSectionHeader.cs rename to SabreTools.Serialization/SabreTools.Wrappers/WiseSectionHeader.cs index 441539e6..0ff3f76f 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/WiseSectionHeader.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/WiseSectionHeader.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.WiseInstaller; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class WiseSectionHeader : WrapperBase { @@ -154,7 +154,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.WiseSectionHeader().Deserialize(data); + var model = new Serialization.Readers.WiseSectionHeader().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/WrapperBase.cs b/SabreTools.Serialization/SabreTools.Wrappers/WrapperBase.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/WrapperBase.cs rename to SabreTools.Serialization/SabreTools.Wrappers/WrapperBase.cs index f6d95887..a80c4422 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/WrapperBase.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/WrapperBase.cs @@ -3,7 +3,7 @@ using System.IO; using SabreTools.IO.Extensions; using SabreTools.IO.Streams; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public abstract class WrapperBase : IWrapper { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/WrapperBaseT.cs b/SabreTools.Serialization/SabreTools.Wrappers/WrapperBaseT.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/WrapperBaseT.cs rename to SabreTools.Serialization/SabreTools.Wrappers/WrapperBaseT.cs index bd864a53..e67fcce7 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/WrapperBaseT.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/WrapperBaseT.cs @@ -1,6 +1,6 @@ using System.IO; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public abstract class WrapperBase : WrapperBase, IWrapper { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/WrapperType.cs b/SabreTools.Serialization/SabreTools.Wrappers/WrapperType.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/WrapperType.cs rename to SabreTools.Serialization/SabreTools.Wrappers/WrapperType.cs index 5de19f42..cc7b53ec 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/WrapperType.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/WrapperType.cs @@ -1,4 +1,4 @@ -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { /// /// Represents each of the IWrapper implementations diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/XMID.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/XMID.Printing.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/XMID.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/XMID.Printing.cs index 510ce9ed..d4d075f1 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/XMID.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/XMID.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using static SabreTools.Data.Models.Xbox.Constants; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class XMID : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/XMID.cs b/SabreTools.Serialization/SabreTools.Wrappers/XMID.cs similarity index 97% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/XMID.cs rename to SabreTools.Serialization/SabreTools.Wrappers/XMID.cs index b527d97e..c3ed217a 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/XMID.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/XMID.cs @@ -2,7 +2,7 @@ using System.IO; using System.Text; using static SabreTools.Data.Models.Xbox.Constants; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class XMID : WrapperBase { @@ -108,7 +108,7 @@ namespace SabreTools.Serialization.Wrappers try { - var model = new Readers.XMID().Deserialize(data); + var model = new Serialization.Readers.XMID().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/XZ.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/XZ.Extraction.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/XZ.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/XZ.Extraction.cs index fad47c3d..474a6d01 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/XZ.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/XZ.Extraction.cs @@ -4,7 +4,7 @@ using System.IO; using SharpCompress.Compressors.Xz; #endif -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { /// /// This is a shell wrapper; one that does not contain diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/XZ.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/XZ.Printing.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/XZ.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/XZ.Printing.cs index 80ed7e98..cc2e94aa 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/XZ.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/XZ.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.XZ; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class XZ : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/XZ.cs b/SabreTools.Serialization/SabreTools.Wrappers/XZ.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/XZ.cs rename to SabreTools.Serialization/SabreTools.Wrappers/XZ.cs index bbae9019..65cc5327 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/XZ.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/XZ.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.XZ; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { /// /// This is a shell wrapper; one that does not contain @@ -78,7 +78,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.XZ().Deserialize(data); + var model = new Serialization.Readers.XZ().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/XZP.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/XZP.Extraction.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/XZP.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/XZP.Extraction.cs index d2e34614..b3e60b1c 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/XZP.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/XZP.Extraction.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class XZP : IExtractable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/XZP.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/XZP.Printing.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/XZP.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/XZP.Printing.cs index bd977920..d765975c 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/XZP.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/XZP.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.XZP; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class XZP : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/XZP.cs b/SabreTools.Serialization/SabreTools.Wrappers/XZP.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/XZP.cs rename to SabreTools.Serialization/SabreTools.Wrappers/XZP.cs index a98da8ae..0916657d 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/XZP.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/XZP.cs @@ -1,6 +1,6 @@ using System.IO; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class XZP : WrapperBase { @@ -82,7 +82,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.XZP().Deserialize(data); + var model = new Serialization.Readers.XZP().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/XboxExecutable.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/XboxExecutable.Printing.cs similarity index 99% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/XboxExecutable.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/XboxExecutable.Printing.cs index 8fe3c454..a664640c 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/XboxExecutable.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/XboxExecutable.Printing.cs @@ -3,7 +3,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.XboxExecutable; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class XboxExecutable : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/XboxExecutable.cs b/SabreTools.Serialization/SabreTools.Wrappers/XboxExecutable.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/XboxExecutable.cs rename to SabreTools.Serialization/SabreTools.Wrappers/XboxExecutable.cs index 9125e1db..9874e2e7 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/XboxExecutable.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/XboxExecutable.cs @@ -4,7 +4,7 @@ using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.XboxExecutable; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class XboxExecutable : WrapperBase { @@ -155,7 +155,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.XboxExecutable().Deserialize(data); + var model = new Serialization.Readers.XboxExecutable().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/XeMID.Printing.cs b/SabreTools.Serialization/SabreTools.Wrappers/XeMID.Printing.cs similarity index 97% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/XeMID.Printing.cs rename to SabreTools.Serialization/SabreTools.Wrappers/XeMID.Printing.cs index a798ef5b..bd8f9596 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/XeMID.Printing.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/XeMID.Printing.cs @@ -2,7 +2,7 @@ using System.Text; using SabreTools.Data.Extensions; using static SabreTools.Data.Models.Xbox.Constants; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class XeMID : IPrintable { diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/XeMID.cs b/SabreTools.Serialization/SabreTools.Wrappers/XeMID.cs similarity index 97% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/XeMID.cs rename to SabreTools.Serialization/SabreTools.Wrappers/XeMID.cs index a04a9c71..a21b1384 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/XeMID.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/XeMID.cs @@ -2,7 +2,7 @@ using System.IO; using System.Text; using static SabreTools.Data.Models.Xbox.Constants; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class XeMID : WrapperBase { @@ -130,7 +130,7 @@ namespace SabreTools.Serialization.Wrappers try { - var model = new Readers.XeMID().Deserialize(data); + var model = new Serialization.Readers.XeMID().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/ZSTD.Extraction.cs b/SabreTools.Serialization/SabreTools.Wrappers/ZSTD.Extraction.cs similarity index 98% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/ZSTD.Extraction.cs rename to SabreTools.Serialization/SabreTools.Wrappers/ZSTD.Extraction.cs index dad283de..349515e9 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/ZSTD.Extraction.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/ZSTD.Extraction.cs @@ -7,7 +7,7 @@ using SabreTools.IO.Extensions; using SharpCompress.Compressors.ZStandard; #endif -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { /// /// This is a shell wrapper; one that does not contain diff --git a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/ZSTD.cs b/SabreTools.Serialization/SabreTools.Wrappers/ZSTD.cs similarity index 96% rename from SabreTools.Serialization/SabreTools.Serialization.Wrappers/ZSTD.cs rename to SabreTools.Serialization/SabreTools.Wrappers/ZSTD.cs index fb427e75..652bcd8c 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.Wrappers/ZSTD.cs +++ b/SabreTools.Serialization/SabreTools.Wrappers/ZSTD.cs @@ -1,7 +1,7 @@ using System.IO; using SabreTools.Data.Models.ZSTD; -namespace SabreTools.Serialization.Wrappers +namespace SabreTools.Wrappers { public partial class ZSTD : WrapperBase
{ @@ -83,7 +83,7 @@ namespace SabreTools.Serialization.Wrappers // Cache the current offset long currentOffset = data.Position; - var model = new Readers.ZSTD().Deserialize(data); + var model = new Serialization.Readers.ZSTD().Deserialize(data); if (model is null) return null; diff --git a/SabreTools.Serialization/WrapperFactory.cs b/SabreTools.Serialization/WrapperFactory.cs index 748ecb63..2b437037 100644 --- a/SabreTools.Serialization/WrapperFactory.cs +++ b/SabreTools.Serialization/WrapperFactory.cs @@ -1,7 +1,7 @@ using System; using System.IO; using SabreTools.IO.Extensions; -using SabreTools.Serialization.Wrappers; +using SabreTools.Wrappers; namespace SabreTools.Serialization { diff --git a/SabreTools.Serialization.Test/Wrappers/AACSMediaKeyBlockTests.cs b/SabreTools.Wrappers.Test/AACSMediaKeyBlockTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/AACSMediaKeyBlockTests.cs rename to SabreTools.Wrappers.Test/AACSMediaKeyBlockTests.cs index 7966b472..4fbad7d8 100644 --- a/SabreTools.Serialization.Test/Wrappers/AACSMediaKeyBlockTests.cs +++ b/SabreTools.Wrappers.Test/AACSMediaKeyBlockTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class AACSMediaKeyBlockTests { diff --git a/SabreTools.Serialization.Test/Wrappers/Atari7800CartTests.cs b/SabreTools.Wrappers.Test/Atari7800CartTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/Atari7800CartTests.cs rename to SabreTools.Wrappers.Test/Atari7800CartTests.cs index 9f44c2a3..db90df39 100644 --- a/SabreTools.Serialization.Test/Wrappers/Atari7800CartTests.cs +++ b/SabreTools.Wrappers.Test/Atari7800CartTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class Atari7800CartTests { diff --git a/SabreTools.Serialization.Test/Wrappers/AtariLynxCartTests.cs b/SabreTools.Wrappers.Test/AtariLynxCartTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/AtariLynxCartTests.cs rename to SabreTools.Wrappers.Test/AtariLynxCartTests.cs index 771143ad..4a9f12c1 100644 --- a/SabreTools.Serialization.Test/Wrappers/AtariLynxCartTests.cs +++ b/SabreTools.Wrappers.Test/AtariLynxCartTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class AtariLynxCartTests { diff --git a/SabreTools.Serialization.Test/Wrappers/BDPlusSVMTests.cs b/SabreTools.Wrappers.Test/BDPlusSVMTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/BDPlusSVMTests.cs rename to SabreTools.Wrappers.Test/BDPlusSVMTests.cs index f47707dc..d7857c89 100644 --- a/SabreTools.Serialization.Test/Wrappers/BDPlusSVMTests.cs +++ b/SabreTools.Wrappers.Test/BDPlusSVMTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class BDPlusSVMTests { diff --git a/SabreTools.Serialization.Test/Wrappers/BFPKTests.cs b/SabreTools.Wrappers.Test/BFPKTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/BFPKTests.cs rename to SabreTools.Wrappers.Test/BFPKTests.cs index f160b3c3..e9bbe965 100644 --- a/SabreTools.Serialization.Test/Wrappers/BFPKTests.cs +++ b/SabreTools.Wrappers.Test/BFPKTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class BFPKTests { diff --git a/SabreTools.Serialization.Test/Wrappers/BSPTests.cs b/SabreTools.Wrappers.Test/BSPTests.cs similarity index 93% rename from SabreTools.Serialization.Test/Wrappers/BSPTests.cs rename to SabreTools.Wrappers.Test/BSPTests.cs index d6dc384f..36acb085 100644 --- a/SabreTools.Serialization.Test/Wrappers/BSPTests.cs +++ b/SabreTools.Wrappers.Test/BSPTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class BSPTests { diff --git a/SabreTools.Serialization.Test/Wrappers/BZip2Tests.cs b/SabreTools.Wrappers.Test/BZip2Tests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/BZip2Tests.cs rename to SabreTools.Wrappers.Test/BZip2Tests.cs index 6cd148ba..84d7025e 100644 --- a/SabreTools.Serialization.Test/Wrappers/BZip2Tests.cs +++ b/SabreTools.Wrappers.Test/BZip2Tests.cs @@ -1,10 +1,9 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; #pragma warning disable xUnit1004 // Test methods should not be skipped -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class BZip2Tests { diff --git a/SabreTools.Serialization.Test/Wrappers/CDROMTests.cs b/SabreTools.Wrappers.Test/CDROMTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/CDROMTests.cs rename to SabreTools.Wrappers.Test/CDROMTests.cs index f6adb9be..0e73916d 100644 --- a/SabreTools.Serialization.Test/Wrappers/CDROMTests.cs +++ b/SabreTools.Wrappers.Test/CDROMTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class CDROMTests { diff --git a/SabreTools.Serialization.Test/Wrappers/CFBTests.cs b/SabreTools.Wrappers.Test/CFBTests.cs similarity index 93% rename from SabreTools.Serialization.Test/Wrappers/CFBTests.cs rename to SabreTools.Wrappers.Test/CFBTests.cs index ccbf79ac..ac97131c 100644 --- a/SabreTools.Serialization.Test/Wrappers/CFBTests.cs +++ b/SabreTools.Wrappers.Test/CFBTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class CFBTests { diff --git a/SabreTools.Serialization.Test/Wrappers/CHDTests.cs b/SabreTools.Wrappers.Test/CHDTests.cs similarity index 93% rename from SabreTools.Serialization.Test/Wrappers/CHDTests.cs rename to SabreTools.Wrappers.Test/CHDTests.cs index 012126bf..312376e7 100644 --- a/SabreTools.Serialization.Test/Wrappers/CHDTests.cs +++ b/SabreTools.Wrappers.Test/CHDTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class CHDTests { diff --git a/SabreTools.Serialization.Test/Wrappers/CIATests.cs b/SabreTools.Wrappers.Test/CIATests.cs similarity index 93% rename from SabreTools.Serialization.Test/Wrappers/CIATests.cs rename to SabreTools.Wrappers.Test/CIATests.cs index 662e8541..3d2186c0 100644 --- a/SabreTools.Serialization.Test/Wrappers/CIATests.cs +++ b/SabreTools.Wrappers.Test/CIATests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class CIATests { diff --git a/SabreTools.Serialization.Test/Wrappers/FDSTests.cs b/SabreTools.Wrappers.Test/FDSTests.cs similarity index 93% rename from SabreTools.Serialization.Test/Wrappers/FDSTests.cs rename to SabreTools.Wrappers.Test/FDSTests.cs index 4f9127b5..055fc3a8 100644 --- a/SabreTools.Serialization.Test/Wrappers/FDSTests.cs +++ b/SabreTools.Wrappers.Test/FDSTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class FDSTests { diff --git a/SabreTools.Serialization.Test/Wrappers/GCFTests.cs b/SabreTools.Wrappers.Test/GCFTests.cs similarity index 93% rename from SabreTools.Serialization.Test/Wrappers/GCFTests.cs rename to SabreTools.Wrappers.Test/GCFTests.cs index c2b1cb19..663dc776 100644 --- a/SabreTools.Serialization.Test/Wrappers/GCFTests.cs +++ b/SabreTools.Wrappers.Test/GCFTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class GCFTests { diff --git a/SabreTools.Serialization.Test/Wrappers/GZipTests.cs b/SabreTools.Wrappers.Test/GZipTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/GZipTests.cs rename to SabreTools.Wrappers.Test/GZipTests.cs index bdc49e99..772136eb 100644 --- a/SabreTools.Serialization.Test/Wrappers/GZipTests.cs +++ b/SabreTools.Wrappers.Test/GZipTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class GZipTests { diff --git a/SabreTools.Serialization.Test/Wrappers/IRDTests.cs b/SabreTools.Wrappers.Test/IRDTests.cs similarity index 93% rename from SabreTools.Serialization.Test/Wrappers/IRDTests.cs rename to SabreTools.Wrappers.Test/IRDTests.cs index f9c4cb11..0c1037c0 100644 --- a/SabreTools.Serialization.Test/Wrappers/IRDTests.cs +++ b/SabreTools.Wrappers.Test/IRDTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class IRDTests { diff --git a/SabreTools.Serialization.Test/Wrappers/ISO9660Tests.cs b/SabreTools.Wrappers.Test/ISO9660Tests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/ISO9660Tests.cs rename to SabreTools.Wrappers.Test/ISO9660Tests.cs index 1be3f0ac..dcc0aa0d 100644 --- a/SabreTools.Serialization.Test/Wrappers/ISO9660Tests.cs +++ b/SabreTools.Wrappers.Test/ISO9660Tests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class ISO9660Tests { diff --git a/SabreTools.Serialization.Test/Wrappers/InstallShieldArchiveV3Tests.cs b/SabreTools.Wrappers.Test/InstallShieldArchiveV3Tests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/InstallShieldArchiveV3Tests.cs rename to SabreTools.Wrappers.Test/InstallShieldArchiveV3Tests.cs index 5dbac1c2..3f8742b5 100644 --- a/SabreTools.Serialization.Test/Wrappers/InstallShieldArchiveV3Tests.cs +++ b/SabreTools.Wrappers.Test/InstallShieldArchiveV3Tests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class InstallShieldArchiveV3Tests { diff --git a/SabreTools.Serialization.Test/Wrappers/InstallShieldCabinetTests.cs b/SabreTools.Wrappers.Test/InstallShieldCabinetTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/InstallShieldCabinetTests.cs rename to SabreTools.Wrappers.Test/InstallShieldCabinetTests.cs index fbea0c5f..dfb06917 100644 --- a/SabreTools.Serialization.Test/Wrappers/InstallShieldCabinetTests.cs +++ b/SabreTools.Wrappers.Test/InstallShieldCabinetTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class InstallShieldCabinetTests { diff --git a/SabreTools.Serialization.Test/Wrappers/LDSCRYPTTests.cs b/SabreTools.Wrappers.Test/LDSCRYPTTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/LDSCRYPTTests.cs rename to SabreTools.Wrappers.Test/LDSCRYPTTests.cs index 8bdc85a8..01d9d973 100644 --- a/SabreTools.Serialization.Test/Wrappers/LDSCRYPTTests.cs +++ b/SabreTools.Wrappers.Test/LDSCRYPTTests.cs @@ -1,10 +1,9 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; #pragma warning disable xUnit1004 // Test methods should not be skipped -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class LDSCRYPTTests { diff --git a/SabreTools.Serialization.Test/Wrappers/LZKWAJTests.cs b/SabreTools.Wrappers.Test/LZKWAJTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/LZKWAJTests.cs rename to SabreTools.Wrappers.Test/LZKWAJTests.cs index b988a5c4..e56263c5 100644 --- a/SabreTools.Serialization.Test/Wrappers/LZKWAJTests.cs +++ b/SabreTools.Wrappers.Test/LZKWAJTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class LZKWAJTests { diff --git a/SabreTools.Serialization.Test/Wrappers/LZQBasicTests.cs b/SabreTools.Wrappers.Test/LZQBasicTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/LZQBasicTests.cs rename to SabreTools.Wrappers.Test/LZQBasicTests.cs index 7db2804c..6b1589a0 100644 --- a/SabreTools.Serialization.Test/Wrappers/LZQBasicTests.cs +++ b/SabreTools.Wrappers.Test/LZQBasicTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class LZQBasicTests { diff --git a/SabreTools.Serialization.Test/Wrappers/LZSZDDTests.cs b/SabreTools.Wrappers.Test/LZSZDDTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/LZSZDDTests.cs rename to SabreTools.Wrappers.Test/LZSZDDTests.cs index 50bba211..aa77a1ae 100644 --- a/SabreTools.Serialization.Test/Wrappers/LZSZDDTests.cs +++ b/SabreTools.Wrappers.Test/LZSZDDTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class LZSZDDTests { diff --git a/SabreTools.Serialization.Test/Wrappers/LinearExecutableTests.cs b/SabreTools.Wrappers.Test/LinearExecutableTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/LinearExecutableTests.cs rename to SabreTools.Wrappers.Test/LinearExecutableTests.cs index 6872046a..6cd74c26 100644 --- a/SabreTools.Serialization.Test/Wrappers/LinearExecutableTests.cs +++ b/SabreTools.Wrappers.Test/LinearExecutableTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class LinearExecutableTests { diff --git a/SabreTools.Serialization.Test/Wrappers/MSDOSTests.cs b/SabreTools.Wrappers.Test/MSDOSTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/MSDOSTests.cs rename to SabreTools.Wrappers.Test/MSDOSTests.cs index cc342cae..ec0103e7 100644 --- a/SabreTools.Serialization.Test/Wrappers/MSDOSTests.cs +++ b/SabreTools.Wrappers.Test/MSDOSTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class MSDOSTests { diff --git a/SabreTools.Serialization.Test/Wrappers/MicrosoftCabinetTests.cs b/SabreTools.Wrappers.Test/MicrosoftCabinetTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/MicrosoftCabinetTests.cs rename to SabreTools.Wrappers.Test/MicrosoftCabinetTests.cs index d25dace2..dc325dc5 100644 --- a/SabreTools.Serialization.Test/Wrappers/MicrosoftCabinetTests.cs +++ b/SabreTools.Wrappers.Test/MicrosoftCabinetTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class MicrosoftCabinetTests { diff --git a/SabreTools.Serialization.Test/Wrappers/MoPaQTests.cs b/SabreTools.Wrappers.Test/MoPaQTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/MoPaQTests.cs rename to SabreTools.Wrappers.Test/MoPaQTests.cs index 22fc9263..be95bfa0 100644 --- a/SabreTools.Serialization.Test/Wrappers/MoPaQTests.cs +++ b/SabreTools.Wrappers.Test/MoPaQTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class MoPaQTests { diff --git a/SabreTools.Serialization.Test/Wrappers/N3DSTests.cs b/SabreTools.Wrappers.Test/N3DSTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/N3DSTests.cs rename to SabreTools.Wrappers.Test/N3DSTests.cs index 63444f24..7758e6f7 100644 --- a/SabreTools.Serialization.Test/Wrappers/N3DSTests.cs +++ b/SabreTools.Wrappers.Test/N3DSTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class N3DSTests { diff --git a/SabreTools.Serialization.Test/Wrappers/NCFTests.cs b/SabreTools.Wrappers.Test/NCFTests.cs similarity index 93% rename from SabreTools.Serialization.Test/Wrappers/NCFTests.cs rename to SabreTools.Wrappers.Test/NCFTests.cs index 0b51335c..f7aed855 100644 --- a/SabreTools.Serialization.Test/Wrappers/NCFTests.cs +++ b/SabreTools.Wrappers.Test/NCFTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class NCFTests { diff --git a/SabreTools.Serialization.Test/Wrappers/NESCartTests.cs b/SabreTools.Wrappers.Test/NESCartTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/NESCartTests.cs rename to SabreTools.Wrappers.Test/NESCartTests.cs index ba09a1db..acb74deb 100644 --- a/SabreTools.Serialization.Test/Wrappers/NESCartTests.cs +++ b/SabreTools.Wrappers.Test/NESCartTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class NESCartTests { diff --git a/SabreTools.Serialization.Test/Wrappers/NewExecutableTests.cs b/SabreTools.Wrappers.Test/NewExecutableTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/NewExecutableTests.cs rename to SabreTools.Wrappers.Test/NewExecutableTests.cs index 9911205a..0cbd5318 100644 --- a/SabreTools.Serialization.Test/Wrappers/NewExecutableTests.cs +++ b/SabreTools.Wrappers.Test/NewExecutableTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class NewExecutableTests { diff --git a/SabreTools.Serialization.Test/Wrappers/NitroTests.cs b/SabreTools.Wrappers.Test/NitroTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/NitroTests.cs rename to SabreTools.Wrappers.Test/NitroTests.cs index afb471a5..6beba76e 100644 --- a/SabreTools.Serialization.Test/Wrappers/NitroTests.cs +++ b/SabreTools.Wrappers.Test/NitroTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class NitroTests { diff --git a/SabreTools.Serialization.Test/Wrappers/PAKTests.cs b/SabreTools.Wrappers.Test/PAKTests.cs similarity index 93% rename from SabreTools.Serialization.Test/Wrappers/PAKTests.cs rename to SabreTools.Wrappers.Test/PAKTests.cs index 448ede79..24b26728 100644 --- a/SabreTools.Serialization.Test/Wrappers/PAKTests.cs +++ b/SabreTools.Wrappers.Test/PAKTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class PAKTests { diff --git a/SabreTools.Serialization.Test/Wrappers/PFFTests.cs b/SabreTools.Wrappers.Test/PFFTests.cs similarity index 93% rename from SabreTools.Serialization.Test/Wrappers/PFFTests.cs rename to SabreTools.Wrappers.Test/PFFTests.cs index 0175ee2e..5013406a 100644 --- a/SabreTools.Serialization.Test/Wrappers/PFFTests.cs +++ b/SabreTools.Wrappers.Test/PFFTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class PFFTests { diff --git a/SabreTools.Serialization.Test/Wrappers/PICTests.cs b/SabreTools.Wrappers.Test/PICTests.cs similarity index 93% rename from SabreTools.Serialization.Test/Wrappers/PICTests.cs rename to SabreTools.Wrappers.Test/PICTests.cs index 7372ee7f..c57df2d0 100644 --- a/SabreTools.Serialization.Test/Wrappers/PICTests.cs +++ b/SabreTools.Wrappers.Test/PICTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class PICTests { diff --git a/SabreTools.Serialization.Test/Wrappers/PKZIPTests.cs b/SabreTools.Wrappers.Test/PKZIPTests.cs similarity index 95% rename from SabreTools.Serialization.Test/Wrappers/PKZIPTests.cs rename to SabreTools.Wrappers.Test/PKZIPTests.cs index 0f588963..a096f866 100644 --- a/SabreTools.Serialization.Test/Wrappers/PKZIPTests.cs +++ b/SabreTools.Wrappers.Test/PKZIPTests.cs @@ -1,10 +1,9 @@ using System; using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class PKZIPTests { diff --git a/SabreTools.Serialization.Test/Wrappers/PlayJAudioFileTests.cs b/SabreTools.Wrappers.Test/PlayJAudioFileTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/PlayJAudioFileTests.cs rename to SabreTools.Wrappers.Test/PlayJAudioFileTests.cs index f417ef7a..8d33bec8 100644 --- a/SabreTools.Serialization.Test/Wrappers/PlayJAudioFileTests.cs +++ b/SabreTools.Wrappers.Test/PlayJAudioFileTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class PlayJAudioFileTests { diff --git a/SabreTools.Serialization.Test/Wrappers/PlayJPlaylistTests.cs b/SabreTools.Wrappers.Test/PlayJPlaylistTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/PlayJPlaylistTests.cs rename to SabreTools.Wrappers.Test/PlayJPlaylistTests.cs index 459010c9..494ac0ed 100644 --- a/SabreTools.Serialization.Test/Wrappers/PlayJPlaylistTests.cs +++ b/SabreTools.Wrappers.Test/PlayJPlaylistTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class PlayJPlaylistTests { diff --git a/SabreTools.Serialization.Test/Wrappers/PortableExecutableTests.cs b/SabreTools.Wrappers.Test/PortableExecutableTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/PortableExecutableTests.cs rename to SabreTools.Wrappers.Test/PortableExecutableTests.cs index e56645b2..56c9486d 100644 --- a/SabreTools.Serialization.Test/Wrappers/PortableExecutableTests.cs +++ b/SabreTools.Wrappers.Test/PortableExecutableTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class PortableExecutableTests { diff --git a/SabreTools.Serialization.Test/Wrappers/QDTests.cs b/SabreTools.Wrappers.Test/QDTests.cs similarity index 93% rename from SabreTools.Serialization.Test/Wrappers/QDTests.cs rename to SabreTools.Wrappers.Test/QDTests.cs index 7342f6ff..661e16ab 100644 --- a/SabreTools.Serialization.Test/Wrappers/QDTests.cs +++ b/SabreTools.Wrappers.Test/QDTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class QDTests { diff --git a/SabreTools.Serialization.Test/Wrappers/QuantumTests.cs b/SabreTools.Wrappers.Test/QuantumTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/QuantumTests.cs rename to SabreTools.Wrappers.Test/QuantumTests.cs index 2503e14d..bbb12128 100644 --- a/SabreTools.Serialization.Test/Wrappers/QuantumTests.cs +++ b/SabreTools.Wrappers.Test/QuantumTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class QuantumTests { diff --git a/SabreTools.Serialization.Test/Wrappers/RARTests.cs b/SabreTools.Wrappers.Test/RARTests.cs similarity index 96% rename from SabreTools.Serialization.Test/Wrappers/RARTests.cs rename to SabreTools.Wrappers.Test/RARTests.cs index 0e7d5594..f4710203 100644 --- a/SabreTools.Serialization.Test/Wrappers/RARTests.cs +++ b/SabreTools.Wrappers.Test/RARTests.cs @@ -1,11 +1,10 @@ using System; using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; #pragma warning disable xUnit1004 // Test methods should not be skipped -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class RARTests { diff --git a/SabreTools.Serialization.Test/Wrappers/RealArcadeInstallerTests.cs b/SabreTools.Wrappers.Test/RealArcadeInstallerTests.cs similarity index 95% rename from SabreTools.Serialization.Test/Wrappers/RealArcadeInstallerTests.cs rename to SabreTools.Wrappers.Test/RealArcadeInstallerTests.cs index 9ae1524c..9ff6b9d9 100644 --- a/SabreTools.Serialization.Test/Wrappers/RealArcadeInstallerTests.cs +++ b/SabreTools.Wrappers.Test/RealArcadeInstallerTests.cs @@ -1,10 +1,9 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; #pragma warning disable xUnit1004 // Test methods should not be skipped -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class RealArcadeInstallerTests { diff --git a/SabreTools.Serialization.Test/Wrappers/RealArcadeMezzanineTests.cs b/SabreTools.Wrappers.Test/RealArcadeMezzanineTests.cs similarity index 95% rename from SabreTools.Serialization.Test/Wrappers/RealArcadeMezzanineTests.cs rename to SabreTools.Wrappers.Test/RealArcadeMezzanineTests.cs index 735363c6..7b1cb88a 100644 --- a/SabreTools.Serialization.Test/Wrappers/RealArcadeMezzanineTests.cs +++ b/SabreTools.Wrappers.Test/RealArcadeMezzanineTests.cs @@ -1,10 +1,9 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; #pragma warning disable xUnit1004 // Test methods should not be skipped -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class RealArcadeMezzanineTests { diff --git a/SabreTools.Serialization.Test/Wrappers/SGATests.cs b/SabreTools.Wrappers.Test/SGATests.cs similarity index 93% rename from SabreTools.Serialization.Test/Wrappers/SGATests.cs rename to SabreTools.Wrappers.Test/SGATests.cs index 9e19bf9d..464af3cd 100644 --- a/SabreTools.Serialization.Test/Wrappers/SGATests.cs +++ b/SabreTools.Wrappers.Test/SGATests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class SGATests { diff --git a/SabreTools.Wrappers.Test/SabreTools.Wrappers.Test.csproj b/SabreTools.Wrappers.Test/SabreTools.Wrappers.Test.csproj new file mode 100644 index 00000000..be783d00 --- /dev/null +++ b/SabreTools.Wrappers.Test/SabreTools.Wrappers.Test.csproj @@ -0,0 +1,38 @@ + + + + net8.0;net9.0;net10.0 + false + latest + enable + + + + + + + + + + + + + Always + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + \ No newline at end of file diff --git a/SabreTools.Serialization.Test/Wrappers/SevenZipTests.cs b/SabreTools.Wrappers.Test/SevenZipTests.cs similarity index 95% rename from SabreTools.Serialization.Test/Wrappers/SevenZipTests.cs rename to SabreTools.Wrappers.Test/SevenZipTests.cs index 0af1a2a6..55e8a101 100644 --- a/SabreTools.Serialization.Test/Wrappers/SevenZipTests.cs +++ b/SabreTools.Wrappers.Test/SevenZipTests.cs @@ -1,11 +1,10 @@ using System; using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; #pragma warning disable xUnit1004 // Test methods should not be skipped -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class SevenZipTests { diff --git a/SabreTools.Serialization.Test/Wrappers/SkeletonTests.cs b/SabreTools.Wrappers.Test/SkeletonTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/SkeletonTests.cs rename to SabreTools.Wrappers.Test/SkeletonTests.cs index f3d2994b..b68b7b45 100644 --- a/SabreTools.Serialization.Test/Wrappers/SkeletonTests.cs +++ b/SabreTools.Wrappers.Test/SkeletonTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class SkeletonTests { diff --git a/SabreTools.Serialization.Test/Wrappers/SkuSisTests.cs b/SabreTools.Wrappers.Test/SkuSisTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/SkuSisTests.cs rename to SabreTools.Wrappers.Test/SkuSisTests.cs index d90ce3c8..a26e05e5 100644 --- a/SabreTools.Serialization.Test/Wrappers/SkuSisTests.cs +++ b/SabreTools.Wrappers.Test/SkuSisTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class SkuSisTests { diff --git a/SabreTools.Serialization.Test/Wrappers/TapeArchiveTests.cs b/SabreTools.Wrappers.Test/TapeArchiveTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/TapeArchiveTests.cs rename to SabreTools.Wrappers.Test/TapeArchiveTests.cs index 5196e282..1fc224b4 100644 --- a/SabreTools.Serialization.Test/Wrappers/TapeArchiveTests.cs +++ b/SabreTools.Wrappers.Test/TapeArchiveTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class TapeArchiveTests { diff --git a/SabreTools.Serialization.Test/TestData/PKZIP/multi-split.zip.001 b/SabreTools.Wrappers.Test/TestData/PKZIP/multi-split.zip.001 similarity index 100% rename from SabreTools.Serialization.Test/TestData/PKZIP/multi-split.zip.001 rename to SabreTools.Wrappers.Test/TestData/PKZIP/multi-split.zip.001 diff --git a/SabreTools.Serialization.Test/TestData/PKZIP/multi-split.zip.002 b/SabreTools.Wrappers.Test/TestData/PKZIP/multi-split.zip.002 similarity index 100% rename from SabreTools.Serialization.Test/TestData/PKZIP/multi-split.zip.002 rename to SabreTools.Wrappers.Test/TestData/PKZIP/multi-split.zip.002 diff --git a/SabreTools.Serialization.Test/TestData/PKZIP/multi-split.zip.003 b/SabreTools.Wrappers.Test/TestData/PKZIP/multi-split.zip.003 similarity index 100% rename from SabreTools.Serialization.Test/TestData/PKZIP/multi-split.zip.003 rename to SabreTools.Wrappers.Test/TestData/PKZIP/multi-split.zip.003 diff --git a/SabreTools.Serialization.Test/TestData/PKZIP/multi.z01 b/SabreTools.Wrappers.Test/TestData/PKZIP/multi.z01 similarity index 100% rename from SabreTools.Serialization.Test/TestData/PKZIP/multi.z01 rename to SabreTools.Wrappers.Test/TestData/PKZIP/multi.z01 diff --git a/SabreTools.Serialization.Test/TestData/PKZIP/multi.z02 b/SabreTools.Wrappers.Test/TestData/PKZIP/multi.z02 similarity index 100% rename from SabreTools.Serialization.Test/TestData/PKZIP/multi.z02 rename to SabreTools.Wrappers.Test/TestData/PKZIP/multi.z02 diff --git a/SabreTools.Serialization.Test/TestData/PKZIP/multi.z03 b/SabreTools.Wrappers.Test/TestData/PKZIP/multi.z03 similarity index 100% rename from SabreTools.Serialization.Test/TestData/PKZIP/multi.z03 rename to SabreTools.Wrappers.Test/TestData/PKZIP/multi.z03 diff --git a/SabreTools.Serialization.Test/TestData/PKZIP/multi.zip b/SabreTools.Wrappers.Test/TestData/PKZIP/multi.zip similarity index 100% rename from SabreTools.Serialization.Test/TestData/PKZIP/multi.zip rename to SabreTools.Wrappers.Test/TestData/PKZIP/multi.zip diff --git a/SabreTools.Serialization.Test/TestData/PKZIP/multix.zipx b/SabreTools.Wrappers.Test/TestData/PKZIP/multix.zipx similarity index 100% rename from SabreTools.Serialization.Test/TestData/PKZIP/multix.zipx rename to SabreTools.Wrappers.Test/TestData/PKZIP/multix.zipx diff --git a/SabreTools.Serialization.Test/TestData/PKZIP/multix.zx01 b/SabreTools.Wrappers.Test/TestData/PKZIP/multix.zx01 similarity index 100% rename from SabreTools.Serialization.Test/TestData/PKZIP/multix.zx01 rename to SabreTools.Wrappers.Test/TestData/PKZIP/multix.zx01 diff --git a/SabreTools.Serialization.Test/TestData/PKZIP/multix.zx02 b/SabreTools.Wrappers.Test/TestData/PKZIP/multix.zx02 similarity index 100% rename from SabreTools.Serialization.Test/TestData/PKZIP/multix.zx02 rename to SabreTools.Wrappers.Test/TestData/PKZIP/multix.zx02 diff --git a/SabreTools.Serialization.Test/TestData/PKZIP/multix.zx03 b/SabreTools.Wrappers.Test/TestData/PKZIP/multix.zx03 similarity index 100% rename from SabreTools.Serialization.Test/TestData/PKZIP/multix.zx03 rename to SabreTools.Wrappers.Test/TestData/PKZIP/multix.zx03 diff --git a/SabreTools.Serialization.Test/TestData/PKZIP/single.zip b/SabreTools.Wrappers.Test/TestData/PKZIP/single.zip similarity index 100% rename from SabreTools.Serialization.Test/TestData/PKZIP/single.zip rename to SabreTools.Wrappers.Test/TestData/PKZIP/single.zip diff --git a/SabreTools.Serialization.Test/TestData/PKZIP/single.zipx b/SabreTools.Wrappers.Test/TestData/PKZIP/single.zipx similarity index 100% rename from SabreTools.Serialization.Test/TestData/PKZIP/single.zipx rename to SabreTools.Wrappers.Test/TestData/PKZIP/single.zipx diff --git a/SabreTools.Serialization.Test/TestData/RAR/multi-new.part01.rar b/SabreTools.Wrappers.Test/TestData/RAR/multi-new.part01.rar similarity index 100% rename from SabreTools.Serialization.Test/TestData/RAR/multi-new.part01.rar rename to SabreTools.Wrappers.Test/TestData/RAR/multi-new.part01.rar diff --git a/SabreTools.Serialization.Test/TestData/RAR/multi-new.part02.rar b/SabreTools.Wrappers.Test/TestData/RAR/multi-new.part02.rar similarity index 100% rename from SabreTools.Serialization.Test/TestData/RAR/multi-new.part02.rar rename to SabreTools.Wrappers.Test/TestData/RAR/multi-new.part02.rar diff --git a/SabreTools.Serialization.Test/TestData/RAR/multi-new.part03.rar b/SabreTools.Wrappers.Test/TestData/RAR/multi-new.part03.rar similarity index 100% rename from SabreTools.Serialization.Test/TestData/RAR/multi-new.part03.rar rename to SabreTools.Wrappers.Test/TestData/RAR/multi-new.part03.rar diff --git a/SabreTools.Serialization.Test/TestData/RAR/multi-old.r00 b/SabreTools.Wrappers.Test/TestData/RAR/multi-old.r00 similarity index 100% rename from SabreTools.Serialization.Test/TestData/RAR/multi-old.r00 rename to SabreTools.Wrappers.Test/TestData/RAR/multi-old.r00 diff --git a/SabreTools.Serialization.Test/TestData/RAR/multi-old.r01 b/SabreTools.Wrappers.Test/TestData/RAR/multi-old.r01 similarity index 100% rename from SabreTools.Serialization.Test/TestData/RAR/multi-old.r01 rename to SabreTools.Wrappers.Test/TestData/RAR/multi-old.r01 diff --git a/SabreTools.Serialization.Test/TestData/RAR/multi-old.r02 b/SabreTools.Wrappers.Test/TestData/RAR/multi-old.r02 similarity index 100% rename from SabreTools.Serialization.Test/TestData/RAR/multi-old.r02 rename to SabreTools.Wrappers.Test/TestData/RAR/multi-old.r02 diff --git a/SabreTools.Serialization.Test/TestData/RAR/multi-old.rar b/SabreTools.Wrappers.Test/TestData/RAR/multi-old.rar similarity index 100% rename from SabreTools.Serialization.Test/TestData/RAR/multi-old.rar rename to SabreTools.Wrappers.Test/TestData/RAR/multi-old.rar diff --git a/SabreTools.Serialization.Test/TestData/RAR/multi-split.rar.001 b/SabreTools.Wrappers.Test/TestData/RAR/multi-split.rar.001 similarity index 100% rename from SabreTools.Serialization.Test/TestData/RAR/multi-split.rar.001 rename to SabreTools.Wrappers.Test/TestData/RAR/multi-split.rar.001 diff --git a/SabreTools.Serialization.Test/TestData/RAR/multi-split.rar.002 b/SabreTools.Wrappers.Test/TestData/RAR/multi-split.rar.002 similarity index 100% rename from SabreTools.Serialization.Test/TestData/RAR/multi-split.rar.002 rename to SabreTools.Wrappers.Test/TestData/RAR/multi-split.rar.002 diff --git a/SabreTools.Serialization.Test/TestData/RAR/multi-split.rar.003 b/SabreTools.Wrappers.Test/TestData/RAR/multi-split.rar.003 similarity index 100% rename from SabreTools.Serialization.Test/TestData/RAR/multi-split.rar.003 rename to SabreTools.Wrappers.Test/TestData/RAR/multi-split.rar.003 diff --git a/SabreTools.Serialization.Test/TestData/RAR/single.rar b/SabreTools.Wrappers.Test/TestData/RAR/single.rar similarity index 100% rename from SabreTools.Serialization.Test/TestData/RAR/single.rar rename to SabreTools.Wrappers.Test/TestData/RAR/single.rar diff --git a/SabreTools.Serialization.Test/TestData/SevenZip/multi.7z.001 b/SabreTools.Wrappers.Test/TestData/SevenZip/multi.7z.001 similarity index 100% rename from SabreTools.Serialization.Test/TestData/SevenZip/multi.7z.001 rename to SabreTools.Wrappers.Test/TestData/SevenZip/multi.7z.001 diff --git a/SabreTools.Serialization.Test/TestData/SevenZip/multi.7z.002 b/SabreTools.Wrappers.Test/TestData/SevenZip/multi.7z.002 similarity index 100% rename from SabreTools.Serialization.Test/TestData/SevenZip/multi.7z.002 rename to SabreTools.Wrappers.Test/TestData/SevenZip/multi.7z.002 diff --git a/SabreTools.Serialization.Test/TestData/SevenZip/multi.7z.003 b/SabreTools.Wrappers.Test/TestData/SevenZip/multi.7z.003 similarity index 100% rename from SabreTools.Serialization.Test/TestData/SevenZip/multi.7z.003 rename to SabreTools.Wrappers.Test/TestData/SevenZip/multi.7z.003 diff --git a/SabreTools.Serialization.Test/TestData/SevenZip/single.7z b/SabreTools.Wrappers.Test/TestData/SevenZip/single.7z similarity index 100% rename from SabreTools.Serialization.Test/TestData/SevenZip/single.7z rename to SabreTools.Wrappers.Test/TestData/SevenZip/single.7z diff --git a/SabreTools.Serialization.Test/Wrappers/VBSPTests.cs b/SabreTools.Wrappers.Test/VBSPTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/VBSPTests.cs rename to SabreTools.Wrappers.Test/VBSPTests.cs index f9f6d926..51ec3a6b 100644 --- a/SabreTools.Serialization.Test/Wrappers/VBSPTests.cs +++ b/SabreTools.Wrappers.Test/VBSPTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class VBSPTests { diff --git a/SabreTools.Serialization.Test/Wrappers/VPKTests.cs b/SabreTools.Wrappers.Test/VPKTests.cs similarity index 93% rename from SabreTools.Serialization.Test/Wrappers/VPKTests.cs rename to SabreTools.Wrappers.Test/VPKTests.cs index 4d6d49ff..75553b45 100644 --- a/SabreTools.Serialization.Test/Wrappers/VPKTests.cs +++ b/SabreTools.Wrappers.Test/VPKTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class VPKTests { diff --git a/SabreTools.Serialization.Test/Wrappers/WAD3Tests.cs b/SabreTools.Wrappers.Test/WAD3Tests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/WAD3Tests.cs rename to SabreTools.Wrappers.Test/WAD3Tests.cs index 3e2fefd9..2eceb783 100644 --- a/SabreTools.Serialization.Test/Wrappers/WAD3Tests.cs +++ b/SabreTools.Wrappers.Test/WAD3Tests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class WAD3Tests { diff --git a/SabreTools.Serialization.Test/Wrappers/WiseOverlayHeaderTests.cs b/SabreTools.Wrappers.Test/WiseOverlayHeaderTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/WiseOverlayHeaderTests.cs rename to SabreTools.Wrappers.Test/WiseOverlayHeaderTests.cs index 8f7d05e8..76cd6ead 100644 --- a/SabreTools.Serialization.Test/Wrappers/WiseOverlayHeaderTests.cs +++ b/SabreTools.Wrappers.Test/WiseOverlayHeaderTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class WiseOverlayHeaderTests { diff --git a/SabreTools.Serialization.Test/Wrappers/WiseScriptTests.cs b/SabreTools.Wrappers.Test/WiseScriptTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/WiseScriptTests.cs rename to SabreTools.Wrappers.Test/WiseScriptTests.cs index 0efa596b..2c9cf3d2 100644 --- a/SabreTools.Serialization.Test/Wrappers/WiseScriptTests.cs +++ b/SabreTools.Wrappers.Test/WiseScriptTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class WiseScriptTests { diff --git a/SabreTools.Serialization.Test/Wrappers/WiseSectionHeaderTests.cs b/SabreTools.Wrappers.Test/WiseSectionHeaderTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/WiseSectionHeaderTests.cs rename to SabreTools.Wrappers.Test/WiseSectionHeaderTests.cs index d6c292d1..2fb3943f 100644 --- a/SabreTools.Serialization.Test/Wrappers/WiseSectionHeaderTests.cs +++ b/SabreTools.Wrappers.Test/WiseSectionHeaderTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class WiseSectionHeaderTests { diff --git a/SabreTools.Serialization.Test/Wrappers/XMIDTests.cs b/SabreTools.Wrappers.Test/XMIDTests.cs similarity index 87% rename from SabreTools.Serialization.Test/Wrappers/XMIDTests.cs rename to SabreTools.Wrappers.Test/XMIDTests.cs index c1e0ccb7..deb28df2 100644 --- a/SabreTools.Serialization.Test/Wrappers/XMIDTests.cs +++ b/SabreTools.Wrappers.Test/XMIDTests.cs @@ -1,8 +1,7 @@ -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class XMIDTests { diff --git a/SabreTools.Serialization.Test/Wrappers/XZPTests.cs b/SabreTools.Wrappers.Test/XZPTests.cs similarity index 93% rename from SabreTools.Serialization.Test/Wrappers/XZPTests.cs rename to SabreTools.Wrappers.Test/XZPTests.cs index 8336b7d7..3cac330f 100644 --- a/SabreTools.Serialization.Test/Wrappers/XZPTests.cs +++ b/SabreTools.Wrappers.Test/XZPTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class XZPTests { diff --git a/SabreTools.Serialization.Test/Wrappers/XZTests.cs b/SabreTools.Wrappers.Test/XZTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/XZTests.cs rename to SabreTools.Wrappers.Test/XZTests.cs index 586338a7..f916aea1 100644 --- a/SabreTools.Serialization.Test/Wrappers/XZTests.cs +++ b/SabreTools.Wrappers.Test/XZTests.cs @@ -1,10 +1,9 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; #pragma warning disable xUnit1004 // Test methods should not be skipped -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class XZTests { diff --git a/SabreTools.Serialization.Test/Wrappers/XboxExecutableTests.cs b/SabreTools.Wrappers.Test/XboxExecutableTests.cs similarity index 94% rename from SabreTools.Serialization.Test/Wrappers/XboxExecutableTests.cs rename to SabreTools.Wrappers.Test/XboxExecutableTests.cs index 5aa3b499..2d112abb 100644 --- a/SabreTools.Serialization.Test/Wrappers/XboxExecutableTests.cs +++ b/SabreTools.Wrappers.Test/XboxExecutableTests.cs @@ -1,9 +1,8 @@ using System.IO; using System.Linq; -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class XboxExecutableTests { diff --git a/SabreTools.Serialization.Test/Wrappers/XeMIDTests.cs b/SabreTools.Wrappers.Test/XeMIDTests.cs similarity index 87% rename from SabreTools.Serialization.Test/Wrappers/XeMIDTests.cs rename to SabreTools.Wrappers.Test/XeMIDTests.cs index a06ea897..e1681a6c 100644 --- a/SabreTools.Serialization.Test/Wrappers/XeMIDTests.cs +++ b/SabreTools.Wrappers.Test/XeMIDTests.cs @@ -1,7 +1,6 @@ -using SabreTools.Serialization.Wrappers; using Xunit; -namespace SabreTools.Serialization.Test.Wrappers +namespace SabreTools.Wrappers.Test { public class XeMIDTests {