Remove framework gating

OpenMSX/Dump.cs

@@ -7,38 +7,22 @@ namespace SabreTools.Models.OpenMSX
     public class Dump
     {
         [XmlElement("original")]
-#if NET48
-        public Original Original { get; set; }
-#else
         public Original? Original { get; set; }
-#endif
 
         [XmlElement("rom", typeof(Rom))]
         [XmlElement("megarom", typeof(MegaRom))]
         [XmlElement("sccpluscart", typeof(SCCPlusCart))]
-#if NET48
-        public RomBase Rom { get; set; }
-#else
         public RomBase? Rom { 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
     }

OpenMSX/Original.cs

@@ -8,36 +8,20 @@ namespace SabreTools.Models.OpenMSX
     {
         /// <remarks>Boolean?</remarks>
         [XmlAttribute("value")]
-#if NET48
-        public string Value { get; set; }
-#else
         public string? Value { 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
     }

OpenMSX/RomBase.cs

@@ -9,51 +9,27 @@ namespace SabreTools.Models.OpenMSX
     public abstract class RomBase
     {
         [XmlElement("start")]
-#if NET48
-        public string Start { get; set; }
-#else
         public string? Start { get; set; }
-#endif
 
         [XmlElement("type")]
-#if NET48
-        public string Type { get; set; }
-#else
         public string? Type { get; set; }
-#endif
 
         /// <remarks>SHA-1 hash</remarks>
         [XmlElement("hash")]
-#if NET48
-        public string Hash { get; set; }
-#else
         public string? Hash { get; set; }
-#endif
 
         [XmlElement("remark")]
-#if NET48
-        public string Remark { get; set; }
-#else
         public string? Remark { 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
     }

OpenMSX/Software.cs

@@ -8,75 +8,39 @@ namespace SabreTools.Models.OpenMSX
     {
         [Required]
         [XmlElement("title")]
-#if NET48
-        public string Title { get; set; }
-#else
         public string? Title { get; set; }
-#endif
 
         [XmlElement("genmsxid")]
-#if NET48
-        public string GenMSXID { get; set; }
-#else
         public string? GenMSXID { get; set; }
-#endif
 
         [Required]
         [XmlElement("system")]
-#if NET48
-        public string System { get; set; }
-#else
         public string? System { get; set; }
-#endif
 
         [Required]
         [XmlElement("company")]
-#if NET48
-        public string Company { get; set; }
-#else
         public string? Company { get; set; }
-#endif
 
         [Required]
         [XmlElement("year")]
-#if NET48
-        public string Year { get; set; }
-#else
         public string? Year { get; set; }
-#endif
 
         [Required]
         [XmlElement("country")]
-#if NET48
-        public string Country { get; set; }
-#else
         public string? Country { get; set; }
-#endif
 
         [XmlElement("dump")]
-#if NET48
-        public Dump[] Dump { get; set; }
-#else
         public Dump[]? Dump { 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
     }

OpenMSX/SoftwareDb.cs

@@ -7,36 +7,20 @@ namespace SabreTools.Models.OpenMSX
     public class SoftwareDb
     {
         [XmlAttribute("timestamp")]
-#if NET48
-        public string Timestamp { get; set; }
-#else
         public string? Timestamp { get; set; }
-#endif
 
         [XmlElement("software")]
-#if NET48
-        public Software[] Software { get; set; }
-#else
         public Software[]? Software { 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
     }