Extract out DatItems namespace

This commit is contained in:
Matt Nadareski
2020-12-08 15:15:41 -08:00
parent 82e3a3939b
commit e806927195
68 changed files with 102 additions and 63 deletions

2
.gitignore vendored
View File

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

View File

@@ -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

View File

@@ -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

View File

@@ -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;

View File

@@ -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

View File

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

View File

@@ -7,7 +7,7 @@ using SabreTools.Core;
using SabreTools.Filtering;
using Newtonsoft.Json;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents which Adjuster(s) is associated with a set

View File

@@ -6,7 +6,7 @@ using SabreTools.Core;
using SabreTools.Filtering;
using Newtonsoft.Json;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents a single analog item

View File

@@ -7,7 +7,7 @@ using SabreTools.Core;
using SabreTools.Filtering;
using Newtonsoft.Json;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents generic archive files to be included in a set

View File

@@ -5,7 +5,7 @@ using Newtonsoft.Json;
/// <summary>
/// This holds all of the auxiliary types needed for proper parsing
/// </summary>
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
#region DatItem

View File

@@ -7,7 +7,7 @@ using SabreTools.Core;
using SabreTools.Filtering;
using Newtonsoft.Json;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents which BIOS(es) is associated with a set

View File

@@ -3,7 +3,7 @@
using SabreTools.Core;
using Newtonsoft.Json;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents a blank set from an input DAT

View File

@@ -9,7 +9,7 @@ using SabreTools.Filtering;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents which Chip(s) is associated with a set

View File

@@ -7,7 +7,7 @@ using SabreTools.Filtering;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents a condition on a machine or other item

View File

@@ -7,7 +7,7 @@ using SabreTools.Core;
using SabreTools.Filtering;
using Newtonsoft.Json;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents which Configuration(s) is associated with a set

View File

@@ -8,7 +8,7 @@ using SabreTools.Filtering;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents control for an input

View File

@@ -12,7 +12,7 @@ using NaturalSort;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Base class for all items included in a set

View File

@@ -8,7 +8,7 @@ using SabreTools.Core;
using SabreTools.Filtering;
using Newtonsoft.Json;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// SoftwareList dataarea information

View File

@@ -7,7 +7,7 @@ using SabreTools.Filtering;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents a single device on the machine

View File

@@ -7,7 +7,7 @@ using SabreTools.Core;
using SabreTools.Filtering;
using Newtonsoft.Json;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents which Device Reference(s) is associated with a set

View File

@@ -7,7 +7,7 @@ using SabreTools.Core;
using SabreTools.Filtering;
using Newtonsoft.Json;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents which DIP Switch(es) is associated with a set

View File

@@ -9,7 +9,7 @@ using SabreTools.Filtering;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents Compressed Hunks of Data (CHD) formatted disks which use internal hashes

View File

@@ -8,7 +8,7 @@ using SabreTools.Core;
using SabreTools.Filtering;
using Newtonsoft.Json;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// SoftwareList diskarea information

View File

@@ -8,7 +8,7 @@ using SabreTools.Filtering;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents one machine display

View File

@@ -7,7 +7,7 @@ using SabreTools.Filtering;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents the a driver of the machine

View File

@@ -7,7 +7,7 @@ using SabreTools.Core;
using SabreTools.Filtering;
using Newtonsoft.Json;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents a matchable extension

View File

@@ -7,7 +7,7 @@ using SabreTools.Filtering;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents the a feature of the machine

View File

@@ -7,7 +7,7 @@ using SabreTools.Core;
using SabreTools.Filtering;
using Newtonsoft.Json;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents special information about a machine

View File

@@ -7,7 +7,7 @@ using SabreTools.Core;
using SabreTools.Filtering;
using Newtonsoft.Json;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents one ListXML input

View File

@@ -7,7 +7,7 @@ using SabreTools.Core;
using SabreTools.Filtering;
using Newtonsoft.Json;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents a single instance of another item

View File

@@ -7,7 +7,7 @@ using SabreTools.Core;
using SabreTools.Filtering;
using Newtonsoft.Json;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents one conflocation or diplocation

View File

@@ -8,7 +8,7 @@ using SabreTools.Filtering;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents the information specific to a set/game/machine

View File

@@ -9,7 +9,7 @@ using SabreTools.FileTypes;
using SabreTools.Filtering;
using Newtonsoft.Json;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents Aaruformat images which use internal hashes

View File

@@ -8,7 +8,7 @@ using SabreTools.Core;
using SabreTools.Filtering;
using Newtonsoft.Json;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// SoftwareList part information

View File

@@ -7,7 +7,7 @@ using SabreTools.Core;
using SabreTools.Filtering;
using Newtonsoft.Json;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents one part feature object

View File

@@ -6,7 +6,7 @@ using SabreTools.Core;
using SabreTools.Filtering;
using Newtonsoft.Json;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents a single port on a machine

View File

@@ -7,7 +7,7 @@ using SabreTools.Core;
using SabreTools.Filtering;
using Newtonsoft.Json;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents which RAM option(s) is associated with a set

View File

@@ -7,7 +7,7 @@ using SabreTools.Core;
using SabreTools.Filtering;
using Newtonsoft.Json;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents release information about a set

View File

@@ -11,7 +11,7 @@ using SabreTools.Filtering;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents a generic file within a set

View File

@@ -0,0 +1,25 @@
<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.FileTypes\SabreTools.FileTypes.csproj" />
<ProjectReference Include="..\SabreTools.Filtering\SabreTools.Filtering.csproj" />
<ProjectReference Include="..\SabreTools.Logging\SabreTools.Logging.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
</ItemGroup>
</Project>

View File

@@ -7,7 +7,7 @@ using SabreTools.Core;
using SabreTools.Filtering;
using Newtonsoft.Json;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents a (usually WAV-formatted) sample to be included for use in the set

View File

@@ -7,7 +7,7 @@ using SabreTools.Core;
using SabreTools.Filtering;
using Newtonsoft.Json;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents one ListXML confsetting or dipvalue

View File

@@ -7,7 +7,7 @@ using SabreTools.Core;
using SabreTools.Filtering;
using Newtonsoft.Json;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents one shared feature object

View File

@@ -7,7 +7,7 @@ using SabreTools.Core;
using SabreTools.Filtering;
using Newtonsoft.Json;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents which Slot(s) is associated with a set

View File

@@ -7,7 +7,7 @@ using SabreTools.Core;
using SabreTools.Filtering;
using Newtonsoft.Json;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents one ListXML slotoption

View File

@@ -8,7 +8,7 @@ using SabreTools.Filtering;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents which SoftwareList(s) is associated with a set

View File

@@ -7,7 +7,7 @@ using SabreTools.Core;
using SabreTools.Filtering;
using Newtonsoft.Json;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Represents the sound output for a machine

View File

@@ -1,6 +1,6 @@
using System;
namespace SabreTools.Library.DatItems
namespace SabreTools.DatItems
{
/// <summary>
/// Source information wrapper

View File

@@ -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
{

View File

@@ -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
{

View File

@@ -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;

View File

@@ -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
{

View File

@@ -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
{

View File

@@ -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
{

View File

@@ -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;

View File

@@ -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
{

View File

@@ -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
{

View File

@@ -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
{

View File

@@ -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
{

View File

@@ -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
{

View File

@@ -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
{

View File

@@ -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
{

View File

@@ -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;

View File

@@ -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
{

View File

@@ -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
{

View File

@@ -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

View File

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

View File

@@ -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