From 0512e393c843f8bbb94c86d9ac29c8f4d6889b1c Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Tue, 8 Dec 2020 13:48:57 -0800 Subject: [PATCH] Extract out Filtering namespace --- .gitignore | 2 ++ RombaSharp/Features/Dir2Dat.cs | 2 +- RombaSharp/RombaSharp.csproj | 1 + .../Cleaner.cs | 2 +- .../ExtraIni.cs | 2 +- .../ExtraIniItem.cs | 2 +- .../Filter.cs | 2 +- .../FilterItem.cs | 2 +- .../SabreTools.Filtering.csproj | 20 +++++++++++++++++++ SabreTools.Library/DatFiles/DatFile.cs | 2 +- SabreTools.Library/DatItems/Adjuster.cs | 2 +- SabreTools.Library/DatItems/Analog.cs | 2 +- SabreTools.Library/DatItems/Archive.cs | 2 +- SabreTools.Library/DatItems/BiosSet.cs | 2 +- SabreTools.Library/DatItems/Chip.cs | 2 +- SabreTools.Library/DatItems/Condition.cs | 2 +- SabreTools.Library/DatItems/Configuration.cs | 2 +- SabreTools.Library/DatItems/Control.cs | 2 +- SabreTools.Library/DatItems/DatItem.cs | 2 +- SabreTools.Library/DatItems/DataArea.cs | 2 +- SabreTools.Library/DatItems/Device.cs | 2 +- .../DatItems/DeviceReference.cs | 2 +- SabreTools.Library/DatItems/DipSwitch.cs | 2 +- SabreTools.Library/DatItems/Disk.cs | 2 +- SabreTools.Library/DatItems/DiskArea.cs | 2 +- SabreTools.Library/DatItems/Display.cs | 2 +- SabreTools.Library/DatItems/Driver.cs | 2 +- SabreTools.Library/DatItems/Extension.cs | 2 +- SabreTools.Library/DatItems/Feature.cs | 2 +- SabreTools.Library/DatItems/Info.cs | 2 +- SabreTools.Library/DatItems/Input.cs | 2 +- SabreTools.Library/DatItems/Instance.cs | 2 +- SabreTools.Library/DatItems/Location.cs | 2 +- SabreTools.Library/DatItems/Machine.cs | 2 +- SabreTools.Library/DatItems/Media.cs | 2 +- SabreTools.Library/DatItems/Part.cs | 2 +- SabreTools.Library/DatItems/PartFeature.cs | 2 +- SabreTools.Library/DatItems/Port.cs | 2 +- SabreTools.Library/DatItems/RamOption.cs | 2 +- SabreTools.Library/DatItems/Release.cs | 2 +- SabreTools.Library/DatItems/Rom.cs | 2 +- SabreTools.Library/DatItems/Sample.cs | 2 +- SabreTools.Library/DatItems/Setting.cs | 2 +- SabreTools.Library/DatItems/SharedFeature.cs | 2 +- SabreTools.Library/DatItems/Slot.cs | 2 +- SabreTools.Library/DatItems/SlotOption.cs | 2 +- SabreTools.Library/DatItems/SoftwareList.cs | 2 +- SabreTools.Library/DatItems/Sound.cs | 2 +- SabreTools.Library/SabreTools.Library.csproj | 1 + SabreTools.sln | 10 ++++++++++ SabreTools/Features/BaseFeature.cs | 2 +- SabreTools/Features/Batch.cs | 2 +- SabreTools/SabreTools.csproj | 1 + 53 files changed, 82 insertions(+), 47 deletions(-) rename {SabreTools.Library/Filtering => SabreTools.Filtering}/Cleaner.cs (98%) rename {SabreTools.Library/Filtering => SabreTools.Filtering}/ExtraIni.cs (98%) rename {SabreTools.Library/Filtering => SabreTools.Filtering}/ExtraIniItem.cs (98%) rename {SabreTools.Library/Filtering => SabreTools.Filtering}/Filter.cs (99%) rename {SabreTools.Library/Filtering => SabreTools.Filtering}/FilterItem.cs (99%) create mode 100644 SabreTools.Filtering/SabreTools.Filtering.csproj diff --git a/.gitignore b/.gitignore index e8e6134a..8dc62d63 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,8 @@ /SabreTools/SabreTools.csproj.user /SabreTools.Core/bin/ /SabreTools.Core/obj/ +/SabreTools.Filtering/bin/ +/SabreTools.Filtering/obj/ /SabreTools.Help/bin/ /SabreTools.Help/obj/ /SabreTools.IO/bin/ diff --git a/RombaSharp/Features/Dir2Dat.cs b/RombaSharp/Features/Dir2Dat.cs index 9bf56936..dc73d7bb 100644 --- a/RombaSharp/Features/Dir2Dat.cs +++ b/RombaSharp/Features/Dir2Dat.cs @@ -2,10 +2,10 @@ using System.IO; using SabreTools.Core; +using SabreTools.Filtering; using SabreTools.Help; using SabreTools.IO; using SabreTools.Library.DatFiles; -using SabreTools.Library.Filtering; namespace RombaSharp.Features { diff --git a/RombaSharp/RombaSharp.csproj b/RombaSharp/RombaSharp.csproj index 9d3d275f..c38d1d22 100644 --- a/RombaSharp/RombaSharp.csproj +++ b/RombaSharp/RombaSharp.csproj @@ -17,6 +17,7 @@ + diff --git a/SabreTools.Library/Filtering/Cleaner.cs b/SabreTools.Filtering/Cleaner.cs similarity index 98% rename from SabreTools.Library/Filtering/Cleaner.cs rename to SabreTools.Filtering/Cleaner.cs index a81436c3..6de7fb8f 100644 --- a/SabreTools.Library/Filtering/Cleaner.cs +++ b/SabreTools.Filtering/Cleaner.cs @@ -2,7 +2,7 @@ using SabreTools.Core; -namespace SabreTools.Library.Filtering +namespace SabreTools.Filtering { /// /// Represents the cleaning operations that need to be performed on a set of items, usually a DAT diff --git a/SabreTools.Library/Filtering/ExtraIni.cs b/SabreTools.Filtering/ExtraIni.cs similarity index 98% rename from SabreTools.Library/Filtering/ExtraIni.cs rename to SabreTools.Filtering/ExtraIni.cs index 39cf27e6..2224f18c 100644 --- a/SabreTools.Library/Filtering/ExtraIni.cs +++ b/SabreTools.Filtering/ExtraIni.cs @@ -3,7 +3,7 @@ using SabreTools.Core; using SabreTools.Logging; -namespace SabreTools.Library.Filtering +namespace SabreTools.Filtering { public class ExtraIni { diff --git a/SabreTools.Library/Filtering/ExtraIniItem.cs b/SabreTools.Filtering/ExtraIniItem.cs similarity index 98% rename from SabreTools.Library/Filtering/ExtraIniItem.cs rename to SabreTools.Filtering/ExtraIniItem.cs index e3052660..e3578e86 100644 --- a/SabreTools.Library/Filtering/ExtraIniItem.cs +++ b/SabreTools.Filtering/ExtraIniItem.cs @@ -5,7 +5,7 @@ using SabreTools.Core; using SabreTools.IO; using SabreTools.Logging; -namespace SabreTools.Library.Filtering +namespace SabreTools.Filtering { public class ExtraIniItem { diff --git a/SabreTools.Library/Filtering/Filter.cs b/SabreTools.Filtering/Filter.cs similarity index 99% rename from SabreTools.Library/Filtering/Filter.cs rename to SabreTools.Filtering/Filter.cs index 1975528e..e71b126c 100644 --- a/SabreTools.Library/Filtering/Filter.cs +++ b/SabreTools.Filtering/Filter.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using SabreTools.Core; using SabreTools.Logging; -namespace SabreTools.Library.Filtering +namespace SabreTools.Filtering { /// /// Represents the filtering operations that need to be performed on a set of items, usually a DAT diff --git a/SabreTools.Library/Filtering/FilterItem.cs b/SabreTools.Filtering/FilterItem.cs similarity index 99% rename from SabreTools.Library/Filtering/FilterItem.cs rename to SabreTools.Filtering/FilterItem.cs index cee3167a..7eb395a1 100644 --- a/SabreTools.Library/Filtering/FilterItem.cs +++ b/SabreTools.Filtering/FilterItem.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text.RegularExpressions; -namespace SabreTools.Library.Filtering +namespace SabreTools.Filtering { /// /// Represents a single filter within the overall filter diff --git a/SabreTools.Filtering/SabreTools.Filtering.csproj b/SabreTools.Filtering/SabreTools.Filtering.csproj new file mode 100644 index 00000000..d1eae1b2 --- /dev/null +++ b/SabreTools.Filtering/SabreTools.Filtering.csproj @@ -0,0 +1,20 @@ + + + + net48;netcoreapp3.1;net5.0 + win10-x64;win7-x86 + Debug;Release + AnyCPU;x64 + + + + NET_FRAMEWORK + + + + + + + + + diff --git a/SabreTools.Library/DatFiles/DatFile.cs b/SabreTools.Library/DatFiles/DatFile.cs index f287f828..3c090b75 100644 --- a/SabreTools.Library/DatFiles/DatFile.cs +++ b/SabreTools.Library/DatFiles/DatFile.cs @@ -10,11 +10,11 @@ using System.Threading.Tasks; using System.Xml.Serialization; using SabreTools.Core; +using SabreTools.Filtering; using SabreTools.IO; using SabreTools.Logging; using SabreTools.Library.DatItems; using SabreTools.Library.FileTypes; -using SabreTools.Library.Filtering; using SabreTools.Library.IO; using SabreTools.Library.Reports; using SabreTools.Skippers; diff --git a/SabreTools.Library/DatItems/Adjuster.cs b/SabreTools.Library/DatItems/Adjuster.cs index 12f316c3..6c31ec2e 100644 --- a/SabreTools.Library/DatItems/Adjuster.cs +++ b/SabreTools.Library/DatItems/Adjuster.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; namespace SabreTools.Library.DatItems diff --git a/SabreTools.Library/DatItems/Analog.cs b/SabreTools.Library/DatItems/Analog.cs index 9535e809..ea9a53c4 100644 --- a/SabreTools.Library/DatItems/Analog.cs +++ b/SabreTools.Library/DatItems/Analog.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; namespace SabreTools.Library.DatItems diff --git a/SabreTools.Library/DatItems/Archive.cs b/SabreTools.Library/DatItems/Archive.cs index 58d5a2dd..a0112f7b 100644 --- a/SabreTools.Library/DatItems/Archive.cs +++ b/SabreTools.Library/DatItems/Archive.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; namespace SabreTools.Library.DatItems diff --git a/SabreTools.Library/DatItems/BiosSet.cs b/SabreTools.Library/DatItems/BiosSet.cs index 9e63974c..a59e9faf 100644 --- a/SabreTools.Library/DatItems/BiosSet.cs +++ b/SabreTools.Library/DatItems/BiosSet.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; namespace SabreTools.Library.DatItems diff --git a/SabreTools.Library/DatItems/Chip.cs b/SabreTools.Library/DatItems/Chip.cs index 817cbcda..14b544b1 100644 --- a/SabreTools.Library/DatItems/Chip.cs +++ b/SabreTools.Library/DatItems/Chip.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; using Newtonsoft.Json.Converters; diff --git a/SabreTools.Library/DatItems/Condition.cs b/SabreTools.Library/DatItems/Condition.cs index 1f5c16ea..d29544f4 100644 --- a/SabreTools.Library/DatItems/Condition.cs +++ b/SabreTools.Library/DatItems/Condition.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; using Newtonsoft.Json.Converters; diff --git a/SabreTools.Library/DatItems/Configuration.cs b/SabreTools.Library/DatItems/Configuration.cs index 8f775471..994bd0e5 100644 --- a/SabreTools.Library/DatItems/Configuration.cs +++ b/SabreTools.Library/DatItems/Configuration.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; namespace SabreTools.Library.DatItems diff --git a/SabreTools.Library/DatItems/Control.cs b/SabreTools.Library/DatItems/Control.cs index 199652c8..d840890d 100644 --- a/SabreTools.Library/DatItems/Control.cs +++ b/SabreTools.Library/DatItems/Control.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; using Newtonsoft.Json.Converters; diff --git a/SabreTools.Library/DatItems/DatItem.cs b/SabreTools.Library/DatItems/DatItem.cs index e4f1c5cb..0193958f 100644 --- a/SabreTools.Library/DatItems/DatItem.cs +++ b/SabreTools.Library/DatItems/DatItem.cs @@ -5,9 +5,9 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; +using SabreTools.Filtering; using SabreTools.Logging; using SabreTools.Library.FileTypes; -using SabreTools.Library.Filtering; using NaturalSort; using Newtonsoft.Json; using Newtonsoft.Json.Converters; diff --git a/SabreTools.Library/DatItems/DataArea.cs b/SabreTools.Library/DatItems/DataArea.cs index cd6fa3d5..05e8a4ae 100644 --- a/SabreTools.Library/DatItems/DataArea.cs +++ b/SabreTools.Library/DatItems/DataArea.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; namespace SabreTools.Library.DatItems diff --git a/SabreTools.Library/DatItems/Device.cs b/SabreTools.Library/DatItems/Device.cs index 2ca3f637..de912fbc 100644 --- a/SabreTools.Library/DatItems/Device.cs +++ b/SabreTools.Library/DatItems/Device.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; using Newtonsoft.Json.Converters; diff --git a/SabreTools.Library/DatItems/DeviceReference.cs b/SabreTools.Library/DatItems/DeviceReference.cs index 615ded43..8a090651 100644 --- a/SabreTools.Library/DatItems/DeviceReference.cs +++ b/SabreTools.Library/DatItems/DeviceReference.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; namespace SabreTools.Library.DatItems diff --git a/SabreTools.Library/DatItems/DipSwitch.cs b/SabreTools.Library/DatItems/DipSwitch.cs index 307e9e11..fab63ba0 100644 --- a/SabreTools.Library/DatItems/DipSwitch.cs +++ b/SabreTools.Library/DatItems/DipSwitch.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; namespace SabreTools.Library.DatItems diff --git a/SabreTools.Library/DatItems/Disk.cs b/SabreTools.Library/DatItems/Disk.cs index 43c6aa9d..0d4afdbf 100644 --- a/SabreTools.Library/DatItems/Disk.cs +++ b/SabreTools.Library/DatItems/Disk.cs @@ -4,8 +4,8 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; +using SabreTools.Filtering; using SabreTools.Library.FileTypes; -using SabreTools.Library.Filtering; using Newtonsoft.Json; using Newtonsoft.Json.Converters; diff --git a/SabreTools.Library/DatItems/DiskArea.cs b/SabreTools.Library/DatItems/DiskArea.cs index c1b8f439..f1aeccdc 100644 --- a/SabreTools.Library/DatItems/DiskArea.cs +++ b/SabreTools.Library/DatItems/DiskArea.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; namespace SabreTools.Library.DatItems diff --git a/SabreTools.Library/DatItems/Display.cs b/SabreTools.Library/DatItems/Display.cs index f13f0a93..d602079a 100644 --- a/SabreTools.Library/DatItems/Display.cs +++ b/SabreTools.Library/DatItems/Display.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; using Newtonsoft.Json.Converters; diff --git a/SabreTools.Library/DatItems/Driver.cs b/SabreTools.Library/DatItems/Driver.cs index a2012b6a..d63aacc8 100644 --- a/SabreTools.Library/DatItems/Driver.cs +++ b/SabreTools.Library/DatItems/Driver.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; using Newtonsoft.Json.Converters; diff --git a/SabreTools.Library/DatItems/Extension.cs b/SabreTools.Library/DatItems/Extension.cs index 8746a3e9..3dc0014c 100644 --- a/SabreTools.Library/DatItems/Extension.cs +++ b/SabreTools.Library/DatItems/Extension.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; namespace SabreTools.Library.DatItems diff --git a/SabreTools.Library/DatItems/Feature.cs b/SabreTools.Library/DatItems/Feature.cs index 810b303b..c2fcfaf1 100644 --- a/SabreTools.Library/DatItems/Feature.cs +++ b/SabreTools.Library/DatItems/Feature.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; using Newtonsoft.Json.Converters; diff --git a/SabreTools.Library/DatItems/Info.cs b/SabreTools.Library/DatItems/Info.cs index 2f33efbf..41caa74a 100644 --- a/SabreTools.Library/DatItems/Info.cs +++ b/SabreTools.Library/DatItems/Info.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; namespace SabreTools.Library.DatItems diff --git a/SabreTools.Library/DatItems/Input.cs b/SabreTools.Library/DatItems/Input.cs index eb705b39..dddbd4f0 100644 --- a/SabreTools.Library/DatItems/Input.cs +++ b/SabreTools.Library/DatItems/Input.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; namespace SabreTools.Library.DatItems diff --git a/SabreTools.Library/DatItems/Instance.cs b/SabreTools.Library/DatItems/Instance.cs index 4a956978..9f7c9962 100644 --- a/SabreTools.Library/DatItems/Instance.cs +++ b/SabreTools.Library/DatItems/Instance.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; namespace SabreTools.Library.DatItems diff --git a/SabreTools.Library/DatItems/Location.cs b/SabreTools.Library/DatItems/Location.cs index 5e49d3e3..dc1de0ae 100644 --- a/SabreTools.Library/DatItems/Location.cs +++ b/SabreTools.Library/DatItems/Location.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; namespace SabreTools.Library.DatItems diff --git a/SabreTools.Library/DatItems/Machine.cs b/SabreTools.Library/DatItems/Machine.cs index 8b751bb7..b2a8da8d 100644 --- a/SabreTools.Library/DatItems/Machine.cs +++ b/SabreTools.Library/DatItems/Machine.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; using Newtonsoft.Json.Converters; diff --git a/SabreTools.Library/DatItems/Media.cs b/SabreTools.Library/DatItems/Media.cs index 60bca6c8..ebfab4df 100644 --- a/SabreTools.Library/DatItems/Media.cs +++ b/SabreTools.Library/DatItems/Media.cs @@ -5,8 +5,8 @@ using System.Text; using System.Xml.Serialization; using SabreTools.Core; +using SabreTools.Filtering; using SabreTools.Library.FileTypes; -using SabreTools.Library.Filtering; using Newtonsoft.Json; namespace SabreTools.Library.DatItems diff --git a/SabreTools.Library/DatItems/Part.cs b/SabreTools.Library/DatItems/Part.cs index 6478270f..9f9bcd4a 100644 --- a/SabreTools.Library/DatItems/Part.cs +++ b/SabreTools.Library/DatItems/Part.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; namespace SabreTools.Library.DatItems diff --git a/SabreTools.Library/DatItems/PartFeature.cs b/SabreTools.Library/DatItems/PartFeature.cs index 01d7d7ec..3a1c2dbf 100644 --- a/SabreTools.Library/DatItems/PartFeature.cs +++ b/SabreTools.Library/DatItems/PartFeature.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; namespace SabreTools.Library.DatItems diff --git a/SabreTools.Library/DatItems/Port.cs b/SabreTools.Library/DatItems/Port.cs index 59c09783..d1620d51 100644 --- a/SabreTools.Library/DatItems/Port.cs +++ b/SabreTools.Library/DatItems/Port.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; namespace SabreTools.Library.DatItems diff --git a/SabreTools.Library/DatItems/RamOption.cs b/SabreTools.Library/DatItems/RamOption.cs index d87ccb0c..0b7abd40 100644 --- a/SabreTools.Library/DatItems/RamOption.cs +++ b/SabreTools.Library/DatItems/RamOption.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; namespace SabreTools.Library.DatItems diff --git a/SabreTools.Library/DatItems/Release.cs b/SabreTools.Library/DatItems/Release.cs index 51dcc9a8..1f3630a2 100644 --- a/SabreTools.Library/DatItems/Release.cs +++ b/SabreTools.Library/DatItems/Release.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; namespace SabreTools.Library.DatItems diff --git a/SabreTools.Library/DatItems/Rom.cs b/SabreTools.Library/DatItems/Rom.cs index 6e986a5e..31ec0c96 100644 --- a/SabreTools.Library/DatItems/Rom.cs +++ b/SabreTools.Library/DatItems/Rom.cs @@ -6,8 +6,8 @@ using System.Text; using System.Xml.Serialization; using SabreTools.Core; +using SabreTools.Filtering; using SabreTools.Library.FileTypes; -using SabreTools.Library.Filtering; using Newtonsoft.Json; using Newtonsoft.Json.Converters; diff --git a/SabreTools.Library/DatItems/Sample.cs b/SabreTools.Library/DatItems/Sample.cs index 41f9e50e..8c5807ba 100644 --- a/SabreTools.Library/DatItems/Sample.cs +++ b/SabreTools.Library/DatItems/Sample.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; namespace SabreTools.Library.DatItems diff --git a/SabreTools.Library/DatItems/Setting.cs b/SabreTools.Library/DatItems/Setting.cs index f93b1a86..bfb9319c 100644 --- a/SabreTools.Library/DatItems/Setting.cs +++ b/SabreTools.Library/DatItems/Setting.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; namespace SabreTools.Library.DatItems diff --git a/SabreTools.Library/DatItems/SharedFeature.cs b/SabreTools.Library/DatItems/SharedFeature.cs index 85de4341..b1f58d19 100644 --- a/SabreTools.Library/DatItems/SharedFeature.cs +++ b/SabreTools.Library/DatItems/SharedFeature.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; namespace SabreTools.Library.DatItems diff --git a/SabreTools.Library/DatItems/Slot.cs b/SabreTools.Library/DatItems/Slot.cs index f7352b60..b002ac6f 100644 --- a/SabreTools.Library/DatItems/Slot.cs +++ b/SabreTools.Library/DatItems/Slot.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; namespace SabreTools.Library.DatItems diff --git a/SabreTools.Library/DatItems/SlotOption.cs b/SabreTools.Library/DatItems/SlotOption.cs index 6731044d..5fe6aa5d 100644 --- a/SabreTools.Library/DatItems/SlotOption.cs +++ b/SabreTools.Library/DatItems/SlotOption.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; namespace SabreTools.Library.DatItems diff --git a/SabreTools.Library/DatItems/SoftwareList.cs b/SabreTools.Library/DatItems/SoftwareList.cs index b5d74829..a26be1f1 100644 --- a/SabreTools.Library/DatItems/SoftwareList.cs +++ b/SabreTools.Library/DatItems/SoftwareList.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; using Newtonsoft.Json.Converters; diff --git a/SabreTools.Library/DatItems/Sound.cs b/SabreTools.Library/DatItems/Sound.cs index 5d6ba2d3..4927b141 100644 --- a/SabreTools.Library/DatItems/Sound.cs +++ b/SabreTools.Library/DatItems/Sound.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Xml.Serialization; using SabreTools.Core; -using SabreTools.Library.Filtering; +using SabreTools.Filtering; using Newtonsoft.Json; namespace SabreTools.Library.DatItems diff --git a/SabreTools.Library/SabreTools.Library.csproj b/SabreTools.Library/SabreTools.Library.csproj index 789052ed..15f46027 100644 --- a/SabreTools.Library/SabreTools.Library.csproj +++ b/SabreTools.Library/SabreTools.Library.csproj @@ -13,6 +13,7 @@ + diff --git a/SabreTools.sln b/SabreTools.sln index 2e819134..089c9ee4 100644 --- a/SabreTools.sln +++ b/SabreTools.sln @@ -26,6 +26,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Logging", "Sabre EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.IO", "SabreTools.IO\SabreTools.IO.csproj", "{884163E0-1B61-468C-8839-7C67AB44EA3F}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Filtering", "SabreTools.Filtering\SabreTools.Filtering.csproj", "{35129634-0F13-416A-8D4D-35B71DFECFFD}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -98,6 +100,14 @@ Global {884163E0-1B61-468C-8839-7C67AB44EA3F}.Release|Any CPU.Build.0 = Release|Any CPU {884163E0-1B61-468C-8839-7C67AB44EA3F}.Release|x64.ActiveCfg = Release|Any CPU {884163E0-1B61-468C-8839-7C67AB44EA3F}.Release|x64.Build.0 = Release|Any CPU + {35129634-0F13-416A-8D4D-35B71DFECFFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {35129634-0F13-416A-8D4D-35B71DFECFFD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {35129634-0F13-416A-8D4D-35B71DFECFFD}.Debug|x64.ActiveCfg = Debug|Any CPU + {35129634-0F13-416A-8D4D-35B71DFECFFD}.Debug|x64.Build.0 = Debug|Any CPU + {35129634-0F13-416A-8D4D-35B71DFECFFD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {35129634-0F13-416A-8D4D-35B71DFECFFD}.Release|Any CPU.Build.0 = Release|Any CPU + {35129634-0F13-416A-8D4D-35B71DFECFFD}.Release|x64.ActiveCfg = Release|Any CPU + {35129634-0F13-416A-8D4D-35B71DFECFFD}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SabreTools/Features/BaseFeature.cs b/SabreTools/Features/BaseFeature.cs index ae318bf7..2e978542 100644 --- a/SabreTools/Features/BaseFeature.cs +++ b/SabreTools/Features/BaseFeature.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using SabreTools.Core; +using SabreTools.Filtering; using SabreTools.Help; using SabreTools.Logging; using SabreTools.Library.DatFiles; -using SabreTools.Library.Filtering; namespace SabreTools.Features { diff --git a/SabreTools/Features/Batch.cs b/SabreTools/Features/Batch.cs index 59de3763..5aa75975 100644 --- a/SabreTools/Features/Batch.cs +++ b/SabreTools/Features/Batch.cs @@ -5,10 +5,10 @@ using System.Linq; using System.Text.RegularExpressions; using SabreTools.Core; +using SabreTools.Filtering; using SabreTools.Help; using SabreTools.IO; using SabreTools.Library.DatFiles; -using SabreTools.Library.Filtering; namespace SabreTools.Features { diff --git a/SabreTools/SabreTools.csproj b/SabreTools/SabreTools.csproj index 7a4ed099..1e4c899d 100644 --- a/SabreTools/SabreTools.csproj +++ b/SabreTools/SabreTools.csproj @@ -13,6 +13,7 @@ +