Remove framework gating

Listxml/Adjuster.cs

@@ -8,44 +8,24 @@ namespace SabreTools.Models.Listxml
     {
         [Required]
         [XmlAttribute("name")]
-#if NET48
-        public string Name { get; set; }
-#else
         public string? Name { get; set; }
-#endif
 
         /// <remarks>(yes|no) "no"</remarks>
         [XmlAttribute("default")]
-#if NET48
-        public string Default { get; set; }
-#else
         public string? Default { get; set; }
-#endif
 
         [XmlElement("condition")]
-#if NET48
-        public Condition Condition { get; set; }
-#else
         public Condition? Condition { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }

Listxml/Analog.cs

@@ -8,29 +8,17 @@ namespace SabreTools.Models.Listxml
     {
         [Required]
         [XmlAttribute("mask")]
-#if NET48
-        public string Mask { get; set; }
-#else
         public string? Mask { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }

Listxml/BiosSet.cs

@@ -8,45 +8,25 @@ namespace SabreTools.Models.Listxml
     {
         [Required]
         [XmlAttribute("name")]
-#if NET48
-        public string Name { get; set; }
-#else
         public string? Name { get; set; }
-#endif
 
         [Required]
         [XmlAttribute("description")]
-#if NET48
-        public string Description { get; set; }
-#else
         public string? Description { get; set; }
-#endif
 
         /// <remarks>(yes|no) "no"</remarks>
         [XmlAttribute("default")]
-#if NET48
-        public string Default { get; set; }
-#else
         public string? Default { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }

Listxml/Chip.cs

@@ -8,60 +8,32 @@ namespace SabreTools.Models.Listxml
     {
         [Required]
         [XmlAttribute("name")]
-#if NET48
-        public string Name { get; set; }
-#else
         public string? Name { get; set; }
-#endif
 
         [XmlAttribute("tag")]
-#if NET48
-        public string Tag { get; set; }
-#else
         public string? Tag { get; set; }
-#endif
 
         /// <remarks>(cpu|audio)</remarks>
         [Required]
         [XmlAttribute("type")]
-#if NET48
-        public string Type { get; set; }
-#else
         public string? Type { get; set; }
-#endif
 
         /// <remarks>Only present in older versions</remarks>
         [XmlAttribute("soundonly")]
-#if NET48
-        public string SoundOnly { get; set; }
-#else
         public string? SoundOnly { get; set; }
-#endif
 
         [XmlAttribute("clock")]
-#if NET48
-        public string Clock { get; set; }
-#else
         public string? Clock { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }

Listxml/Condition.cs

@@ -8,54 +8,30 @@ namespace SabreTools.Models.Listxml
     {
         [Required]
         [XmlAttribute("tag")]
-#if NET48
-        public string Tag { get; set; }
-#else
         public string? Tag { get; set; }
-#endif
 
         [Required]
         [XmlAttribute("mask")]
-#if NET48
-        public string Mask { get; set; }
-#else
         public string? Mask { get; set; }
-#endif
 
         /// <remarks>(eq|ne|gt|le|lt|ge)</remarks>
         [Required]
         [XmlAttribute("relation")]
-#if NET48
-        public string Relation { get; set; }
-#else
         public string? Relation { get; set; }
-#endif
 
         [Required]
         [XmlAttribute("value")]
-#if NET48
-        public string Value { get; set; }
-#else
         public string? Value { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }

Listxml/ConfLocation.cs

@@ -8,46 +8,26 @@ namespace SabreTools.Models.Listxml
     {
         [Required]
         [XmlAttribute("name")]
-#if NET48
-        public string Name { get; set; }
-#else
         public string? Name { get; set; }
-#endif
 
         /// <remarks>Numeric?</remarks>
         [Required]
         [XmlAttribute("number")]
-#if NET48
-        public string Number { get; set; }
-#else
         public string? Number { get; set; }
-#endif
 
         /// <remarks>(yes|no) "no"</remarks>
         [XmlAttribute("inverted")]
-#if NET48
-        public string Inverted { get; set; }
-#else
         public string? Inverted { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }

Listxml/ConfSetting.cs

@@ -8,52 +8,28 @@ namespace SabreTools.Models.Listxml
     {
         [Required]
         [XmlAttribute("name")]
-#if NET48
-        public string Name { get; set; }
-#else
         public string? Name { get; set; }
-#endif
 
         [Required]
         [XmlAttribute("value")]
-#if NET48
-        public string Value { get; set; }
-#else
         public string? Value { get; set; }
-#endif
 
         /// <remarks>(yes|no) "no"</remarks>
         [XmlAttribute("default")]
-#if NET48
-        public string Default { get; set; }
-#else
         public string? Default { get; set; }
-#endif
 
         [XmlElement("condition")]
-#if NET48
-        public Condition Condition { get; set; }
-#else
         public Condition? Condition { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }

Listxml/Configuration.cs

@@ -8,65 +8,33 @@ namespace SabreTools.Models.Listxml
     {
         [Required]
         [XmlAttribute("name")]
-#if NET48
-        public string Name { get; set; }
-#else
         public string? Name { get; set; }
-#endif
 
         [Required]
         [XmlAttribute("tag")]
-#if NET48
-        public string Tag { get; set; }
-#else
         public string? Tag { get; set; }
-#endif
 
         [XmlAttribute("mask")]
-#if NET48
-        public string Mask { get; set; }
-#else
         public string? Mask { get; set; }
-#endif
 
         [XmlElement("condition")]
-#if NET48
-        public Condition Condition { get; set; }
-#else
         public Condition? Condition { get; set; }
-#endif
 
         [XmlElement("conflocation")]
-#if NET48
-        public ConfLocation[] ConfLocation { get; set; }
-#else
         public ConfLocation[]? ConfLocation { get; set; }
-#endif
 
         [XmlElement("confsetting")]
-#if NET48
-        public ConfSetting[] ConfSetting { get; set; }
-#else
         public ConfSetting[]? ConfSetting { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }

Listxml/Control.cs

@@ -9,117 +9,61 @@ namespace SabreTools.Models.Listxml
         /// <remarks>(joy|stick|paddle|pedal|lightgun|positional|dial|trackball|mouse|only_buttons|keypad|keyboard|mahjong|hanafuda|gambling)</remarks>
         [Required]
         [XmlAttribute("type")]
-#if NET48
-        public string Type { get; set; }
-#else
         public string? Type { get; set; }
-#endif
 
         /// <remarks>Numeric</remarks>
         [XmlAttribute("player")]
-#if NET48
-        public string Player { get; set; }
-#else
         public string? Player { get; set; }
-#endif
 
         /// <remarks>Numeric</remarks>
         [XmlAttribute("buttons")]
-#if NET48
-        public string Buttons { get; set; }
-#else
         public string? Buttons { get; set; }
-#endif
 
         /// <remarks>Numeric</remarks>
         [XmlAttribute("reqbuttons")]
-#if NET48
-        public string ReqButtons { get; set; }
-#else
         public string? ReqButtons { get; set; }
-#endif
 
         /// <remarks>Numeric</remarks>
         [XmlAttribute("minimum")]
-#if NET48
-        public string Minimum { get; set; }
-#else
         public string? Minimum { get; set; }
-#endif
 
         /// <remarks>Numeric</remarks>
         [XmlAttribute("maximum")]
-#if NET48
-        public string Maximum { get; set; }
-#else
         public string? Maximum { get; set; }
-#endif
 
         /// <remarks>Numeric</remarks>
         [XmlAttribute("sensitivity")]
-#if NET48
-        public string Sensitivity { get; set; }
-#else
         public string? Sensitivity { get; set; }
-#endif
 
         /// <remarks>Numeric</remarks>
         [XmlAttribute("keydelta")]
-#if NET48
-        public string KeyDelta { get; set; }
-#else
         public string? KeyDelta { get; set; }
-#endif
 
         /// <remarks>(yes|no) "no"</remarks>
         [XmlAttribute("reverse")]
-#if NET48
-        public string Reverse { get; set; }
-#else
         public string? Reverse { get; set; }
-#endif
 
         /// <remarks>Numeric?</remarks>
         [XmlAttribute("ways")]
-#if NET48
-        public string Ways { get; set; }
-#else
         public string? Ways { get; set; }
-#endif
 
         /// <remarks>Numeric?</remarks>
         [XmlAttribute("ways2")]
-#if NET48
-        public string Ways2 { get; set; }
-#else
         public string? Ways2 { get; set; }
-#endif
 
         /// <remarks>Numeric?</remarks>
         [XmlAttribute("ways3")]
-#if NET48
-        public string Ways3 { get; set; }
-#else
         public string? Ways3 { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }

Listxml/Device.cs

@@ -8,72 +8,36 @@ namespace SabreTools.Models.Listxml
     {
         [Required]
         [XmlAttribute("type")]
-#if NET48
-        public string Type { get; set; }
-#else
         public string? Type { get; set; }
-#endif
 
         [XmlAttribute("tag")]
-#if NET48
-        public string Tag { get; set; }
-#else
         public string? Tag { get; set; }
-#endif
 
         [XmlAttribute("fixed_image")]
-#if NET48
-        public string FixedImage { get; set; }
-#else
         public string? FixedImage { get; set; }
-#endif
 
         /// <remarks>Numeric boolean</remarks>
         [XmlAttribute("mandatory")]
-#if NET48
-        public string Mandatory { get; set; }
-#else
         public string? Mandatory { get; set; }
-#endif
 
         [XmlAttribute("interface")]
-#if NET48
-        public string Interface { get; set; }
-#else
         public string? Interface { get; set; }
-#endif
 
         [XmlElement("instance")]
-#if NET48
-        public Instance Instance { get; set; }
-#else
         public Instance? Instance { get; set; }
-#endif
 
         [XmlElement("extension")]
-#if NET48
-        public Extension[] Extension { get; set; }
-#else
         public Extension[]? Extension { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }

Listxml/DeviceRef.cs

@@ -8,29 +8,17 @@ namespace SabreTools.Models.Listxml
     {
         [Required]
         [XmlAttribute("name")]
-#if NET48
-        public string Name { get; set; }
-#else
         public string? Name { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }

Listxml/DipLocation.cs

@@ -8,46 +8,26 @@ namespace SabreTools.Models.Listxml
     {
         [Required]
         [XmlAttribute("name")]
-#if NET48
-        public string Name { get; set; }
-#else
         public string? Name { get; set; }
-#endif
 
         /// <remarks>Numeric?</remarks>
         [Required]
         [XmlAttribute("number")]
-#if NET48
-        public string Number { get; set; }
-#else
         public string? Number { get; set; }
-#endif
 
         /// <remarks>(yes|no) "no"</remarks>
         [XmlAttribute("inverted")]
-#if NET48
-        public string Inverted { get; set; }
-#else
         public string? Inverted { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }

Listxml/DipSwitch.cs

@@ -8,65 +8,33 @@ namespace SabreTools.Models.Listxml
     {
         [Required]
         [XmlAttribute("name")]
-#if NET48
-        public string Name { get; set; }
-#else
         public string? Name { get; set; }
-#endif
 
         [Required]
         [XmlAttribute("tag")]
-#if NET48
-        public string Tag { get; set; }
-#else
         public string? Tag { get; set; }
-#endif
 
         [XmlAttribute("mask")]
-#if NET48
-        public string Mask { get; set; }
-#else
         public string? Mask { get; set; }
-#endif
 
         [XmlElement("condition")]
-#if NET48
-        public Condition Condition { get; set; }
-#else
         public Condition? Condition { get; set; }
-#endif
 
         [XmlElement("diplocation")]
-#if NET48
-        public DipLocation[] DipLocation { get; set; }
-#else
         public DipLocation[]? DipLocation { get; set; }
-#endif
 
         [XmlElement("dipvalue")]
-#if NET48
-        public DipValue[] DipValue { get; set; }
-#else
         public DipValue[]? DipValue { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }

Listxml/DipValue.cs

@@ -8,52 +8,28 @@ namespace SabreTools.Models.Listxml
     {
         [Required]
         [XmlAttribute("name")]
-#if NET48
-        public string Name { get; set; }
-#else
         public string? Name { get; set; }
-#endif
 
         [Required]
         [XmlAttribute("value")]
-#if NET48
-        public string Value { get; set; }
-#else
         public string? Value { get; set; }
-#endif
 
         /// <remarks>(yes|no) "no"</remarks>
         [XmlAttribute("default")]
-#if NET48
-        public string Default { get; set; }
-#else
         public string? Default { get; set; }
-#endif
 
         [XmlElement("condition")]
-#if NET48
-        public Condition Condition { get; set; }
-#else
         public Condition? Condition { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }

Listxml/Disk.cs

@@ -8,90 +8,46 @@ namespace SabreTools.Models.Listxml
     {
         [Required]
         [XmlAttribute("name")]
-#if NET48
-        public string Name { get; set; }
-#else
         public string? Name { get; set; }
-#endif
 
         /// <remarks>Only present in older versions</remarks>
         [XmlAttribute("md5")]
-#if NET48
-        public string MD5 { get; set; }
-#else
         public string? MD5 { get; set; }
-#endif
 
         [XmlAttribute("sha1")]
-#if NET48
-        public string SHA1 { get; set; }
-#else
         public string? SHA1 { get; set; }
-#endif
 
         [XmlAttribute("merge")]
-#if NET48
-        public string Merge { get; set; }
-#else
         public string? Merge { get; set; }
-#endif
 
         [XmlAttribute("region")]
-#if NET48
-        public string Region { get; set; }
-#else
         public string? Region { get; set; }
-#endif
 
         /// <remarks>Numeric?</remarks>
         [XmlAttribute("index")]
-#if NET48
-        public string Index { get; set; }
-#else
         public string? Index { get; set; }
-#endif
 
         /// <remarks>(yes|no) "no"</remarks>
         [XmlAttribute("writable")]
-#if NET48
-        public string Writable { get; set; }
-#else
         public string? Writable { get; set; }
-#endif
 
         /// <remarks>(baddump|nodump|good) "good"</remarks>
         [XmlAttribute("status")]
-#if NET48
-        public string Status { get; set; }
-#else
         public string? Status { get; set; }
-#endif
 
         /// <remarks>(yes|no) "no"</remarks>
         [XmlAttribute("optional")]
-#if NET48
-        public string Optional { get; set; }
-#else
         public string? Optional { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }

Listxml/Display.cs

@@ -7,135 +7,71 @@ namespace SabreTools.Models.Listxml
     public class Display
     {
         [XmlAttribute("tag")]
-#if NET48
-        public string Tag { get; set; }
-#else
         public string? Tag { get; set; }
-#endif
 
         /// <remarks>(raster|vector|lcd|svg|unknown)</remarks>
         [Required]
         [XmlAttribute("type")]
-#if NET48
-        public string Type { get; set; }
-#else
         public string? Type { get; set; }
-#endif
 
         /// <remarks>(0|90|180|270)</remarks>
         [XmlAttribute("rotate")]
-#if NET48
-        public string Rotate { get; set; }
-#else
         public string? Rotate { get; set; }
-#endif
 
         /// <remarks>(yes|no) "no"</remarks>
         [XmlAttribute("flipx")]
-#if NET48
-        public string FlipX { get; set; }
-#else
         public string? FlipX { get; set; }
-#endif
 
         /// <remarks>Numeric</remarks>
         [XmlAttribute("width")]
-#if NET48
-        public string Width { get; set; }
-#else
         public string? Width { get; set; }
-#endif
 
         /// <remarks>Numeric</remarks>
         [XmlAttribute("height")]
-#if NET48
-        public string Height { get; set; }
-#else
         public string? Height { get; set; }
-#endif
 
         /// <remarks>Numeric</remarks>
         [Required]
         [XmlAttribute("refresh")]
-#if NET48
-        public string Refresh { get; set; }
-#else
         public string? Refresh { get; set; }
-#endif
 
         /// <remarks>Numeric</remarks>
         [XmlAttribute("pixclock")]
-#if NET48
-        public string PixClock { get; set; }
-#else
         public string? PixClock { get; set; }
-#endif
 
         /// <remarks>Numeric</remarks>
         [XmlAttribute("htotal")]
-#if NET48
-        public string HTotal { get; set; }
-#else
         public string? HTotal { get; set; }
-#endif
 
         /// <remarks>Numeric</remarks>
         [XmlAttribute("hbend")]
-#if NET48
-        public string HBEnd { get; set; }
-#else
         public string? HBEnd { get; set; }
-#endif
 
         /// <remarks>Numeric</remarks>
         [XmlAttribute("hbstart")]
-#if NET48
-        public string HBStart { get; set; }
-#else
         public string? HBStart { get; set; }
-#endif
 
         /// <remarks>Numeric</remarks>
         [XmlAttribute("vtotal")]
-#if NET48
-        public string VTotal { get; set; }
-#else
         public string? VTotal { get; set; }
-#endif
 
         /// <remarks>Numeric</remarks>
         [XmlAttribute("vbend")]
-#if NET48
-        public string VBEnd { get; set; }
-#else
         public string? VBEnd { get; set; }
-#endif
 
         /// <remarks>Numeric</remarks>
         [XmlAttribute("vbstart")]
-#if NET48
-        public string VBStart { get; set; }
-#else
         public string? VBStart { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }

Listxml/Driver.cs

@@ -9,112 +9,60 @@ namespace SabreTools.Models.Listxml
         /// <remarks>(good|imperfect|preliminary), (good|preliminary|test) in older versions</remarks>
         [Required]
         [XmlAttribute("status")]
-#if NET48
-        public string Status { get; set; }
-#else
         public string? Status { get; set; }
-#endif
 
         /// <remarks>(good|imperfect|preliminary), Only present in older versions</remarks>
         [XmlAttribute("color")]
-#if NET48
-        public string Color { get; set; }
-#else
         public string? Color { get; set; }
-#endif
 
         /// <remarks>(good|imperfect|preliminary), Only present in older versions</remarks>
         [XmlAttribute("sound")]
-#if NET48
-        public string Sound { get; set; }
-#else
         public string? Sound { get; set; }
-#endif
 
         /// <remarks>Only present in older versions</remarks>
         [XmlAttribute("palettesize")]
-#if NET48
-        public string PaletteSize { get; set; }
-#else
         public string? PaletteSize { get; set; }
-#endif
 
         /// <remarks>(good|imperfect|preliminary)</remarks>
         [Required]
         [XmlAttribute("emulation")]
-#if NET48
-        public string Emulation { get; set; }
-#else
         public string? Emulation { get; set; }
-#endif
 
         /// <remarks>(good|imperfect|preliminary)</remarks>
         [Required]
         [XmlAttribute("cocktail")]
-#if NET48
-        public string Cocktail { get; set; }
-#else
         public string? Cocktail { get; set; }
-#endif
 
         /// <remarks>(supported|unsupported)</remarks>
         [Required]
         [XmlAttribute("savestate")]
-#if NET48
-        public string SaveState { get; set; }
-#else
         public string? SaveState { get; set; }
-#endif
 
         /// <remarks>(yes|no) "no"</remarks>
         [XmlAttribute("requiresartwork")]
-#if NET48
-        public string RequiresArtwork { get; set; }
-#else
         public string? RequiresArtwork { get; set; }
-#endif
 
         /// <remarks>(yes|no) "no"</remarks>
         [XmlAttribute("unofficial")]
-#if NET48
-        public string Unofficial { get; set; }
-#else
         public string? Unofficial { get; set; }
-#endif
 
         /// <remarks>(yes|no) "no"</remarks>
         [XmlAttribute("nosoundhardware")]
-#if NET48
-        public string NoSoundHardware { get; set; }
-#else
         public string? NoSoundHardware { get; set; }
-#endif
 
         /// <remarks>(yes|no) "no"</remarks>
         [XmlAttribute("incomplete")]
-#if NET48
-        public string Incomplete { get; set; }
-#else
         public string? Incomplete { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }

Listxml/Extension.cs

@@ -8,29 +8,17 @@ namespace SabreTools.Models.Listxml
     {
         [Required]
         [XmlAttribute("name")]
-#if NET48
-        public string Name { get; set; }
-#else
         public string? Name { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }

Listxml/Feature.cs

@@ -9,45 +9,25 @@ namespace SabreTools.Models.Listxml
         /// <remarks>(protection|timing|graphics|palette|sound|capture|camera|microphone|controls|keyboard|mouse|media|disk|printer|tape|punch|drum|rom|comms|lan|wan)</remarks>
         [Required]
         [XmlAttribute("type")]
-#if NET48
-        public string Type { get; set; }
-#else
         public string? Type { get; set; }
-#endif
 
         /// <remarks>(unemulated|imperfect)</remarks>
         [XmlAttribute("status")]
-#if NET48
-        public string Status { get; set; }
-#else
         public string? Status { get; set; }
-#endif
 
         /// <remarks>(unemulated|imperfect)</remarks>
         [XmlAttribute("overall")]
-#if NET48
-        public string Overall { get; set; }
-#else
         public string? Overall { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }

Listxml/GameBase.cs

@@ -10,261 +10,121 @@ namespace SabreTools.Models.Listxml
     {
         [Required]
         [XmlAttribute("name")]
-#if NET48
-        public string Name { get; set; }
-#else
         public string? Name { get; set; }
-#endif
 
         /// <remarks>Machine only</remarks>
         [XmlAttribute("sourcefile")]
-#if NET48
-        public string SourceFile { get; set; }
-#else
         public string? SourceFile { get; set; }
-#endif
 
         /// <remarks>(yes|no) "no", Machine only</remarks>
         [XmlAttribute("isbios")]
-#if NET48
-        public string IsBios { get; set; }
-#else
         public string? IsBios { get; set; }
-#endif
 
         /// <remarks>(yes|no) "no", Machine only</remarks>
         [XmlAttribute("isdevice")]
-#if NET48
-        public string IsDevice { get; set; }
-#else
         public string? IsDevice { get; set; }
-#endif
 
         /// <remarks>(yes|no) "no", Machine only</remarks>
         [XmlAttribute("ismechanical")]
-#if NET48
-        public string IsMechanical { get; set; }
-#else
         public string? IsMechanical { get; set; }
-#endif
 
         /// <remarks>(yes|no) "no"</remarks>
         [XmlAttribute("runnable")]
-#if NET48
-        public string Runnable { get; set; }
-#else
         public string? Runnable { get; set; }
-#endif
 
         [XmlAttribute("cloneof")]
-#if NET48
-        public string CloneOf { get; set; }
-#else
         public string? CloneOf { get; set; }
-#endif
 
         [XmlAttribute("romof")]
-#if NET48
-        public string RomOf { get; set; }
-#else
         public string? RomOf { get; set; }
-#endif
 
         [XmlAttribute("sampleof")]
-#if NET48
-        public string SampleOf { get; set; }
-#else
         public string? SampleOf { get; set; }
-#endif
 
         [Required]
         [XmlElement("description")]
-#if NET48
-        public string Description { get; set; }
-#else
         public string? Description { get; set; }
-#endif
 
         [XmlElement("year")]
-#if NET48
-        public string Year { get; set; }
-#else
         public string? Year { get; set; }
-#endif
 
         [XmlElement("manufacturer")]
-#if NET48
-        public string Manufacturer { get; set; }
-#else
         public string? Manufacturer { get; set; }
-#endif
 
         /// <remarks>Game only</remarks>
         [XmlElement("history")]
-#if NET48
-        public string History { get; set; }
-#else
         public string? History { get; set; }
-#endif
 
         [XmlElement("biosset")]
-#if NET48
-        public BiosSet[] BiosSet { get; set; }
-#else
         public BiosSet[]? BiosSet { get; set; }
-#endif
 
         [XmlElement("rom")]
-#if NET48
-        public Rom[] Rom { get; set; }
-#else
         public Rom[]? Rom { get; set; }
-#endif
 
         [XmlElement("disk")]
-#if NET48
-        public Disk[] Disk { get; set; }
-#else
         public Disk[]? Disk { get; set; }
-#endif
 
         [XmlElement("device_ref")]
-#if NET48
-        public DeviceRef[] DeviceRef { get; set; }
-#else
         public DeviceRef[]? DeviceRef { get; set; }
-#endif
 
         [XmlElement("sample")]
-#if NET48
-        public Sample[] Sample { get; set; }
-#else
         public Sample[]? Sample { get; set; }
-#endif
 
         [XmlElement("chip")]
-#if NET48
-        public Chip[] Chip { get; set; }
-#else
         public Chip[]? Chip { get; set; }
-#endif
 
         [XmlElement("display")]
-#if NET48
-        public Display[] Display { get; set; }
-#else
         public Display[]? Display { get; set; }
-#endif
 
         /// <remarks>Only present in older versions</remarks>
         [XmlElement("video")]
-#if NET48
-        public Video[] Video { get; set; }
-#else
         public Video[]? Video { get; set; }
-#endif
 
         [XmlElement("sound")]
-#if NET48
-        public Sound Sound { get; set; }
-#else
         public Sound? Sound { get; set; }
-#endif
 
         [XmlElement("input")]
-#if NET48
-        public Input Input { get; set; }
-#else
         public Input? Input { get; set; }
-#endif
 
         [XmlElement("dipswitch")]
-#if NET48
-        public DipSwitch[] DipSwitch { get; set; }
-#else
         public DipSwitch[]? DipSwitch { get; set; }
-#endif
 
         [XmlElement("configuration")]
-#if NET48
-        public Configuration[] Configuration { get; set; }
-#else
         public Configuration[]? Configuration { get; set; }
-#endif
 
         [XmlElement("port")]
-#if NET48
-        public Port[] Port { get; set; }
-#else
         public Port[]? Port { get; set; }
-#endif
 
         [XmlElement("adjuster")]
-#if NET48
-        public Adjuster[] Adjuster { get; set; }
-#else
         public Adjuster[]? Adjuster { get; set; }
-#endif
 
         [XmlElement("driver")]
-#if NET48
-        public Driver Driver { get; set; }
-#else
         public Driver? Driver { get; set; }
-#endif
 
         [XmlElement("feature")]
-#if NET48
-        public Feature[] Feature { get; set; }
-#else
         public Feature[]? Feature { get; set; }
-#endif
 
         [XmlElement("device")]
-#if NET48
-        public Device[] Device { get; set; }
-#else
         public Device[]? Device { get; set; }
-#endif
 
         [XmlElement("slot")]
-#if NET48
-        public Slot[] Slot { get; set; }
-#else
         public Slot[]? Slot { get; set; }
-#endif
 
         [XmlElement("softwarelist")]
-#if NET48
-        public SoftwareList[] SoftwareList { get; set; }
-#else
         public SoftwareList[]? SoftwareList { get; set; }
-#endif
 
         [XmlElement("ramoption")]
-#if NET48
-        public RamOption[] RamOption { get; set; }
-#else
         public RamOption[]? RamOption { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }

Listxml/Input.cs

@@ -8,77 +8,41 @@ namespace SabreTools.Models.Listxml
     {
         /// <remarks>(yes|no) "no"</remarks>
         [XmlAttribute("service")]
-#if NET48
-        public string Service { get; set; }
-#else
         public string? Service { get; set; }
-#endif
 
         /// <remarks>(yes|no) "no"</remarks>
         [XmlAttribute("tilt")]
-#if NET48
-        public string Tilt { get; set; }
-#else
         public string? Tilt { get; set; }
-#endif
 
         /// <remarks>Numeric</remarks>
         [Required]
         [XmlAttribute("players")]
-#if NET48
-        public string Players { get; set; }
-#else
         public string? Players { get; set; }
-#endif
 
         /// <remarks>Only present in older versions</remarks>
         [XmlAttribute("control")]
-#if NET48
-        public string ControlAttr { get; set; }
-#else
         public string? ControlAttr { get; set; }
-#endif
 
         /// <remarks>Only present in older versions, Numeric?</remarks>
         [XmlAttribute("buttons")]
-#if NET48
-        public string Buttons { get; set; }
-#else
         public string? Buttons { get; set; }
-#endif
 
         /// <remarks>Numeric?</remarks>
         [XmlAttribute("coins")]
-#if NET48
-        public string Coins { get; set; }
-#else
         public string? Coins { get; set; }
-#endif
 
         [XmlElement("control")]
-#if NET48
-        public Control[] Control { get; set; }
-#else
         public Control[]? Control { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }

Listxml/Instance.cs

@@ -8,37 +8,21 @@ namespace SabreTools.Models.Listxml
     {
         [Required]
         [XmlAttribute("name")]
-#if NET48
-        public string Name { get; set; }
-#else
         public string? Name { get; set; }
-#endif
 
         [Required]
         [XmlAttribute("briefname")]
-#if NET48
-        public string BriefName { get; set; }
-#else
         public string? BriefName { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }

Listxml/M1.cs

@@ -7,37 +7,21 @@ namespace SabreTools.Models.Listxml
     public class M1
     {
         [XmlAttribute("version")]
-#if NET48
-        public string Version { get; set; }
-#else
         public string? Version { get; set; }
-#endif
 
         [XmlElement("machine", typeof(Machine))]
         [XmlElement("game", typeof(Game))]
-#if NET48
-        public GameBase[] Game { get; set; }
-#else
         public GameBase[]? Game { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }

Listxml/Mame.cs

@@ -7,53 +7,29 @@ namespace SabreTools.Models.Listxml
     public class Mame
     {
         [XmlAttribute("build")]
-#if NET48
-        public string Build { get; set; }
-#else
         public string? Build { get; set; }
-#endif
 
         /// <remarks>(yes|no) "no"</remarks>
         [XmlAttribute("debug")]
-#if NET48
-        public string Debug { get; set; }
-#else
         public string? Debug { get; set; }
-#endif
 
         [Required]
         [XmlAttribute("mameconfig")]
-#if NET48
-        public string MameConfig { get; set; }
-#else
         public string? MameConfig { get; set; }
-#endif
 
         [XmlElement("machine", typeof(Machine))]
         [XmlElement("game", typeof(Game))]
-#if NET48
-        public GameBase[] Game { get; set; }
-#else
         public GameBase[]? Game { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }

Listxml/Port.cs

@@ -8,36 +8,20 @@ namespace SabreTools.Models.Listxml
     {
         [Required]
         [XmlAttribute("tag")]
-#if NET48
-        public string Tag { get; set; }
-#else
         public string? Tag { get; set; }
-#endif
 
         [XmlElement("analog")]
-#if NET48
-        public Analog[] Analog { get; set; }
-#else
         public Analog[]? Analog { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }

Listxml/RamOption.cs

@@ -8,43 +8,23 @@ namespace SabreTools.Models.Listxml
     {
         [Required]
         [XmlAttribute("name")]
-#if NET48
-        public string Name { get; set; }
-#else
         public string? Name { get; set; }
-#endif
 
         [XmlAttribute("default")]
-#if NET48
-        public string Default { get; set; }
-#else
         public string? Default { get; set; }
-#endif
 
         [XmlText]
-#if NET48
-        public string Content { get; set; }
-#else
         public string? Content { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }

Listxml/Rom.cs

@@ -8,113 +8,57 @@ namespace SabreTools.Models.Listxml
     {
         [Required]
         [XmlAttribute("name")]
-#if NET48
-        public string Name { get; set; }
-#else
         public string? Name { get; set; }
-#endif
 
         [XmlAttribute("bios")]
-#if NET48
-        public string Bios { get; set; }
-#else
         public string? Bios { get; set; }
-#endif
 
         /// <remarks>Numeric</remarks>
         [Required]
         [XmlAttribute("size")]
-#if NET48
-        public string Size { get; set; }
-#else
         public string? Size { get; set; }
-#endif
 
         [XmlAttribute("crc")]
-#if NET48
-        public string CRC { get; set; }
-#else
         public string? CRC { get; set; }
-#endif
 
         [XmlAttribute("sha1")]
-#if NET48
-        public string SHA1 { get; set; }
-#else
         public string? SHA1 { get; set; }
-#endif
 
         [XmlAttribute("merge")]
-#if NET48
-        public string Merge { get; set; }
-#else
         public string? Merge { get; set; }
-#endif
 
         [XmlAttribute("region")]
-#if NET48
-        public string Region { get; set; }
-#else
         public string? Region { get; set; }
-#endif
 
         /// <remarks>Numeric</remarks>
         [XmlAttribute("offset")]
-#if NET48
-        public string Offset { get; set; }
-#else
         public string? Offset { get; set; }
-#endif
 
         /// <remarks>(baddump|nodump|good) "good"</remarks>
         [XmlAttribute("status")]
-#if NET48
-        public string Status { get; set; }
-#else
         public string? Status { get; set; }
-#endif
 
         /// <remarks>(yes|no) "no"</remarks>
         [XmlAttribute("optional")]
-#if NET48
-        public string Optional { get; set; }
-#else
         public string? Optional { get; set; }
-#endif
 
         /// <remarks>(yes|no) "no", Only present in older versions</remarks>
         [XmlAttribute("dispose")]
-#if NET48
-        public string Dispose { get; set; }
-#else
         public string? Dispose { get; set; }
-#endif
 
         /// <remarks>(yes|no) "no", Only present in older versions</remarks>
         [XmlAttribute("soundonly")]
-#if NET48
-        public string SoundOnly { get; set; }
-#else
         public string? SoundOnly { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }

Listxml/Sample.cs

@@ -8,29 +8,17 @@ namespace SabreTools.Models.Listxml
     {
         [Required]
         [XmlAttribute("name")]
-#if NET48
-        public string Name { get; set; }
-#else
         public string? Name { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }

Listxml/Slot.cs

@@ -8,36 +8,20 @@ namespace SabreTools.Models.Listxml
     {
         [Required]
         [XmlAttribute("name")]
-#if NET48
-        public string Name { get; set; }
-#else
         public string? Name { get; set; }
-#endif
 
         [XmlElement("slotoption")]
-#if NET48
-        public SlotOption[] SlotOption { get; set; }
-#else
         public SlotOption[]? SlotOption { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }

Listxml/SlotOption.cs

@@ -8,45 +8,25 @@ namespace SabreTools.Models.Listxml
     {
         [Required]
         [XmlAttribute("name")]
-#if NET48
-        public string Name { get; set; }
-#else
         public string? Name { get; set; }
-#endif
 
         [Required]
         [XmlAttribute("devname")]
-#if NET48
-        public string DevName { get; set; }
-#else
         public string? DevName { get; set; }
-#endif
 
         /// <remarks>(yes|no) "no"</remarks>
         [XmlAttribute("default")]
-#if NET48
-        public string Default { get; set; }
-#else
         public string? Default { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }

Listxml/SoftwareList.cs

@@ -8,53 +8,29 @@ namespace SabreTools.Models.Listxml
     {
         [Required]
         [XmlAttribute("tag")]
-#if NET48
-        public string Tag { get; set; }
-#else
         public string? Tag { get; set; }
-#endif
 
         [Required]
         [XmlAttribute("name")]
-#if NET48
-        public string Name { get; set; }
-#else
         public string? Name { get; set; }
-#endif
 
         /// <remarks>(original|compatible)</remarks>
         [Required]
         [XmlAttribute("status")]
-#if NET48
-        public string Status { get; set; }
-#else
         public string? Status { get; set; }
-#endif
 
         [XmlAttribute("filter")]
-#if NET48
-        public string Filter { get; set; }
-#else
         public string? Filter { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }

Listxml/Sound.cs

@@ -9,29 +9,17 @@ namespace SabreTools.Models.Listxml
         /// <remarks>Numeric</remarks>
         [Required]
         [XmlAttribute("channels")]
-#if NET48
-        public string Channels { get; set; }
-#else
         public string? Channels { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }

Listxml/Video.cs

@@ -9,78 +9,42 @@ namespace SabreTools.Models.Listxml
         /// <remarks>(raster|vector)</remarks>
         [Required]
         [XmlAttribute("screen")]
-#if NET48
-        public string Screen { get; set; }
-#else
         public string? Screen { get; set; }
-#endif
 
         /// <remarks>(vertical|horizontal)</remarks>
         [Required]
         [XmlAttribute("orientation")]
-#if NET48
-        public string Orientation { get; set; }
-#else
         public string? Orientation { get; set; }
-#endif
 
         /// <remarks>Numeric</remarks>
         [XmlAttribute("width")]
-#if NET48
-        public string Width { get; set; }
-#else
         public string? Width { get; set; }
-#endif
 
         /// <remarks>Numeric</remarks>
         [XmlAttribute("height")]
-#if NET48
-        public string Height { get; set; }
-#else
         public string? Height { get; set; }
-#endif
 
         /// <remarks>Numeric</remarks>
         [XmlAttribute("aspectx")]
-#if NET48
-        public string AspectX { get; set; }
-#else
         public string? AspectX { get; set; }
-#endif
 
         /// <remarks>Numeric</remarks>
         [XmlAttribute("aspecty")]
-#if NET48
-        public string AspectY { get; set; }
-#else
         public string? AspectY { get; set; }
-#endif
 
         /// <remarks>Numeric</remarks>
         [XmlAttribute("refresh")]
-#if NET48
-        public string Refresh { get; set; }
-#else
         public string? Refresh { get; set; }
-#endif
 
         #region DO NOT USE IN PRODUCTION
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyAttribute]
-#if NET48
-        public XmlAttribute[] ADDITIONAL_ATTRIBUTES { get; set; }
-#else
         public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; }
-#endif
 
         /// <remarks>Should be empty</remarks>
         [XmlAnyElement]
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
         public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif
 
         #endregion
     }