Use "main" instead of "master"

Update copyright date
Add nuget package and PR workflows
2026-02-04 21:30:19 +00:00 · 2024-02-27 19:06:26 -05:00 · 2024-02-27 17:18:02 -05:00 · 2024-02-27 17:17:50 -05:00 · 2023-11-30 19:11:52 -05:00 · 2023-11-21 11:15:24 -05:00
381 changed files with 556 additions and 7358 deletions
--- a/.github/workflows/build_nupkg.yml
+++ b/.github/workflows/build_nupkg.yml
@@ -0,0 +1,43 @@
+name: Nuget Pack
+
+on:
+  push:
+    branches: [ "main" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: recursive
+    
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 8.0.x
+        
+    - name: Restore dependencies
+      run: dotnet restore
+      
+    - name: Pack
+      run: dotnet pack
+
+    - name: Upload build
+      uses: actions/upload-artifact@v4
+      with:
+        name: 'Nuget Package'
+        path: 'bin/Release/*.nupkg'
+
+    - name: Upload to rolling
+      uses: ncipollo/release-action@v1.14.0
+      with:
+        allowUpdates: True
+        artifacts: 'bin/Release/*.nupkg'
+        body: 'Last built commit: ${{ github.sha }}'
+        name: 'Rolling Release'
+        prerelease: True
+        replacesArtifacts: True
+        tag: "rolling"
+        updateOnlyUnreleased: True
--- a/.github/workflows/check_pr.yml
+++ b/.github/workflows/check_pr.yml
@@ -0,0 +1,17 @@
+name: Build PR
+
+on: [pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 8.0.x
+      
+    - name: Build
+      run: dotnet build
--- a/AACS/CopyrightRecord.cs
+++ b/AACS/CopyrightRecord.cs
@@ -8,10 +8,6 @@ namespace SabreTools.Models.AACS
        /// <summary>
        /// Null-terminated ASCII string representing the copyright
        /// </summary>
-#if NET48
-        public string Copyright { get; set; }
-#else
        public string? Copyright { get; set; }
-#endif
    }
 }
--- a/AACS/DriveRevocationListEntry.cs
+++ b/AACS/DriveRevocationListEntry.cs
@@ -16,10 +16,6 @@ namespace SabreTools.Models.AACS
        /// (or the first in a range of Licensed Drives being revoked, in the
        /// case of a non-zero Range value).
        /// </summary>
-#if NET48
-        public byte[] DriveID { get; set; }
-#else
        public byte[]? DriveID { get; set; }
-#endif
    }
 }
--- a/AACS/DriveRevocationListRecord.cs
+++ b/AACS/DriveRevocationListRecord.cs
@@ -21,10 +21,6 @@ namespace SabreTools.Models.AACS
        /// <summary>
        /// Revocation list entries
        /// </summary>
-#if NET48
-        public DriveRevocationSignatureBlock[] SignatureBlocks { get; set; }
-#else
        public DriveRevocationSignatureBlock?[]? SignatureBlocks { get; set; }
-#endif
    }
 }
--- a/AACS/DriveRevocationSignatureBlock.cs
+++ b/AACS/DriveRevocationSignatureBlock.cs
@@ -12,10 +12,6 @@ namespace SabreTools.Models.AACS
        /// A list of 8-byte Host Drive List Entry fields, the length of this
        /// list being equal to the number in the signature block.
        /// </summary>
-#if NET48
-        public DriveRevocationListEntry[] EntryFields { get; set; }
-#else
        public DriveRevocationListEntry?[]? EntryFields { get; set; }
-#endif
    }
 }
--- a/AACS/EndOfMediaKeyBlockRecord.cs
+++ b/AACS/EndOfMediaKeyBlockRecord.cs
@@ -18,10 +18,6 @@ namespace SabreTools.Models.AACS
        /// determines that the signature does not verify or is omitted, it
        /// must refuse to use the Media Key.
        /// </summary>
-#if NET48
-        public byte[] SignatureData { get; set; }
-#else
        public byte[]? SignatureData { get; set; }
-#endif
    }
 }
--- a/AACS/ExplicitSubsetDifferenceRecord.cs
+++ b/AACS/ExplicitSubsetDifferenceRecord.cs
@@ -6,10 +6,6 @@ namespace SabreTools.Models.AACS
        /// <summary>
        /// In this record, each subset-difference is encoded with 5 bytes.
        /// </summary>
-#if NET48
-        public SubsetDifference[] SubsetDifferences { get; set; }
-#else
        public SubsetDifference?[]? SubsetDifferences { get; set; }
-#endif
    }
 }
--- a/AACS/HostRevocationListEntry.cs
+++ b/AACS/HostRevocationListEntry.cs
@@ -16,10 +16,6 @@ namespace SabreTools.Models.AACS
        /// first in a range of hosts being revoked, in the case of a non-zero
        /// Range value).
        /// </summary>
-#if NET48
-        public byte[] HostID { get; set; }
-#else
        public byte[]? HostID { get; set; }
-#endif
    }
 }
--- a/AACS/HostRevocationListRecord.cs
+++ b/AACS/HostRevocationListRecord.cs
@@ -24,10 +24,6 @@ namespace SabreTools.Models.AACS
        /// <summary>
        /// Revocation list entries
        /// </summary>
-#if NET48
-        public HostRevocationSignatureBlock[] SignatureBlocks { get; set; }
-#else
        public HostRevocationSignatureBlock?[]? SignatureBlocks { get; set; }
-#endif
    }
 }
--- a/AACS/HostRevocationSignatureBlock.cs
+++ b/AACS/HostRevocationSignatureBlock.cs
@@ -12,10 +12,6 @@ namespace SabreTools.Models.AACS
        /// A list of 8-byte Host Revocation List Entry fields, the length of this
        /// list being equal to the number in the signature block.
        /// </summary>
-#if NET48
-        public HostRevocationListEntry[] EntryFields { get; set; }
-#else
        public HostRevocationListEntry?[]? EntryFields { get; set; }
-#endif
    }
 }
--- a/AACS/MediaKeyBlock.cs
+++ b/AACS/MediaKeyBlock.cs
@@ -9,10 +9,6 @@ namespace SabreTools.Models.AACS
        /// <summary>
        /// Records
        /// </summary>
-#if NET48
-        public Record[] Records { get; set; }
-#else
        public Record?[]? Records { get; set; }
-#endif
    }
 }
--- a/AACS/MediaKeyDataRecord.cs
+++ b/AACS/MediaKeyDataRecord.cs
@@ -13,10 +13,6 @@ namespace SabreTools.Models.AACS
        /// record. This 16 bytes is the ciphertext value C in the media
        /// key calculation.
        /// </summary>
-#if NET48
-        public byte[][] MediaKeyData { get; set; }
-#else
        public byte[][]? MediaKeyData { get; set; }
-#endif
    }
 }
--- a/AACS/SubsetDifferenceIndexRecord.cs
+++ b/AACS/SubsetDifferenceIndexRecord.cs
@@ -21,10 +21,6 @@ namespace SabreTools.Models.AACS
        /// Subset-Difference record, with 0 being the start of the record.
        /// </summary>
        // <remarks>UInt24 not UInt32</remarks>
-#if NET48
-        public uint[] Offsets { get; set; }
-#else
        public uint[]? Offsets { get; set; }
-#endif
    }
 }
--- a/AACS/VerifyMediaKeyRecord.cs
+++ b/AACS/VerifyMediaKeyRecord.cs
@@ -19,10 +19,6 @@ namespace SabreTools.Models.AACS
        /// where 0xXXXXXXXXXXXXXXXX is an arbitrary 8-byte value, and Km is
        /// the correct final Media Key value.
        /// </summary>
-#if NET48
-        public byte[] CiphertextValue { get; set; }
-#else
        public byte[]? CiphertextValue { get; set; }
-#endif
    }
 }
--- a/ArchiveDotOrg/File.cs
+++ b/ArchiveDotOrg/File.cs
@@ -7,438 +7,198 @@ namespace SabreTools.Models.ArchiveDotOrg
    public class File
    {
        [XmlAttribute("name")]
-#if NET48
-        public string Name { get; set; }
-#else
        public string? Name { get; set; }
-#endif

        /// <remarks>Is this a set of defined values?</remarks>
        [XmlAttribute("source")]
-#if NET48
-        public string Source { get; set; }
-#else
        public string? Source { get; set; }
-#endif

        [XmlElement("btih")]
-#if NET48
-        public string BitTorrentMagnetHash { get; set; }
-#else
        public string? BitTorrentMagnetHash { get; set; }
-#endif

        [XmlElement("mtime")]
-#if NET48
-        public string LastModifiedTime { get; set; }
-#else
        public string? LastModifiedTime { get; set; }
-#endif

        [XmlElement("size")]
-#if NET48
-        public string Size { get; set; }
-#else
        public string? Size { get; set; }
-#endif

        [XmlElement("md5")]
-#if NET48
-        public string MD5 { get; set; }
-#else
        public string? MD5 { get; set; }
-#endif

        [XmlElement("crc32")]
-#if NET48
-        public string CRC32 { get; set; }
-#else
        public string? CRC32 { get; set; }
-#endif

        [XmlElement("sha1")]
-#if NET48
-        public string SHA1 { get; set; }
-#else
        public string? SHA1 { get; set; }
-#endif

        [XmlElement("filecount")]
-#if NET48
-        public string FileCount { get; set; }
-#else
        public string? FileCount { get; set; }
-#endif

        /// <remarks>Is this a set of defined values?</remarks>
        [XmlElement("format")]
-#if NET48
-        public string Format { get; set; }
-#else
        public string? Format { get; set; }
-#endif

        [XmlElement("original")]
-#if NET48
-        public string Original { get; set; }
-#else
        public string? Original { get; set; }
-#endif

        /// <remarks>Is this a set of defined values?</remarks>
        [XmlElement("summation")]
-#if NET48
-        public string Summation { get; set; }
-#else
        public string? Summation { get; set; }
-#endif

        [XmlElement("matrix_number")]
-#if NET48
-        public string MatrixNumber { get; set; }
-#else
        public string? MatrixNumber { get; set; }
-#endif

        [XmlElement("collection-catalog-number")]
-#if NET48
-        public string CollectionCatalogNumber { get; set; }
-#else
        public string? CollectionCatalogNumber { get; set; }
-#endif

        [XmlElement("publisher")]
-#if NET48
-        public string Publisher { get; set; }
-#else
        public string? Publisher { get; set; }
-#endif

        [XmlElement("comment")]
-#if NET48
-        public string Comment { get; set; }
-#else
        public string? Comment { get; set; }
-#endif

        #region ASR-Related

        [XmlElement("asr_detected_lang")]
-#if NET48
-        public string ASRDetectedLang { get; set; }
-#else
        public string? ASRDetectedLang { get; set; }
-#endif

        [XmlElement("asr_detected_lang_conf")]
-#if NET48
-        public string ASRDetectedLangConf { get; set; }
-#else
        public string? ASRDetectedLangConf { get; set; }
-#endif

        [XmlElement("asr_transcribed_lang")]
-#if NET48
-        public string ASRTranscribedLang { get; set; }
-#else
        public string? ASRTranscribedLang { get; set; }
-#endif

        [XmlElement("whisper_asr_module_version")]
-#if NET48
-        public string WhisperASRModuleVersion { get; set; }
-#else
        public string? WhisperASRModuleVersion { get; set; }
-#endif

        [XmlElement("whisper_model_hash")]
-#if NET48
-        public string WhisperModelHash { get; set; }
-#else
        public string? WhisperModelHash { get; set; }
-#endif

        [XmlElement("whisper_model_name")]
-#if NET48
-        public string WhisperModelName { get; set; }
-#else
        public string? WhisperModelName { get; set; }
-#endif

        [XmlElement("whisper_version")]
-#if NET48
-        public string WhisperVersion { get; set; }
-#else
        public string? WhisperVersion { get; set; }
-#endif

        #endregion

        #region OCR-Related

        [XmlElement("cloth_cover_detection_module_version")]
-#if NET48
-        public string ClothCoverDetectionModuleVersion { get; set; }
-#else
        public string? ClothCoverDetectionModuleVersion { get; set; }
-#endif

        [XmlElement("hocr_char_to_word_hocr_version")]
-#if NET48
-        public string hOCRCharToWordhOCRVersion { get; set; }
-#else
        public string? hOCRCharToWordhOCRVersion { get; set; }
-#endif

        [XmlElement("hocr_char_to_word_module_version")]
-#if NET48
-        public string hOCRCharToWordModuleVersion { get; set; }
-#else
        public string? hOCRCharToWordModuleVersion { get; set; }
-#endif

        [XmlElement("hocr_fts_text_hocr_version")]
-#if NET48
-        public string hOCRFtsTexthOCRVersion { get; set; }
-#else
        public string? hOCRFtsTexthOCRVersion { get; set; }
-#endif

        [XmlElement("hocr_fts_text_module_version")]
-#if NET48
-        public string hOCRFtsTextModuleVersion { get; set; }
-#else
        public string? hOCRFtsTextModuleVersion { get; set; }
-#endif

        [XmlElement("hocr_pageindex_hocr_version")]
-#if NET48
-        public string hOCRPageIndexhOCRVersion { get; set; }
-#else
        public string? hOCRPageIndexhOCRVersion { get; set; }
-#endif

        [XmlElement("hocr_pageindex_module_version")]
-#if NET48
-        public string hOCRPageIndexModuleVersion { get; set; }
-#else
        public string? hOCRPageIndexModuleVersion { get; set; }
-#endif

        [XmlElement("ocr")]
-#if NET48
-        public string TesseractOCR { get; set; }
-#else
        public string? TesseractOCR { get; set; }
-#endif

        [XmlElement("ocr_converted")]
-#if NET48
-        public string TesseractOCRConverted { get; set; }
-#else
        public string? TesseractOCRConverted { get; set; }
-#endif

        [XmlElement("ocr_detected_lang")]
-#if NET48
-        public string TesseractOCRDetectedLang { get; set; }
-#else
        public string? TesseractOCRDetectedLang { get; set; }
-#endif

        [XmlElement("ocr_detected_lang_conf")]
-#if NET48
-        public string TesseractOCRDetectedLangConf { get; set; }
-#else
        public string? TesseractOCRDetectedLangConf { get; set; }
-#endif

        [XmlElement("ocr_detected_script")]
-#if NET48
-        public string TesseractOCRDetectedScript { get; set; }
-#else
        public string? TesseractOCRDetectedScript { get; set; }
-#endif

        [XmlElement("ocr_detected_script_conf")]
-#if NET48
-        public string TesseractOCRDetectedScriptConf { get; set; }
-#else
        public string? TesseractOCRDetectedScriptConf { get; set; }
-#endif

        [XmlElement("ocr_module_version")]
-#if NET48
-        public string TesseractOCRModuleVersion { get; set; }
-#else
        public string? TesseractOCRModuleVersion { get; set; }
-#endif

        [XmlElement("ocr_parameters")]
-#if NET48
-        public string TesseractOCRParameters { get; set; }
-#else
        public string? TesseractOCRParameters { get; set; }
-#endif

        [XmlElement("pdf_module_version")]
-#if NET48
-        public string PDFModuleVersion { get; set; }
-#else
        public string? PDFModuleVersion { get; set; }
-#endif

        [XmlElement("word_conf_0_10")]
-#if NET48
-        public string WordConfidenceInterval0To10 { get; set; }
-#else
        public string? WordConfidenceInterval0To10 { get; set; }
-#endif

        [XmlElement("word_conf_11_20")]
-#if NET48
-        public string WordConfidenceInterval11To20 { get; set; }
-#else
        public string? WordConfidenceInterval11To20 { get; set; }
-#endif

        [XmlElement("word_conf_21_30")]
-#if NET48
-        public string WordConfidenceInterval21To30 { get; set; }
-#else
        public string? WordConfidenceInterval21To30 { get; set; }
-#endif

        [XmlElement("word_conf_31_40")]
-#if NET48
-        public string WordConfidenceInterval31To40 { get; set; }
-#else
        public string? WordConfidenceInterval31To40 { get; set; }
-#endif

        [XmlElement("word_conf_41_50")]
-#if NET48
-        public string WordConfidenceInterval41To50 { get; set; }
-#else
        public string? WordConfidenceInterval41To50 { get; set; }
-#endif

        [XmlElement("word_conf_51_60")]
-#if NET48
-        public string WordConfidenceInterval51To60 { get; set; }
-#else
        public string? WordConfidenceInterval51To60 { get; set; }
-#endif

        [XmlElement("word_conf_61_70")]
-#if NET48
-        public string WordConfidenceInterval61To70 { get; set; }
-#else
        public string? WordConfidenceInterval61To70 { get; set; }
-#endif

        [XmlElement("word_conf_71_80")]
-#if NET48
-        public string WordConfidenceInterval71To80 { get; set; }
-#else
        public string? WordConfidenceInterval71To80 { get; set; }
-#endif

        [XmlElement("word_conf_81_90")]
-#if NET48
-        public string WordConfidenceInterval81To90 { get; set; }
-#else
        public string? WordConfidenceInterval81To90 { get; set; }
-#endif

        [XmlElement("word_conf_91_100")]
-#if NET48
-        public string WordConfidenceInterval91To100 { get; set; }
-#else
        public string? WordConfidenceInterval91To100 { get; set; }
-#endif

        #endregion

        #region Media-Related

        [XmlElement("album")]
-#if NET48
-        public string Album { get; set; }
-#else
        public string? Album { get; set; }
-#endif

        [XmlElement("artist")]
-#if NET48
-        public string Artist { get; set; }
-#else
        public string? Artist { get; set; }
-#endif

        [XmlElement("bitrate")]
-#if NET48
-        public string Bitrate { get; set; }
-#else
        public string? Bitrate { get; set; }
-#endif

        [XmlElement("creator")]
-#if NET48
-        public string Creator { get; set; }
-#else
        public string? Creator { get; set; }
-#endif

        [XmlElement("height")]
-#if NET48
-        public string Height { get; set; }
-#else
        public string? Height { get; set; }
-#endif

        [XmlElement("length")]
-#if NET48
-        public string Length { get; set; }
-#else
        public string? Length { get; set; }
-#endif

        [XmlElement("preview-image")]
-#if NET48
-        public string PreviewImage { get; set; }
-#else
        public string? PreviewImage { get; set; }
-#endif

        /// <remarks>Is this a set of defined values?</remarks>
        [XmlElement("rotation")]
-#if NET48
-        public string Rotation { get; set; }
-#else
        public string? Rotation { get; set; }
-#endif

        [XmlElement("title")]
-#if NET48
-        public string Title { get; set; }
-#else
        public string? Title { get; set; }
-#endif

        [XmlElement("track")]
-#if NET48
-        public string Track { get; set; }
-#else
        public string? Track { get; set; }
-#endif

        [XmlElement("width")]
-#if NET48
-        public string Width { get; set; }
-#else
        public string? Width { get; set; }
-#endif

        #endregion

@@ -446,19 +206,11 @@ namespace SabreTools.Models.ArchiveDotOrg

        /// <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
    }
--- a/ArchiveDotOrg/Files.cs
+++ b/ArchiveDotOrg/Files.cs
@@ -7,29 +7,17 @@ namespace SabreTools.Models.ArchiveDotOrg
    public class Files
    {
        [XmlElement("file")]
-#if NET48
-        public File[] File { get; set; }
-#else
        public File?[]? File { 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
    }
--- a/AttractMode/MetadataFile.cs
+++ b/AttractMode/MetadataFile.cs
@@ -6,16 +6,8 @@ namespace SabreTools.Models.AttractMode
    public class MetadataFile
    {
        [Required]
-#if NET48
-        public string[] Header { get; set; }
-#else
        public string[]? Header { get; set; }
-#endif

-#if NET48
-        public Row[] Row { get; set; }
-#else
        public Row?[]? Row { get; set; }
-#endif
    }
 }
--- a/AttractMode/Row.cs
+++ b/AttractMode/Row.cs
@@ -4,146 +4,54 @@ namespace SabreTools.Models.AttractMode
    {
        /// <remarks>Also called Romname</remarks>
        [Required]
-#if NET48
-        public string Name { get; set; }
-#else
        public string? Name { get; set; }
-#endif

-#if NET48
-        public string Title { get; set; }
-#else
        public string? Title { get; set; }
-#endif

-#if NET48
-        public string Emulator { get; set; }
-#else
        public string? Emulator { get; set; }
-#endif

-#if NET48
-        public string CloneOf { get; set; }
-#else
        public string? CloneOf { get; set; }
-#endif

-#if NET48
-        public string Year { get; set; }
-#else
        public string? Year { get; set; }
-#endif

-#if NET48
-        public string Manufacturer { get; set; }
-#else
        public string? Manufacturer { get; set; }
-#endif

-#if NET48
-        public string Category { get; set; }
-#else
        public string? Category { get; set; }
-#endif

-#if NET48
-        public string Players { get; set; }
-#else
        public string? Players { get; set; }
-#endif

-#if NET48
-        public string Rotation { get; set; }
-#else
        public string? Rotation { get; set; }
-#endif

-#if NET48
-        public string Control { get; set; }
-#else
        public string? Control { get; set; }
-#endif

-#if NET48
-        public string Status { get; set; }
-#else
        public string? Status { get; set; }
-#endif

-#if NET48
-        public string DisplayCount { get; set; }
-#else
        public string? DisplayCount { get; set; }
-#endif

-#if NET48
-        public string DisplayType { get; set; }
-#else
        public string? DisplayType { get; set; }
-#endif

-#if NET48
-        public string AltRomname { get; set; }
-#else
        public string? AltRomname { get; set; }
-#endif

-#if NET48
-        public string AltTitle { get; set; }
-#else
        public string? AltTitle { get; set; }
-#endif

-#if NET48
-        public string Extra { get; set; }
-#else
        public string? Extra { get; set; }
-#endif

-#if NET48
-        public string Buttons { get; set; }
-#else
        public string? Buttons { get; set; }
-#endif

-#if NET48
-        public string Favorite { get; set; }
-#else
        public string? Favorite { get; set; }
-#endif

-#if NET48
-        public string Tags { get; set; }
-#else
        public string? Tags { get; set; }
-#endif

-#if NET48
-        public string PlayedCount { get; set; }
-#else
        public string? PlayedCount { get; set; }
-#endif

-#if NET48
-        public string PlayedTime { get; set; }
-#else
        public string? PlayedTime { get; set; }
-#endif

-#if NET48
-        public string FileIsAvailable { get; set; }
-#else
        public string? FileIsAvailable { get; set; }
-#endif

        #region DO NOT USE IN PRODUCTION

        /// <remarks>Should be empty</remarks>
-#if NET48
-        public string[] ADDITIONAL_ELEMENTS { get; set; }
-#else
        public string[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif

        #endregion
    }
--- a/BDPlus/SVM.cs
+++ b/BDPlus/SVM.cs
@@ -6,20 +6,12 @@ namespace SabreTools.Models.BDPlus
        /// <summary>
        /// "BDSVM_CC"
        /// </summary>
-#if NET48
-        public string Signature { get; set; }
-#else
        public string? Signature { get; set; }
-#endif

        /// <summary>
        /// 5 bytes of unknown data
        /// </summary>
-#if NET48
-        public byte[] Unknown1 { get; set; }
-#else
        public byte[]? Unknown1 { get; set; }
-#endif

        /// <summary>
        /// Version year
@@ -39,11 +31,7 @@ namespace SabreTools.Models.BDPlus
        /// <summary>
        /// 4 bytes of unknown data
        /// </summary>
-#if NET48
-        public byte[] Unknown2 { get; set; }
-#else
        public byte[]? Unknown2 { get; set; }
-#endif

        /// <summary>
        /// Length
@@ -53,10 +41,6 @@ namespace SabreTools.Models.BDPlus
        /// <summary>
        /// Length bytes of data
        /// </summary>
-#if NET48
-        public byte[] Data { get; set; }
-#else
        public byte[]? Data { get; set; }
-#endif
    }
 }
--- a/BFPK/Archive.cs
+++ b/BFPK/Archive.cs
@@ -9,19 +9,11 @@
        /// <summary>
        /// Header
        /// </summary>
-#if NET48
-        public Header Header { get; set; }
-#else
        public Header? Header { get; set; }
-#endif

        /// <summary>
        /// Files
        /// </summary>
-#if NET48
-        public FileEntry[] Files { get; set; }
-#else
        public FileEntry?[]? Files { get; set; }
-#endif
    }
 }
--- a/BFPK/FileEntry.cs
+++ b/BFPK/FileEntry.cs
@@ -14,11 +14,7 @@
        /// <summary>
        /// Name
        /// </summary>
-#if NET48
-        public string Name { get; set; }
-#else
        public string? Name { get; set; }
-#endif

        /// <summary>
        /// Uncompressed size
--- a/BFPK/Header.cs
+++ b/BFPK/Header.cs
@@ -9,11 +9,7 @@
        /// <summary>
        /// "BFPK"
        /// </summary>
-#if NET48
-        public string Magic { get; set; }
-#else
        public string? Magic { get; set; }
-#endif

        /// <summary>
        /// Version
--- a/BSP/File.cs
+++ b/BSP/File.cs
@@ -9,37 +9,21 @@ namespace SabreTools.Models.BSP
        /// <summary>
        /// Header data
        /// </summary>
-#if NET48
-        public Header Header { get; set; }
-#else
        public Header? Header { get; set; }
-#endif

        /// <summary>
        /// Lumps
        /// </summary>
-#if NET48
-        public Lump[] Lumps { get; set; }
-#else
        public Lump?[]? Lumps { get; set; }
-#endif

        /// <summary>
        /// Texture header data
        /// </summary>
-#if NET48
-        public TextureHeader TextureHeader { get; set; }
-#else
        public TextureHeader? TextureHeader { get; set; }
-#endif

        /// <summary>
        /// Textures
        /// </summary>
-#if NET48
-        public Texture[] Textures { get; set; }
-#else
        public Texture?[]? Textures { get; set; }
-#endif
    }
 }
--- a/BSP/Texture.cs
+++ b/BSP/Texture.cs
@@ -6,11 +6,7 @@ namespace SabreTools.Models.BSP
        /// <summary>
        /// Name
        /// </summary>
-#if NET48
-        public string Name { get; set; }
-#else
        public string? Name { get; set; }
-#endif
    
        /// <summary>
        /// Width
@@ -25,20 +21,12 @@ namespace SabreTools.Models.BSP
        /// <summary>
        /// Offsets
        /// </summary>
-#if NET48
-        public uint[] Offsets { get; set; }
-#else
        public uint[]? Offsets { get; set; }
-#endif

        /// <summary>
        /// Texture data
        /// </summary>
-#if NET48
-        public byte[] TextureData { get; set; }
-#else
        public byte[]? TextureData { get; set; }
-#endif

        /// <summary>
        /// Palette size
@@ -48,10 +36,6 @@ namespace SabreTools.Models.BSP
        /// <summary>
        /// Palette data
        /// </summary>
-#if NET48
-        public byte[] PaletteData { get; set; }
-#else
        public byte[]? PaletteData { get; set; }
-#endif
    }
 }
--- a/BSP/TextureHeader.cs
+++ b/BSP/TextureHeader.cs
@@ -11,10 +11,6 @@ namespace SabreTools.Models.BSP
        /// <summary>
        /// Offsets
        /// </summary>
-#if NET48
-        public uint[] Offsets { get; set; }
-#else
        public uint[]? Offsets { get; set; }
-#endif
    }
 }
--- a/CFB/Binary.cs
+++ b/CFB/Binary.cs
@@ -12,11 +12,7 @@ namespace SabreTools.Models.CFB
        /// <summary>
        /// Compound file header
        /// </summary>
-#if NET48
-        public FileHeader Header { get; set; }
-#else
        public FileHeader? Header { get; set; }
-#endif

        /// <summary>
        /// The FAT is the main allocator for space within a compound file.
@@ -29,11 +25,7 @@ namespace SabreTools.Models.CFB
        /// 
        /// If Header Major Version is 4, there MUST be 1,024 fields specified to fill a 4,096-byte sector
        /// </remarks>
-#if NET48
-        public SectorNumber[] FATSectorNumbers { get; set; }
-#else
        public SectorNumber?[]? FATSectorNumbers { get; set; }
-#endif

        /// <summary>
        /// The mini FAT is used to allocate space in the mini stream.
@@ -46,11 +38,7 @@ namespace SabreTools.Models.CFB
        /// 
        /// If Header Major Version is 4, there MUST be 1,024 fields specified to fill a 4,096-byte sector
        /// </remarks>
-#if NET48
-        public SectorNumber[] MiniFATSectorNumbers { get; set; }
-#else
        public SectorNumber?[]? MiniFATSectorNumbers { get; set; }
-#endif

        /// <summary>
        /// The DIFAT array is used to represent storage of the FAT sectors.
@@ -67,11 +55,7 @@ namespace SabreTools.Models.CFB
        /// If Header Major Version is 4, there MUST be 1,023 fields specified
        /// to fill a 4,096-byte sector minus the "Next DIFAT Sector Location" field.
        /// </remarks>
-#if NET48
-        public SectorNumber[] DIFATSectorNumbers { get; set; }
-#else
        public SectorNumber?[]? DIFATSectorNumbers { get; set; }
-#endif

        /// <summary>
        /// The directory entry array is an array of directory entries that
@@ -103,10 +87,6 @@ namespace SabreTools.Models.CFB
        /// all zeroes. The Modified Time field in the root storage directory
        /// entry MAY be all zeroes.
        /// <remarks>
-#if NET48
-        public DirectoryEntry[] DirectoryEntries { get; set; }
-#else
        public DirectoryEntry?[]? DirectoryEntries { get; set; }
-#endif
    }
 }
--- a/CFB/DirectoryEntry.cs
+++ b/CFB/DirectoryEntry.cs
@@ -16,11 +16,7 @@ namespace SabreTools.Models.CFB
        /// The following characters are illegal and MUST NOT be part of the
        /// name: '/', '\', ':', '!'.
        /// </summary>
-#if NET48
-        public string Name { get; set; }
-#else
        public string? Name { get; set; }
-#endif

        /// <summary>
        /// This field MUST be 0x00, 0x01, 0x02, or 0x05, depending on the
--- a/CFB/FileHeader.cs
+++ b/CFB/FileHeader.cs
@@ -57,11 +57,7 @@ namespace SabreTools.Models.CFB
        /// <summary>
        /// This field MUST be set to all zeroes.
        /// </summary>
-#if NET48
-        public byte[] Reserved { get; set; }
-#else
        public byte[]? Reserved { get; set; }
-#endif

        /// <summary>
        /// This integer field contains the count of the number of directory sectors
@@ -126,10 +122,6 @@ namespace SabreTools.Models.CFB
        /// This array of 32-bit integer fields contains the first 109 FAT sector
        /// locations of the compound file
        /// </summary>
-#if NET48
-        public SectorNumber[] DIFAT { get; set; }
-#else
        public SectorNumber?[]? DIFAT { get; set; }
-#endif
    }
 }
--- a/CFB/SummaryInformation.cs
+++ b/CFB/SummaryInformation.cs
@@ -36,11 +36,7 @@ namespace SabreTools.Models.CFB
        /// <summary>
        /// 4 bytes of reserved data
        /// </summary>
-#if NET48
-        public byte[] Reserved { get; set; }
-#else
        public byte[]? Reserved { get; set; }
-#endif

        #endregion

@@ -54,11 +50,7 @@ namespace SabreTools.Models.CFB
        /// <summary>
        /// 16 bytes of unknown data
        /// </summary>
-#if NET48
-        public byte[] Unknown { get; set; }
-#else
        public byte[]? Unknown { get; set; }
-#endif

        #endregion

@@ -83,11 +75,7 @@ namespace SabreTools.Models.CFB
        /// Properties
        /// </summary>
        /// <remarks>Each Variant might be followed by an index and offset value</remarks>
-#if NET48
-        public Variant[] Properties { get; set; }
-#else
        public Variant?[]? Properties { get; set; }
-#endif

        #endregion
    }
--- a/CFB/Variant.cs
+++ b/CFB/Variant.cs
@@ -40,10 +40,6 @@ namespace SabreTools.Models.CFB
        /// MUST contain an instance of the type, according to the value
        /// in the <see cref="VariantType"/> field.
        /// </summary>
-#if NET48
-        public object Union { get; set; }
-#else
        public object? Union { get; set; }
-#endif
    }
 }
--- a/CHD/Header.cs
+++ b/CHD/Header.cs
@@ -6,11 +6,7 @@ namespace SabreTools.Models.CHD
        /// <summary>
        /// 'MComprHD'
        /// </summary>
-#if NET48
-        public string Tag { get; set; }
-#else
        public string? Tag { get; set; }
-#endif

        /// <summary>
        /// Length of header (including tag and length fields)
--- a/CHD/HeaderV1.cs
+++ b/CHD/HeaderV1.cs
@@ -41,19 +41,11 @@
        /// <summary>
        /// MD5 checksum of raw data
        /// </summary>
-#if NET48
-        public byte[] MD5 { get; set; } = new byte[16];
-#else
        public byte[]? MD5 { get; set; } = new byte[16];
-#endif

        /// <summary>
        /// MD5 checksum of parent file
        /// </summary>
-#if NET48
-        public byte[] ParentMD5 { get; set; } = new byte[16];
-#else
        public byte[]? ParentMD5 { get; set; } = new byte[16];
-#endif
    }
 }
--- a/CHD/HeaderV2.cs
+++ b/CHD/HeaderV2.cs
@@ -41,20 +41,12 @@
        /// <summary>
        /// MD5 checksum of raw data
        /// </summary>
-#if NET48
-        public byte[] MD5 { get; set; } = new byte[16];
-#else
        public byte[]? MD5 { get; set; } = new byte[16];
-#endif

        /// <summary>
        /// MD5 checksum of parent file
        /// </summary>
-#if NET48
-        public byte[] ParentMD5 { get; set; } = new byte[16];
-#else
        public byte[]? ParentMD5 { get; set; } = new byte[16];
-#endif

        /// <summary>
        /// Number of bytes per sector
--- a/CHD/HeaderV3.cs
+++ b/CHD/HeaderV3.cs
@@ -31,20 +31,12 @@
        /// <summary>
        /// MD5 checksum of raw data
        /// </summary>
-#if NET48
-        public byte[] MD5 { get; set; } = new byte[16];
-#else
        public byte[]? MD5 { get; set; } = new byte[16];
-#endif

        /// <summary>
        /// MD5 checksum of parent file
        /// </summary>
-#if NET48
-        public byte[] ParentMD5 { get; set; } = new byte[16];
-#else
        public byte[]? ParentMD5 { get; set; } = new byte[16];
-#endif

        /// <summary>
        /// Number of bytes per hunk
@@ -54,19 +46,11 @@
        /// <summary>
        /// SHA1 checksum of raw data
        /// </summary>
-#if NET48
-        public byte[] SHA1 { get; set; } = new byte[20];
-#else
        public byte[]? SHA1 { get; set; } = new byte[20];
-#endif

        /// <summary>
        /// SHA1 checksum of parent file
        /// </summary>
-#if NET48
-        public byte[] ParentSHA1 { get; set; } = new byte[20];
-#else
        public byte[]? ParentSHA1 { get; set; } = new byte[20];
-#endif
    }
 }
--- a/CHD/HeaderV4.cs
+++ b/CHD/HeaderV4.cs
@@ -36,28 +36,16 @@
        /// <summary>
        /// Combined raw+meta SHA1
        /// </summary>
-#if NET48
-        public byte[] SHA1 { get; set; } = new byte[20];
-#else
        public byte[]? SHA1 { get; set; } = new byte[20];
-#endif

        /// <summary>
        /// Combined raw+meta SHA1 of parent
        /// </summary>
-#if NET48
-        public byte[] ParentSHA1 { get; set; } = new byte[20];
-#else
        public byte[]? ParentSHA1 { get; set; } = new byte[20];
-#endif

        /// <summary>
        /// Raw data SHA1
        /// </summary>
-#if NET48
-        public byte[] RawSHA1 { get; set; } = new byte[20];
-#else
        public byte[]? RawSHA1 { get; set; } = new byte[20];
-#endif
    }
 }
--- a/CHD/HeaderV5.cs
+++ b/CHD/HeaderV5.cs
@@ -36,28 +36,16 @@
        /// <summary>
        /// Raw data SHA1
        /// </summary>
-#if NET48
-        public byte[] RawSHA1 { get; set; }
-#else
        public byte[]? RawSHA1 { get; set; }
-#endif

        /// <summary>
        /// Combined raw+meta SHA1
        /// </summary>
-#if NET48
-        public byte[] SHA1 { get; set; }
-#else
        public byte[]? SHA1 { get; set; }
-#endif

        /// <summary>
        /// Combined raw+meta SHA1 of parent
        /// </summary>
-#if NET48
-        public byte[] ParentSHA1 { get; set; }
-#else
        public byte[]? ParentSHA1 { get; set; }
-#endif
    }
 }
--- a/Charts/SongIni.cs
+++ b/Charts/SongIni.cs
@@ -12,71 +12,43 @@ namespace SabreTools.Models.Charts
        /// Title of the song.
        /// </summary>
        /// <remarks>name</remarks>
-#if NET48
-        public string Name { get; set; }
-#else
        public string? Name { get; set; }
-#endif

        /// <summary>
        /// Artist(s) or band(s) behind the song.
        /// </summary>
        /// <remarks>artist</remarks>
-#if NET48
-        public string Artist { get; set; }
-#else
        public string? Artist { get; set; }
-#endif

        /// <summary>
        /// Title of the album the song is featured in.
        /// </summary>
        /// <remarks>album</remarks>
-#if NET48
-        public string Album { get; set; }
-#else
        public string? Album { get; set; }
-#endif

        /// <summary>
        /// Genre of the song.
        /// </summary>
        /// <remarks>genre</remarks>
-#if NET48
-        public string Genre { get; set; }
-#else
        public string? Genre { get; set; }
-#endif

        /// <summary>
        /// Sub-genre for the song.
        /// </summary>
        /// <remarks>sub_genre</remarks>
-#if NET48
-        public string SubGenre { get; set; }
-#else
        public string? SubGenre { get; set; }
-#endif

        /// <summary>
        /// Year of the song’s release.
        /// </summary>
        /// <remarks>year</remarks>
-#if NET48
-        public string Year { get; set; }
-#else
        public string? Year { get; set; }
-#endif

        /// <summary>
        /// Community member responsible for charting the song.
        /// </summary>
        /// <remarks>charter, frets</remarks>
-#if NET48
-        public string Charter { get; set; }
-#else
        public string? Charter { get; set; }
-#endif

        /// <summary>
        /// Version number for the song.
@@ -118,11 +90,7 @@ namespace SabreTools.Models.Charts
        /// Flavor text for this song, usually shown after picking the song or during loading.
        /// </summary>
        /// <remarks>loading_phrase</remarks>
-#if NET48
-        public string LoadingPhrase { get; set; }
-#else
        public string? LoadingPhrase { get; set; }
-#endif

        #endregion

@@ -132,53 +100,33 @@ namespace SabreTools.Models.Charts
        /// (FoFiX) Hex color to use in the song screen for the cassette.
        /// </summary>
        /// <remarks>cassettecolor</remarks>
-#if NET48
-        public string CassetteColor { get; set; }
-#else
        public string? CassetteColor { get; set; }
-#endif

        /// <summary>
        /// (FoFiX) Miscellaneous tags for the chart.
        /// Only known valid value is `cover`.
        /// </summary>
        /// <remarks>tags</remarks>
-#if NET48
-        public string Tags { get; set; }
-#else
        public string? Tags { get; set; }
-#endif

        /// <summary>
        /// (PS) Two timestamps in milliseconds for preview start and end time.
        /// Example: `55000 85000`
        /// </summary>
        /// <remarks>preview</remarks>
-#if NET48
-        public long[] Preview { get; set; }
-#else
        public long[]? Preview { get; set; }
-#endif

        /// <summary>
        /// (CH) Playlist that the song should show up in.
        /// </summary>
        /// <remarks>playlist</remarks>
-#if NET48
-        public string Playlist { get; set; }
-#else
        public string? Playlist { get; set; }
-#endif

        /// <summary>
        /// (CH) Sub-playlist that the song should show up in. 	
        /// </summary>
        /// <remarks>sub_playlist</remarks>
-#if NET48
-        public string SubPlaylist { get; set; }
-#else
        public string? SubPlaylist { get; set; }
-#endif

        /// <summary>
        /// (CH) Indicates if this song is a modchart.
@@ -350,51 +298,31 @@ namespace SabreTools.Models.Charts
        /// Specifies a voice type for the singer (either "male" or "female").
        /// </summary>
        /// <remarks>vocal_gender</remarks>
-#if NET48
-        public string VocalGender { get; set; }
-#else
        public string? VocalGender { get; set; }
-#endif

        /// <summary>
        /// Specifies a tuning for 17-fret Pro Guitar.
        /// </summary>
        /// <remarks>real_guitar_tuning</remarks>
-#if NET48
-        public string RealGuitarTuning { get; set; }
-#else
        public string? RealGuitarTuning { get; set; }
-#endif

        /// <summary>
        /// Specifies a tuning for 22-fret Pro Guitar.
        /// </summary>
        /// <remarks>real_guitar_22_tuning</remarks>
-#if NET48
-        public string RealGuitar22Tuning { get; set; }
-#else
        public string? RealGuitar22Tuning { get; set; }
-#endif

        /// <summary>
        /// Specifies a tuning for 17-fret Pro Bass.
        /// </summary>
        /// <remarks>real_bass_tuning</remarks>
-#if NET48
-        public string RealBassTuning { get; set; }
-#else
        public string? RealBassTuning { get; set; }
-#endif

        /// <summary>
        /// Specifies a tuning for 22-fret Pro Bass.
        /// </summary>
        /// <remarks>real_bass_22_tuning</remarks>
-#if NET48
-        public string RealBass22Tuning { get; set; }
-#else
        public string? RealBass22Tuning { get; set; }
-#endif

        /// <summary>
        /// Specifies the number of lanes for the right hand in Real Keys.
@@ -479,11 +407,7 @@ namespace SabreTools.Models.Charts
        /// Valid values are "none", "half", or "full".
        /// </summary>
        /// <remarks>early_hit_window_size</remarks>
-#if NET48
-        public string EarlyHitWindowSize { get; set; }
-#else
        public string? EarlyHitWindowSize { get; set; }
-#endif

        /// <summary>
        /// (CH) Sets whether or not end events in the chart will be respected.
@@ -560,31 +484,19 @@ namespace SabreTools.Models.Charts
        /// Included in either the chart folder or the game the chart was made for, or sourced from this repository of icons.
        /// </summary>
        /// <remarks>icon</remarks>
-#if NET48
-        public string Icon { get; set; }
-#else
        public string? Icon { get; set; }
-#endif

        /// <summary>
        /// Name for a background image file.
        /// </summary>
        /// <remarks>background</remarks>
-#if NET48
-        public string Background { get; set; }
-#else
        public string? Background { get; set; }
-#endif

        /// <summary>
        /// Name for a background video file.
        /// </summary>
        /// <remarks>video</remarks>
-#if NET48
-        public string Video { get; set; }
-#else
        public string? Video { get; set; }
-#endif

        /// <summary>
        /// Name for a background video file.
@@ -610,11 +522,7 @@ namespace SabreTools.Models.Charts
        /// Name for a cover image file.
        /// </summary>
        /// <remarks>cover</remarks>
-#if NET48
-        public string Cover { get; set; }
-#else
        public string? Cover { get; set; }
-#endif

        #endregion

@@ -624,41 +532,25 @@ namespace SabreTools.Models.Charts
        /// (PS) Name for banner A.
        /// </summary>
        /// <remarks>link_name_a</remarks>
-#if NET48
-        public string LinkNameA { get; set; }
-#else
        public string? LinkNameA { get; set; }
-#endif

        /// <summary>
        /// (PS) Name for banner B.
        /// </summary>
        /// <remarks>link_name_b</remarks>
-#if NET48
-        public string LinkNameB { get; set; }
-#else
        public string? LinkNameB { get; set; }
-#endif

        /// <summary>
        /// (PS) Link that clicking banner A will open.
        /// </summary>
        /// <remarks>banner_link_a</remarks>
-#if NET48
-        public string BannerLinkA { get; set; }
-#else
        public string? BannerLinkA { get; set; }
-#endif

        /// <summary>
        /// (PS) Link that clicking banner B will open.
        /// </summary>
        /// <remarks>banner_link_b</remarks>
-#if NET48
-        public string BannerLinkB { get; set; }
-#else
        public string? BannerLinkB { get; set; }
-#endif

        #endregion

@@ -668,21 +560,13 @@ namespace SabreTools.Models.Charts
        /// (FoFiX) High score data.
        /// </summary>
        /// <remarks>scores</remarks>
-#if NET48
-        public string Scores { get; set; }
-#else
        public string? Scores { get; set; }
-#endif

        /// <summary>
        /// (FoFiX) Additional score data.
        /// </summary>
        /// <remarks>scores_ext</remarks>
-#if NET48
-        public string ScoresExt { get; set; }
-#else
        public string? ScoresExt { get; set; }
-#endif

        /// <summary>
        /// (FoFiX) Play count.
@@ -700,31 +584,19 @@ namespace SabreTools.Models.Charts
        /// (FoFiX) Career ID for this song.
        /// </summary>
        /// <remarks>unlock_id</remarks>
-#if NET48
-        public string UnlockId { get; set; }
-#else
        public string? UnlockId { get; set; }
-#endif

        /// <summary>
        /// (FoFiX) The career ID that must be completed to unlock this song.
        /// </summary>
        /// <remarks>unlock_require</remarks>
-#if NET48
-        public string UnlockRequire { get; set; }
-#else
        public string? UnlockRequire { get; set; }
-#endif

        /// <summary>
        /// (FoFiX) Text to display if the song is locked.
        /// </summary>
        /// <remarks>unlock_text</remarks>
-#if NET48
-        public string UnlockText { get; set; }
-#else
        public string? UnlockText { get; set; }
-#endif

        /// <summary>
        /// (FoFiX) Indicates if the song is unlocked.
--- a/Charts/TitlesIni.cs
+++ b/Charts/TitlesIni.cs
@@ -10,20 +10,12 @@ namespace SabreTools.Models.Charts
        /// A space-separated list of .ini sections to include in the career.
        /// </summary>
        /// <remarks>sections</remarks>
-#if NET48
-        public string[] SectionList { get; set; }
-#else
        public string[]? SectionList { get; set; }
-#endif

        /// <summary>
        /// `name` - Display name of the tier.
        /// `unlock_id` - Name used for associating a song with this tier, and for checking unlock requirements.
        /// </summary>
-#if NET48
-        public Dictionary<string, (string Name, string UnlockId)> Sections { get; set; }
-#else
        public Dictionary<string, (string? Name, string? UnlockId)>? Sections { get; set; }
-#endif
    }
 }
--- a/ClrMamePro/Archive.cs
+++ b/ClrMamePro/Archive.cs
@@ -5,20 +5,12 @@ namespace SabreTools.Models.ClrMamePro
    {
        /// <remarks>name</remarks>
        [Required]
-#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>
-#if NET48
-        public string[] ADDITIONAL_ELEMENTS { get; set; }
-#else
        public string[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif

        #endregion
    }
--- a/ClrMamePro/BiosSet.cs
+++ b/ClrMamePro/BiosSet.cs
@@ -5,35 +5,19 @@ namespace SabreTools.Models.ClrMamePro
    {
        /// <remarks>name</remarks>
        [Required]
-#if NET48
-        public string Name { get; set; }
-#else
        public string? Name { get; set; }
-#endif

        /// <remarks>description</remarks>
        [Required]
-#if NET48
-        public string Description { get; set; }
-#else
        public string? Description { get; set; }
-#endif

        /// <remarks>default</remarks>
-#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>
-#if NET48
-        public string[] ADDITIONAL_ELEMENTS { get; set; }
-#else
        public string[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif

        #endregion
    }
--- a/ClrMamePro/Chip.cs
+++ b/ClrMamePro/Chip.cs
@@ -5,42 +5,22 @@ namespace SabreTools.Models.ClrMamePro
    {
        /// <remarks>type, (cpu|audio)</remarks>
        [Required]
-#if NET48
-        public string Type { get; set; }
-#else
        public string? Type { get; set; }
-#endif

        /// <remarks>name</remarks>
        [Required]
-#if NET48
-        public string Name { get; set; }
-#else
        public string? Name { get; set; }
-#endif

        /// <remarks>flags</remarks>
-#if NET48
-        public string Flags { get; set; }
-#else
        public string? Flags { get; set; }
-#endif

        /// <remarks>clock, Numeric?</remarks>
-#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>
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
        public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif

        #endregion
    }
--- a/ClrMamePro/ClrMamePro.cs
+++ b/ClrMamePro/ClrMamePro.cs
@@ -4,118 +4,54 @@ namespace SabreTools.Models.ClrMamePro
    public class ClrMamePro
    {
        /// <remarks>name</remarks>
-#if NET48
-        public string Name { get; set; }
-#else
        public string? Name { get; set; }
-#endif

        /// <remarks>description</remarks>
-#if NET48
-        public string Description { get; set; }
-#else
        public string? Description { get; set; }
-#endif

        /// <remarks>rootdir</remarks>
-#if NET48
-        public string RootDir { get; set; }
-#else
        public string? RootDir { get; set; }
-#endif

        /// <remarks>category</remarks>
-#if NET48
-        public string Category { get; set; }
-#else
        public string? Category { get; set; }
-#endif

        /// <remarks>version</remarks>
-#if NET48
-        public string Version { get; set; }
-#else
        public string? Version { get; set; }
-#endif

        /// <remarks>date</remarks>
-#if NET48
-        public string Date { get; set; }
-#else
        public string? Date { get; set; }
-#endif

        /// <remarks>author</remarks>
-#if NET48
-        public string Author { get; set; }
-#else
        public string? Author { get; set; }
-#endif

        /// <remarks>homepage</remarks>
-#if NET48
-        public string Homepage { get; set; }
-#else
        public string? Homepage { get; set; }
-#endif

        /// <remarks>url</remarks>
-#if NET48
-        public string Url { get; set; }
-#else
        public string? Url { get; set; }
-#endif

        /// <remarks>comment</remarks>
-#if NET48
-        public string Comment { get; set; }
-#else
        public string? Comment { get; set; }
-#endif

        /// <remarks>header</remarks>
-#if NET48
-        public string Header { get; set; }
-#else
        public string? Header { get; set; }
-#endif

        /// <remarks>type</remarks>
-#if NET48
-        public string Type { get; set; }
-#else
        public string? Type { get; set; }
-#endif

        /// <remarks>forcemerging</remarks>
-#if NET48
-        public string ForceMerging { get; set; }
-#else
        public string? ForceMerging { get; set; }
-#endif

        /// <remarks>forcezipping</remarks>
-#if NET48
-        public string ForceZipping { get; set; }
-#else
        public string? ForceZipping { get; set; }
-#endif

        /// <remarks>forcepacking</remarks>
-#if NET48
-        public string ForcePacking { get; set; }
-#else
        public string? ForcePacking { get; set; }
-#endif

        #region DO NOT USE IN PRODUCTION

        /// <remarks>Should be empty</remarks>
-#if NET48
-        public string[] ADDITIONAL_ELEMENTS { get; set; }
-#else
        public string[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif

        #endregion
    }
--- a/ClrMamePro/DipSwitch.cs
+++ b/ClrMamePro/DipSwitch.cs
@@ -5,34 +5,18 @@ namespace SabreTools.Models.ClrMamePro
    {
        /// <remarks>name</remarks>
        [Required]
-#if NET48
-        public string Name { get; set; }
-#else
        public string? Name { get; set; }
-#endif

        /// <remarks>entry</remarks>
-#if NET48
-        public string[] Entry { get; set; }
-#else
        public string[]? Entry { get; set; }
-#endif

        /// <remarks>default, (yes|no) "no"</remarks>
-#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>
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
        public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif

        #endregion
    }
--- a/ClrMamePro/Disk.cs
+++ b/ClrMamePro/Disk.cs
@@ -5,55 +5,27 @@ namespace SabreTools.Models.ClrMamePro
    {
        /// <remarks>name</remarks>
        [Required]
-#if NET48
-        public string Name { get; set; }
-#else
        public string? Name { get; set; }
-#endif

        /// <remarks>md5</remarks>
-#if NET48
-        public string MD5 { get; set; }
-#else
        public string? MD5 { get; set; }
-#endif

        /// <remarks>sha1</remarks>
-#if NET48
-        public string SHA1 { get; set; }
-#else
        public string? SHA1 { get; set; }
-#endif

        /// <remarks>merge</remarks>
-#if NET48
-        public string Merge { get; set; }
-#else
        public string? Merge { get; set; }
-#endif

        /// <remarks>status</remarks>
-#if NET48
-        public string Status { get; set; }
-#else
        public string? Status { get; set; }
-#endif

        /// <remarks>flags</remarks>
-#if NET48
-        public string Flags { get; set; }
-#else
        public string? Flags { get; set; }
-#endif

        #region DO NOT USE IN PRODUCTION

        /// <remarks>Should be empty</remarks>
-#if NET48
-        public string[] ADDITIONAL_ELEMENTS { get; set; }
-#else
        public string[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif

        #endregion
    }
--- a/ClrMamePro/Driver.cs
+++ b/ClrMamePro/Driver.cs
@@ -5,48 +5,24 @@ namespace SabreTools.Models.ClrMamePro
    {
        /// <remarks>status, (good|imperfect|preliminary)</remarks>
        [Required]
-#if NET48
-        public string Status { get; set; }
-#else
        public string? Status { get; set; }
-#endif

        /// <remarks>color, (good|imperfect|preliminary)</remarks>
-#if NET48
-        public string Color { get; set; }
-#else
        public string? Color { get; set; }
-#endif

        /// <remarks>sound, (good|imperfect|preliminary)</remarks>
-#if NET48
-        public string Sound { get; set; }
-#else
        public string? Sound { get; set; }
-#endif

        /// <remarks>palettesize, Numeric?</remarks>
-#if NET48
-        public string PaletteSize { get; set; }
-#else
        public string? PaletteSize { get; set; }
-#endif

        /// <remarks>blit, (plain|dirty)</remarks>
-#if NET48
-        public string Blit { get; set; }
-#else
        public string? Blit { get; set; }
-#endif

        #region DO NOT USE IN PRODUCTION

        /// <remarks>Should be empty</remarks>
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
        public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif

        #endregion
    }
--- a/ClrMamePro/GameBase.cs
+++ b/ClrMamePro/GameBase.cs
@@ -7,168 +7,80 @@ namespace SabreTools.Models.ClrMamePro
    {
        /// <remarks>name</remarks>
        [Required]
-#if NET48
-        public string Name { get; set; }
-#else
        public string? Name { get; set; }
-#endif

        /// <remarks>description</remarks>
-#if NET48
-        public string Description { get; set; }
-#else
        public string? Description { get; set; }
-#endif

        /// <remarks>year</remarks>
-#if NET48
-        public string Year { get; set; }
-#else
        public string? Year { get; set; }
-#endif

        /// <remarks>manufacturer</remarks>
-#if NET48
-        public string Manufacturer { get; set; }
-#else
        public string? Manufacturer { get; set; }
-#endif

        /// <remarks>category</remarks>
-#if NET48
-        public string Category { get; set; }
-#else
        public string? Category { get; set; }
-#endif

        /// <remarks>cloneof</remarks>
-#if NET48
-        public string CloneOf { get; set; }
-#else
        public string? CloneOf { get; set; }
-#endif

        /// <remarks>romof</remarks>
-#if NET48
-        public string RomOf { get; set; }
-#else
        public string? RomOf { get; set; }
-#endif

        /// <remarks>sampleof</remarks>
-#if NET48
-        public string SampleOf { get; set; }
-#else
        public string? SampleOf { get; set; }
-#endif

        /// <remarks>release</remarks>
-#if NET48
-        public Release[] Release { get; set; }
-#else
        public Release[]? Release { get; set; }
-#endif

        /// <remarks>biosset</remarks>
-#if NET48
-        public BiosSet[] BiosSet { get; set; }
-#else
        public BiosSet[]? BiosSet { get; set; }
-#endif

        /// <remarks>rom</remarks>
-#if NET48
-        public Rom[] Rom { get; set; }
-#else
        public Rom[]? Rom { get; set; }
-#endif

        /// <remarks>disk</remarks>
-#if NET48
-        public Disk[] Disk { get; set; }
-#else
        public Disk[]? Disk { get; set; }
-#endif

        /// <remarks>sample</remarks>
-#if NET48
-        public Sample[] Sample { get; set; }
-#else
        public Sample[]? Sample { get; set; }
-#endif

        /// <remarks>archive</remarks>
-#if NET48
-        public Archive[] Archive { get; set; }
-#else
        public Archive[]? Archive { get; set; }
-#endif

        #region Aaru Extensions

        /// <remarks>media, Appears after Disk</remarks>
-#if NET48
-        public Media[] Media { get; set; }
-#else
        public Media[]? Media { get; set; }
-#endif

        #endregion

        #region MAME Extensions

        /// <remarks>chip, Appears after Archive</remarks>
-#if NET48
-        public Chip[] Chip { get; set; }
-#else
        public Chip[]? Chip { get; set; }
-#endif

        /// <remarks>video, Appears after Chip</remarks>
-#if NET48
-        public Video[] Video { get; set; }
-#else
        public Video[]? Video { get; set; }
-#endif

        /// <remarks>sound, Appears after Video</remarks>
-#if NET48
-        public Sound Sound { get; set; }
-#else
        public Sound? Sound { get; set; }
-#endif

        /// <remarks>input, Appears after Sound</remarks>
-#if NET48
-        public Input Input { get; set; }
-#else
        public Input? Input { get; set; }
-#endif

        /// <remarks>dipswitch, Appears after Input</remarks>
-#if NET48
-        public DipSwitch[] DipSwitch { get; set; }
-#else
        public DipSwitch[]? DipSwitch { get; set; }
-#endif

        /// <remarks>driver, Appears after DipSwitch</remarks>
-#if NET48
-        public Driver Driver { get; set; }
-#else
        public Driver? Driver { get; set; }
-#endif

        #endregion

        #region DO NOT USE IN PRODUCTION

        /// <remarks>Should be empty</remarks>
-#if NET48
-        public string[] ADDITIONAL_ELEMENTS { get; set; }
-#else
        public string[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif

        #endregion
    }
--- a/ClrMamePro/Input.cs
+++ b/ClrMamePro/Input.cs
@@ -5,56 +5,28 @@ namespace SabreTools.Models.ClrMamePro
    {
        /// <remarks>players, Numeric/remarks>
        [Required]
-#if NET48
-        public string Players { get; set; }
-#else
        public string? Players { get; set; }
-#endif

        /// <remarks>control</remarks>
-#if NET48
-        public string Control { get; set; }
-#else
        public string? Control { get; set; }
-#endif

        /// <remarks>buttons, Numeric</remarks>
        [Required]
-#if NET48
-        public string Buttons { get; set; }
-#else
        public string? Buttons { get; set; }
-#endif

        /// <remarks>coins, Numeric</remarks>
-#if NET48
-        public string Coins { get; set; }
-#else
        public string? Coins { get; set; }
-#endif

        /// <remarks>tilt, (yes|no) "no"</remarks>
-#if NET48
-        public string Tilt { get; set; }
-#else
        public string? Tilt { get; set; }
-#endif

        /// <remarks>service, (yes|no) "no"</remarks>
-#if NET48
-        public string Service { get; set; }
-#else
        public string? Service { get; set; }
-#endif

        #region DO NOT USE IN PRODUCTION

        /// <remarks>Should be empty</remarks>
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
        public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif

        #endregion
    }
--- a/ClrMamePro/Media.cs
+++ b/ClrMamePro/Media.cs
@@ -5,48 +5,24 @@ namespace SabreTools.Models.ClrMamePro
    {
        /// <remarks>name</remarks>
        [Required]
-#if NET48
-        public string Name { get; set; }
-#else
        public string? Name { get; set; }
-#endif

        /// <remarks>md5</remarks>
-#if NET48
-        public string MD5 { get; set; }
-#else
        public string? MD5 { get; set; }
-#endif

        /// <remarks>sha1</remarks>
-#if NET48
-        public string SHA1 { get; set; }
-#else
        public string? SHA1 { get; set; }
-#endif

        /// <remarks>sha256</remarks>
-#if NET48
-        public string SHA256 { get; set; }
-#else
        public string? SHA256 { get; set; }
-#endif

        /// <remarks>spamsum</remarks>
-#if NET48
-        public string SpamSum { get; set; }
-#else
        public string? SpamSum { get; set; }
-#endif

        #region DO NOT USE IN PRODUCTION

        /// <remarks>Should be empty</remarks>
-#if NET48
-        public string[] ADDITIONAL_ELEMENTS { get; set; }
-#else
        public string[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif

        #endregion
    }
--- a/ClrMamePro/MetadataFile.cs
+++ b/ClrMamePro/MetadataFile.cs
@@ -3,27 +3,15 @@ namespace SabreTools.Models.ClrMamePro
    public class MetadataFile
    {
        /// <remarks>clrmamepro</remarks>
-#if NET48
-        public ClrMamePro ClrMamePro { get; set; }
-#else
        public ClrMamePro? ClrMamePro { get; set; }
-#endif

        /// <remarks>game, machine, resource, set</remarks>
-#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>
-#if NET48
-        public string[] ADDITIONAL_ELEMENTS { get; set; }
-#else
        public string[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif

        #endregion
    }
--- a/ClrMamePro/Release.cs
+++ b/ClrMamePro/Release.cs
@@ -5,49 +5,25 @@ namespace SabreTools.Models.ClrMamePro
    {
        /// <remarks>name</remarks>
        [Required]
-#if NET48
-        public string Name { get; set; }
-#else
        public string? Name { get; set; }
-#endif

        /// <remarks>region</remarks>
        [Required]
-#if NET48
-        public string Region { get; set; }
-#else
        public string? Region { get; set; }
-#endif

        /// <remarks>language</remarks>
-#if NET48
-        public string Language { get; set; }
-#else
        public string? Language { get; set; }
-#endif

        /// <remarks>date</remarks>
-#if NET48
-        public string Date { get; set; }
-#else
        public string? Date { get; set; }
-#endif

        /// <remarks>default</remarks>
-#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>
-#if NET48
-        public string[] ADDITIONAL_ELEMENTS { get; set; }
-#else
        public string[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif

        #endregion
    }
--- a/ClrMamePro/Rom.cs
+++ b/ClrMamePro/Rom.cs
@@ -5,181 +5,93 @@ namespace SabreTools.Models.ClrMamePro
    {
        /// <remarks>name</remarks>
        [Required]
-#if NET48
-        public string Name { get; set; }
-#else
        public string? Name { get; set; }
-#endif

        /// <remarks>size, Numeric</remarks>
        [Required]
-#if NET48
-        public string Size { get; set; }
-#else
        public string? Size { get; set; }
-#endif

        /// <remarks>crc</remarks>
-#if NET48
-        public string CRC { get; set; }
-#else
        public string? CRC { get; set; }
-#endif

        /// <remarks>md5</remarks>
-#if NET48
-        public string MD5 { get; set; }
-#else
        public string? MD5 { get; set; }
-#endif

        /// <remarks>sha1</remarks>
-#if NET48
-        public string SHA1 { get; set; }
-#else
        public string? SHA1 { get; set; }
-#endif

        /// <remarks>merge</remarks>
-#if NET48
-        public string Merge { get; set; }
-#else
        public string? Merge { get; set; }
-#endif

        /// <remarks>status</remarks>
-#if NET48
-        public string Status { get; set; }
-#else
        public string? Status { get; set; }
-#endif

        /// <remarks>flags</remarks>
-#if NET48
-        public string Flags { get; set; }
-#else
        public string? Flags { get; set; }
-#endif

        /// <remarks>date</remarks>
-#if NET48
-        public string Date { get; set; }
-#else
        public string? Date { get; set; }
-#endif

        #region Hash Extensions

        /// <remarks>sha256; Also in No-Intro spec; Appears after SHA1</remarks>
-#if NET48
-        public string SHA256 { get; set; }
-#else
        public string? SHA256 { get; set; }
-#endif

        /// <remarks>sha384; Appears after SHA256</remarks>
-#if NET48
-        public string SHA384 { get; set; }
-#else
        public string? SHA384 { get; set; }
-#endif

        /// <remarks>sha512; Appears after SHA384</remarks>
-#if NET48
-        public string SHA512 { get; set; }
-#else
        public string? SHA512 { get; set; }
-#endif

        /// <remarks>spamsum; Appears after SHA512</remarks>
-#if NET48
-        public string SpamSum { get; set; }
-#else
        public string? SpamSum { get; set; }
-#endif

        #endregion

        #region DiscImgeCreator Extensions

        /// <remarks>xxh3_64; Appears after SpamSum</remarks>
-#if NET48
-        public string xxHash364 { get; set; }
-#else
        public string? xxHash364 { get; set; }
-#endif

        /// <remarks>xxh3_128; Appears after xxHash364</remarks>
-#if NET48
-        public string xxHash3128 { get; set; }
-#else
        public string? xxHash3128 { get; set; }
-#endif

        #endregion

        #region MAME Extensions

        /// <remarks>region; Appears after Status</remarks>
-#if NET48
-        public string Region { get; set; }
-#else
        public string? Region { get; set; }
-#endif

        /// <remarks>offs; Appears after Flags</remarks>
-#if NET48
-        public string Offs { get; set; }
-#else
        public string? Offs { get; set; }
-#endif

        #endregion

        #region No-Intro Extensions

        /// <remarks>serial; Appears after Offs</remarks>
-#if NET48
-        public string Serial { get; set; }
-#else
        public string? Serial { get; set; }
-#endif

        /// <remarks>header; Appears after Serial</remarks>
-#if NET48
-        public string Header { get; set; }
-#else
        public string? Header { get; set; }
-#endif

        #endregion

        #region RomVault Extensions

        /// <remarks>inverted; Boolean; Appears after Date</remarks>
-#if NET48
-        public string Inverted { get; set; }
-#else
        public string? Inverted { get; set; }
-#endif

        /// <remarks>mia; Boolean; Appears after Inverted</remarks>
-#if NET48
-        public string MIA { get; set; }
-#else
        public string? MIA { get; set; }
-#endif

        #endregion

        #region DO NOT USE IN PRODUCTION

        /// <remarks>Should be empty</remarks>
-#if NET48
-        public string[] ADDITIONAL_ELEMENTS { get; set; }
-#else
        public string[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif

        #endregion
    }
--- a/ClrMamePro/RomVault.cs
+++ b/ClrMamePro/RomVault.cs
@@ -4,108 +4,48 @@ namespace SabreTools.Models.ClrMamePro
    public class RomVault
    {
        /// <remarks>name</remarks>
-#if NET48
-        public string Name { get; set; }
-#else
        public string? Name { get; set; }
-#endif

        /// <remarks>description</remarks>
-#if NET48
-        public string Description { get; set; }
-#else
        public string? Description { get; set; }
-#endif

        /// <remarks>rootdir</remarks>
-#if NET48
-        public string RootDir { get; set; }
-#else
        public string? RootDir { get; set; }
-#endif

        /// <remarks>category</remarks>
-#if NET48
-        public string Category { get; set; }
-#else
        public string? Category { get; set; }
-#endif

        /// <remarks>version</remarks>
-#if NET48
-        public string Version { get; set; }
-#else
        public string? Version { get; set; }
-#endif

        /// <remarks>date</remarks>
-#if NET48
-        public string Date { get; set; }
-#else
        public string? Date { get; set; }
-#endif

        /// <remarks>author</remarks>
-#if NET48
-        public string Author { get; set; }
-#else
        public string? Author { get; set; }
-#endif

        /// <remarks>homepage</remarks>
-#if NET48
-        public string Homepage { get; set; }
-#else
        public string? Homepage { get; set; }
-#endif

        /// <remarks>url</remarks>
-#if NET48
-        public string Url { get; set; }
-#else
        public string? Url { get; set; }
-#endif

        /// <remarks>comment</remarks>
-#if NET48
-        public string Comment { get; set; }
-#else
        public string? Comment { get; set; }
-#endif

        /// <remarks>header</remarks>
-#if NET48
-        public string Header { get; set; }
-#else
        public string? Header { get; set; }
-#endif

        /// <remarks>type</remarks>
-#if NET48
-        public string Type { get; set; }
-#else
        public string? Type { get; set; }
-#endif

        /// <remarks>forcemerging</remarks>
-#if NET48
-        public string ForceMerging { get; set; }
-#else
        public string? ForceMerging { get; set; }
-#endif

        /// <remarks>forcezipping</remarks>
-#if NET48
-        public string ForceZipping { get; set; }
-#else
        public string? ForceZipping { get; set; }
-#endif

        /// <remarks>forcepacking</remarks>
-#if NET48
-        public string ForcePacking { get; set; }
-#else
        public string? ForcePacking { get; set; }
-#endif
    }
 }
--- a/ClrMamePro/Sample.cs
+++ b/ClrMamePro/Sample.cs
@@ -5,20 +5,12 @@ namespace SabreTools.Models.ClrMamePro
    {
        /// <remarks>name</remarks>
        [Required]
-#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>
-#if NET48
-        public string[] ADDITIONAL_ELEMENTS { get; set; }
-#else
        public string[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif

        #endregion
    }
--- a/ClrMamePro/Sound.cs
+++ b/ClrMamePro/Sound.cs
@@ -5,20 +5,12 @@ namespace SabreTools.Models.ClrMamePro
    {
        /// <remarks>channels, Numeric?</remarks>
        [Required]
-#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>
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
        public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif

        #endregion
    }
--- a/ClrMamePro/Video.cs
+++ b/ClrMamePro/Video.cs
@@ -5,63 +5,31 @@ namespace SabreTools.Models.ClrMamePro
    {
        /// <remarks>screen, (raster|vector)</remarks>
        [Required]
-#if NET48
-        public string Screen { get; set; }
-#else
        public string? Screen { get; set; }
-#endif

        /// <remarks>orientation, (vertical|horizontal)</remarks>
        [Required]
-#if NET48
-        public string Orientation { get; set; }
-#else
        public string? Orientation { get; set; }
-#endif

        /// <remarks>x, Numeric?</remarks>
-#if NET48
-        public string X { get; set; }
-#else
        public string? X { get; set; }
-#endif

        /// <remarks>y, Numeric?</remarks>
-#if NET48
-        public string Y { get; set; }
-#else
        public string? Y { get; set; }
-#endif

        /// <remarks>aspectx, Numeric?</remarks>
-#if NET48
-        public string AspectX { get; set; }
-#else
        public string? AspectX { get; set; }
-#endif

        /// <remarks>aspecty, Numeric?</remarks>
-#if NET48
-        public string AspectY { get; set; }
-#else
        public string? AspectY { get; set; }
-#endif

        /// <remarks>freq, Numeric?</remarks>
-#if NET48
-        public string Freq { get; set; }
-#else
        public string? Freq { get; set; }
-#endif

        #region DO NOT USE IN PRODUCTION

        /// <remarks>Should be empty</remarks>
-#if NET48
-        public object[] ADDITIONAL_ELEMENTS { get; set; }
-#else
        public object[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif

        #endregion
    }
--- a/Compression/LZ/FileHeader.cs
+++ b/Compression/LZ/FileHeader.cs
@@ -6,11 +6,7 @@ namespace SabreTools.Models.Compression.LZ
    /// <see href="https://github.com/wine-mirror/wine/blob/master/dlls/kernel32/lzexpand.c"/>
    public sealed class FileHeaader
    {
-#if NET48
-        public string Magic { get; set; }
-#else
        public string? Magic { get; set; }
-#endif

        public byte CompressionType { get; set; }

--- a/Compression/LZ/State.cs
+++ b/Compression/LZ/State.cs
@@ -7,11 +7,7 @@ namespace SabreTools.Models.Compression.LZ
        /// <summary>
        /// Internal backing stream
        /// </summary>
-#if NET48
-        public Stream Source { get; set; }
-#else
        public Stream? Source { get; set; }
-#endif

        /// <summary>
        /// The last char of the filename for replacement
@@ -36,11 +32,7 @@ namespace SabreTools.Models.Compression.LZ
        /// <summary>
        /// The rotating LZ table
        /// </summary>
-#if NET48
-        public byte[] Table { get; set; }
-#else
        public byte[]? Table { get; set; }
-#endif

        /// <summary>
        /// CURrent TABle ENTry
@@ -65,11 +57,7 @@ namespace SabreTools.Models.Compression.LZ
        /// <summary>
        /// GETLEN bytes
        /// </summary>
-#if NET48
-        public byte[] Window { get; set; }
-#else
        public byte[]? Window { get; set; }
-#endif

        /// <summary>
        /// Current read
--- a/Compression/LZX/AlignedOffsetBlockData.cs
+++ b/Compression/LZX/AlignedOffsetBlockData.cs
@@ -11,80 +11,48 @@ namespace SabreTools.Models.Compression.LZX
        /// Aligned offset tree
        /// </summary>
        /// <remarks>8 elements, 3 bits each</remarks>
-#if NET48
-        public byte[] AlignedOffsetTree { get; set; }
-#else
        public byte[]? AlignedOffsetTree { get; set; }
-#endif

        /// <summary>
        /// Pretree for first 256 elements of main tree
        /// </summary>
        /// <remarks>20 elements, 4 bits each</remarks>
-#if NET48
-        public byte[] PretreeFirst256 { get; set; }
-#else
        public byte[]? PretreeFirst256 { get; set; }
-#endif

        /// <summary>
        /// Path lengths of first 256 elements of main tree
        /// </summary>
        /// <remarks>Encoded using pretree</remarks>
-#if NET48
-        public int[] PathLengthsFirst256 { get; set; }
-#else
        public int[]? PathLengthsFirst256 { get; set; }
-#endif

        /// <summary>
        /// Pretree for remainder of main tree
        /// </summary>
        /// <remarks>20 elements, 4 bits each</remarks>
-#if NET48
-        public byte[] PretreeRemainder { get; set; }
-#else
        public byte[]? PretreeRemainder { get; set; }
-#endif

        /// <summary>
        /// Path lengths of remaining elements of main tree
        /// </summary>
        /// <remarks>Encoded using pretree</remarks>
-#if NET48
-        public int[] PathLengthsRemainder { get; set; }
-#else
        public int[]? PathLengthsRemainder { get; set; }
-#endif

        /// <summary>
        /// Pretree for length tree
        /// </summary>
        /// <remarks>20 elements, 4 bits each</remarks>
-#if NET48
-        public byte[] PretreeLengthTree { get; set; }
-#else
        public byte[]? PretreeLengthTree { get; set; }
-#endif

        /// <summary>
        /// Path lengths of elements in length tree
        /// </summary>
        /// <remarks>Encoded using pretree</remarks>
-#if NET48
-        public int[] PathLengthsLengthTree { get; set; }
-#else
        public int[]? PathLengthsLengthTree { get; set; }
-#endif

        /// <summary>
        /// Token sequence (matches and literals)
        /// </summary>
        /// <remarks>Variable</remarks>
-#if NET48
-        public byte[] TokenSequence { get; set; }
-#else
        public byte[]? TokenSequence { get; set; }
-#endif
    }
 }
--- a/Compression/LZX/Block.cs
+++ b/Compression/LZX/Block.cs
@@ -14,19 +14,11 @@ namespace SabreTools.Models.Compression.LZX
        /// <summary>
        /// Block header
        /// </summary>
-#if NET48
-        public BlockHeader Header { get; set; }
-#else
        public BlockHeader? Header { get; set; }
-#endif

        /// <summary>
        /// Block data
        /// </summary>
-#if NET48
-        public BlockData BlockData { get; set; }
-#else
        public BlockData? BlockData { get; set; }
-#endif
    }
 }
--- a/Compression/LZX/Chunk.cs
+++ b/Compression/LZX/Chunk.cs
@@ -15,19 +15,11 @@ namespace SabreTools.Models.Compression.LZX
        /// <summary>
        /// Chunk header
        /// </summary>
-#if NET48
-        public ChunkHeader Header { get; set; }
-#else
        public ChunkHeader? Header { get; set; }
-#endif

        /// <summary>
        /// Block headers and data
        /// </summary>
-#if NET48
-        public Block[] Blocks { get; set; }
-#else
        public Block[]? Blocks { get; set; }
-#endif
    }
 }
--- a/Compression/LZX/UncompressedBlockData.cs
+++ b/Compression/LZX/UncompressedBlockData.cs
@@ -44,11 +44,7 @@ namespace SabreTools.Models.Compression.LZX
        /// Can use the direct memcpy function, as specified in [IEEE1003.1]
        /// </summary>
        /// <remarks>Encoded directly in the byte stream, not in the bitstream of byte-swapped 16-bit words</remarks>
-#if NET48
-        public byte[] RawDataBytes { get; set; }
-#else
        public byte[]? RawDataBytes { get; set; }
-#endif

        /// <summary>
        /// Only if uncompressed size is odd
--- a/Compression/LZX/VerbatimBlockData.cs
+++ b/Compression/LZX/VerbatimBlockData.cs
@@ -10,70 +10,42 @@ namespace SabreTools.Models.Compression.LZX
        /// Pretree for first 256 elements of main tree
        /// </summary>
        /// <remarks>20 elements, 4 bits each</remarks>
-#if NET48
-        public byte[] PretreeFirst256 { get; set; }
-#else
        public byte[]? PretreeFirst256 { get; set; }
-#endif

        /// <summary>
        /// Path lengths of first 256 elements of main tree
        /// </summary>
        /// <remarks>Encoded using pretree</remarks>
-#if NET48
-        public int[] PathLengthsFirst256 { get; set; }
-#else
        public int[]? PathLengthsFirst256 { get; set; }
-#endif

        /// <summary>
        /// Pretree for remainder of main tree
        /// </summary>
        /// <remarks>20 elements, 4 bits each</remarks>
-#if NET48
-        public byte[] PretreeRemainder { get; set; }
-#else
        public byte[]? PretreeRemainder { get; set; }
-#endif

        /// <summary>
        /// Path lengths of remaining elements of main tree
        /// </summary>
        /// <remarks>Encoded using pretree</remarks>
-#if NET48
-        public int[] PathLengthsRemainder { get; set; }
-#else
        public int[]? PathLengthsRemainder { get; set; }
-#endif

        /// <summary>
        /// Pretree for length tree
        /// </summary>
        /// <remarks>20 elements, 4 bits each</remarks>
-#if NET48
-        public byte[] PretreeLengthTree { get; set; }
-#else
        public byte[]? PretreeLengthTree { get; set; }
-#endif

        /// <summary>
        /// Path lengths of elements in length tree
        /// </summary>
        /// <remarks>Encoded using pretree</remarks>
-#if NET48
-        public int[] PathLengthsLengthTree { get; set; }
-#else
        public int[]? PathLengthsLengthTree { get; set; }
-#endif

        /// <summary>
        /// Token sequence (matches and literals)
        /// </summary>
        /// <remarks>Variable</remarks>
-#if NET48
-        public byte[] TokenSequence { get; set; }
-#else
        public byte[]? TokenSequence { get; set; }
-#endif
    }
 }
--- a/Compression/MSZIP/Block.cs
+++ b/Compression/MSZIP/Block.cs
@@ -23,19 +23,11 @@ namespace SabreTools.Models.Compression.MSZIP
        /// <summary>
        /// Block header
        /// </summary>
-#if NET48
-        public BlockHeader BlockHeader { get; set; }
-#else
        public BlockHeader? BlockHeader { get; set; }
-#endif

        /// <summary>
        /// Compressed blocks
        /// </summary>
-#if NET48
-        public DeflateBlock[] CompressedBlocks { get; set; }
-#else
        public DeflateBlock[]? CompressedBlocks { get; set; }
-#endif
    }
 }
--- a/Compression/MSZIP/CompressedBlockHeader.cs
+++ b/Compression/MSZIP/CompressedBlockHeader.cs
@@ -10,19 +10,11 @@ namespace SabreTools.Models.Compression.MSZIP
        /// <summary>
        /// Huffman code lengths for the literal / length alphabet
        /// </summary>
-#if NET48
-        public virtual uint[] LiteralLengths { get; set; }
-#else
        public virtual uint[]? LiteralLengths { get; set; }
-#endif

        /// <summary>
        /// Huffman distance codes for the literal / length alphabet
        /// </summary>
-#if NET48
-        public virtual uint[] DistanceCodes { get; set; }
-#else
        public virtual uint[]? DistanceCodes { get; set; }
-#endif
    }
 }
--- a/Compression/MSZIP/DeflateBlock.cs
+++ b/Compression/MSZIP/DeflateBlock.cs
@@ -15,20 +15,12 @@ namespace SabreTools.Models.Compression.MSZIP
        /// <summary>
        /// Deflate block (RFC-1951) header
        /// </summary>
-#if NET48
-        public DeflateBlockHeader Header { get; set; }
-#else
        public DeflateBlockHeader? Header { get; set; }
-#endif

        /// <summary>
        /// Compression-specific data header
        /// </summary>
-#if NET48
-        public DataHeader DataHeader { get; set; }
-#else
        public DataHeader? DataHeader { get; set; }
-#endif

        /// <summary>
        /// MSZIP data
@@ -38,10 +30,6 @@ namespace SabreTools.Models.Compression.MSZIP
        /// compressed or uncompressed data. Keep this in mind when using the built
        /// versions of this model.
        /// </remarks>
-#if NET48
-        public byte[] Data { get; set; }
-#else
        public byte[]? Data { get; set; }
-#endif
    }
 }
--- a/Compression/MSZIP/FixedCompressedDataHeader.cs
+++ b/Compression/MSZIP/FixedCompressedDataHeader.cs
@@ -14,11 +14,7 @@ namespace SabreTools.Models.Compression.MSZIP
        /// <summary>
        /// Huffman code lengths for the literal / length alphabet
        /// </summary>
-#if NET48
-        public override uint[] LiteralLengths
-#else
        public override uint[]? LiteralLengths
-#endif
        {
            get
            {
@@ -56,11 +52,7 @@ namespace SabreTools.Models.Compression.MSZIP
        /// <summary>
        /// Huffman distance codes for the literal / length alphabet
        /// </summary>
-#if NET48
-        public override uint[] DistanceCodes
-#else
        public override uint[]? DistanceCodes
-#endif
        {
            get
            {
@@ -90,20 +82,12 @@ namespace SabreTools.Models.Compression.MSZIP
        /// <summary>
        /// Huffman code lengths for the literal / length alphabet
        /// </summary>
-#if NET48
-        private uint[] _literalLengths = null;
-#else
        private uint[]? _literalLengths = null;
-#endif

        /// <summary>
        /// Huffman distance codes for the literal / length alphabet
        /// </summary>
-#if NET48
-        private uint[] _distanceCodes = null;
-#else
        private uint[]? _distanceCodes = null;
-#endif

        #endregion
    }
--- a/Compression/Quantum/Model.cs
+++ b/Compression/Quantum/Model.cs
@@ -10,11 +10,7 @@ namespace SabreTools.Models.Compression.Quantum
        /// order in the table, and with every symbol in the table
        /// having a frequency of 1
        /// </remarks>
-#if NET48
-        public ModelSymbol[] Symbols { get; set; }
-#else
        public ModelSymbol?[]? Symbols { get; set; }
-#endif

        /// <remarks>
        /// The initial total frequency is equal to the number of entries
--- a/CueSheets/CueFile.cs
+++ b/CueSheets/CueFile.cs
@@ -15,11 +15,7 @@ namespace SabreTools.Models.CueSheets
        /// <summary>
        /// filename
        /// </summary>
-#if NET48
-        public string FileName { get; set; }
-#else
        public string? FileName { get; set; }
-#endif

        /// <summary>
        /// filetype
@@ -29,10 +25,6 @@ namespace SabreTools.Models.CueSheets
        /// <summary>
        /// List of TRACK in FILE
        /// </summary>
-#if NET48
-        public CueTrack[] Tracks { get; set; }
-#else
        public CueTrack?[]? Tracks { get; set; }
-#endif
    }
 }
--- a/CueSheets/CueSheet.cs
+++ b/CueSheets/CueSheet.cs
@@ -11,55 +11,31 @@ namespace SabreTools.Models.CueSheets
        /// <summary>
        /// CATALOG
        /// </summary>
-#if NET48
-        public string Catalog { get; set; }
-#else
        public string? Catalog { get; set; }
-#endif

        /// <summary>
        /// CDTEXTFILE
        /// </summary>
-#if NET48
-        public string CdTextFile { get; set; }
-#else
        public string? CdTextFile { get; set; }
-#endif

        /// <summary>
        /// PERFORMER
        /// </summary>
-#if NET48
-        public string Performer { get; set; }
-#else
        public string? Performer { get; set; }
-#endif

        /// <summary>
        /// SONGWRITER
        /// </summary>
-#if NET48
-        public string Songwriter { get; set; }
-#else
        public string? Songwriter { get; set; }
-#endif

        /// <summary>
        /// TITLE
        /// </summary>
-#if NET48
-        public string Title { get; set; }
-#else
        public string? Title { get; set; }
-#endif

        /// <summary>
        /// List of FILE in cuesheet
        /// </summary>
-#if NET48
-        public CueFile[] Files { get; set; }
-#else
        public CueFile?[]? Files { get; set; }
-#endif
    }
 }
--- a/CueSheets/CueTrack.cs
+++ b/CueSheets/CueTrack.cs
@@ -27,65 +27,37 @@ namespace SabreTools.Models.CueSheets
        /// ISRC
        /// </summary>
        /// <remarks>12 characters in length</remarks>
-#if NET48
-        public string ISRC { get; set; }
-#else
        public string? ISRC { get; set; }
-#endif

        /// <summary>
        /// PERFORMER
        /// </summary>
-#if NET48
-        public string Performer { get; set; }
-#else
        public string? Performer { get; set; }
-#endif

        /// <summary>
        /// SONGWRITER
        /// </summary>
-#if NET48
-        public string Songwriter { get; set; }
-#else
        public string? Songwriter { get; set; }
-#endif

        /// <summary>
        /// TITLE
        /// </summary>
-#if NET48
-        public string Title { get; set; }
-#else
        public string? Title { get; set; }
-#endif

        /// <summary>
        /// PREGAP
        /// </summary>
-#if NET48
-        public PreGap PreGap { get; set; }
-#else
        public PreGap? PreGap { get; set; }
-#endif

        /// <summary>
        /// List of INDEX in TRACK
        /// </summary>
        /// <remarks>Must start with 0 or 1 and then sequential</remarks>
-#if NET48
-        public CueIndex[] Indices { get; set; }
-#else
        public CueIndex?[]? Indices { get; set; }
-#endif

        /// <summary>
        /// POSTGAP
        /// </summary>
-#if NET48
-        public PostGap PostGap { get; set; }
-#else
        public PostGap? PostGap { get; set; }
-#endif
    }
 }
--- a/DVD/AudioSubPictureAttributesTable.cs
+++ b/DVD/AudioSubPictureAttributesTable.cs
@@ -11,11 +11,7 @@ namespace SabreTools.Models.DVD
        /// <summary>
        /// Reserved
        /// </summary>
-#if NET48
-        public byte[] Reserved { get; set; }
-#else
        public byte[]? Reserved { get; set; }
-#endif

        /// <summary>
        /// End address (last byte of last VTS_ATRT)
@@ -25,19 +21,11 @@ namespace SabreTools.Models.DVD
        /// <summary>
        /// Offset to VTS_ATRT n
        /// </summary>
-#if NET48
-        public uint[] Offsets { get; set; }
-#else
        public uint[]? Offsets { get; set; }
-#endif

        /// <summary>
        /// Entries
        /// </summary>
-#if NET48
-        public AudioSubPictureAttributesTableEntry[] Entries { get; set; }
-#else
        public AudioSubPictureAttributesTableEntry?[]? Entries { get; set; }
-#endif
    }
 }
--- a/DVD/AudioSubPictureAttributesTableEntry.cs
+++ b/DVD/AudioSubPictureAttributesTableEntry.cs
@@ -18,10 +18,6 @@ namespace SabreTools.Models.DVD
        /// Copy of VTS attributes (offset 100 and on from the VTS IFO
        /// file, usually 0x300 bytes long)
        /// </summary>
-#if NET48
-        public byte[] AttributesCopy { get; set; }
-#else
        public byte[]? AttributesCopy { get; set; }
-#endif
    }
 }
--- a/DVD/CellAddressTable.cs
+++ b/DVD/CellAddressTable.cs
@@ -11,11 +11,7 @@ namespace SabreTools.Models.DVD
        /// <summary>
        /// Reserved
        /// </summary>
-#if NET48
-        public byte[] Reserved { get; set; }
-#else
        public byte[]? Reserved { get; set; }
-#endif

        /// <summary>
        /// End address (last byte of last entry)
@@ -25,10 +21,6 @@ namespace SabreTools.Models.DVD
        /// <summary>
        /// 12-byte entries
        /// </summary>
-#if NET48
-        public CellAddressTableEntry[] Entries { get; set; }
-#else
        public CellAddressTableEntry?[]? Entries { get; set; }
-#endif
    }
 }
--- a/DVD/LanguageUnitTable.cs
+++ b/DVD/LanguageUnitTable.cs
@@ -11,11 +11,7 @@ namespace SabreTools.Models.DVD
        /// <summary>
        /// Reserved
        /// </summary>
-#if NET48
-        public byte[] Reserved { get; set; }
-#else
        public byte[]? Reserved { get; set; }
-#endif

        /// <summary>
        /// End address (last byte of last PGC in last LU)
@@ -26,19 +22,11 @@ namespace SabreTools.Models.DVD
        /// <summary>
        /// Language Units
        /// </summary>
-#if NET48
-        public LanguageUnitTableEntry[] Entries { get; set; }
-#else
        public LanguageUnitTableEntry?[]? Entries { get; set; }
-#endif

        /// <summary>
        /// Program Chains
        /// </summary>
-#if NET48
-        public ProgramChainTable[] ProgramChains { get; set; }
-#else
        public ProgramChainTable?[]? ProgramChains { get; set; }
-#endif
    }
 }
--- a/DVD/ParentalManagementMasksTable.cs
+++ b/DVD/ParentalManagementMasksTable.cs
@@ -25,21 +25,13 @@ namespace SabreTools.Models.DVD
        /// <summary>
        /// Entries
        /// </summary>
-#if NET48
-        public ParentalManagementMasksTableEntry[] Entries { get; set; }
-#else
        public ParentalManagementMasksTableEntry?[]? Entries { get; set; }
-#endif

        /// <summary>
        /// The PTL_MAIT contains the 16-bit masks for the VMG and
        /// all title sets for parental management level 8 followed
        /// by the masks for level 7, and so on to level 1.
        /// </summary>
-#if NET48
-        public byte[][] BitMasks { get; set; }
-#else
        public byte[][]? BitMasks { get; set; }
-#endif
    }
 }
--- a/DVD/ParentalManagementMasksTableEntry.cs
+++ b/DVD/ParentalManagementMasksTableEntry.cs
@@ -11,11 +11,7 @@ namespace SabreTools.Models.DVD
        /// <summary>
        /// Reserved
        /// </summary>
-#if NET48
-        public byte[] Reserved { get; set; }
-#else
        public byte[]? Reserved { get; set; }
-#endif

        /// <summary>
        /// Offset to PTL_MAIT
--- a/DVD/ProgramChainTable.cs
+++ b/DVD/ProgramChainTable.cs
@@ -11,11 +11,7 @@ namespace SabreTools.Models.DVD
        /// <summary>
        /// Reserved
        /// </summary>
-#if NET48
-        public byte[] Reserved { get; set; }
-#else
        public byte[]? Reserved { get; set; }
-#endif

        /// <summary>
        /// End address (last byte of last PGC in this LU)
@@ -26,10 +22,6 @@ namespace SabreTools.Models.DVD
        /// <summary>
        /// Program Chains
        /// </summary>
-#if NET48
-        public ProgramChainTableEntry[] Entries { get; set; }
-#else
        public ProgramChainTableEntry?[]? Entries { get; set; }
-#endif
    }
 }
--- a/DVD/TitlesTable.cs
+++ b/DVD/TitlesTable.cs
@@ -11,11 +11,7 @@ namespace SabreTools.Models.DVD
        /// <summary>
        /// Reserved
        /// </summary>
-#if NET48
-        public byte[] Reserved { get; set; }
-#else
        public byte[]? Reserved { get; set; }
-#endif

        /// <summary>
        /// End address (last byte of last entry)
@@ -25,10 +21,6 @@ namespace SabreTools.Models.DVD
        /// <summary>
        /// 12-byte entries
        /// </summary>
-#if NET48
-        public TitlesTableEntry[] Entries { get; set; }
-#else
        public TitlesTableEntry?[]? Entries { get; set; }
-#endif
    }
 }
--- a/DVD/VOBUAddressMap.cs
+++ b/DVD/VOBUAddressMap.cs
@@ -11,10 +11,6 @@ namespace SabreTools.Models.DVD
        /// <summary>
        /// Starting sector within VOB of nth VOBU
        /// </summary>
-#if NET48
-        public uint[] StartingSectors { get; set; }
-#else
        public uint[]? StartingSectors { get; set; }
-#endif
    }
 }
--- a/DVD/VideoManagerIFO.cs
+++ b/DVD/VideoManagerIFO.cs
@@ -6,11 +6,7 @@ namespace SabreTools.Models.DVD
        /// <summary>
        /// "DVDVIDEO-VMG"
        /// </summary>
-#if NET48
-        public string Signature { get; set; }
-#else
        public string? Signature { get; set; }
-#endif

        /// <summary>
        /// Last sector of VMG set (last sector of BUP)
@@ -59,11 +55,7 @@ namespace SabreTools.Models.DVD
        /// <summary>
        /// Provider ID
        /// </summary>
-#if NET48
-        public byte[] ProviderID { get; set; }
-#else
        public byte[]? ProviderID { get; set; }
-#endif

        /// <summary>
        /// VMG POS
@@ -123,11 +115,7 @@ namespace SabreTools.Models.DVD
        /// <summary>
        /// Video attributes of VMGM_VOBS
        /// </summary>
-#if NET48
-        public byte[] VideoAttributes { get; set; }
-#else
        public byte[]? VideoAttributes { get; set; }
-#endif

        /// <summary>
        /// Number of audio streams in VMGM_VOBS
@@ -137,20 +125,12 @@ namespace SabreTools.Models.DVD
        /// <summary>
        /// Audio attributes of VMGM_VOBS
        /// </summary>
-#if NET48
-        public byte[][] AudioAttributes { get; set; }
-#else
        public byte[][]? AudioAttributes { get; set; }
-#endif

        /// <summary>
        /// Unknown
        /// </summary>
-#if NET48
-        public byte[] Unknown { get; set; }
-#else
        public byte[]? Unknown { get; set; }
-#endif

        /// <summary>
        /// Number of subpicture streams in VMGM_VOBS (0 or 1)
@@ -160,19 +140,11 @@ namespace SabreTools.Models.DVD
        /// <summary>
        /// Subpicture attributes of VMGM_VOBS
        /// </summary>
-#if NET48
-        public byte[] SubpictureAttributes { get; set; }
-#else
        public byte[]? SubpictureAttributes { get; set; }
-#endif

        /// <summary>
        /// Reserved
        /// </summary>
-#if NET48
-        public byte[] Reserved { get; set; }
-#else
        public byte[]? Reserved { get; set; }
-#endif
    }
 }
--- a/DVD/VideoTitleSetIFO.cs
+++ b/DVD/VideoTitleSetIFO.cs
@@ -6,11 +6,7 @@ namespace SabreTools.Models.DVD
        /// <summary>
        /// "DVDVIDEO-VTS"
        /// </summary>
-#if NET48
-        public string Signature { get; set; }
-#else
        public string? Signature { get; set; }
-#endif

        /// <summary>
        /// Last sector of title set (last sector of BUP)
@@ -59,11 +55,7 @@ namespace SabreTools.Models.DVD
        /// <summary>
        /// Provider ID
        /// </summary>
-#if NET48
-        public byte[] ProviderID { get; set; }
-#else
        public byte[]? ProviderID { get; set; }
-#endif

        /// <summary>
        /// VMG POS
@@ -133,11 +125,7 @@ namespace SabreTools.Models.DVD
        /// <summary>
        /// Video attributes of VTSM_VOBS
        /// </summary>
-#if NET48
-        public byte[] VideoAttributes { get; set; }
-#else
        public byte[]? VideoAttributes { get; set; }
-#endif

        /// <summary>
        /// Number of audio streams in VTSM_VOBS
@@ -147,20 +135,12 @@ namespace SabreTools.Models.DVD
        /// <summary>
        /// Audio attributes of VTSM_VOBS
        /// </summary>
-#if NET48
-        public byte[][] AudioAttributes { get; set; }
-#else
        public byte[][]? AudioAttributes { get; set; }
-#endif

        /// <summary>
        /// Unknown
        /// </summary>
-#if NET48
-        public byte[] Unknown { get; set; }
-#else
        public byte[]? Unknown { get; set; }
-#endif

        /// <summary>
        /// Number of subpicture streams in VTSM_VOBS (0 or 1)
@@ -170,19 +150,11 @@ namespace SabreTools.Models.DVD
        /// <summary>
        /// Subpicture attributes of VTSM_VOBS
        /// </summary>
-#if NET48
-        public byte[] SubpictureAttributes { get; set; }
-#else
        public byte[]? SubpictureAttributes { get; set; }
-#endif

        /// <summary>
        /// Reserved
        /// </summary>
-#if NET48
-        public byte[] Reserved { get; set; }
-#else
        public byte[]? Reserved { get; set; }
-#endif
    }
 }
--- a/DosCenter/DosCenter.cs
+++ b/DosCenter/DosCenter.cs
@@ -4,62 +4,30 @@ namespace SabreTools.Models.DosCenter
    public class DosCenter
    {
        /// <remarks>name</remarks>
-#if NET48
-        public string Name { get; set; }
-#else
        public string? Name { get; set; }
-#endif

        /// <remarks>description</remarks>
-#if NET48
-        public string Description { get; set; }
-#else
        public string? Description { get; set; }
-#endif

        /// <remarks>version</remarks>
-#if NET48
-        public string Version { get; set; }
-#else
        public string? Version { get; set; }
-#endif

        /// <remarks>date</remarks>
-#if NET48
-        public string Date { get; set; }
-#else
        public string? Date { get; set; }
-#endif

        /// <remarks>author</remarks>
-#if NET48
-        public string Author { get; set; }
-#else
        public string? Author { get; set; }
-#endif

        /// <remarks>homepage</remarks>
-#if NET48
-        public string Homepage { get; set; }
-#else
        public string? Homepage { get; set; }
-#endif

        /// <remarks>comment</remarks>
-#if NET48
-        public string Comment { get; set; }
-#else
        public string? Comment { get; set; }
-#endif

        #region DO NOT USE IN PRODUCTION

        /// <remarks>Should be empty</remarks>
-#if NET48
-        public string[] ADDITIONAL_ELEMENTS { get; set; }
-#else
        public string[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif

        #endregion
    }
--- a/DosCenter/File.cs
+++ b/DosCenter/File.cs
@@ -5,43 +5,23 @@ namespace SabreTools.Models.DosCenter
    {
        /// <remarks>name, attribute</remarks>
        [Required]
-#if NET48
-        public string Name { get; set; }
-#else
        public string? Name { get; set; }
-#endif

        /// <remarks>size, attribute, numeric</remarks>
        [Required]
-#if NET48
-        public string Size { get; set; }
-#else
        public string? Size { get; set; }
-#endif

        /// <remarks>crc, attribute</remarks>
        [Required]
-#if NET48
-        public string CRC { get; set; }
-#else
        public string? CRC { get; set; }
-#endif

        /// <remarks>date, attribute</remarks>
-#if NET48
-        public string Date { get; set; }
-#else
        public string? Date { get; set; }
-#endif

        #region DO NOT USE IN PRODUCTION

        /// <remarks>Should be empty</remarks>
-#if NET48
-        public string[] ADDITIONAL_ELEMENTS { get; set; }
-#else
        public string[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif

        #endregion
    }
--- a/DosCenter/Game.cs
+++ b/DosCenter/Game.cs
@@ -5,27 +5,15 @@ namespace SabreTools.Models.DosCenter
    {
        /// <remarks>name</remarks>
        [Required]
-#if NET48
-        public string Name { get; set; }
-#else
        public string? Name { get; set; }
-#endif

        /// <remarks>file</remarks>
-#if NET48
-        public File[] File { get; set; }
-#else
        public File[]? File { get; set; }
-#endif

        #region DO NOT USE IN PRODUCTION

        /// <remarks>Should be empty</remarks>
-#if NET48
-        public string[] ADDITIONAL_ELEMENTS { get; set; }
-#else
        public string[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif

        #endregion
    }
--- a/DosCenter/MetadataFile.cs
+++ b/DosCenter/MetadataFile.cs
@@ -3,27 +3,15 @@ namespace SabreTools.Models.DosCenter
    public class MetadataFile
    {
        /// <remarks>doscenter</remarks>
-#if NET48
-        public DosCenter DosCenter { get; set; }
-#else
        public DosCenter? DosCenter { get; set; }
-#endif

        /// <remarks>game</remarks>
-#if NET48
-        public Game[] Game { get; set; }
-#else
        public Game[]? Game { get; set; }
-#endif

        #region DO NOT USE IN PRODUCTION

        /// <remarks>Should be empty</remarks>
-#if NET48
-        public string[] ADDITIONAL_ELEMENTS { get; set; }
-#else
        public string[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif

        #endregion
    }
--- a/EverdriveSMDB/MetadataFile.cs
+++ b/EverdriveSMDB/MetadataFile.cs
@@ -2,10 +2,6 @@ namespace SabreTools.Models.EverdriveSMDB
 {
    public class MetadataFile
    {
-#if NET48
-        public Row[] Row { get; set; }
-#else
        public Row[]? Row { get; set; }
-#endif
    }
 }
--- a/EverdriveSMDB/Row.cs
+++ b/EverdriveSMDB/Row.cs
@@ -6,54 +6,26 @@ namespace SabreTools.Models.EverdriveSMDB
    public class Row
    {
        [Required]
-#if NET48
-        public string SHA256 { get; set; }
-#else
        public string? SHA256 { get; set; }
-#endif

        [Required]
-#if NET48
-        public string Name { get; set; }
-#else
        public string? Name { get; set; }
-#endif

        [Required]
-#if NET48
-        public string SHA1 { get; set; }
-#else
        public string? SHA1 { get; set; }
-#endif

        [Required]
-#if NET48
-        public string MD5 { get; set; }
-#else
        public string? MD5 { get; set; }
-#endif

        [Required]
-#if NET48
-        public string CRC32 { get; set; }
-#else
        public string? CRC32 { get; set; }
-#endif

-#if NET48
-        public string Size { get; set; }
-#else
        public string? Size { get; set; }
-#endif

        #region DO NOT USE IN PRODUCTION

        /// <remarks>Should be empty</remarks>
-#if NET48
-        public string[] ADDITIONAL_ELEMENTS { get; set; }
-#else
        public string[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif

        #endregion
    }
--- a/GCF/DirectoryEntry.cs
+++ b/GCF/DirectoryEntry.cs
@@ -11,11 +11,7 @@ namespace SabreTools.Models.GCF
        /// <summary>
        /// Directory item name from the end of the directory items.
        /// </summary>
-#if NET48
-        public string Name { get; set; }
-#else
        public string? Name { get; set; }
-#endif

        /// <summary>
        /// Size of the item.  (If file, file size.  If folder, num items.)
--- a/GCF/File.cs
+++ b/GCF/File.cs
@@ -11,192 +11,108 @@ namespace SabreTools.Models.GCF
        /// <summary>
        /// Header data
        /// </summary>
-#if NET48
-        public Header Header { get; set; }
-#else
        public Header? Header { get; set; }
-#endif

        /// <summary>
        /// Block entry header data
        /// </summary>
-#if NET48
-        public BlockEntryHeader BlockEntryHeader { get; set; }
-#else
        public BlockEntryHeader? BlockEntryHeader { get; set; }
-#endif

        /// <summary>
        /// Block entries data
        /// </summary>
-#if NET48
-        public BlockEntry[] BlockEntries { get; set; }
-#else
        public BlockEntry?[]? BlockEntries { get; set; }
-#endif

        /// <summary>
        /// Fragmentation map header data
        /// </summary>
-#if NET48
-        public FragmentationMapHeader FragmentationMapHeader { get; set; }
-#else
        public FragmentationMapHeader? FragmentationMapHeader { get; set; }
-#endif

        /// <summary>
        /// Fragmentation map data
        /// </summary>
-#if NET48
-        public FragmentationMap[] FragmentationMaps { get; set; }
-#else
        public FragmentationMap?[]? FragmentationMaps { get; set; }
-#endif

        /// <summary>
        /// Block entry map header data
        /// </summary>
        /// <remarks>Part of version 5 but not version 6.</remarks>
-#if NET48
-        public BlockEntryMapHeader BlockEntryMapHeader { get; set; }
-#else
        public BlockEntryMapHeader? BlockEntryMapHeader { get; set; }
-#endif

        /// <summary>
        /// Block entry map data
        /// </summary>
        /// <remarks>Part of version 5 but not version 6.</remarks>
-#if NET48
-        public BlockEntryMap[] BlockEntryMaps { get; set; }
-#else
        public BlockEntryMap?[]? BlockEntryMaps { get; set; }
-#endif

        /// <summary>
        /// Directory header data
        /// </summary>
-#if NET48
-        public DirectoryHeader DirectoryHeader { get; set; }
-#else
        public DirectoryHeader? DirectoryHeader { get; set; }
-#endif

        /// <summary>
        /// Directory entries data
        /// </summary>
-#if NET48
-        public DirectoryEntry[] DirectoryEntries { get; set; }
-#else
        public DirectoryEntry?[]? DirectoryEntries { get; set; }
-#endif

        /// <summary>
        /// Directory names data
        /// </summary>
-#if NET48
-        public Dictionary<long, string> DirectoryNames { get; set; }
-#else
        public Dictionary<long, string?>? DirectoryNames { get; set; }
-#endif

        /// <summary>
        /// Directory info 1 entries data
        /// </summary>
-#if NET48
-        public DirectoryInfo1Entry[] DirectoryInfo1Entries { get; set; }
-#else
        public DirectoryInfo1Entry?[]? DirectoryInfo1Entries { get; set; }
-#endif

        /// <summary>
        /// Directory info 2 entries data
        /// </summary>
-#if NET48
-        public DirectoryInfo2Entry[] DirectoryInfo2Entries { get; set; }
-#else
        public DirectoryInfo2Entry?[]? DirectoryInfo2Entries { get; set; }
-#endif

        /// <summary>
        /// Directory copy entries data
        /// </summary>
-#if NET48
-        public DirectoryCopyEntry[] DirectoryCopyEntries { get; set; }
-#else
        public DirectoryCopyEntry?[]? DirectoryCopyEntries { get; set; }
-#endif

        /// <summary>
        /// Directory local entries data
        /// </summary>
-#if NET48
-        public DirectoryLocalEntry[] DirectoryLocalEntries { get; set; }
-#else
        public DirectoryLocalEntry?[]? DirectoryLocalEntries { get; set; }
-#endif

        /// <summary>
        /// Directory map header data
        /// </summary>
-#if NET48
-        public DirectoryMapHeader DirectoryMapHeader { get; set; }
-#else
        public DirectoryMapHeader? DirectoryMapHeader { get; set; }
-#endif

        /// <summary>
        /// Directory map entries data
        /// </summary>
-#if NET48
-        public DirectoryMapEntry[] DirectoryMapEntries { get; set; }
-#else
        public DirectoryMapEntry?[]? DirectoryMapEntries { get; set; }
-#endif

        /// <summary>
        /// Checksum header data
        /// </summary>
-#if NET48
-        public ChecksumHeader ChecksumHeader { get; set; }
-#else
        public ChecksumHeader? ChecksumHeader { get; set; }
-#endif

        /// <summary>
        /// Checksum map header data
        /// </summary>
-#if NET48
-        public ChecksumMapHeader ChecksumMapHeader { get; set; }
-#else
        public ChecksumMapHeader? ChecksumMapHeader { get; set; }
-#endif

        /// <summary>
        /// Checksum map entries data
        /// </summary>
-#if NET48
-        public ChecksumMapEntry[] ChecksumMapEntries { get; set; }
-#else
        public ChecksumMapEntry?[]? ChecksumMapEntries { get; set; }
-#endif

        /// <summary>
        /// Checksum entries data
        /// </summary>
-#if NET48
-        public ChecksumEntry[] ChecksumEntries { get; set; }
-#else
        public ChecksumEntry?[]? ChecksumEntries { get; set; }
-#endif

        /// <summary>
        /// Data block header data
        /// </summary>
-#if NET48
-        public DataBlockHeader DataBlockHeader { get; set; }
-#else
        public DataBlockHeader? DataBlockHeader { get; set; }
-#endif
    }
 }
--- a/Hashfile/Hashfile.cs
+++ b/Hashfile/Hashfile.cs
@@ -3,56 +3,24 @@ namespace SabreTools.Models.Hashfile
    /// <remarks>Hashfiles can only contain one type of hash at a time</remarks>
    public class Hashfile
    {
-#if NET48
-        public SFV[] SFV { get; set; }
-#else
        public SFV[]? SFV { get; set; }
-#endif

-#if NET48
-        public MD5[] MD5 { get; set; }
-#else
        public MD5[]? MD5 { get; set; }
-#endif

-#if NET48
-        public SHA1[] SHA1 { get; set; }
-#else
        public SHA1[]? SHA1 { get; set; }
-#endif

-#if NET48
-        public SHA256[] SHA256 { get; set; }
-#else
        public SHA256[]? SHA256 { get; set; }
-#endif

-#if NET48
-        public SHA384[] SHA384 { get; set; }
-#else
        public SHA384[]? SHA384 { get; set; }
-#endif

-#if NET48
-        public SHA512[] SHA512 { get; set; }
-#else
        public SHA512[]? SHA512 { get; set; }
-#endif

-#if NET48
-        public SpamSum[] SpamSum { get; set; }
-#else
        public SpamSum[]? SpamSum { get; set; }
-#endif

        #region DO NOT USE IN PRODUCTION

        /// <remarks>Should be empty</remarks>
-#if NET48
-        public string[] ADDITIONAL_ELEMENTS { get; set; }
-#else
        public string[]? ADDITIONAL_ELEMENTS { get; set; }
-#endif

        #endregion
    }
--- a/Hashfile/MD5.cs
+++ b/Hashfile/MD5.cs
@@ -6,17 +6,9 @@ namespace SabreTools.Models.Hashfile
    public class MD5
    {
        [Required]
-#if NET48
-        public string Hash { get; set; }
-#else
        public string? Hash { get; set; }
-#endif

        [Required]
-#if NET48
-        public string File { get; set; }
-#else
        public string? File { get; set; }
-#endif
    }
 }
--- a/Hashfile/SFV.cs
+++ b/Hashfile/SFV.cs
@@ -6,17 +6,9 @@ namespace SabreTools.Models.Hashfile
    public class SFV
    {
        [Required]
-#if NET48
-        public string File { get; set; }
-#else
        public string? File { get; set; }
-#endif

        [Required]
-#if NET48
-        public string Hash { get; set; }
-#else
        public string? Hash { get; set; }
-#endif
    }
 }
--- a/Hashfile/SHA1.cs
+++ b/Hashfile/SHA1.cs
@@ -6,17 +6,9 @@ namespace SabreTools.Models.Hashfile
    public class SHA1
    {
        [Required]
-#if NET48
-        public string Hash { get; set; }
-#else
        public string? Hash { get; set; }
-#endif

        [Required]
-#if NET48
-        public string File { get; set; }
-#else
        public string? File { get; set; }
-#endif
    }
 }
--- a/Hashfile/SHA256.cs
+++ b/Hashfile/SHA256.cs
@@ -6,17 +6,9 @@ namespace SabreTools.Models.Hashfile
    public class SHA256
    {
        [Required]
-#if NET48
-        public string Hash { get; set; }
-#else
        public string? Hash { get; set; }
-#endif

        [Required]
-#if NET48
-        public string File { get; set; }
-#else
        public string? File { get; set; }
-#endif
    }
 }
--- a/Hashfile/SHA384.cs
+++ b/Hashfile/SHA384.cs
@@ -6,17 +6,9 @@ namespace SabreTools.Models.Hashfile
    public class SHA384
    {
        [Required]
-#if NET48
-        public string Hash { get; set; }
-#else
        public string? Hash { get; set; }
-#endif

        [Required]
-#if NET48
-        public string File { get; set; }
-#else
        public string? File { get; set; }
-#endif
    }
 }
--- a/Hashfile/SHA512.cs
+++ b/Hashfile/SHA512.cs
@@ -6,17 +6,9 @@ namespace SabreTools.Models.Hashfile
    public class SHA512
    {
        [Required]
-#if NET48
-        public string Hash { get; set; }
-#else
        public string? Hash { get; set; }
-#endif

        [Required]
-#if NET48
-        public string File { get; set; }
-#else
        public string? File { get; set; }
-#endif
    }
 }
--- a/Hashfile/SpamSum.cs
+++ b/Hashfile/SpamSum.cs
@@ -6,17 +6,9 @@ namespace SabreTools.Models.Hashfile
    public class SpamSum
    {
        [Required]
-#if NET48
-        public string Hash { get; set; }
-#else
        public string? Hash { get; set; }
-#endif

        [Required]
-#if NET48
-        public string File { get; set; }
-#else
        public string? File { get; set; }
-#endif
    }
 }
--- a/IRD/File.cs
+++ b/IRD/File.cs
@@ -2,16 +2,12 @@ namespace SabreTools.Models.IRD
 {
    /// <see href="https://psdevwiki.com/ps3/Bluray_disc#IRD_file"/> 
    /// <see href="https://github.com/SabreTools/MPF/files/13062347/IRD.File.Format.pdf"/> 
-    public class IRD
+    public class File
    {
        /// <summary>
        /// "3IRD"
        /// </summary>
-#if NET48
-        public byte[] Magic { get; set; }
-#else
        public byte[]? Magic { get; set; }
-#endif

        /// <summary>
        /// Version
@@ -23,11 +19,7 @@ namespace SabreTools.Models.IRD
        /// The same value stored in PARAM.SFO / TITLE_ID
        /// </summary>
        /// <remarks>9 bytes, ASCII, stored without dashes</remarks>
-#if NET48
-        public string TitleID { get; set; }
-#else
        public string? TitleID { get; set; }
-#endif

        /// <summary>
        /// Number of bytes that follow containing the title
@@ -38,41 +30,25 @@ namespace SabreTools.Models.IRD
        /// The same value stored in PARAM.SFO / TITLE
        /// </summary>
        /// <remarks><see cref="TitleLength"/> bytes, ASCII</remarks>
-#if NET48
-        public string Title { get; set; }
-#else
        public string? Title { get; set; }
-#endif

        /// <summary>
        /// The same value stored in PARAM.SFO / PS3_SYSTEM_VER
        /// </summary>
        /// <remarks>4 bytes, ASCII, missing uses "0000"</remarks>
-#if NET48
-        public string SystemVersion { get; set; }
-#else
        public string? SystemVersion { get; set; }
-#endif

        /// <summary>
        /// The same value stored in PARAM.SFO / VERSION
        /// </summary>
        /// <remarks>5 bytes, ASCII</remarks>
-#if NET48
-        public string GameVersion { get; set; }
-#else
        public string? GameVersion { get; set; }
-#endif

        /// <summary>
        /// The same value stored in PARAM.SFO / APP_VER
        /// </summary>
        /// <remarks>5 bytes, ASCII</remarks>
-#if NET48
-        public string AppVersion { get; set; }
-#else
        public string? AppVersion { get; set; }
-#endif

        /// <summary>
        /// Length of the gzip-compressed header data
@@ -82,11 +58,7 @@ namespace SabreTools.Models.IRD
        /// <summary>
        /// Gzip-compressed header data
        /// </summary>
-#if NET48
-        public byte[] Header { get; set; }
-#else
        public byte[]? Header { get; set; }
-#endif

        /// <summary>
        /// Length of the gzip-compressed footer data
@@ -96,11 +68,7 @@ namespace SabreTools.Models.IRD
        /// <summary>
        /// Gzip-compressed footer data
        /// </summary>
-#if NET48
-        public byte[] Footer { get; set; }
-#else
        public byte[]? Footer { get; set; }
-#endif

        /// <summary>
        /// Number of complete regions in the image
@@ -111,11 +79,7 @@ namespace SabreTools.Models.IRD
        /// MD5 hashes for all complete regions in the image
        /// </summary>
        /// <remarks><see cref="RegionCount"/> regions, 16-bytes per hash</remarks>
-#if NET48
-        public byte[][] RegionHashes { get; set; }
-#else
        public byte[][]? RegionHashes { get; set; }
-#endif

        /// <summary>
        /// Number of decrypted files in the image
@@ -126,21 +90,13 @@ namespace SabreTools.Models.IRD
        /// Starting sector for each decrypted file
        /// </summary>
        /// <remarks><see cref="FileCount"/> files, alternating with each <see cref="FileHashes"/> entry</remarks>
-#if NET48
-        public ulong[] FileKeys { get; set; }
-#else
        public ulong[]? FileKeys { get; set; }
-#endif

        /// <summary>
        /// MD5 hashes for all decrypted files in the image
        /// </summary>
        /// <remarks><see cref="FileCount"/> files, 16-bytes per hash, alternating with each <see cref="FileHashes"/> entry</remarks>
-#if NET48
-        public byte[][] FileHashes { get; set; }
-#else
        public byte[][]? FileHashes { get; set; }
-#endif

        /// <summary>
        /// Extra Config, usually 0x0000
@@ -156,31 +112,19 @@ namespace SabreTools.Models.IRD
        /// D1 key
        /// </summary>
        /// <remarks>16 bytes</remarks>
-#if NET48
-        public byte[] Data1Key { get; set; }
-#else
        public byte[]? Data1Key { get; set; }
-#endif

        /// <summary>
        /// D2 key
        /// </summary>
        /// <remarks>16 bytes</remarks>
-#if NET48
-        public byte[] Data2Key { get; set; }
-#else
        public byte[]? Data2Key { get; set; }
-#endif

        /// <summary>
        /// Uncompressed PIC data
        /// </summary>
        /// <remarks>115 bytes, before D1/D2 keys on version 9</remarks>
-#if NET48
-        public byte[] PIC { get; set; }
-#else
        public byte[]? PIC { get; set; }
-#endif

        /// <summary>
        /// Unique Identifier
--- a/InstallShieldArchiveV3/Archive.cs
+++ b/InstallShieldArchiveV3/Archive.cs
@@ -0,0 +1,21 @@
+namespace SabreTools.Models.InstallShieldArchiveV3
+{
+    /// <see href="https://github.com/wfr/unshieldv3/blob/master/ISArchiveV3.cpp"/>
+    public class Archive
+    {
+        /// <summary>
+        /// Archive header information
+        /// </summary>
+        public Header? Header { get; set; }
+
+        /// <summary>
+        /// Directories found in the archive
+        /// </summary>
+        public Directory[]? Directories {  get; set; }
+
+        /// <summary>
+        /// Files found in the archive
+        /// </summary>
+        public File[]? Files { get; set; }
+    }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matt Nadareski	b3f3f12b3e	Use "main" instead of "master"	2024-02-27 19:06:26 -05:00
Matt Nadareski	b41700ff92	Update copyright date	2024-02-27 17:18:02 -05:00
Matt Nadareski	e8a357546b	Add nuget package and PR workflows	2024-02-27 17:17:50 -05:00
Matt Nadareski	68f0201c11	Add SafeDisc encrypted file entry model	2023-11-30 19:11:52 -05:00
Matt Nadareski	25b6493249	Bump version	2023-11-21 11:15:24 -05:00
Matt Nadareski	a551363c0b	Support .NET Framework 2.0	2023-11-20 23:44:05 -05:00
Matt Nadareski	2fd92aea8f	Support .NET Framework 3.5	2023-11-20 21:10:43 -05:00
Matt Nadareski	a61b3d0ed9	Add IS Archive V3 models	2023-11-15 14:30:25 -05:00
Matt Nadareski	a40a6871df	Bump version	2023-11-14 12:30:15 -05:00
Matt Nadareski	5792ec64c0	Cut off at .NET Framework 4.0	2023-11-08 10:45:12 -05:00
Matt Nadareski	3b13c7cc96	Cut off at .NET Framework 4.0	2023-11-08 10:44:47 -05:00
Matt Nadareski	894d7b62e2	Enable warnings as errors	2023-11-07 21:52:01 -05:00
Matt Nadareski	38e37b1a63	Support ancient .NET	2023-11-07 21:18:17 -05:00
Matt Nadareski	1f340bd244	Remove framework gating	2023-11-07 20:57:05 -05:00
Matt Nadareski	e582ce8726	Enable latest language version	2023-11-07 20:48:49 -05:00
Matt Nadareski	dad71add36	Expand supported RIDs	2023-11-07 20:47:31 -05:00
Matt Nadareski	cb2a28016e	Enable broader support	2023-11-07 20:46:11 -05:00
Matt Nadareski	46a814ac73	Add PS3 SFB and SFO models	2023-11-03 15:18:26 -04:00
Matt Nadareski	8fabe9c02d	Rename IRD to File internally	2023-10-29 21:53:12 -04:00