diff --git a/.gitignore b/.gitignore index 654b2451..a67add3f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,8 @@ /SabreTools/obj/ /SabreTools/Properties/launchSettings.json /SabreTools/SabreTools.csproj.user +/SabreTools.Data/bin/ +/SabreTools.Data/obj/ /SabreTools.Library/bin/ /SabreTools.Library/obj/ /SabreTools.userprefs diff --git a/RombaSharp/Features/BaseFeature.cs b/RombaSharp/Features/BaseFeature.cs index 1b1b5605..106c4064 100644 --- a/RombaSharp/Features/BaseFeature.cs +++ b/RombaSharp/Features/BaseFeature.cs @@ -4,7 +4,7 @@ using System.IO; using System.Linq; using System.Xml; -using SabreTools.Library.Data; +using SabreTools.Data; using SabreTools.Library.DatFiles; using SabreTools.Library.DatItems; using SabreTools.Library.Help; diff --git a/RombaSharp/Features/Lookup.cs b/RombaSharp/Features/Lookup.cs index 9c3fc048..a5c6911a 100644 --- a/RombaSharp/Features/Lookup.cs +++ b/RombaSharp/Features/Lookup.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -using SabreTools.Library.Data; +using SabreTools.Data; using SabreTools.Library.Help; using SabreTools.Library.Tools; using Microsoft.Data.Sqlite; diff --git a/RombaSharp/Features/Miss.cs b/RombaSharp/Features/Miss.cs index ba9bc1a4..360ee16f 100644 --- a/RombaSharp/Features/Miss.cs +++ b/RombaSharp/Features/Miss.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.IO; -using SabreTools.Library.Data; +using SabreTools.Data; using SabreTools.Library.DatFiles; using SabreTools.Library.Help; using SabreTools.Library.IO; diff --git a/RombaSharp/Features/RefreshDats.cs b/RombaSharp/Features/RefreshDats.cs index 0abd2f89..7d3497a7 100644 --- a/RombaSharp/Features/RefreshDats.cs +++ b/RombaSharp/Features/RefreshDats.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.IO; -using SabreTools.Library.Data; +using SabreTools.Data; using SabreTools.Library.DatFiles; using SabreTools.Library.DatItems; using SabreTools.Library.Tools; diff --git a/RombaSharp/Features/Version.cs b/RombaSharp/Features/Version.cs index df76d8d4..42703cf9 100644 --- a/RombaSharp/Features/Version.cs +++ b/RombaSharp/Features/Version.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -using SabreTools.Library.Data; +using SabreTools.Data; using SabreTools.Library.Help; namespace RombaSharp.Features diff --git a/RombaSharp/Program.cs b/RombaSharp/Program.cs index bd1c1ecd..bd40cf43 100644 --- a/RombaSharp/Program.cs +++ b/RombaSharp/Program.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using RombaSharp.Features; -using SabreTools.Library.Data; +using SabreTools.Data; using SabreTools.Library.Help; using SabreTools.Library.Logging; diff --git a/SabreTools.Library/Data/Constants.cs b/SabreTools.Data/Constants.cs similarity index 99% rename from SabreTools.Library/Data/Constants.cs rename to SabreTools.Data/Constants.cs index 94f6fd12..cccacb72 100644 --- a/SabreTools.Library/Data/Constants.cs +++ b/SabreTools.Data/Constants.cs @@ -2,7 +2,7 @@ using System.IO; using System.Reflection; -namespace SabreTools.Library.Data +namespace SabreTools.Data { /// /// Constants that are used throughout the library diff --git a/SabreTools.Library/Data/Globals.cs b/SabreTools.Data/Globals.cs similarity index 95% rename from SabreTools.Library/Data/Globals.cs rename to SabreTools.Data/Globals.cs index df74f2f7..d4469642 100644 --- a/SabreTools.Library/Data/Globals.cs +++ b/SabreTools.Data/Globals.cs @@ -3,9 +3,7 @@ using System.IO; using System.Reflection; using System.Threading.Tasks; -using SabreTools.Library.Logging; - -namespace SabreTools.Library.Data +namespace SabreTools.Data { /// /// Globally-accessible objects for the library diff --git a/SabreTools.Library/Data/Prepare.cs b/SabreTools.Data/Prepare.cs similarity index 98% rename from SabreTools.Library/Data/Prepare.cs rename to SabreTools.Data/Prepare.cs index 06920768..fe339d0c 100644 --- a/SabreTools.Library/Data/Prepare.cs +++ b/SabreTools.Data/Prepare.cs @@ -1,6 +1,6 @@ using System; -namespace SabreTools.Library.Data +namespace SabreTools.Data { /// /// Generic console preparation for program output diff --git a/SabreTools.Data/SabreTools.Data.csproj b/SabreTools.Data/SabreTools.Data.csproj new file mode 100644 index 00000000..42795bd9 --- /dev/null +++ b/SabreTools.Data/SabreTools.Data.csproj @@ -0,0 +1,14 @@ + + + + net48;netcoreapp3.1;net5.0 + win10-x64;win7-x86 + Debug;Release + AnyCPU;x64 + + + + NET_FRAMEWORK + + + diff --git a/SabreTools.Library/DatFiles/AttractMode.cs b/SabreTools.Library/DatFiles/AttractMode.cs index 3c52c09e..a4792a04 100644 --- a/SabreTools.Library/DatFiles/AttractMode.cs +++ b/SabreTools.Library/DatFiles/AttractMode.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Text; -using SabreTools.Library.Data; +using SabreTools.Data; using SabreTools.Library.DatItems; using SabreTools.Library.IO; diff --git a/SabreTools.Library/DatFiles/DatFile.cs b/SabreTools.Library/DatFiles/DatFile.cs index f5412520..e4aa89e2 100644 --- a/SabreTools.Library/DatFiles/DatFile.cs +++ b/SabreTools.Library/DatFiles/DatFile.cs @@ -9,7 +9,7 @@ using System.Threading; using System.Threading.Tasks; using System.Xml.Serialization; -using SabreTools.Library.Data; +using SabreTools.Data; using SabreTools.Library.DatItems; using SabreTools.Library.FileTypes; using SabreTools.Library.Filtering; diff --git a/SabreTools.Library/DatFiles/DepotInformation.cs b/SabreTools.Library/DatFiles/DepotInformation.cs index cbbe0639..5fe1364a 100644 --- a/SabreTools.Library/DatFiles/DepotInformation.cs +++ b/SabreTools.Library/DatFiles/DepotInformation.cs @@ -1,6 +1,6 @@ using System; -using SabreTools.Library.Data; +using SabreTools.Data; namespace SabreTools.Library.DatFiles { diff --git a/SabreTools.Library/DatFiles/ItemDictionary.cs b/SabreTools.Library/DatFiles/ItemDictionary.cs index 7515636d..ba3aaa7e 100644 --- a/SabreTools.Library/DatFiles/ItemDictionary.cs +++ b/SabreTools.Library/DatFiles/ItemDictionary.cs @@ -8,7 +8,7 @@ using System.Net; using System.Threading.Tasks; using System.Xml.Serialization; -using SabreTools.Library.Data; +using SabreTools.Data; using SabreTools.Library.DatItems; using SabreTools.Library.IO; using SabreTools.Library.Logging; diff --git a/SabreTools.Library/DatItems/DatItem.cs b/SabreTools.Library/DatItems/DatItem.cs index 89cd2ceb..7d19197a 100644 --- a/SabreTools.Library/DatItems/DatItem.cs +++ b/SabreTools.Library/DatItems/DatItem.cs @@ -4,7 +4,7 @@ using System.IO; using System.Linq; using System.Xml.Serialization; -using SabreTools.Library.Data; +using SabreTools.Data; using SabreTools.Library.FileTypes; using SabreTools.Library.Filtering; using SabreTools.Library.Logging; diff --git a/SabreTools.Library/DatItems/Rom.cs b/SabreTools.Library/DatItems/Rom.cs index ea1b21aa..a9d8be4d 100644 --- a/SabreTools.Library/DatItems/Rom.cs +++ b/SabreTools.Library/DatItems/Rom.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Xml.Serialization; -using SabreTools.Library.Data; +using SabreTools.Data; using SabreTools.Library.FileTypes; using SabreTools.Library.Filtering; using SabreTools.Library.Tools; diff --git a/SabreTools.Library/FileTypes/AaruFormat.cs b/SabreTools.Library/FileTypes/AaruFormat.cs index 27210220..a90d27b5 100644 --- a/SabreTools.Library/FileTypes/AaruFormat.cs +++ b/SabreTools.Library/FileTypes/AaruFormat.cs @@ -2,7 +2,7 @@ using System.IO; using System.Text; -using SabreTools.Library.Data; +using SabreTools.Data; using SabreTools.Library.FileTypes.Aaru; using SabreTools.Library.IO; diff --git a/SabreTools.Library/FileTypes/BaseArchive.cs b/SabreTools.Library/FileTypes/BaseArchive.cs index 76eb8940..fc446445 100644 --- a/SabreTools.Library/FileTypes/BaseArchive.cs +++ b/SabreTools.Library/FileTypes/BaseArchive.cs @@ -3,7 +3,6 @@ using System.IO; using SabreTools.Library.DatItems; using SabreTools.Library.IO; -using SabreTools.Library.Logging; namespace SabreTools.Library.FileTypes { diff --git a/SabreTools.Library/FileTypes/GZipArchive.cs b/SabreTools.Library/FileTypes/GZipArchive.cs index 0d11cc81..865ca99d 100644 --- a/SabreTools.Library/FileTypes/GZipArchive.cs +++ b/SabreTools.Library/FileTypes/GZipArchive.cs @@ -4,7 +4,7 @@ using System.IO; using System.Linq; using System.Text.RegularExpressions; -using SabreTools.Library.Data; +using SabreTools.Data; using SabreTools.Library.DatFiles; using SabreTools.Library.DatItems; using SabreTools.Library.IO; diff --git a/SabreTools.Library/FileTypes/XZArchive.cs b/SabreTools.Library/FileTypes/XZArchive.cs index f026b45f..fde1a188 100644 --- a/SabreTools.Library/FileTypes/XZArchive.cs +++ b/SabreTools.Library/FileTypes/XZArchive.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Text.RegularExpressions; -using SabreTools.Library.Data; +using SabreTools.Data; using SabreTools.Library.DatFiles; using SabreTools.Library.DatItems; using SabreTools.Library.IO; diff --git a/SabreTools.Library/Help/Feature.cs b/SabreTools.Library/Help/Feature.cs index 238b6d02..2637e730 100644 --- a/SabreTools.Library/Help/Feature.cs +++ b/SabreTools.Library/Help/Feature.cs @@ -1,7 +1,5 @@ -using SabreTools.Library.Data; -using System; +using System; using System.Collections.Generic; -using System.IO; using System.Linq; namespace SabreTools.Library.Help diff --git a/SabreTools.Library/IO/ClrMameProReader.cs b/SabreTools.Library/IO/ClrMameProReader.cs index c54953fc..fedae52f 100644 --- a/SabreTools.Library/IO/ClrMameProReader.cs +++ b/SabreTools.Library/IO/ClrMameProReader.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Text.RegularExpressions; -using SabreTools.Library.Data; +using SabreTools.Data; namespace SabreTools.Library.IO { diff --git a/SabreTools.Library/IO/FileExtensions.cs b/SabreTools.Library/IO/FileExtensions.cs index a766a816..52c3c355 100644 --- a/SabreTools.Library/IO/FileExtensions.cs +++ b/SabreTools.Library/IO/FileExtensions.cs @@ -5,7 +5,7 @@ using System.Text.RegularExpressions; using System.Xml; using System.Xml.Schema; -using SabreTools.Library.Data; +using SabreTools.Data; using SabreTools.Library.DatFiles; using SabreTools.Library.FileTypes; using SabreTools.Library.Logging; diff --git a/SabreTools.Library/IO/PathExtensions.cs b/SabreTools.Library/IO/PathExtensions.cs index 446cd1b9..862285b0 100644 --- a/SabreTools.Library/IO/PathExtensions.cs +++ b/SabreTools.Library/IO/PathExtensions.cs @@ -1,6 +1,6 @@ using System.IO; -using SabreTools.Library.Data; +using SabreTools.Data; namespace SabreTools.Library.IO { diff --git a/SabreTools.Library/IO/StreamExtensions.cs b/SabreTools.Library/IO/StreamExtensions.cs index 101c4764..484dab89 100644 --- a/SabreTools.Library/IO/StreamExtensions.cs +++ b/SabreTools.Library/IO/StreamExtensions.cs @@ -4,7 +4,7 @@ using System.IO; using System.Linq; using System.Threading.Tasks; -using SabreTools.Library.Data; +using SabreTools.Data; using SabreTools.Library.DatFiles; using SabreTools.Library.FileTypes; using SabreTools.Library.Logging; diff --git a/SabreTools.Library/Logging/LoggerImpl.cs b/SabreTools.Library/Logging/LoggerImpl.cs index 5b5fc64c..06165884 100644 --- a/SabreTools.Library/Logging/LoggerImpl.cs +++ b/SabreTools.Library/Logging/LoggerImpl.cs @@ -2,7 +2,7 @@ using System.IO; using System.Text; -using SabreTools.Library.Data; +using SabreTools.Data; using SabreTools.Library.IO; namespace SabreTools.Library.Logging diff --git a/SabreTools.Library/SabreTools.Library.csproj b/SabreTools.Library/SabreTools.Library.csproj index 5bc76b4f..f8617ca5 100644 --- a/SabreTools.Library/SabreTools.Library.csproj +++ b/SabreTools.Library/SabreTools.Library.csproj @@ -11,6 +11,10 @@ NET_FRAMEWORK + + + + diff --git a/SabreTools.Library/Skippers/Transform.cs b/SabreTools.Library/Skippers/Transform.cs index a46ea1bd..c98ff3d2 100644 --- a/SabreTools.Library/Skippers/Transform.cs +++ b/SabreTools.Library/Skippers/Transform.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.IO; -using SabreTools.Library.Data; +using SabreTools.Data; using SabreTools.Library.DatFiles; using SabreTools.Library.FileTypes; using SabreTools.Library.IO; diff --git a/SabreTools.Library/Tools/DatabaseTools.cs b/SabreTools.Library/Tools/DatabaseTools.cs index e3376c43..c140117d 100644 --- a/SabreTools.Library/Tools/DatabaseTools.cs +++ b/SabreTools.Library/Tools/DatabaseTools.cs @@ -2,7 +2,7 @@ using System.IO; using System.Collections.Generic; -using SabreTools.Library.Data; +using SabreTools.Data; using SabreTools.Library.Logging; using Microsoft.Data.Sqlite; diff --git a/SabreTools.Library/Tools/Hasher.cs b/SabreTools.Library/Tools/Hasher.cs index 08369ea2..0133ec2a 100644 --- a/SabreTools.Library/Tools/Hasher.cs +++ b/SabreTools.Library/Tools/Hasher.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using System.Security.Cryptography; -using System.Threading.Tasks; + using Aaru.Checksums; using SabreTools.Library.DatFiles; using SabreTools.Library.External; diff --git a/SabreTools.Library/Tools/Sanitizer.cs b/SabreTools.Library/Tools/Sanitizer.cs index 1a28e915..330c403f 100644 --- a/SabreTools.Library/Tools/Sanitizer.cs +++ b/SabreTools.Library/Tools/Sanitizer.cs @@ -4,7 +4,7 @@ using System.IO; using System.Linq; using System.Text.RegularExpressions; -using SabreTools.Library.Data; +using SabreTools.Data; namespace SabreTools.Library.Tools { diff --git a/SabreTools.sln b/SabreTools.sln index be9ca9fd..0df32d4a 100644 --- a/SabreTools.sln +++ b/SabreTools.sln @@ -16,6 +16,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution README.MD = README.MD EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Data", "SabreTools.Data\SabreTools.Data.csproj", "{66E2FB10-77C0-4589-9DCD-3CA48702C18A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -48,6 +50,14 @@ Global {A7F4C9D8-C086-4296-9BD3-637CF9C78F51}.Release|Any CPU.Build.0 = Release|Any CPU {A7F4C9D8-C086-4296-9BD3-637CF9C78F51}.Release|x64.ActiveCfg = Release|Any CPU {A7F4C9D8-C086-4296-9BD3-637CF9C78F51}.Release|x64.Build.0 = Release|Any CPU + {66E2FB10-77C0-4589-9DCD-3CA48702C18A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {66E2FB10-77C0-4589-9DCD-3CA48702C18A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {66E2FB10-77C0-4589-9DCD-3CA48702C18A}.Debug|x64.ActiveCfg = Debug|Any CPU + {66E2FB10-77C0-4589-9DCD-3CA48702C18A}.Debug|x64.Build.0 = Debug|Any CPU + {66E2FB10-77C0-4589-9DCD-3CA48702C18A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {66E2FB10-77C0-4589-9DCD-3CA48702C18A}.Release|Any CPU.Build.0 = Release|Any CPU + {66E2FB10-77C0-4589-9DCD-3CA48702C18A}.Release|x64.ActiveCfg = Release|Any CPU + {66E2FB10-77C0-4589-9DCD-3CA48702C18A}.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 2c242009..37f97993 100644 --- a/SabreTools/Features/BaseFeature.cs +++ b/SabreTools/Features/BaseFeature.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -using SabreTools.Library.Data; +using SabreTools.Data; using SabreTools.Library.DatFiles; using SabreTools.Library.DatItems; using SabreTools.Library.FileTypes; diff --git a/SabreTools/Features/Split.cs b/SabreTools/Features/Split.cs index 32d43324..1bed5249 100644 --- a/SabreTools/Features/Split.cs +++ b/SabreTools/Features/Split.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; -using SabreTools.Library.Data; +using SabreTools.Data; using SabreTools.Library.DatFiles; using SabreTools.Library.DatItems; using SabreTools.Library.IO; diff --git a/SabreTools/Features/Update.cs b/SabreTools/Features/Update.cs index f1ab6354..1c2439ff 100644 --- a/SabreTools/Features/Update.cs +++ b/SabreTools/Features/Update.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Threading.Tasks; -using SabreTools.Library.Data; +using SabreTools.Data; using SabreTools.Library.DatFiles; using SabreTools.Library.DatItems; using SabreTools.Library.IO; diff --git a/SabreTools/Program.cs b/SabreTools/Program.cs index 1121c187..5c67351e 100644 --- a/SabreTools/Program.cs +++ b/SabreTools/Program.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using SabreTools.Features; -using SabreTools.Library.Data; +using SabreTools.Data; using SabreTools.Library.Help; using SabreTools.Library.Logging;