Extract out Data namespace

This commit is contained in:
Matt Nadareski
2020-12-07 12:33:24 -08:00
parent a183480c0d
commit e7461370af
37 changed files with 62 additions and 37 deletions

2
.gitignore vendored
View File

@@ -8,6 +8,8 @@
/SabreTools/obj/ /SabreTools/obj/
/SabreTools/Properties/launchSettings.json /SabreTools/Properties/launchSettings.json
/SabreTools/SabreTools.csproj.user /SabreTools/SabreTools.csproj.user
/SabreTools.Data/bin/
/SabreTools.Data/obj/
/SabreTools.Library/bin/ /SabreTools.Library/bin/
/SabreTools.Library/obj/ /SabreTools.Library/obj/
/SabreTools.userprefs /SabreTools.userprefs

View File

@@ -4,7 +4,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Xml; using System.Xml;
using SabreTools.Library.Data; using SabreTools.Data;
using SabreTools.Library.DatFiles; using SabreTools.Library.DatFiles;
using SabreTools.Library.DatItems; using SabreTools.Library.DatItems;
using SabreTools.Library.Help; using SabreTools.Library.Help;

View File

@@ -1,6 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using SabreTools.Library.Data; using SabreTools.Data;
using SabreTools.Library.Help; using SabreTools.Library.Help;
using SabreTools.Library.Tools; using SabreTools.Library.Tools;
using Microsoft.Data.Sqlite; using Microsoft.Data.Sqlite;

View File

@@ -1,7 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using SabreTools.Library.Data; using SabreTools.Data;
using SabreTools.Library.DatFiles; using SabreTools.Library.DatFiles;
using SabreTools.Library.Help; using SabreTools.Library.Help;
using SabreTools.Library.IO; using SabreTools.Library.IO;

View File

@@ -1,7 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using SabreTools.Library.Data; using SabreTools.Data;
using SabreTools.Library.DatFiles; using SabreTools.Library.DatFiles;
using SabreTools.Library.DatItems; using SabreTools.Library.DatItems;
using SabreTools.Library.Tools; using SabreTools.Library.Tools;

View File

@@ -1,6 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using SabreTools.Library.Data; using SabreTools.Data;
using SabreTools.Library.Help; using SabreTools.Library.Help;
namespace RombaSharp.Features namespace RombaSharp.Features

View File

@@ -2,7 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using RombaSharp.Features; using RombaSharp.Features;
using SabreTools.Library.Data; using SabreTools.Data;
using SabreTools.Library.Help; using SabreTools.Library.Help;
using SabreTools.Library.Logging; using SabreTools.Library.Logging;

View File

@@ -2,7 +2,7 @@
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
namespace SabreTools.Library.Data namespace SabreTools.Data
{ {
/// <summary> /// <summary>
/// Constants that are used throughout the library /// Constants that are used throughout the library

View File

@@ -3,9 +3,7 @@ using System.IO;
using System.Reflection; using System.Reflection;
using System.Threading.Tasks; using System.Threading.Tasks;
using SabreTools.Library.Logging; namespace SabreTools.Data
namespace SabreTools.Library.Data
{ {
/// <summary> /// <summary>
/// Globally-accessible objects for the library /// Globally-accessible objects for the library

View File

@@ -1,6 +1,6 @@
using System; using System;
namespace SabreTools.Library.Data namespace SabreTools.Data
{ {
/// <summary> /// <summary>
/// Generic console preparation for program output /// Generic console preparation for program output

View File

@@ -0,0 +1,14 @@
<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>
</Project>

View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System.Text; using System.Text;
using SabreTools.Library.Data; using SabreTools.Data;
using SabreTools.Library.DatItems; using SabreTools.Library.DatItems;
using SabreTools.Library.IO; using SabreTools.Library.IO;

View File

@@ -9,7 +9,7 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Library.Data; using SabreTools.Data;
using SabreTools.Library.DatItems; using SabreTools.Library.DatItems;
using SabreTools.Library.FileTypes; using SabreTools.Library.FileTypes;
using SabreTools.Library.Filtering; using SabreTools.Library.Filtering;

View File

@@ -1,6 +1,6 @@
using System; using System;
using SabreTools.Library.Data; using SabreTools.Data;
namespace SabreTools.Library.DatFiles namespace SabreTools.Library.DatFiles
{ {

View File

@@ -8,7 +8,7 @@ using System.Net;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Library.Data; using SabreTools.Data;
using SabreTools.Library.DatItems; using SabreTools.Library.DatItems;
using SabreTools.Library.IO; using SabreTools.Library.IO;
using SabreTools.Library.Logging; using SabreTools.Library.Logging;

View File

@@ -4,7 +4,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Library.Data; using SabreTools.Data;
using SabreTools.Library.FileTypes; using SabreTools.Library.FileTypes;
using SabreTools.Library.Filtering; using SabreTools.Library.Filtering;
using SabreTools.Library.Logging; using SabreTools.Library.Logging;

View File

@@ -5,7 +5,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Library.Data; using SabreTools.Data;
using SabreTools.Library.FileTypes; using SabreTools.Library.FileTypes;
using SabreTools.Library.Filtering; using SabreTools.Library.Filtering;
using SabreTools.Library.Tools; using SabreTools.Library.Tools;

View File

@@ -2,7 +2,7 @@
using System.IO; using System.IO;
using System.Text; using System.Text;
using SabreTools.Library.Data; using SabreTools.Data;
using SabreTools.Library.FileTypes.Aaru; using SabreTools.Library.FileTypes.Aaru;
using SabreTools.Library.IO; using SabreTools.Library.IO;

View File

@@ -3,7 +3,6 @@ using System.IO;
using SabreTools.Library.DatItems; using SabreTools.Library.DatItems;
using SabreTools.Library.IO; using SabreTools.Library.IO;
using SabreTools.Library.Logging;
namespace SabreTools.Library.FileTypes namespace SabreTools.Library.FileTypes
{ {

View File

@@ -4,7 +4,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using SabreTools.Library.Data; using SabreTools.Data;
using SabreTools.Library.DatFiles; using SabreTools.Library.DatFiles;
using SabreTools.Library.DatItems; using SabreTools.Library.DatItems;
using SabreTools.Library.IO; using SabreTools.Library.IO;

View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using SabreTools.Library.Data; using SabreTools.Data;
using SabreTools.Library.DatFiles; using SabreTools.Library.DatFiles;
using SabreTools.Library.DatItems; using SabreTools.Library.DatItems;
using SabreTools.Library.IO; using SabreTools.Library.IO;

View File

@@ -1,7 +1,5 @@
using SabreTools.Library.Data; using System;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using System.Linq; using System.Linq;
namespace SabreTools.Library.Help namespace SabreTools.Library.Help

View File

@@ -5,7 +5,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using SabreTools.Library.Data; using SabreTools.Data;
namespace SabreTools.Library.IO namespace SabreTools.Library.IO
{ {

View File

@@ -5,7 +5,7 @@ using System.Text.RegularExpressions;
using System.Xml; using System.Xml;
using System.Xml.Schema; using System.Xml.Schema;
using SabreTools.Library.Data; using SabreTools.Data;
using SabreTools.Library.DatFiles; using SabreTools.Library.DatFiles;
using SabreTools.Library.FileTypes; using SabreTools.Library.FileTypes;
using SabreTools.Library.Logging; using SabreTools.Library.Logging;

View File

@@ -1,6 +1,6 @@
using System.IO; using System.IO;
using SabreTools.Library.Data; using SabreTools.Data;
namespace SabreTools.Library.IO namespace SabreTools.Library.IO
{ {

View File

@@ -4,7 +4,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using SabreTools.Library.Data; using SabreTools.Data;
using SabreTools.Library.DatFiles; using SabreTools.Library.DatFiles;
using SabreTools.Library.FileTypes; using SabreTools.Library.FileTypes;
using SabreTools.Library.Logging; using SabreTools.Library.Logging;

View File

@@ -2,7 +2,7 @@
using System.IO; using System.IO;
using System.Text; using System.Text;
using SabreTools.Library.Data; using SabreTools.Data;
using SabreTools.Library.IO; using SabreTools.Library.IO;
namespace SabreTools.Library.Logging namespace SabreTools.Library.Logging

View File

@@ -11,6 +11,10 @@
<DefineConstants>NET_FRAMEWORK</DefineConstants> <DefineConstants>NET_FRAMEWORK</DefineConstants>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\SabreTools.Data\SabreTools.Data.csproj" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<None Remove="Skippers\a7800.xml" /> <None Remove="Skippers\a7800.xml" />
<None Remove="Skippers\fds.xml" /> <None Remove="Skippers\fds.xml" />

View File

@@ -1,7 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using SabreTools.Library.Data; using SabreTools.Data;
using SabreTools.Library.DatFiles; using SabreTools.Library.DatFiles;
using SabreTools.Library.FileTypes; using SabreTools.Library.FileTypes;
using SabreTools.Library.IO; using SabreTools.Library.IO;

View File

@@ -2,7 +2,7 @@
using System.IO; using System.IO;
using System.Collections.Generic; using System.Collections.Generic;
using SabreTools.Library.Data; using SabreTools.Data;
using SabreTools.Library.Logging; using SabreTools.Library.Logging;
using Microsoft.Data.Sqlite; using Microsoft.Data.Sqlite;

View File

@@ -1,7 +1,7 @@
using System; using System;
using System.Linq; using System.Linq;
using System.Security.Cryptography; using System.Security.Cryptography;
using System.Threading.Tasks;
using Aaru.Checksums; using Aaru.Checksums;
using SabreTools.Library.DatFiles; using SabreTools.Library.DatFiles;
using SabreTools.Library.External; using SabreTools.Library.External;

View File

@@ -4,7 +4,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using SabreTools.Library.Data; using SabreTools.Data;
namespace SabreTools.Library.Tools namespace SabreTools.Library.Tools
{ {

View File

@@ -16,6 +16,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
README.MD = README.MD README.MD = README.MD
EndProjectSection EndProjectSection
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Data", "SabreTools.Data\SabreTools.Data.csproj", "{66E2FB10-77C0-4589-9DCD-3CA48702C18A}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU 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|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.ActiveCfg = Release|Any CPU
{A7F4C9D8-C086-4296-9BD3-637CF9C78F51}.Release|x64.Build.0 = 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 EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

View File

@@ -1,7 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using SabreTools.Library.Data; using SabreTools.Data;
using SabreTools.Library.DatFiles; using SabreTools.Library.DatFiles;
using SabreTools.Library.DatItems; using SabreTools.Library.DatItems;
using SabreTools.Library.FileTypes; using SabreTools.Library.FileTypes;

View File

@@ -1,7 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
using SabreTools.Library.Data; using SabreTools.Data;
using SabreTools.Library.DatFiles; using SabreTools.Library.DatFiles;
using SabreTools.Library.DatItems; using SabreTools.Library.DatItems;
using SabreTools.Library.IO; using SabreTools.Library.IO;

View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System.Threading.Tasks; using System.Threading.Tasks;
using SabreTools.Library.Data; using SabreTools.Data;
using SabreTools.Library.DatFiles; using SabreTools.Library.DatFiles;
using SabreTools.Library.DatItems; using SabreTools.Library.DatItems;
using SabreTools.Library.IO; using SabreTools.Library.IO;

View File

@@ -2,7 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using SabreTools.Features; using SabreTools.Features;
using SabreTools.Library.Data; using SabreTools.Data;
using SabreTools.Library.Help; using SabreTools.Library.Help;
using SabreTools.Library.Logging; using SabreTools.Library.Logging;