Combine some tags

2025-12-16 19:14:27 +00:00 · 2020-09-08 10:12:41 -07:00
parent e34f50c464
commit f0afe33dd7
43 changed files with 106 additions and 160 deletions
--- a/SabreTools.Library/DatItems/Adjuster.cs
+++ b/SabreTools.Library/DatItems/Adjuster.cs
@@ -12,8 +12,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents which Adjuster(s) is associated with a set
    /// </summary>
-    [JsonObject("adjuster")]
-    [XmlRoot("adjuster")]
+    [JsonObject("adjuster"), XmlRoot("adjuster")]
    public class Adjuster : DatItem
    {
        #region Fields
--- a/SabreTools.Library/DatItems/Analog.cs
+++ b/SabreTools.Library/DatItems/Analog.cs
@@ -10,8 +10,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents a single analog item
    /// </summary>
-    [JsonObject("analog")]
-    [XmlRoot("analog")]
+    [JsonObject("analog"), XmlRoot("analog")]
    public class Analog : DatItem
    {
        #region Fields
--- a/SabreTools.Library/DatItems/Archive.cs
+++ b/SabreTools.Library/DatItems/Archive.cs
@@ -12,8 +12,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents generic archive files to be included in a set
    /// </summary>
-    [JsonObject("archive")]
-    [XmlRoot("archive")]
+    [JsonObject("archive"), XmlRoot("archive")]
    public class Archive : DatItem
    {
        #region Fields
--- a/SabreTools.Library/DatItems/Auxiliary.cs
+++ b/SabreTools.Library/DatItems/Auxiliary.cs
@@ -14,8 +14,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents the OpenMSX original value
    /// </summary>
-    [JsonObject("original")]
-    [XmlRoot("original")]
+    [JsonObject("original"), XmlRoot("original")]
    public class Original
    {
        [JsonProperty("value")]
--- a/SabreTools.Library/DatItems/BiosSet.cs
+++ b/SabreTools.Library/DatItems/BiosSet.cs
@@ -12,8 +12,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents which BIOS(es) is associated with a set
    /// </summary>
-    [JsonObject("biosset")]
-    [XmlRoot("biosset")]
+    [JsonObject("biosset"), XmlRoot("biosset")]
    public class BiosSet : DatItem
    {
        #region Fields
--- a/SabreTools.Library/DatItems/Blank.cs
+++ b/SabreTools.Library/DatItems/Blank.cs
@@ -7,8 +7,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents a blank set from an input DAT
    /// </summary>
-    [JsonObject("blank")]
-    [XmlRoot("blank")]
+    [JsonObject("blank"), XmlRoot("blank")]
    public class Blank : DatItem
    {
        #region Constructors
--- a/SabreTools.Library/DatItems/Chip.cs
+++ b/SabreTools.Library/DatItems/Chip.cs
@@ -14,8 +14,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents which Chip(s) is associated with a set
    /// </summary>
-    [JsonObject("chip")]
-    [XmlRoot("chip")]
+    [JsonObject("chip"), XmlRoot("chip")]
    public class Chip : DatItem
    {
        #region Fields
--- a/SabreTools.Library/DatItems/Condition.cs
+++ b/SabreTools.Library/DatItems/Condition.cs
@@ -12,8 +12,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents a condition on a machine or other item
    /// </summary>
-    [JsonObject("condition")]
-    [XmlRoot("condition")]
+    [JsonObject("condition"), XmlRoot("condition")]
    public class Condition : DatItem
    {
        #region Fields
--- a/SabreTools.Library/DatItems/Configuration.cs
+++ b/SabreTools.Library/DatItems/Configuration.cs
@@ -12,8 +12,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents which Configuration(s) is associated with a set
    /// </summary>
-    [JsonObject("configuration")]
-    [XmlRoot("configuration")]
+    [JsonObject("configuration"), XmlRoot("configuration")]
    public class Configuration : DatItem
    {
        #region Fields
--- a/SabreTools.Library/DatItems/Control.cs
+++ b/SabreTools.Library/DatItems/Control.cs
@@ -13,8 +13,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents control for an input
    /// </summary>
-    [JsonObject("control")]
-    [XmlRoot("control")]
+    [JsonObject("control"), XmlRoot("control")]
    public class Control : DatItem
    {
        #region Fields
--- a/SabreTools.Library/DatItems/DatItem.cs
+++ b/SabreTools.Library/DatItems/DatItem.cs
@@ -17,8 +17,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Base class for all items included in a set
    /// </summary>
-    [JsonObject("datitem")]
-    [XmlRoot("datitem")]
+    [JsonObject("datitem"), XmlRoot("datitem")]
    [XmlInclude(typeof(Adjuster))]
    [XmlInclude(typeof(Analog))]
    [XmlInclude(typeof(Archive))]
@@ -73,8 +72,7 @@ namespace SabreTools.Library.DatItems
        /// <summary>
        /// Duplicate type when compared to another item
        /// </summary>
-        [JsonIgnore]
-        [XmlIgnore]
+        [JsonIgnore, XmlIgnore]
        public DupeType DupeType { get; set; }

        #endregion
@@ -84,8 +82,7 @@ namespace SabreTools.Library.DatItems
        /// <summary>
        /// Machine values
        /// </summary>
-        [JsonIgnore]
-        [XmlIgnore]
+        [JsonIgnore, XmlIgnore]
        public Machine Machine { get; set; } = new Machine();

        #endregion
@@ -95,15 +92,13 @@ namespace SabreTools.Library.DatItems
        /// <summary>
        /// Source information
        /// </summary>
-        [JsonIgnore]
-        [XmlIgnore]
+        [JsonIgnore, XmlIgnore]
        public Source Source { get; set; } = new Source();

        /// <summary>
        /// Flag if item should be removed
        /// </summary>
-        [JsonIgnore]
-        [XmlIgnore]
+        [JsonIgnore, XmlIgnore]
        public bool Remove { get; set; }

        #endregion
--- a/SabreTools.Library/DatItems/DataArea.cs
+++ b/SabreTools.Library/DatItems/DataArea.cs
@@ -14,8 +14,7 @@ namespace SabreTools.Library.DatItems
    /// SoftwareList dataarea information
    /// </summary>
    /// <remarks>One DataArea can contain multiple Rom items</remarks>
-    [JsonObject("dataarea")]
-    [XmlRoot("dataarea")]
+    [JsonObject("dataarea"), XmlRoot("dataarea")]
    public class DataArea : DatItem
    {
        #region Fields
--- a/SabreTools.Library/DatItems/Device.cs
+++ b/SabreTools.Library/DatItems/Device.cs
@@ -12,8 +12,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents a single device on the machine
    /// </summary>
-    [JsonObject("device")]
-    [XmlRoot("device")]
+    [JsonObject("device"), XmlRoot("device")]
    public class Device : DatItem
    {
        #region Fields
--- a/SabreTools.Library/DatItems/DeviceReference.cs
+++ b/SabreTools.Library/DatItems/DeviceReference.cs
@@ -12,8 +12,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents which Device Reference(s) is associated with a set
    /// </summary>
-    [JsonObject("device_ref")]
-    [XmlRoot("device_ref")]
+    [JsonObject("device_ref"), XmlRoot("device_ref")]
    public class DeviceReference : DatItem
    {
        #region Fields
--- a/SabreTools.Library/DatItems/DipSwitch.cs
+++ b/SabreTools.Library/DatItems/DipSwitch.cs
@@ -12,8 +12,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents which DIP Switch(es) is associated with a set
    /// </summary>
-    [JsonObject("dipswitch")]
-    [XmlRoot("dipswitch")]
+    [JsonObject("dipswitch"), XmlRoot("dipswitch")]
    public class DipSwitch : DatItem
    {
        #region Fields
--- a/SabreTools.Library/DatItems/Disk.cs
+++ b/SabreTools.Library/DatItems/Disk.cs
@@ -14,8 +14,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents Compressed Hunks of Data (CHD) formatted disks which use internal hashes
    /// </summary>
-    [JsonObject("disk")]
-    [XmlRoot("disk")]
+    [JsonObject("disk"), XmlRoot("disk")]
    public class Disk : DatItem
    {
        #region Private instance variables
--- a/SabreTools.Library/DatItems/DiskArea.cs
+++ b/SabreTools.Library/DatItems/DiskArea.cs
@@ -14,8 +14,7 @@ namespace SabreTools.Library.DatItems
    /// SoftwareList diskarea information
    /// </summary>
    /// <remarks>One DiskArea can contain multiple Disk items</remarks>
-    [JsonObject("diskarea")]
-    [XmlRoot("diskarea")]
+    [JsonObject("diskarea"), XmlRoot("diskarea")]
    public class DiskArea : DatItem
    {
        #region Fields
--- a/SabreTools.Library/DatItems/Display.cs
+++ b/SabreTools.Library/DatItems/Display.cs
@@ -13,8 +13,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents one machine display
    /// </summary>
-    [JsonObject("display")]
-    [XmlRoot("display")]
+    [JsonObject("display"), XmlRoot("display")]
    public class Display : DatItem
    {
        #region Fields
--- a/SabreTools.Library/DatItems/Driver.cs
+++ b/SabreTools.Library/DatItems/Driver.cs
@@ -12,8 +12,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents the a driver of the machine
    /// </summary>
-    [JsonObject("driver")]
-    [XmlRoot("driver")]
+    [JsonObject("driver"), XmlRoot("driver")]
    public class Driver : DatItem
    {
        #region Fields
--- a/SabreTools.Library/DatItems/Extension.cs
+++ b/SabreTools.Library/DatItems/Extension.cs
@@ -12,8 +12,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents a matchable extension
    /// </summary>
-    [JsonObject("extension")]
-    [XmlRoot("extension")]
+    [JsonObject("extension"), XmlRoot("extension")]
    public class Extension : DatItem
    {
        #region Fields
--- a/SabreTools.Library/DatItems/Feature.cs
+++ b/SabreTools.Library/DatItems/Feature.cs
@@ -12,8 +12,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents the a feature of the machine
    /// </summary>
-    [JsonObject("feature")]
-    [XmlRoot("feature")]
+    [JsonObject("feature"), XmlRoot("feature")]
    public class Feature : DatItem
    {
        #region Fields
--- a/SabreTools.Library/DatItems/Info.cs
+++ b/SabreTools.Library/DatItems/Info.cs
@@ -12,8 +12,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents special information about a machine
    /// </summary>
-    [JsonObject("info")]
-    [XmlRoot("info")]
+    [JsonObject("info"), XmlRoot("info")]
    public class Info : DatItem
    {
        #region Fields
--- a/SabreTools.Library/DatItems/Input.cs
+++ b/SabreTools.Library/DatItems/Input.cs
@@ -12,8 +12,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents one ListXML input
    /// </summary>
-    [JsonObject("input")]
-    [XmlRoot("input")]
+    [JsonObject("input"), XmlRoot("input")]
    public class Input : DatItem
    {
        #region Fields
--- a/SabreTools.Library/DatItems/Instance.cs
+++ b/SabreTools.Library/DatItems/Instance.cs
@@ -12,8 +12,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents a single instance of another item
    /// </summary>
-    [JsonObject("instance")]
-    [XmlRoot("instance")]
+    [JsonObject("instance"), XmlRoot("instance")]
    public class Instance : DatItem
    {
        #region Fields
--- a/SabreTools.Library/DatItems/Location.cs
+++ b/SabreTools.Library/DatItems/Location.cs
@@ -12,8 +12,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents one conflocation or diplocation
    /// </summary>
-    [JsonObject("location")]
-    [XmlRoot("location")]
+    [JsonObject("location"), XmlRoot("location")]
    public class Location : DatItem
    {
        #region Fields
--- a/SabreTools.Library/DatItems/Machine.cs
+++ b/SabreTools.Library/DatItems/Machine.cs
@@ -13,8 +13,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents the information specific to a set/game/machine
    /// </summary>
-    [JsonObject("machine")]
-    [XmlRoot("machine")]
+    [JsonObject("machine"), XmlRoot("machine")]
    public class Machine : ICloneable
    {
        #region Fields
--- a/SabreTools.Library/DatItems/Media.cs
+++ b/SabreTools.Library/DatItems/Media.cs
@@ -14,8 +14,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents Aaruformat images which use internal hashes
    /// </summary>
-    [JsonObject("media")]
-    [XmlRoot("media")]
+    [JsonObject("media"), XmlRoot("media")]
    public class Media : DatItem
    {
        #region Private instance variables
--- a/SabreTools.Library/DatItems/Part.cs
+++ b/SabreTools.Library/DatItems/Part.cs
@@ -14,8 +14,7 @@ namespace SabreTools.Library.DatItems
    /// SoftwareList part information
    /// </summary>
    /// <remarks>One Part can contain multiple PartFeature, DataArea, DiskArea, and DipSwitch items</remarks>
-    [JsonObject("part")]
-    [XmlRoot("part")]
+    [JsonObject("part"), XmlRoot("part")]
    public class Part : DatItem
    {
        #region Fields
--- a/SabreTools.Library/DatItems/PartFeature.cs
+++ b/SabreTools.Library/DatItems/PartFeature.cs
@@ -12,8 +12,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents one part feature object
    /// </summary>
-    [JsonObject("part_feature")]
-    [XmlRoot("part_feature")]
+    [JsonObject("part_feature"), XmlRoot("part_feature")]
    public class PartFeature : DatItem
    {
        #region Fields
--- a/SabreTools.Library/DatItems/Port.cs
+++ b/SabreTools.Library/DatItems/Port.cs
@@ -10,8 +10,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents a single port on a machine
    /// </summary>
-    [JsonObject("port")]
-    [XmlRoot("port")]
+    [JsonObject("port"), XmlRoot("port")]
    public class Port : DatItem
    {
        #region Fields
--- a/SabreTools.Library/DatItems/RamOption.cs
+++ b/SabreTools.Library/DatItems/RamOption.cs
@@ -12,8 +12,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents which RAM option(s) is associated with a set
    /// </summary>
-    [JsonObject("ramoption")]
-    [XmlRoot("ramoption")]
+    [JsonObject("ramoption"), XmlRoot("ramoption")]
    public class RamOption : DatItem
    {
        #region Fields
--- a/SabreTools.Library/DatItems/Release.cs
+++ b/SabreTools.Library/DatItems/Release.cs
@@ -12,8 +12,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents release information about a set
    /// </summary>
-    [JsonObject("release")]
-    [XmlRoot("release")]
+    [JsonObject("release"), XmlRoot("release")]
    public class Release : DatItem
    {
        #region Fields
--- a/SabreTools.Library/DatItems/Rom.cs
+++ b/SabreTools.Library/DatItems/Rom.cs
@@ -17,8 +17,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents a generic file within a set
    /// </summary>
-    [JsonObject("rom")]
-    [XmlRoot("rom")]
+    [JsonObject("rom"), XmlRoot("rom")]
    public class Rom : DatItem
    {
        #region Private instance variables
--- a/SabreTools.Library/DatItems/Sample.cs
+++ b/SabreTools.Library/DatItems/Sample.cs
@@ -12,8 +12,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents a (usually WAV-formatted) sample to be included for use in the set
    /// </summary>
-    [JsonObject("sample")]
-    [XmlRoot("sample")]
+    [JsonObject("sample"), XmlRoot("sample")]
    public class Sample : DatItem
    {
        #region Fields
--- a/SabreTools.Library/DatItems/Setting.cs
+++ b/SabreTools.Library/DatItems/Setting.cs
@@ -12,8 +12,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents one ListXML confsetting or dipvalue
    /// </summary>
-    [JsonObject("setting")]
-    [XmlRoot("setting")]
+    [JsonObject("setting"), XmlRoot("setting")]
    public class Setting : DatItem
    {
        #region Fields
--- a/SabreTools.Library/DatItems/SharedFeature.cs
+++ b/SabreTools.Library/DatItems/SharedFeature.cs
@@ -12,8 +12,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents one shared feature object
    /// </summary>
-    [JsonObject("sharedfeat")]
-    [XmlRoot("sharedfeat")]
+    [JsonObject("sharedfeat"), XmlRoot("sharedfeat")]
    public class SharedFeature : DatItem
    {
        #region Fields
--- a/SabreTools.Library/DatItems/Slot.cs
+++ b/SabreTools.Library/DatItems/Slot.cs
@@ -12,8 +12,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents which Slot(s) is associated with a set
    /// </summary>
-    [JsonObject("slot")]
-    [XmlRoot("slot")]
+    [JsonObject("slot"), XmlRoot("slot")]
    public class Slot : DatItem
    {
        #region Fields
--- a/SabreTools.Library/DatItems/SlotOption.cs
+++ b/SabreTools.Library/DatItems/SlotOption.cs
@@ -12,8 +12,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents one ListXML slotoption
    /// </summary>
-    [JsonObject("slotoption")]
-    [XmlRoot("slotoption")]
+    [JsonObject("slotoption"), XmlRoot("slotoption")]
    public class SlotOption : DatItem
    {
        #region Fields
--- a/SabreTools.Library/DatItems/SoftwareList.cs
+++ b/SabreTools.Library/DatItems/SoftwareList.cs
@@ -13,8 +13,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents which SoftwareList(s) is associated with a set
    /// </summary>
-    [JsonObject("softwarelist")]
-    [XmlRoot("softwarelist")]
+    [JsonObject("softwarelist"), XmlRoot("softwarelist")]
    public class SoftwareList : DatItem
    {
        #region Fields
--- a/SabreTools.Library/DatItems/Sound.cs
+++ b/SabreTools.Library/DatItems/Sound.cs
@@ -12,8 +12,7 @@ namespace SabreTools.Library.DatItems
    /// <summary>
    /// Represents the sound output for a machine
    /// </summary>
-    [JsonObject("sound")]
-    [XmlRoot("sound")]
+    [JsonObject("sound"), XmlRoot("sound")]
    public class Sound : DatItem
    {
        #region Fields