diff --git a/.gitignore b/.gitignore index 4210b7ee..68dfeca8 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,8 @@ /SabreTools/SabreTools.csproj.user /SabreTools.Core/bin/ /SabreTools.Core/obj/ +/SabreTools.DatItems/bin/ +/SabreTools.DatItems/obj/ /SabreTools.FileTypes/bin/ /SabreTools.FileTypes/obj/ /SabreTools.Filtering/bin/ diff --git a/RombaSharp/Features/Archive.cs b/RombaSharp/Features/Archive.cs index a563aa76..bb24ad84 100644 --- a/RombaSharp/Features/Archive.cs +++ b/RombaSharp/Features/Archive.cs @@ -3,9 +3,9 @@ using System.IO; using System.Linq; using SabreTools.Core; +using SabreTools.DatItems; using SabreTools.Help; using SabreTools.Library.DatFiles; -using SabreTools.Library.DatItems; using Microsoft.Data.Sqlite; namespace RombaSharp.Features diff --git a/RombaSharp/Features/BaseFeature.cs b/RombaSharp/Features/BaseFeature.cs index ff05ecad..6b21ca55 100644 --- a/RombaSharp/Features/BaseFeature.cs +++ b/RombaSharp/Features/BaseFeature.cs @@ -6,11 +6,11 @@ using System.Xml; using System.Xml.Schema; using SabreTools.Core; +using SabreTools.DatItems; using SabreTools.FileTypes; using SabreTools.Help; using SabreTools.Logging; using SabreTools.Library.DatFiles; -using SabreTools.Library.DatItems; using Microsoft.Data.Sqlite; namespace RombaSharp.Features diff --git a/RombaSharp/Features/RefreshDats.cs b/RombaSharp/Features/RefreshDats.cs index b243b796..ae25cb79 100644 --- a/RombaSharp/Features/RefreshDats.cs +++ b/RombaSharp/Features/RefreshDats.cs @@ -2,9 +2,9 @@ using System.IO; using SabreTools.Core; +using SabreTools.DatItems; using SabreTools.Help; using SabreTools.Library.DatFiles; -using SabreTools.Library.DatItems; using SabreTools.Logging; using Microsoft.Data.Sqlite; diff --git a/RombaSharp/Features/RescanDepots.cs b/RombaSharp/Features/RescanDepots.cs index 37d7c3ae..5026c276 100644 --- a/RombaSharp/Features/RescanDepots.cs +++ b/RombaSharp/Features/RescanDepots.cs @@ -2,9 +2,9 @@ using System.IO; using SabreTools.Core; +using SabreTools.DatItems; using SabreTools.Help; using SabreTools.Library.DatFiles; -using SabreTools.Library.DatItems; using Microsoft.Data.Sqlite; namespace RombaSharp.Features diff --git a/RombaSharp/RombaSharp.csproj b/RombaSharp/RombaSharp.csproj index 04c39422..2dc4f76e 100644 --- a/RombaSharp/RombaSharp.csproj +++ b/RombaSharp/RombaSharp.csproj @@ -17,6 +17,7 @@ + diff --git a/SabreTools.Library/DatItems/Adjuster.cs b/SabreTools.DatItems/Adjuster.cs similarity index 99% rename from SabreTools.Library/DatItems/Adjuster.cs rename to SabreTools.DatItems/Adjuster.cs index 6c31ec2e..55e3c914 100644 --- a/SabreTools.Library/DatItems/Adjuster.cs +++ b/SabreTools.DatItems/Adjuster.cs @@ -7,7 +7,7 @@ using SabreTools.Core; using SabreTools.Filtering; using Newtonsoft.Json; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents which Adjuster(s) is associated with a set diff --git a/SabreTools.Library/DatItems/Analog.cs b/SabreTools.DatItems/Analog.cs similarity index 99% rename from SabreTools.Library/DatItems/Analog.cs rename to SabreTools.DatItems/Analog.cs index ea9a53c4..020cb564 100644 --- a/SabreTools.Library/DatItems/Analog.cs +++ b/SabreTools.DatItems/Analog.cs @@ -6,7 +6,7 @@ using SabreTools.Core; using SabreTools.Filtering; using Newtonsoft.Json; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents a single analog item diff --git a/SabreTools.Library/DatItems/Archive.cs b/SabreTools.DatItems/Archive.cs similarity index 99% rename from SabreTools.Library/DatItems/Archive.cs rename to SabreTools.DatItems/Archive.cs index a0112f7b..1e01b66e 100644 --- a/SabreTools.Library/DatItems/Archive.cs +++ b/SabreTools.DatItems/Archive.cs @@ -7,7 +7,7 @@ using SabreTools.Core; using SabreTools.Filtering; using Newtonsoft.Json; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents generic archive files to be included in a set diff --git a/SabreTools.Library/DatItems/Auxiliary.cs b/SabreTools.DatItems/Auxiliary.cs similarity index 93% rename from SabreTools.Library/DatItems/Auxiliary.cs rename to SabreTools.DatItems/Auxiliary.cs index 311d22ec..36a2d37c 100644 --- a/SabreTools.Library/DatItems/Auxiliary.cs +++ b/SabreTools.DatItems/Auxiliary.cs @@ -5,7 +5,7 @@ using Newtonsoft.Json; /// /// This holds all of the auxiliary types needed for proper parsing /// -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { #region DatItem diff --git a/SabreTools.Library/DatItems/BiosSet.cs b/SabreTools.DatItems/BiosSet.cs similarity index 99% rename from SabreTools.Library/DatItems/BiosSet.cs rename to SabreTools.DatItems/BiosSet.cs index a59e9faf..34e2ff8a 100644 --- a/SabreTools.Library/DatItems/BiosSet.cs +++ b/SabreTools.DatItems/BiosSet.cs @@ -7,7 +7,7 @@ using SabreTools.Core; using SabreTools.Filtering; using Newtonsoft.Json; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents which BIOS(es) is associated with a set diff --git a/SabreTools.Library/DatItems/Blank.cs b/SabreTools.DatItems/Blank.cs similarity index 97% rename from SabreTools.Library/DatItems/Blank.cs rename to SabreTools.DatItems/Blank.cs index 75ba04a6..4aecdc51 100644 --- a/SabreTools.Library/DatItems/Blank.cs +++ b/SabreTools.DatItems/Blank.cs @@ -3,7 +3,7 @@ using SabreTools.Core; using Newtonsoft.Json; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents a blank set from an input DAT diff --git a/SabreTools.Library/DatItems/Chip.cs b/SabreTools.DatItems/Chip.cs similarity index 99% rename from SabreTools.Library/DatItems/Chip.cs rename to SabreTools.DatItems/Chip.cs index 14b544b1..029a4d88 100644 --- a/SabreTools.Library/DatItems/Chip.cs +++ b/SabreTools.DatItems/Chip.cs @@ -9,7 +9,7 @@ using SabreTools.Filtering; using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents which Chip(s) is associated with a set diff --git a/SabreTools.Library/DatItems/Condition.cs b/SabreTools.DatItems/Condition.cs similarity index 99% rename from SabreTools.Library/DatItems/Condition.cs rename to SabreTools.DatItems/Condition.cs index d29544f4..364c9eb4 100644 --- a/SabreTools.Library/DatItems/Condition.cs +++ b/SabreTools.DatItems/Condition.cs @@ -7,7 +7,7 @@ using SabreTools.Filtering; using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents a condition on a machine or other item diff --git a/SabreTools.Library/DatItems/Configuration.cs b/SabreTools.DatItems/Configuration.cs similarity index 99% rename from SabreTools.Library/DatItems/Configuration.cs rename to SabreTools.DatItems/Configuration.cs index 994bd0e5..923bf2fa 100644 --- a/SabreTools.Library/DatItems/Configuration.cs +++ b/SabreTools.DatItems/Configuration.cs @@ -7,7 +7,7 @@ using SabreTools.Core; using SabreTools.Filtering; using Newtonsoft.Json; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents which Configuration(s) is associated with a set diff --git a/SabreTools.Library/DatItems/Control.cs b/SabreTools.DatItems/Control.cs similarity index 99% rename from SabreTools.Library/DatItems/Control.cs rename to SabreTools.DatItems/Control.cs index d840890d..88bc40ba 100644 --- a/SabreTools.Library/DatItems/Control.cs +++ b/SabreTools.DatItems/Control.cs @@ -8,7 +8,7 @@ using SabreTools.Filtering; using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents control for an input diff --git a/SabreTools.Library/DatItems/DatItem.cs b/SabreTools.DatItems/DatItem.cs similarity index 99% rename from SabreTools.Library/DatItems/DatItem.cs rename to SabreTools.DatItems/DatItem.cs index 7624557e..15a817f3 100644 --- a/SabreTools.Library/DatItems/DatItem.cs +++ b/SabreTools.DatItems/DatItem.cs @@ -12,7 +12,7 @@ using NaturalSort; using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Base class for all items included in a set diff --git a/SabreTools.Library/DatItems/DataArea.cs b/SabreTools.DatItems/DataArea.cs similarity index 99% rename from SabreTools.Library/DatItems/DataArea.cs rename to SabreTools.DatItems/DataArea.cs index 05e8a4ae..7ee9bf2c 100644 --- a/SabreTools.Library/DatItems/DataArea.cs +++ b/SabreTools.DatItems/DataArea.cs @@ -8,7 +8,7 @@ using SabreTools.Core; using SabreTools.Filtering; using Newtonsoft.Json; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// SoftwareList dataarea information diff --git a/SabreTools.Library/DatItems/Device.cs b/SabreTools.DatItems/Device.cs similarity index 99% rename from SabreTools.Library/DatItems/Device.cs rename to SabreTools.DatItems/Device.cs index de912fbc..7996f603 100644 --- a/SabreTools.Library/DatItems/Device.cs +++ b/SabreTools.DatItems/Device.cs @@ -7,7 +7,7 @@ using SabreTools.Filtering; using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents a single device on the machine diff --git a/SabreTools.Library/DatItems/DeviceReference.cs b/SabreTools.DatItems/DeviceReference.cs similarity index 99% rename from SabreTools.Library/DatItems/DeviceReference.cs rename to SabreTools.DatItems/DeviceReference.cs index 8a090651..f400d764 100644 --- a/SabreTools.Library/DatItems/DeviceReference.cs +++ b/SabreTools.DatItems/DeviceReference.cs @@ -7,7 +7,7 @@ using SabreTools.Core; using SabreTools.Filtering; using Newtonsoft.Json; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents which Device Reference(s) is associated with a set diff --git a/SabreTools.Library/DatItems/DipSwitch.cs b/SabreTools.DatItems/DipSwitch.cs similarity index 99% rename from SabreTools.Library/DatItems/DipSwitch.cs rename to SabreTools.DatItems/DipSwitch.cs index fab63ba0..0f4d2669 100644 --- a/SabreTools.Library/DatItems/DipSwitch.cs +++ b/SabreTools.DatItems/DipSwitch.cs @@ -7,7 +7,7 @@ using SabreTools.Core; using SabreTools.Filtering; using Newtonsoft.Json; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents which DIP Switch(es) is associated with a set diff --git a/SabreTools.Library/DatItems/Disk.cs b/SabreTools.DatItems/Disk.cs similarity index 99% rename from SabreTools.Library/DatItems/Disk.cs rename to SabreTools.DatItems/Disk.cs index f1228da0..2b65251c 100644 --- a/SabreTools.Library/DatItems/Disk.cs +++ b/SabreTools.DatItems/Disk.cs @@ -9,7 +9,7 @@ using SabreTools.Filtering; using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents Compressed Hunks of Data (CHD) formatted disks which use internal hashes diff --git a/SabreTools.Library/DatItems/DiskArea.cs b/SabreTools.DatItems/DiskArea.cs similarity index 99% rename from SabreTools.Library/DatItems/DiskArea.cs rename to SabreTools.DatItems/DiskArea.cs index f1aeccdc..43f3e8ec 100644 --- a/SabreTools.Library/DatItems/DiskArea.cs +++ b/SabreTools.DatItems/DiskArea.cs @@ -8,7 +8,7 @@ using SabreTools.Core; using SabreTools.Filtering; using Newtonsoft.Json; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// SoftwareList diskarea information diff --git a/SabreTools.Library/DatItems/Display.cs b/SabreTools.DatItems/Display.cs similarity index 99% rename from SabreTools.Library/DatItems/Display.cs rename to SabreTools.DatItems/Display.cs index d602079a..2891a5ea 100644 --- a/SabreTools.Library/DatItems/Display.cs +++ b/SabreTools.DatItems/Display.cs @@ -8,7 +8,7 @@ using SabreTools.Filtering; using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents one machine display diff --git a/SabreTools.Library/DatItems/Driver.cs b/SabreTools.DatItems/Driver.cs similarity index 99% rename from SabreTools.Library/DatItems/Driver.cs rename to SabreTools.DatItems/Driver.cs index d63aacc8..86913075 100644 --- a/SabreTools.Library/DatItems/Driver.cs +++ b/SabreTools.DatItems/Driver.cs @@ -7,7 +7,7 @@ using SabreTools.Filtering; using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents the a driver of the machine diff --git a/SabreTools.Library/DatItems/Extension.cs b/SabreTools.DatItems/Extension.cs similarity index 99% rename from SabreTools.Library/DatItems/Extension.cs rename to SabreTools.DatItems/Extension.cs index 3dc0014c..03cf30db 100644 --- a/SabreTools.Library/DatItems/Extension.cs +++ b/SabreTools.DatItems/Extension.cs @@ -7,7 +7,7 @@ using SabreTools.Core; using SabreTools.Filtering; using Newtonsoft.Json; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents a matchable extension diff --git a/SabreTools.Library/DatItems/Feature.cs b/SabreTools.DatItems/Feature.cs similarity index 99% rename from SabreTools.Library/DatItems/Feature.cs rename to SabreTools.DatItems/Feature.cs index c2fcfaf1..6cab84d2 100644 --- a/SabreTools.Library/DatItems/Feature.cs +++ b/SabreTools.DatItems/Feature.cs @@ -7,7 +7,7 @@ using SabreTools.Filtering; using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents the a feature of the machine diff --git a/SabreTools.Library/DatItems/Info.cs b/SabreTools.DatItems/Info.cs similarity index 99% rename from SabreTools.Library/DatItems/Info.cs rename to SabreTools.DatItems/Info.cs index 41caa74a..e8889a77 100644 --- a/SabreTools.Library/DatItems/Info.cs +++ b/SabreTools.DatItems/Info.cs @@ -7,7 +7,7 @@ using SabreTools.Core; using SabreTools.Filtering; using Newtonsoft.Json; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents special information about a machine diff --git a/SabreTools.Library/DatItems/Input.cs b/SabreTools.DatItems/Input.cs similarity index 99% rename from SabreTools.Library/DatItems/Input.cs rename to SabreTools.DatItems/Input.cs index dddbd4f0..bafd4db9 100644 --- a/SabreTools.Library/DatItems/Input.cs +++ b/SabreTools.DatItems/Input.cs @@ -7,7 +7,7 @@ using SabreTools.Core; using SabreTools.Filtering; using Newtonsoft.Json; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents one ListXML input diff --git a/SabreTools.Library/DatItems/Instance.cs b/SabreTools.DatItems/Instance.cs similarity index 99% rename from SabreTools.Library/DatItems/Instance.cs rename to SabreTools.DatItems/Instance.cs index 9f7c9962..1393359c 100644 --- a/SabreTools.Library/DatItems/Instance.cs +++ b/SabreTools.DatItems/Instance.cs @@ -7,7 +7,7 @@ using SabreTools.Core; using SabreTools.Filtering; using Newtonsoft.Json; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents a single instance of another item diff --git a/SabreTools.Library/DatItems/Location.cs b/SabreTools.DatItems/Location.cs similarity index 99% rename from SabreTools.Library/DatItems/Location.cs rename to SabreTools.DatItems/Location.cs index dc1de0ae..197f8ae0 100644 --- a/SabreTools.Library/DatItems/Location.cs +++ b/SabreTools.DatItems/Location.cs @@ -7,7 +7,7 @@ using SabreTools.Core; using SabreTools.Filtering; using Newtonsoft.Json; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents one conflocation or diplocation diff --git a/SabreTools.Library/DatItems/Machine.cs b/SabreTools.DatItems/Machine.cs similarity index 99% rename from SabreTools.Library/DatItems/Machine.cs rename to SabreTools.DatItems/Machine.cs index b2a8da8d..e1fef421 100644 --- a/SabreTools.Library/DatItems/Machine.cs +++ b/SabreTools.DatItems/Machine.cs @@ -8,7 +8,7 @@ using SabreTools.Filtering; using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents the information specific to a set/game/machine diff --git a/SabreTools.Library/DatItems/Media.cs b/SabreTools.DatItems/Media.cs similarity index 99% rename from SabreTools.Library/DatItems/Media.cs rename to SabreTools.DatItems/Media.cs index 88faa601..81a666fe 100644 --- a/SabreTools.Library/DatItems/Media.cs +++ b/SabreTools.DatItems/Media.cs @@ -9,7 +9,7 @@ using SabreTools.FileTypes; using SabreTools.Filtering; using Newtonsoft.Json; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents Aaruformat images which use internal hashes diff --git a/SabreTools.Library/DatItems/Part.cs b/SabreTools.DatItems/Part.cs similarity index 99% rename from SabreTools.Library/DatItems/Part.cs rename to SabreTools.DatItems/Part.cs index 9f9bcd4a..8c65332a 100644 --- a/SabreTools.Library/DatItems/Part.cs +++ b/SabreTools.DatItems/Part.cs @@ -8,7 +8,7 @@ using SabreTools.Core; using SabreTools.Filtering; using Newtonsoft.Json; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// SoftwareList part information diff --git a/SabreTools.Library/DatItems/PartFeature.cs b/SabreTools.DatItems/PartFeature.cs similarity index 99% rename from SabreTools.Library/DatItems/PartFeature.cs rename to SabreTools.DatItems/PartFeature.cs index 3a1c2dbf..28b17be2 100644 --- a/SabreTools.Library/DatItems/PartFeature.cs +++ b/SabreTools.DatItems/PartFeature.cs @@ -7,7 +7,7 @@ using SabreTools.Core; using SabreTools.Filtering; using Newtonsoft.Json; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents one part feature object diff --git a/SabreTools.Library/DatItems/Port.cs b/SabreTools.DatItems/Port.cs similarity index 99% rename from SabreTools.Library/DatItems/Port.cs rename to SabreTools.DatItems/Port.cs index d1620d51..8d4eea63 100644 --- a/SabreTools.Library/DatItems/Port.cs +++ b/SabreTools.DatItems/Port.cs @@ -6,7 +6,7 @@ using SabreTools.Core; using SabreTools.Filtering; using Newtonsoft.Json; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents a single port on a machine diff --git a/SabreTools.Library/DatItems/RamOption.cs b/SabreTools.DatItems/RamOption.cs similarity index 99% rename from SabreTools.Library/DatItems/RamOption.cs rename to SabreTools.DatItems/RamOption.cs index 0b7abd40..d666cf30 100644 --- a/SabreTools.Library/DatItems/RamOption.cs +++ b/SabreTools.DatItems/RamOption.cs @@ -7,7 +7,7 @@ using SabreTools.Core; using SabreTools.Filtering; using Newtonsoft.Json; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents which RAM option(s) is associated with a set diff --git a/SabreTools.Library/DatItems/Release.cs b/SabreTools.DatItems/Release.cs similarity index 99% rename from SabreTools.Library/DatItems/Release.cs rename to SabreTools.DatItems/Release.cs index 1f3630a2..b6133dd1 100644 --- a/SabreTools.Library/DatItems/Release.cs +++ b/SabreTools.DatItems/Release.cs @@ -7,7 +7,7 @@ using SabreTools.Core; using SabreTools.Filtering; using Newtonsoft.Json; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents release information about a set diff --git a/SabreTools.Library/DatItems/Rom.cs b/SabreTools.DatItems/Rom.cs similarity index 99% rename from SabreTools.Library/DatItems/Rom.cs rename to SabreTools.DatItems/Rom.cs index e9dc700b..ad3ba1be 100644 --- a/SabreTools.Library/DatItems/Rom.cs +++ b/SabreTools.DatItems/Rom.cs @@ -11,7 +11,7 @@ using SabreTools.Filtering; using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents a generic file within a set diff --git a/SabreTools.DatItems/SabreTools.DatItems.csproj b/SabreTools.DatItems/SabreTools.DatItems.csproj new file mode 100644 index 00000000..a27b27b9 --- /dev/null +++ b/SabreTools.DatItems/SabreTools.DatItems.csproj @@ -0,0 +1,25 @@ + + + + net48;netcoreapp3.1;net5.0 + win10-x64;win7-x86 + Debug;Release + AnyCPU;x64 + + + + NET_FRAMEWORK + + + + + + + + + + + + + + diff --git a/SabreTools.Library/DatItems/Sample.cs b/SabreTools.DatItems/Sample.cs similarity index 99% rename from SabreTools.Library/DatItems/Sample.cs rename to SabreTools.DatItems/Sample.cs index 8c5807ba..851227ef 100644 --- a/SabreTools.Library/DatItems/Sample.cs +++ b/SabreTools.DatItems/Sample.cs @@ -7,7 +7,7 @@ using SabreTools.Core; using SabreTools.Filtering; using Newtonsoft.Json; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents a (usually WAV-formatted) sample to be included for use in the set diff --git a/SabreTools.Library/DatItems/Setting.cs b/SabreTools.DatItems/Setting.cs similarity index 99% rename from SabreTools.Library/DatItems/Setting.cs rename to SabreTools.DatItems/Setting.cs index bfb9319c..03ed2fe8 100644 --- a/SabreTools.Library/DatItems/Setting.cs +++ b/SabreTools.DatItems/Setting.cs @@ -7,7 +7,7 @@ using SabreTools.Core; using SabreTools.Filtering; using Newtonsoft.Json; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents one ListXML confsetting or dipvalue diff --git a/SabreTools.Library/DatItems/SharedFeature.cs b/SabreTools.DatItems/SharedFeature.cs similarity index 99% rename from SabreTools.Library/DatItems/SharedFeature.cs rename to SabreTools.DatItems/SharedFeature.cs index b1f58d19..5ef80d82 100644 --- a/SabreTools.Library/DatItems/SharedFeature.cs +++ b/SabreTools.DatItems/SharedFeature.cs @@ -7,7 +7,7 @@ using SabreTools.Core; using SabreTools.Filtering; using Newtonsoft.Json; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents one shared feature object diff --git a/SabreTools.Library/DatItems/Slot.cs b/SabreTools.DatItems/Slot.cs similarity index 99% rename from SabreTools.Library/DatItems/Slot.cs rename to SabreTools.DatItems/Slot.cs index b002ac6f..4c44e5b0 100644 --- a/SabreTools.Library/DatItems/Slot.cs +++ b/SabreTools.DatItems/Slot.cs @@ -7,7 +7,7 @@ using SabreTools.Core; using SabreTools.Filtering; using Newtonsoft.Json; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents which Slot(s) is associated with a set diff --git a/SabreTools.Library/DatItems/SlotOption.cs b/SabreTools.DatItems/SlotOption.cs similarity index 99% rename from SabreTools.Library/DatItems/SlotOption.cs rename to SabreTools.DatItems/SlotOption.cs index 5fe6aa5d..985c30ee 100644 --- a/SabreTools.Library/DatItems/SlotOption.cs +++ b/SabreTools.DatItems/SlotOption.cs @@ -7,7 +7,7 @@ using SabreTools.Core; using SabreTools.Filtering; using Newtonsoft.Json; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents one ListXML slotoption diff --git a/SabreTools.Library/DatItems/SoftwareList.cs b/SabreTools.DatItems/SoftwareList.cs similarity index 99% rename from SabreTools.Library/DatItems/SoftwareList.cs rename to SabreTools.DatItems/SoftwareList.cs index a26be1f1..ca23f234 100644 --- a/SabreTools.Library/DatItems/SoftwareList.cs +++ b/SabreTools.DatItems/SoftwareList.cs @@ -8,7 +8,7 @@ using SabreTools.Filtering; using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents which SoftwareList(s) is associated with a set diff --git a/SabreTools.Library/DatItems/Sound.cs b/SabreTools.DatItems/Sound.cs similarity index 99% rename from SabreTools.Library/DatItems/Sound.cs rename to SabreTools.DatItems/Sound.cs index 4927b141..4262919c 100644 --- a/SabreTools.Library/DatItems/Sound.cs +++ b/SabreTools.DatItems/Sound.cs @@ -7,7 +7,7 @@ using SabreTools.Core; using SabreTools.Filtering; using Newtonsoft.Json; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Represents the sound output for a machine diff --git a/SabreTools.Library/DatItems/Source.cs b/SabreTools.DatItems/Source.cs similarity index 95% rename from SabreTools.Library/DatItems/Source.cs rename to SabreTools.DatItems/Source.cs index f848aa98..a63718eb 100644 --- a/SabreTools.Library/DatItems/Source.cs +++ b/SabreTools.DatItems/Source.cs @@ -1,6 +1,6 @@ using System; -namespace SabreTools.Library.DatItems +namespace SabreTools.DatItems { /// /// Source information wrapper diff --git a/SabreTools.Library/DatFiles/AttractMode.cs b/SabreTools.Library/DatFiles/AttractMode.cs index 7f541418..71befa64 100644 --- a/SabreTools.Library/DatFiles/AttractMode.cs +++ b/SabreTools.Library/DatFiles/AttractMode.cs @@ -4,8 +4,8 @@ using System.IO; using System.Text; using SabreTools.Core; +using SabreTools.DatItems; using SabreTools.IO; -using SabreTools.Library.DatItems; namespace SabreTools.Library.DatFiles { diff --git a/SabreTools.Library/DatFiles/ClrMamePro.cs b/SabreTools.Library/DatFiles/ClrMamePro.cs index e86c7231..e40def14 100644 --- a/SabreTools.Library/DatFiles/ClrMamePro.cs +++ b/SabreTools.Library/DatFiles/ClrMamePro.cs @@ -4,8 +4,8 @@ using System.IO; using System.Text; using SabreTools.Core; +using SabreTools.DatItems; using SabreTools.IO; -using SabreTools.Library.DatItems; namespace SabreTools.Library.DatFiles { diff --git a/SabreTools.Library/DatFiles/DatFile.cs b/SabreTools.Library/DatFiles/DatFile.cs index dbaf28ec..8b6f0522 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.DatItems; using SabreTools.FileTypes; using SabreTools.Filtering; using SabreTools.IO; using SabreTools.Logging; -using SabreTools.Library.DatItems; using SabreTools.Library.Reports; using SabreTools.Skippers; using NaturalSort; diff --git a/SabreTools.Library/DatFiles/DosCenter.cs b/SabreTools.Library/DatFiles/DosCenter.cs index eace6e38..28e0a15d 100644 --- a/SabreTools.Library/DatFiles/DosCenter.cs +++ b/SabreTools.Library/DatFiles/DosCenter.cs @@ -5,8 +5,8 @@ using System.Linq; using System.Text; using SabreTools.Core; +using SabreTools.DatItems; using SabreTools.IO; -using SabreTools.Library.DatItems; namespace SabreTools.Library.DatFiles { diff --git a/SabreTools.Library/DatFiles/EverdriveSmdb.cs b/SabreTools.Library/DatFiles/EverdriveSmdb.cs index 1ceccc73..060e9e80 100644 --- a/SabreTools.Library/DatFiles/EverdriveSmdb.cs +++ b/SabreTools.Library/DatFiles/EverdriveSmdb.cs @@ -4,8 +4,8 @@ using System.IO; using System.Text; using SabreTools.Core; +using SabreTools.DatItems; using SabreTools.IO; -using SabreTools.Library.DatItems; namespace SabreTools.Library.DatFiles { diff --git a/SabreTools.Library/DatFiles/Hashfile.cs b/SabreTools.Library/DatFiles/Hashfile.cs index 19f43aba..8b60be36 100644 --- a/SabreTools.Library/DatFiles/Hashfile.cs +++ b/SabreTools.Library/DatFiles/Hashfile.cs @@ -4,8 +4,8 @@ using System.IO; using System.Text; using SabreTools.Core; +using SabreTools.DatItems; using SabreTools.IO; -using SabreTools.Library.DatItems; namespace SabreTools.Library.DatFiles { diff --git a/SabreTools.Library/DatFiles/ItemDictionary.cs b/SabreTools.Library/DatFiles/ItemDictionary.cs index f8a1a203..ecefe9df 100644 --- a/SabreTools.Library/DatFiles/ItemDictionary.cs +++ b/SabreTools.Library/DatFiles/ItemDictionary.cs @@ -9,9 +9,9 @@ using System.Threading.Tasks; using System.Xml.Serialization; using SabreTools.Core; +using SabreTools.DatItems; using SabreTools.IO; using SabreTools.Logging; -using SabreTools.Library.DatItems; using SabreTools.Library.Reports; using NaturalSort; using Newtonsoft.Json; diff --git a/SabreTools.Library/DatFiles/Listrom.cs b/SabreTools.Library/DatFiles/Listrom.cs index 9bed3df8..58106fd3 100644 --- a/SabreTools.Library/DatFiles/Listrom.cs +++ b/SabreTools.Library/DatFiles/Listrom.cs @@ -5,8 +5,8 @@ using System.Text; using System.Text.RegularExpressions; using SabreTools.Core; +using SabreTools.DatItems; using SabreTools.IO; -using SabreTools.Library.DatItems; namespace SabreTools.Library.DatFiles { diff --git a/SabreTools.Library/DatFiles/Listxml.cs b/SabreTools.Library/DatFiles/Listxml.cs index 29235a48..55d83e11 100644 --- a/SabreTools.Library/DatFiles/Listxml.cs +++ b/SabreTools.Library/DatFiles/Listxml.cs @@ -7,8 +7,8 @@ using System.Xml; using System.Xml.Schema; using SabreTools.Core; +using SabreTools.DatItems; using SabreTools.IO; -using SabreTools.Library.DatItems; namespace SabreTools.Library.DatFiles { diff --git a/SabreTools.Library/DatFiles/Logiqx.cs b/SabreTools.Library/DatFiles/Logiqx.cs index dfc8c8be..a86200d7 100644 --- a/SabreTools.Library/DatFiles/Logiqx.cs +++ b/SabreTools.Library/DatFiles/Logiqx.cs @@ -8,8 +8,8 @@ using System.Xml; using System.Xml.Schema; using SabreTools.Core; +using SabreTools.DatItems; using SabreTools.IO; -using SabreTools.Library.DatItems; namespace SabreTools.Library.DatFiles { diff --git a/SabreTools.Library/DatFiles/Missfile.cs b/SabreTools.Library/DatFiles/Missfile.cs index 7aa87fba..b182dfdd 100644 --- a/SabreTools.Library/DatFiles/Missfile.cs +++ b/SabreTools.Library/DatFiles/Missfile.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Text; -using SabreTools.Library.DatItems; +using SabreTools.DatItems; namespace SabreTools.Library.DatFiles { diff --git a/SabreTools.Library/DatFiles/OfflineList.cs b/SabreTools.Library/DatFiles/OfflineList.cs index 549fb333..32d96bb3 100644 --- a/SabreTools.Library/DatFiles/OfflineList.cs +++ b/SabreTools.Library/DatFiles/OfflineList.cs @@ -6,8 +6,8 @@ using System.Xml; using System.Xml.Schema; using SabreTools.Core; +using SabreTools.DatItems; using SabreTools.IO; -using SabreTools.Library.DatItems; namespace SabreTools.Library.DatFiles { diff --git a/SabreTools.Library/DatFiles/OpenMSX.cs b/SabreTools.Library/DatFiles/OpenMSX.cs index 69c26d5c..1e279b03 100644 --- a/SabreTools.Library/DatFiles/OpenMSX.cs +++ b/SabreTools.Library/DatFiles/OpenMSX.cs @@ -6,8 +6,8 @@ using System.Xml; using System.Xml.Schema; using SabreTools.Core; +using SabreTools.DatItems; using SabreTools.IO; -using SabreTools.Library.DatItems; namespace SabreTools.Library.DatFiles { diff --git a/SabreTools.Library/DatFiles/RomCenter.cs b/SabreTools.Library/DatFiles/RomCenter.cs index 12f2b6af..37caef06 100644 --- a/SabreTools.Library/DatFiles/RomCenter.cs +++ b/SabreTools.Library/DatFiles/RomCenter.cs @@ -4,8 +4,8 @@ using System.IO; using System.Text; using SabreTools.Core; +using SabreTools.DatItems; using SabreTools.IO; -using SabreTools.Library.DatItems; namespace SabreTools.Library.DatFiles { diff --git a/SabreTools.Library/DatFiles/SabreJSON.cs b/SabreTools.Library/DatFiles/SabreJSON.cs index 6efa0d46..947aaf8b 100644 --- a/SabreTools.Library/DatFiles/SabreJSON.cs +++ b/SabreTools.Library/DatFiles/SabreJSON.cs @@ -4,7 +4,7 @@ using System.IO; using System.Text; using SabreTools.Core; -using SabreTools.Library.DatItems; +using SabreTools.DatItems; using Newtonsoft.Json; using Newtonsoft.Json.Linq; diff --git a/SabreTools.Library/DatFiles/SabreXML.cs b/SabreTools.Library/DatFiles/SabreXML.cs index c3df7c6e..78b45bcf 100644 --- a/SabreTools.Library/DatFiles/SabreXML.cs +++ b/SabreTools.Library/DatFiles/SabreXML.cs @@ -6,7 +6,7 @@ using System.Xml; using System.Xml.Schema; using System.Xml.Serialization; -using SabreTools.Library.DatItems; +using SabreTools.DatItems; namespace SabreTools.Library.DatFiles { diff --git a/SabreTools.Library/DatFiles/SeparatedValue.cs b/SabreTools.Library/DatFiles/SeparatedValue.cs index 6ce981ad..b0032183 100644 --- a/SabreTools.Library/DatFiles/SeparatedValue.cs +++ b/SabreTools.Library/DatFiles/SeparatedValue.cs @@ -4,8 +4,8 @@ using System.IO; using System.Text; using SabreTools.Core; +using SabreTools.DatItems; using SabreTools.IO; -using SabreTools.Library.DatItems; namespace SabreTools.Library.DatFiles { diff --git a/SabreTools.Library/DatFiles/SoftwareList.cs b/SabreTools.Library/DatFiles/SoftwareList.cs index 742b9c29..8c69080f 100644 --- a/SabreTools.Library/DatFiles/SoftwareList.cs +++ b/SabreTools.Library/DatFiles/SoftwareList.cs @@ -7,8 +7,8 @@ using System.Xml; using System.Xml.Schema; using SabreTools.Core; +using SabreTools.DatItems; using SabreTools.IO; -using SabreTools.Library.DatItems; // TODO: Use softwarelist.dtd and *try* to make this write more correctly namespace SabreTools.Library.DatFiles diff --git a/SabreTools.Library/SabreTools.Library.csproj b/SabreTools.Library/SabreTools.Library.csproj index 0fc303d4..04548183 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 570f9efc..0b5bf0fa 100644 --- a/SabreTools.sln +++ b/SabreTools.sln @@ -30,6 +30,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Filtering", "Sab EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.FileTypes", "SabreTools.FileTypes\SabreTools.FileTypes.csproj", "{0B36F39B-69CB-4E8A-B251-D063CB08B247}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.DatItems", "SabreTools.DatItems\SabreTools.DatItems.csproj", "{90ADE461-33B1-4E0D-925F-C99913665F0C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -118,6 +120,14 @@ Global {0B36F39B-69CB-4E8A-B251-D063CB08B247}.Release|Any CPU.Build.0 = Release|Any CPU {0B36F39B-69CB-4E8A-B251-D063CB08B247}.Release|x64.ActiveCfg = Release|Any CPU {0B36F39B-69CB-4E8A-B251-D063CB08B247}.Release|x64.Build.0 = Release|Any CPU + {90ADE461-33B1-4E0D-925F-C99913665F0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {90ADE461-33B1-4E0D-925F-C99913665F0C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {90ADE461-33B1-4E0D-925F-C99913665F0C}.Debug|x64.ActiveCfg = Debug|Any CPU + {90ADE461-33B1-4E0D-925F-C99913665F0C}.Debug|x64.Build.0 = Debug|Any CPU + {90ADE461-33B1-4E0D-925F-C99913665F0C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {90ADE461-33B1-4E0D-925F-C99913665F0C}.Release|Any CPU.Build.0 = Release|Any CPU + {90ADE461-33B1-4E0D-925F-C99913665F0C}.Release|x64.ActiveCfg = Release|Any CPU + {90ADE461-33B1-4E0D-925F-C99913665F0C}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE