From 918e81a4cb79ca7b1e36b5af7fc092428e761cef Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Tue, 23 Sep 2025 09:58:44 -0400
Subject: [PATCH] Move extensions to new namespace for cleanliness

---
 SabreTools.Serialization/Deserializers/CFB.cs                 | 1 +
 .../Deserializers/InstallShieldCabinet.cs                     | 1 +
 SabreTools.Serialization/Deserializers/NewExecutable.cs       | 1 +
 SabreTools.Serialization/Deserializers/PortableExecutable.cs  | 1 +
 .../{Extensions.CFB.cs => Extensions/CFB.cs}                  | 4 ++--
 .../InstallShieldCabinet.cs}                                  | 4 ++--
 .../NewExecutable.cs}                                         | 4 ++--
 .../PortableExecutable.cs}                                    | 4 ++--
 .../{Extensions.WiseScript.cs => Extensions/WiseScript.cs}    | 4 ++--
 SabreTools.Serialization/Printers/NewExecutable.cs            | 1 +
 SabreTools.Serialization/Printers/PortableExecutable.cs       | 1 +
 SabreTools.Serialization/Printers/WiseScript.cs               | 1 +
 SabreTools.Serialization/Wrappers/InstallShieldCabinet.cs     | 1 +
 SabreTools.Serialization/Wrappers/PortableExecutable.cs       | 1 +
 14 files changed, 19 insertions(+), 10 deletions(-)
 rename SabreTools.Serialization/{Extensions.CFB.cs => Extensions/CFB.cs} (97%)
 rename SabreTools.Serialization/{Extensions.InstallShieldCabinet.cs => Extensions/InstallShieldCabinet.cs} (97%)
 rename SabreTools.Serialization/{Extensions.NewExecutable.cs => Extensions/NewExecutable.cs} (95%)
 rename SabreTools.Serialization/{Extensions.PortableExecutable.cs => Extensions/PortableExecutable.cs} (99%)
 rename SabreTools.Serialization/{Extensions.WiseScript.cs => Extensions/WiseScript.cs} (96%)

diff --git a/SabreTools.Serialization/Deserializers/CFB.cs b/SabreTools.Serialization/Deserializers/CFB.cs
index 4357c314..c06c4c81 100644
--- a/SabreTools.Serialization/Deserializers/CFB.cs
+++ b/SabreTools.Serialization/Deserializers/CFB.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.Text;
 using SabreTools.IO.Extensions;
 using SabreTools.Models.CFB;
+using SabreTools.Serialization.Extensions;
 using static SabreTools.Models.CFB.Constants;
 
 namespace SabreTools.Serialization.Deserializers
diff --git a/SabreTools.Serialization/Deserializers/InstallShieldCabinet.cs b/SabreTools.Serialization/Deserializers/InstallShieldCabinet.cs
index e082fc59..43ca313f 100644
--- a/SabreTools.Serialization/Deserializers/InstallShieldCabinet.cs
+++ b/SabreTools.Serialization/Deserializers/InstallShieldCabinet.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.Text;
 using SabreTools.IO.Extensions;
 using SabreTools.Models.InstallShieldCabinet;
+using SabreTools.Serialization.Extensions;
 using static SabreTools.Models.InstallShieldCabinet.Constants;
 
 namespace SabreTools.Serialization.Deserializers
diff --git a/SabreTools.Serialization/Deserializers/NewExecutable.cs b/SabreTools.Serialization/Deserializers/NewExecutable.cs
index aa59fd85..a72724bd 100644
--- a/SabreTools.Serialization/Deserializers/NewExecutable.cs
+++ b/SabreTools.Serialization/Deserializers/NewExecutable.cs
@@ -3,6 +3,7 @@ using System.IO;
 using System.Text;
 using SabreTools.IO.Extensions;
 using SabreTools.Models.NewExecutable;
+using SabreTools.Serialization.Extensions;
 using static SabreTools.Models.NewExecutable.Constants;
 
 namespace SabreTools.Serialization.Deserializers
diff --git a/SabreTools.Serialization/Deserializers/PortableExecutable.cs b/SabreTools.Serialization/Deserializers/PortableExecutable.cs
index 263b1a57..807772e8 100644
--- a/SabreTools.Serialization/Deserializers/PortableExecutable.cs
+++ b/SabreTools.Serialization/Deserializers/PortableExecutable.cs
@@ -6,6 +6,7 @@ using SabreTools.IO.Extensions;
 using SabreTools.Models.COFF;
 using SabreTools.Models.COFF.SymbolTableEntries;
 using SabreTools.Models.PortableExecutable;
+using SabreTools.Serialization.Extensions;
 using static SabreTools.Models.COFF.Constants;
 using static SabreTools.Models.PortableExecutable.Constants;
 
diff --git a/SabreTools.Serialization/Extensions.CFB.cs b/SabreTools.Serialization/Extensions/CFB.cs
similarity index 97%
rename from SabreTools.Serialization/Extensions.CFB.cs
rename to SabreTools.Serialization/Extensions/CFB.cs
index 752c9fa8..95a7700d 100644
--- a/SabreTools.Serialization/Extensions.CFB.cs
+++ b/SabreTools.Serialization/Extensions/CFB.cs
@@ -1,8 +1,8 @@
 using System.Text;
 
-namespace SabreTools.Serialization
+namespace SabreTools.Serialization.Extensions
 {
-    public static partial class Extensions
+    public static class CFB
     {
         /// <summary>
         /// Decode a MIME-encoded stream name stored as a byte array
diff --git a/SabreTools.Serialization/Extensions.InstallShieldCabinet.cs b/SabreTools.Serialization/Extensions/InstallShieldCabinet.cs
similarity index 97%
rename from SabreTools.Serialization/Extensions.InstallShieldCabinet.cs
rename to SabreTools.Serialization/Extensions/InstallShieldCabinet.cs
index ba88e3d2..ed680544 100644
--- a/SabreTools.Serialization/Extensions.InstallShieldCabinet.cs
+++ b/SabreTools.Serialization/Extensions/InstallShieldCabinet.cs
@@ -1,8 +1,8 @@
 using SabreTools.Models.InstallShieldCabinet;
 
-namespace SabreTools.Serialization
+namespace SabreTools.Serialization.Extensions
 {
-    public static partial class Extensions
+    public static class InstallShieldCabinet
     {
         #region File Descriptors
 
diff --git a/SabreTools.Serialization/Extensions.NewExecutable.cs b/SabreTools.Serialization/Extensions/NewExecutable.cs
similarity index 95%
rename from SabreTools.Serialization/Extensions.NewExecutable.cs
rename to SabreTools.Serialization/Extensions/NewExecutable.cs
index 4b2afd20..319daee7 100644
--- a/SabreTools.Serialization/Extensions.NewExecutable.cs
+++ b/SabreTools.Serialization/Extensions/NewExecutable.cs
@@ -1,8 +1,8 @@
 using SabreTools.Models.NewExecutable;
 
-namespace SabreTools.Serialization
+namespace SabreTools.Serialization.Extensions
 {
-    public static partial class Extensions
+    public static class NewExecutable
     {
         /// <summary>
         /// Determine if a resource type information entry is an integer or offset
diff --git a/SabreTools.Serialization/Extensions.PortableExecutable.cs b/SabreTools.Serialization/Extensions/PortableExecutable.cs
similarity index 99%
rename from SabreTools.Serialization/Extensions.PortableExecutable.cs
rename to SabreTools.Serialization/Extensions/PortableExecutable.cs
index 04359bea..de63a206 100644
--- a/SabreTools.Serialization/Extensions.PortableExecutable.cs
+++ b/SabreTools.Serialization/Extensions/PortableExecutable.cs
@@ -9,9 +9,9 @@ using SabreTools.Models.PortableExecutable;
 using SabreTools.Models.PortableExecutable.Resource.Entries;
 using SabreTools.Models.SecuROM;
 
-namespace SabreTools.Serialization
+namespace SabreTools.Serialization.Extensions
 {
-    public static partial class Extensions
+    public static class PortableExecutable
     {
         /// <summary>
         /// Convert a relative virtual address to a physical one
diff --git a/SabreTools.Serialization/Extensions.WiseScript.cs b/SabreTools.Serialization/Extensions/WiseScript.cs
similarity index 96%
rename from SabreTools.Serialization/Extensions.WiseScript.cs
rename to SabreTools.Serialization/Extensions/WiseScript.cs
index e38fb09f..70077e77 100644
--- a/SabreTools.Serialization/Extensions.WiseScript.cs
+++ b/SabreTools.Serialization/Extensions/WiseScript.cs
@@ -1,8 +1,8 @@
 using System.Text.RegularExpressions;
 
-namespace SabreTools.Serialization
+namespace SabreTools.Serialization.Extensions
 {
-    public static partial class Extensions
+    public static class WiseScript
     {
         /// <summary>
         /// Convert a Wise function ID to the formal action name
diff --git a/SabreTools.Serialization/Printers/NewExecutable.cs b/SabreTools.Serialization/Printers/NewExecutable.cs
index 570ab6b9..2e631dd7 100644
--- a/SabreTools.Serialization/Printers/NewExecutable.cs
+++ b/SabreTools.Serialization/Printers/NewExecutable.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Text;
 using SabreTools.Models.NewExecutable;
+using SabreTools.Serialization.Extensions;
 using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.Printers
diff --git a/SabreTools.Serialization/Printers/PortableExecutable.cs b/SabreTools.Serialization/Printers/PortableExecutable.cs
index 73951fc5..d5ac1a81 100644
--- a/SabreTools.Serialization/Printers/PortableExecutable.cs
+++ b/SabreTools.Serialization/Printers/PortableExecutable.cs
@@ -9,6 +9,7 @@ using SabreTools.Models.COFF;
 using SabreTools.Models.COFF.SymbolTableEntries;
 using SabreTools.Models.PortableExecutable;
 using SabreTools.Models.PortableExecutable.Resource.Entries;
+using SabreTools.Serialization.Extensions;
 using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.Printers
diff --git a/SabreTools.Serialization/Printers/WiseScript.cs b/SabreTools.Serialization/Printers/WiseScript.cs
index 4d3764f0..e78a8630 100644
--- a/SabreTools.Serialization/Printers/WiseScript.cs
+++ b/SabreTools.Serialization/Printers/WiseScript.cs
@@ -1,6 +1,7 @@
 using System.Text;
 using SabreTools.Models.WiseInstaller;
 using SabreTools.Models.WiseInstaller.Actions;
+using SabreTools.Serialization.Extensions;
 using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.Printers
diff --git a/SabreTools.Serialization/Wrappers/InstallShieldCabinet.cs b/SabreTools.Serialization/Wrappers/InstallShieldCabinet.cs
index 2839ca73..68077534 100644
--- a/SabreTools.Serialization/Wrappers/InstallShieldCabinet.cs
+++ b/SabreTools.Serialization/Wrappers/InstallShieldCabinet.cs
@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using SabreTools.Models.InstallShieldCabinet;
+using SabreTools.Serialization.Extensions;
 
 namespace SabreTools.Serialization.Wrappers
 {
diff --git a/SabreTools.Serialization/Wrappers/PortableExecutable.cs b/SabreTools.Serialization/Wrappers/PortableExecutable.cs
index 147f524e..7eb00e0a 100644
--- a/SabreTools.Serialization/Wrappers/PortableExecutable.cs
+++ b/SabreTools.Serialization/Wrappers/PortableExecutable.cs
@@ -7,6 +7,7 @@ using SabreTools.Matching;
 using SabreTools.Models.COFF;
 using SabreTools.Models.PortableExecutable;
 using SabreTools.Models.PortableExecutable.Resource.Entries;
+using SabreTools.Serialization.Extensions;
 
 namespace SabreTools.Serialization.Wrappers
 {