Extract out Filtering namespace

.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/

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
 {

RombaSharp/RombaSharp.csproj

@@ -17,6 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\SabreTools.Filtering\SabreTools.Filtering.csproj" />
     <ProjectReference Include="..\SabreTools.Help\SabreTools.Help.csproj" />
     <ProjectReference Include="..\SabreTools.Library\SabreTools.Library.csproj" />
     <ProjectReference Include="..\SabreTools.Logging\SabreTools.Logging.csproj" />

SabreTools.Filtering/Cleaner.cs

@@ -2,7 +2,7 @@
 
 using SabreTools.Core;
 
-namespace SabreTools.Library.Filtering
+namespace SabreTools.Filtering
 {
     /// <summary>
     /// Represents the cleaning operations that need to be performed on a set of items, usually a DAT

SabreTools.Filtering/ExtraIni.cs

@@ -3,7 +3,7 @@
 using SabreTools.Core;
 using SabreTools.Logging;
 
-namespace SabreTools.Library.Filtering
+namespace SabreTools.Filtering
 {
     public class ExtraIni
     {

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
     {

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
 {
     /// <summary>
     /// Represents the filtering operations that need to be performed on a set of items, usually a DAT

SabreTools.Filtering/FilterItem.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
-namespace SabreTools.Library.Filtering
+namespace SabreTools.Filtering
 {
     /// <summary>
     /// Represents a single filter within the overall filter

SabreTools.Filtering/SabreTools.Filtering.csproj

@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net48;netcoreapp3.1;net5.0</TargetFrameworks>
+    <RuntimeIdentifiers>win10-x64;win7-x86</RuntimeIdentifiers>
+    <Configurations>Debug;Release</Configurations>
+    <Platforms>AnyCPU;x64</Platforms>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)'=='net48'">
+    <DefineConstants>NET_FRAMEWORK</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SabreTools.Core\SabreTools.Core.csproj" />
+    <ProjectReference Include="..\SabreTools.IO\SabreTools.IO.csproj" />
+    <ProjectReference Include="..\SabreTools.Logging\SabreTools.Logging.csproj" />
+  </ItemGroup>
+
+</Project>

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;

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

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

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

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

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;
 

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;
 

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

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;
 

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;

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

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;
 

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

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

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;
 

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

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;
 

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;
 

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

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;
 

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

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

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

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

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;
 

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

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

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

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

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

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

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;
 

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

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

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

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

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

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;
 

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

SabreTools.Library/SabreTools.Library.csproj

@@ -13,6 +13,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\SabreTools.Core\SabreTools.Core.csproj" />
+    <ProjectReference Include="..\SabreTools.Filtering\SabreTools.Filtering.csproj" />
     <ProjectReference Include="..\SabreTools.IO\SabreTools.IO.csproj" />
     <ProjectReference Include="..\SabreTools.Logging\SabreTools.Logging.csproj" />
     <ProjectReference Include="..\SabreTools.Skippers\SabreTools.Skippers.csproj" />

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

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
 {

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
 {

SabreTools/SabreTools.csproj

@@ -13,6 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\SabreTools.Filtering\SabreTools.Filtering.csproj" />
     <ProjectReference Include="..\SabreTools.Help\SabreTools.Help.csproj" />
     <ProjectReference Include="..\SabreTools.Library\SabreTools.Library.csproj" />
     <ProjectReference Include="..\SabreTools.Logging\SabreTools.Logging.csproj" />