From e3c5c76ee5eaa0249a9e3bbf070bd22424c005f8 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Sun, 10 Sep 2023 20:47:25 -0400 Subject: [PATCH] Ensure more correct nullability --- N3DS/CIA.cs | 4 +-- N3DS/Cart.cs | 8 +++--- N3DS/ExeFSHeader.cs | 2 +- N3DS/NCSDHeader.cs | 2 +- N3DS/Ticket.cs | 2 +- N3DS/TitleMetadata.cs | 6 ++-- NCF/File.cs | 16 +++++------ NewExecutable/Executable.cs | 10 +++---- NewExecutable/PerSegmentData.cs | 2 +- NewExecutable/ResourceTable.cs | 2 +- NewExecutable/ResourceTypeInformationEntry.cs | 2 +- Nitro/Cart.cs | 2 +- Nitro/NameTable.cs | 4 +-- PAK/File.cs | 2 +- PFF/Archive.cs | 2 +- PlayJ/AudioFile.cs | 2 +- PlayJ/Playlist.cs | 2 +- PortableExecutable/AssemblyManifest.cs | 28 +++++++++---------- PortableExecutable/BaseRelocationBlock.cs | 2 +- PortableExecutable/DebugTable.cs | 2 +- PortableExecutable/DialogBoxResource.cs | 4 +-- PortableExecutable/Executable.cs | 8 +++--- PortableExecutable/ExportTable.cs | 2 +- PortableExecutable/FontGroupHeader.cs | 2 +- PortableExecutable/ImportTable.cs | 4 +-- PortableExecutable/MenuResource.cs | 4 +-- PortableExecutable/MessageResourceData.cs | 2 +- PortableExecutable/ResourceDirectoryTable.cs | 2 +- PortableExecutable/SectionHeader.cs | 4 +-- PortableExecutable/SecuROMAddD.cs | 2 +- PortableExecutable/StringFileInfo.cs | 2 +- PortableExecutable/StringTable.cs | 2 +- PortableExecutable/VarFileInfo.cs | 2 +- Quantum/Archive.cs | 2 +- SFFS/StarForceFileSystem.cs | 4 +-- SGA/SpecializedDirectory.cs | 6 ++-- VBSP/Header.cs | 2 +- VPK/File.cs | 4 +-- XZP/File.cs | 8 +++--- 39 files changed, 84 insertions(+), 84 deletions(-) diff --git a/N3DS/CIA.cs b/N3DS/CIA.cs index 81ae4c9..720b7f8 100644 --- a/N3DS/CIA.cs +++ b/N3DS/CIA.cs @@ -32,7 +32,7 @@ namespace SabreTools.Models.N3DS #if NET48 public Certificate[] CertificateChain { get; set; } #else - public Certificate[]? CertificateChain { get; set; } + public Certificate?[]? CertificateChain { get; set; } #endif /// @@ -59,7 +59,7 @@ namespace SabreTools.Models.N3DS #if NET48 public NCCHHeader[] Partitions { get; set; } #else - public NCCHHeader[]? Partitions { get; set; } + public NCCHHeader?[]? Partitions { get; set; } #endif /// diff --git a/N3DS/Cart.cs b/N3DS/Cart.cs index 498a943..7c7d85b 100644 --- a/N3DS/Cart.cs +++ b/N3DS/Cart.cs @@ -38,7 +38,7 @@ namespace SabreTools.Models.N3DS #if NET48 public NCCHHeader[] Partitions { get; set; } #else - public NCCHHeader[]? Partitions { get; set; } + public NCCHHeader?[]? Partitions { get; set; } #endif /// @@ -47,7 +47,7 @@ namespace SabreTools.Models.N3DS #if NET48 public NCCHExtendedHeader[] ExtendedHeaders { get; set; } #else - public NCCHExtendedHeader[]? ExtendedHeaders { get; set; } + public NCCHExtendedHeader?[]? ExtendedHeaders { get; set; } #endif /// @@ -56,7 +56,7 @@ namespace SabreTools.Models.N3DS #if NET48 public ExeFSHeader[] ExeFSHeaders { get; set; } #else - public ExeFSHeader[]? ExeFSHeaders { get; set; } + public ExeFSHeader?[]? ExeFSHeaders { get; set; } #endif /// @@ -65,7 +65,7 @@ namespace SabreTools.Models.N3DS #if NET48 public RomFSHeader[] RomFSHeaders { get; set; } #else - public RomFSHeader[]? RomFSHeaders { get; set; } + public RomFSHeader?[]? RomFSHeaders { get; set; } #endif } } \ No newline at end of file diff --git a/N3DS/ExeFSHeader.cs b/N3DS/ExeFSHeader.cs index 8d5113a..7f667a3 100644 --- a/N3DS/ExeFSHeader.cs +++ b/N3DS/ExeFSHeader.cs @@ -19,7 +19,7 @@ #if NET48 public ExeFSFileHeader[] FileHeaders; #else - public ExeFSFileHeader[]? FileHeaders; + public ExeFSFileHeader?[]? FileHeaders; #endif /// diff --git a/N3DS/NCSDHeader.cs b/N3DS/NCSDHeader.cs index fe0ad68..5097f55 100644 --- a/N3DS/NCSDHeader.cs +++ b/N3DS/NCSDHeader.cs @@ -65,7 +65,7 @@ #if NET48 public PartitionTableEntry[] PartitionsTable; #else - public PartitionTableEntry[]? PartitionsTable; + public PartitionTableEntry?[]? PartitionsTable; #endif #endregion diff --git a/N3DS/Ticket.cs b/N3DS/Ticket.cs index d49f5cd..1e9db74 100644 --- a/N3DS/Ticket.cs +++ b/N3DS/Ticket.cs @@ -220,7 +220,7 @@ namespace SabreTools.Models.N3DS #if NET48 public Certificate[] CertificateChain; #else - public Certificate[]? CertificateChain; + public Certificate?[]? CertificateChain; #endif } } diff --git a/N3DS/TitleMetadata.cs b/N3DS/TitleMetadata.cs index 651b7ce..57214b5 100644 --- a/N3DS/TitleMetadata.cs +++ b/N3DS/TitleMetadata.cs @@ -167,7 +167,7 @@ namespace SabreTools.Models.N3DS #if NET48 public ContentInfoRecord[] ContentInfoRecords; #else - public ContentInfoRecord[]? ContentInfoRecords; + public ContentInfoRecord?[]? ContentInfoRecords; #endif /// @@ -177,7 +177,7 @@ namespace SabreTools.Models.N3DS #if NET48 public ContentChunkRecord[] ContentChunkRecords; #else - public ContentChunkRecord[]? ContentChunkRecords; + public ContentChunkRecord?[]? ContentChunkRecords; #endif /// @@ -189,7 +189,7 @@ namespace SabreTools.Models.N3DS #if NET48 public Certificate[] CertificateChain; #else - public Certificate[]? CertificateChain; + public Certificate?[]? CertificateChain; #endif } } \ No newline at end of file diff --git a/NCF/File.cs b/NCF/File.cs index 5373835..892abc6 100644 --- a/NCF/File.cs +++ b/NCF/File.cs @@ -32,7 +32,7 @@ namespace SabreTools.Models.NCF #if NET48 public DirectoryEntry[] DirectoryEntries { get; set; } #else - public DirectoryEntry[]? DirectoryEntries { get; set; } + public DirectoryEntry?[]? DirectoryEntries { get; set; } #endif /// @@ -50,7 +50,7 @@ namespace SabreTools.Models.NCF #if NET48 public DirectoryInfo1Entry[] DirectoryInfo1Entries { get; set; } #else - public DirectoryInfo1Entry[]? DirectoryInfo1Entries { get; set; } + public DirectoryInfo1Entry?[]? DirectoryInfo1Entries { get; set; } #endif /// @@ -59,7 +59,7 @@ namespace SabreTools.Models.NCF #if NET48 public DirectoryInfo2Entry[] DirectoryInfo2Entries { get; set; } #else - public DirectoryInfo2Entry[]? DirectoryInfo2Entries { get; set; } + public DirectoryInfo2Entry?[]? DirectoryInfo2Entries { get; set; } #endif /// @@ -68,7 +68,7 @@ namespace SabreTools.Models.NCF #if NET48 public DirectoryCopyEntry[] DirectoryCopyEntries { get; set; } #else - public DirectoryCopyEntry[]? DirectoryCopyEntries { get; set; } + public DirectoryCopyEntry?[]? DirectoryCopyEntries { get; set; } #endif /// @@ -77,7 +77,7 @@ namespace SabreTools.Models.NCF #if NET48 public DirectoryLocalEntry[] DirectoryLocalEntries { get; set; } #else - public DirectoryLocalEntry[]? DirectoryLocalEntries { get; set; } + public DirectoryLocalEntry?[]? DirectoryLocalEntries { get; set; } #endif /// @@ -95,7 +95,7 @@ namespace SabreTools.Models.NCF #if NET48 public UnknownEntry[] UnknownEntries { get; set; } #else - public UnknownEntry[]? UnknownEntries { get; set; } + public UnknownEntry?[]? UnknownEntries { get; set; } #endif /// @@ -122,7 +122,7 @@ namespace SabreTools.Models.NCF #if NET48 public ChecksumMapEntry[] ChecksumMapEntries { get; set; } #else - public ChecksumMapEntry[]? ChecksumMapEntries { get; set; } + public ChecksumMapEntry?[]? ChecksumMapEntries { get; set; } #endif /// @@ -131,7 +131,7 @@ namespace SabreTools.Models.NCF #if NET48 public ChecksumEntry[] ChecksumEntries { get; set; } #else - public ChecksumEntry[]? ChecksumEntries { get; set; } + public ChecksumEntry?[]? ChecksumEntries { get; set; } #endif } } diff --git a/NewExecutable/Executable.cs b/NewExecutable/Executable.cs index d7e7ea5..3d472a9 100644 --- a/NewExecutable/Executable.cs +++ b/NewExecutable/Executable.cs @@ -37,7 +37,7 @@ namespace SabreTools.Models.NewExecutable #if NET48 public SegmentTableEntry[] SegmentTable { get; set; } #else - public SegmentTableEntry[]? SegmentTable { get; set; } + public SegmentTableEntry?[]? SegmentTable { get; set; } #endif /// @@ -55,7 +55,7 @@ namespace SabreTools.Models.NewExecutable #if NET48 public ResidentNameTableEntry[] ResidentNameTable { get; set; } #else - public ResidentNameTableEntry[]? ResidentNameTable { get; set; } + public ResidentNameTableEntry?[]? ResidentNameTable { get; set; } #endif /// @@ -64,7 +64,7 @@ namespace SabreTools.Models.NewExecutable #if NET48 public ModuleReferenceTableEntry[] ModuleReferenceTable { get; set; } #else - public ModuleReferenceTableEntry[]? ModuleReferenceTable { get; set; } + public ModuleReferenceTableEntry?[]? ModuleReferenceTable { get; set; } #endif /// @@ -82,7 +82,7 @@ namespace SabreTools.Models.NewExecutable #if NET48 public EntryTableBundle[] EntryTable { get; set; } #else - public EntryTableBundle[]? EntryTable { get; set; } + public EntryTableBundle?[]? EntryTable { get; set; } #endif /// @@ -91,7 +91,7 @@ namespace SabreTools.Models.NewExecutable #if NET48 public NonResidentNameTableEntry[] NonResidentNameTable { get; set; } #else - public NonResidentNameTableEntry[]? NonResidentNameTable { get; set; } + public NonResidentNameTableEntry?[]? NonResidentNameTable { get; set; } #endif } } diff --git a/NewExecutable/PerSegmentData.cs b/NewExecutable/PerSegmentData.cs index 4f34e81..87093f7 100644 --- a/NewExecutable/PerSegmentData.cs +++ b/NewExecutable/PerSegmentData.cs @@ -21,7 +21,7 @@ #if NET48 public RelocationRecord[] RelocationRecords; #else - public RelocationRecord[]? RelocationRecords; + public RelocationRecord?[]? RelocationRecords; #endif } } diff --git a/NewExecutable/ResourceTable.cs b/NewExecutable/ResourceTable.cs index b6de3e9..7bf9029 100644 --- a/NewExecutable/ResourceTable.cs +++ b/NewExecutable/ResourceTable.cs @@ -28,7 +28,7 @@ namespace SabreTools.Models.NewExecutable #if NET48 public ResourceTypeInformationEntry[] ResourceTypes; #else - public ResourceTypeInformationEntry[]? ResourceTypes; + public ResourceTypeInformationEntry?[]? ResourceTypes; #endif /// diff --git a/NewExecutable/ResourceTypeInformationEntry.cs b/NewExecutable/ResourceTypeInformationEntry.cs index 5e3e16b..82367c7 100644 --- a/NewExecutable/ResourceTypeInformationEntry.cs +++ b/NewExecutable/ResourceTypeInformationEntry.cs @@ -35,7 +35,7 @@ namespace SabreTools.Models.NewExecutable #if NET48 public ResourceTypeResourceEntry[] Resources; #else - public ResourceTypeResourceEntry[]? Resources; + public ResourceTypeResourceEntry?[]? Resources; #endif } } diff --git a/Nitro/Cart.cs b/Nitro/Cart.cs index 89348ec..d3085ac 100644 --- a/Nitro/Cart.cs +++ b/Nitro/Cart.cs @@ -47,7 +47,7 @@ namespace SabreTools.Models.Nitro #if NET48 public FileAllocationTableEntry[] FileAllocationTable { get; set; } #else - public FileAllocationTableEntry[]? FileAllocationTable { get; set; } + public FileAllocationTableEntry?[]? FileAllocationTable { get; set; } #endif } } \ No newline at end of file diff --git a/Nitro/NameTable.cs b/Nitro/NameTable.cs index c51f51a..5d5da6e 100644 --- a/Nitro/NameTable.cs +++ b/Nitro/NameTable.cs @@ -18,7 +18,7 @@ namespace SabreTools.Models.Nitro #if NET48 public FolderAllocationTableEntry[] FolderAllocationTable; #else - public FolderAllocationTableEntry[]? FolderAllocationTable; + public FolderAllocationTableEntry?[]? FolderAllocationTable; #endif /// @@ -27,7 +27,7 @@ namespace SabreTools.Models.Nitro #if NET48 public NameListEntry[] NameList; #else - public NameListEntry[]? NameList; + public NameListEntry?[]? NameList; #endif } } \ No newline at end of file diff --git a/PAK/File.cs b/PAK/File.cs index 6ca2fab..fa54c6c 100644 --- a/PAK/File.cs +++ b/PAK/File.cs @@ -21,7 +21,7 @@ namespace SabreTools.Models.PAK #if NET48 public DirectoryItem[] DirectoryItems { get; set; } #else - public DirectoryItem[]? DirectoryItems { get; set; } + public DirectoryItem?[]? DirectoryItems { get; set; } #endif } } diff --git a/PFF/Archive.cs b/PFF/Archive.cs index 5fc9bf5..4d787d8 100644 --- a/PFF/Archive.cs +++ b/PFF/Archive.cs @@ -21,7 +21,7 @@ namespace SabreTools.Models.PFF #if NET48 public Segment[] Segments { get; set; } #else - public Segment[]? Segments { get; set; } + public Segment?[]? Segments { get; set; } #endif /// diff --git a/PlayJ/AudioFile.cs b/PlayJ/AudioFile.cs index b25f217..5ed073d 100644 --- a/PlayJ/AudioFile.cs +++ b/PlayJ/AudioFile.cs @@ -55,7 +55,7 @@ namespace SabreTools.Models.PlayJ #if NET48 public DataFile[] DataFiles { get; set; } #else - public DataFile[]? DataFiles { get; set; } + public DataFile?[]? DataFiles { get; set; } #endif // After the data files is a block starting with 0x00000001 diff --git a/PlayJ/Playlist.cs b/PlayJ/Playlist.cs index 0000bdd..b79d804 100644 --- a/PlayJ/Playlist.cs +++ b/PlayJ/Playlist.cs @@ -20,7 +20,7 @@ namespace SabreTools.Models.PlayJ #if NET48 public AudioFile[] AudioFiles { get; set; } #else - public AudioFile[]? AudioFiles { get; set; } + public AudioFile?[]? AudioFiles { get; set; } #endif } } \ No newline at end of file diff --git a/PortableExecutable/AssemblyManifest.cs b/PortableExecutable/AssemblyManifest.cs index d99f6f7..655c24e 100644 --- a/PortableExecutable/AssemblyManifest.cs +++ b/PortableExecutable/AssemblyManifest.cs @@ -19,14 +19,14 @@ namespace SabreTools.Models.PortableExecutable #if NET48 public AssemblyIdentity[] AssemblyIdentities; #else - public AssemblyIdentity[]? AssemblyIdentities; + public AssemblyIdentity?[]? AssemblyIdentities; #endif [XmlElement("noInheritable")] #if NET48 public AssemblyNoInheritable[] NoInheritables; #else - public AssemblyNoInheritable[]? NoInheritables; + public AssemblyNoInheritable?[]? NoInheritables; #endif #endregion @@ -54,35 +54,35 @@ namespace SabreTools.Models.PortableExecutable #if NET48 public AssemblyCOMInterfaceExternalProxyStub[] COMInterfaceExternalProxyStub; #else - public AssemblyCOMInterfaceExternalProxyStub[]? COMInterfaceExternalProxyStub; + public AssemblyCOMInterfaceExternalProxyStub?[]? COMInterfaceExternalProxyStub; #endif [XmlElement("dependency")] #if NET48 public AssemblyDependency[] Dependency; #else - public AssemblyDependency[]? Dependency; + public AssemblyDependency?[]? Dependency; #endif [XmlElement("file")] #if NET48 public AssemblyFile[] File; #else - public AssemblyFile[]? File; + public AssemblyFile?[]? File; #endif [XmlElement("clrClass")] #if NET48 public AssemblyCommonLanguageRuntimeClass[] CLRClass; #else - public AssemblyCommonLanguageRuntimeClass[]? CLRClass; + public AssemblyCommonLanguageRuntimeClass?[]? CLRClass; #endif [XmlElement("clrSurrogate")] #if NET48 public AssemblyCommonLanguageSurrogateClass[] CLRSurrogate; #else - public AssemblyCommonLanguageSurrogateClass[]? CLRSurrogate; + public AssemblyCommonLanguageSurrogateClass?[]? CLRSurrogate; #endif #endregion @@ -177,7 +177,7 @@ namespace SabreTools.Models.PortableExecutable #if NET48 public AssemblyProgID[] ProgIDs; #else - public AssemblyProgID[]? ProgIDs; + public AssemblyProgID?[]? ProgIDs; #endif } @@ -329,7 +329,7 @@ namespace SabreTools.Models.PortableExecutable #if NET48 public AssemblyProgID[] ProgIDs; #else - public AssemblyProgID[]? ProgIDs; + public AssemblyProgID?[]? ProgIDs; #endif } @@ -390,7 +390,7 @@ namespace SabreTools.Models.PortableExecutable #if NET48 public AssemblyBindingRedirect[] BindingRedirect; #else - public AssemblyBindingRedirect[]? BindingRedirect; + public AssemblyBindingRedirect?[]? BindingRedirect; #endif } @@ -486,28 +486,28 @@ namespace SabreTools.Models.PortableExecutable #if NET48 public AssemblyCOMClass[] COMClass; #else - public AssemblyCOMClass[]? COMClass; + public AssemblyCOMClass?[]? COMClass; #endif [XmlElement("comInterfaceProxyStub")] #if NET48 public AssemblyCOMInterfaceProxyStub[] COMInterfaceProxyStub; #else - public AssemblyCOMInterfaceProxyStub[]? COMInterfaceProxyStub; + public AssemblyCOMInterfaceProxyStub?[]? COMInterfaceProxyStub; #endif [XmlElement("typelib")] #if NET48 public AssemblyTypeLib[] Typelib; #else - public AssemblyTypeLib[]? Typelib; + public AssemblyTypeLib?[]? Typelib; #endif [XmlElement("windowClass")] #if NET48 public AssemblyWindowClass[] WindowClass; #else - public AssemblyWindowClass[]? WindowClass; + public AssemblyWindowClass?[]? WindowClass; #endif #endregion diff --git a/PortableExecutable/BaseRelocationBlock.cs b/PortableExecutable/BaseRelocationBlock.cs index 1289d92..2482107 100644 --- a/PortableExecutable/BaseRelocationBlock.cs +++ b/PortableExecutable/BaseRelocationBlock.cs @@ -49,7 +49,7 @@ #if NET48 public BaseRelocationTypeOffsetFieldEntry[] TypeOffsetFieldEntries; #else - public BaseRelocationTypeOffsetFieldEntry[]? TypeOffsetFieldEntries; + public BaseRelocationTypeOffsetFieldEntry?[]? TypeOffsetFieldEntries; #endif } } diff --git a/PortableExecutable/DebugTable.cs b/PortableExecutable/DebugTable.cs index d09b09b..4334d7d 100644 --- a/PortableExecutable/DebugTable.cs +++ b/PortableExecutable/DebugTable.cs @@ -36,7 +36,7 @@ #if NET48 public DebugDirectoryEntry[] DebugDirectoryTable; #else - public DebugDirectoryEntry[]? DebugDirectoryTable; + public DebugDirectoryEntry?[]? DebugDirectoryTable; #endif } } diff --git a/PortableExecutable/DialogBoxResource.cs b/PortableExecutable/DialogBoxResource.cs index 3f37c26..993073d 100644 --- a/PortableExecutable/DialogBoxResource.cs +++ b/PortableExecutable/DialogBoxResource.cs @@ -42,7 +42,7 @@ #if NET48 public DialogItemTemplate[] DialogItemTemplates; #else - public DialogItemTemplate[]? DialogItemTemplates; + public DialogItemTemplate?[]? DialogItemTemplates; #endif /// @@ -54,7 +54,7 @@ #if NET48 public DialogItemTemplateExtended[] ExtendedDialogItemTemplates; #else - public DialogItemTemplateExtended[]? ExtendedDialogItemTemplates; + public DialogItemTemplateExtended?[]? ExtendedDialogItemTemplates; #endif #endregion diff --git a/PortableExecutable/Executable.cs b/PortableExecutable/Executable.cs index d87645c..b910396 100644 --- a/PortableExecutable/Executable.cs +++ b/PortableExecutable/Executable.cs @@ -59,7 +59,7 @@ namespace SabreTools.Models.PortableExecutable #if NET48 public SectionHeader[] SectionTable { get; set; } #else - public SectionHeader[]? SectionTable { get; set; } + public SectionHeader?[]? SectionTable { get; set; } #endif /// @@ -68,7 +68,7 @@ namespace SabreTools.Models.PortableExecutable #if NET48 public COFFSymbolTableEntry[] COFFSymbolTable { get; set; } #else - public COFFSymbolTableEntry[]? COFFSymbolTable { get; set; } + public COFFSymbolTableEntry?[]? COFFSymbolTable { get; set; } #endif /// @@ -86,7 +86,7 @@ namespace SabreTools.Models.PortableExecutable #if NET48 public AttributeCertificateTableEntry[] AttributeCertificateTable { get; set; } #else - public AttributeCertificateTableEntry[]? AttributeCertificateTable { get; set; } + public AttributeCertificateTableEntry?[]? AttributeCertificateTable { get; set; } #endif /// @@ -110,7 +110,7 @@ namespace SabreTools.Models.PortableExecutable #if NET48 public BaseRelocationBlock[] BaseRelocationTable { get; set; } #else - public BaseRelocationBlock[]? BaseRelocationTable { get; set; } + public BaseRelocationBlock?[]? BaseRelocationTable { get; set; } #endif /// diff --git a/PortableExecutable/ExportTable.cs b/PortableExecutable/ExportTable.cs index 8290c23..e450222 100644 --- a/PortableExecutable/ExportTable.cs +++ b/PortableExecutable/ExportTable.cs @@ -34,7 +34,7 @@ #if NET48 public ExportAddressTableEntry[] ExportAddressTable; #else - public ExportAddressTableEntry[]? ExportAddressTable; + public ExportAddressTableEntry?[]? ExportAddressTable; #endif /// diff --git a/PortableExecutable/FontGroupHeader.cs b/PortableExecutable/FontGroupHeader.cs index cc8fa89..b4fc37c 100644 --- a/PortableExecutable/FontGroupHeader.cs +++ b/PortableExecutable/FontGroupHeader.cs @@ -19,7 +19,7 @@ #if NET48 public DirEntry[] DE; #else - public DirEntry[]? DE; + public DirEntry?[]? DE; #endif } } diff --git a/PortableExecutable/ImportTable.cs b/PortableExecutable/ImportTable.cs index a41578c..0aaec0a 100644 --- a/PortableExecutable/ImportTable.cs +++ b/PortableExecutable/ImportTable.cs @@ -26,7 +26,7 @@ namespace SabreTools.Models.PortableExecutable #if NET48 public ImportDirectoryTableEntry[] ImportDirectoryTable; #else - public ImportDirectoryTableEntry[]? ImportDirectoryTable; + public ImportDirectoryTableEntry?[]? ImportDirectoryTable; #endif /// @@ -55,7 +55,7 @@ namespace SabreTools.Models.PortableExecutable #if NET48 public HintNameTableEntry[] HintNameTable; #else - public HintNameTableEntry[]? HintNameTable; + public HintNameTableEntry?[]? HintNameTable; #endif } } diff --git a/PortableExecutable/MenuResource.cs b/PortableExecutable/MenuResource.cs index a44b0ad..9788df4 100644 --- a/PortableExecutable/MenuResource.cs +++ b/PortableExecutable/MenuResource.cs @@ -39,7 +39,7 @@ #if NET48 public MenuItem[] MenuItems; #else - public MenuItem[]? MenuItems; + public MenuItem?[]? MenuItems; #endif /// @@ -48,7 +48,7 @@ #if NET48 public MenuItemExtended[] ExtendedMenuItems; #else - public MenuItemExtended[]? ExtendedMenuItems; + public MenuItemExtended?[]? ExtendedMenuItems; #endif #endregion diff --git a/PortableExecutable/MessageResourceData.cs b/PortableExecutable/MessageResourceData.cs index 6d11509..17aa6a7 100644 --- a/PortableExecutable/MessageResourceData.cs +++ b/PortableExecutable/MessageResourceData.cs @@ -20,7 +20,7 @@ namespace SabreTools.Models.PortableExecutable #if NET48 public MessageResourceBlock[] Blocks; #else - public MessageResourceBlock[]? Blocks; + public MessageResourceBlock?[]? Blocks; #endif /// diff --git a/PortableExecutable/ResourceDirectoryTable.cs b/PortableExecutable/ResourceDirectoryTable.cs index 3786e94..a325bd6 100644 --- a/PortableExecutable/ResourceDirectoryTable.cs +++ b/PortableExecutable/ResourceDirectoryTable.cs @@ -60,7 +60,7 @@ namespace SabreTools.Models.PortableExecutable #if NET48 public ResourceDirectoryEntry[] Entries; #else - public ResourceDirectoryEntry[]? Entries; + public ResourceDirectoryEntry?[]? Entries; #endif } } diff --git a/PortableExecutable/SectionHeader.cs b/PortableExecutable/SectionHeader.cs index f7cc424..b38877d 100644 --- a/PortableExecutable/SectionHeader.cs +++ b/PortableExecutable/SectionHeader.cs @@ -111,7 +111,7 @@ namespace SabreTools.Models.PortableExecutable #if NET48 public COFFRelocation[] COFFRelocations; #else - public COFFRelocation[]? COFFRelocations; + public COFFRelocation?[]? COFFRelocations; #endif /// @@ -120,7 +120,7 @@ namespace SabreTools.Models.PortableExecutable #if NET48 public COFFLineNumber[] COFFLineNumbers; #else - public COFFLineNumber[]? COFFLineNumbers; + public COFFLineNumber?[]? COFFLineNumbers; #endif } } diff --git a/PortableExecutable/SecuROMAddD.cs b/PortableExecutable/SecuROMAddD.cs index ca09c92..92697c7 100644 --- a/PortableExecutable/SecuROMAddD.cs +++ b/PortableExecutable/SecuROMAddD.cs @@ -70,7 +70,7 @@ namespace SabreTools.Models.PortableExecutable #if NET48 public SecuROMAddDEntry[] Entries; #else - public SecuROMAddDEntry[]? Entries; + public SecuROMAddDEntry?[]? Entries; #endif } } diff --git a/PortableExecutable/StringFileInfo.cs b/PortableExecutable/StringFileInfo.cs index 6e8a7c3..1b61e55 100644 --- a/PortableExecutable/StringFileInfo.cs +++ b/PortableExecutable/StringFileInfo.cs @@ -45,7 +45,7 @@ #if NET48 public StringTable[] Children; #else - public StringTable[]? Children; + public StringTable?[]? Children; #endif } } diff --git a/PortableExecutable/StringTable.cs b/PortableExecutable/StringTable.cs index d8bf92b..59d8666 100644 --- a/PortableExecutable/StringTable.cs +++ b/PortableExecutable/StringTable.cs @@ -48,7 +48,7 @@ #if NET48 public StringData[] Children; #else - public StringData[]? Children; + public StringData?[]? Children; #endif } } diff --git a/PortableExecutable/VarFileInfo.cs b/PortableExecutable/VarFileInfo.cs index a21f319..b3bfbf3 100644 --- a/PortableExecutable/VarFileInfo.cs +++ b/PortableExecutable/VarFileInfo.cs @@ -43,7 +43,7 @@ #if NET48 public VarData[] Children; #else - public VarData[]? Children; + public VarData?[]? Children; #endif } } diff --git a/Quantum/Archive.cs b/Quantum/Archive.cs index 60186c7..43f6386 100644 --- a/Quantum/Archive.cs +++ b/Quantum/Archive.cs @@ -21,7 +21,7 @@ namespace SabreTools.Models.Quantum #if NET48 public FileDescriptor[] FileList { get; set; } #else - public FileDescriptor[]? FileList { get; set; } + public FileDescriptor?[]? FileList { get; set; } #endif /// diff --git a/SFFS/StarForceFileSystem.cs b/SFFS/StarForceFileSystem.cs index ad0c14d..cf5f37b 100644 --- a/SFFS/StarForceFileSystem.cs +++ b/SFFS/StarForceFileSystem.cs @@ -30,7 +30,7 @@ #if NET48 public FileEntry[] Files { get; set; } #else - public FileEntry[]? Files { get; set; } + public FileEntry?[]? Files { get; set; } #endif /// @@ -39,7 +39,7 @@ #if NET48 public FileHeader[] FileHeaders { get; set; } #else - public FileHeader[]? FileHeaders { get; set; } + public FileHeader?[]? FileHeaders { get; set; } #endif } } diff --git a/SGA/SpecializedDirectory.cs b/SGA/SpecializedDirectory.cs index 525deeb..4ed43af 100644 --- a/SGA/SpecializedDirectory.cs +++ b/SGA/SpecializedDirectory.cs @@ -37,7 +37,7 @@ namespace SabreTools.Models.SGA #if NET48 public TSection[] Sections { get; set; } #else - public TSection[]? Sections { get; set; } + public TSection?[]? Sections { get; set; } #endif /// @@ -46,7 +46,7 @@ namespace SabreTools.Models.SGA #if NET48 public TFolder[] Folders { get; set; } #else - public TFolder[]? Folders { get; set; } + public TFolder?[]? Folders { get; set; } #endif /// @@ -55,7 +55,7 @@ namespace SabreTools.Models.SGA #if NET48 public TFile[] Files { get; set; } #else - public TFile[]? Files { get; set; } + public TFile?[]? Files { get; set; } #endif /// diff --git a/VBSP/Header.cs b/VBSP/Header.cs index 8af2e46..bd395a6 100644 --- a/VBSP/Header.cs +++ b/VBSP/Header.cs @@ -28,7 +28,7 @@ namespace SabreTools.Models.VBSP #if NET48 public Lump[] Lumps; #else - public Lump[]? Lumps; + public Lump?[]? Lumps; #endif /// diff --git a/VPK/File.cs b/VPK/File.cs index 28a9d99..fd2f714 100644 --- a/VPK/File.cs +++ b/VPK/File.cs @@ -30,7 +30,7 @@ namespace SabreTools.Models.VPK #if NET48 public ArchiveHash[] ArchiveHashes { get; set; } #else - public ArchiveHash[]? ArchiveHashes { get; set; } + public ArchiveHash?[]? ArchiveHashes { get; set; } #endif /// @@ -39,7 +39,7 @@ namespace SabreTools.Models.VPK #if NET48 public DirectoryItem[] DirectoryItems { get; set; } #else - public DirectoryItem[]? DirectoryItems { get; set; } + public DirectoryItem?[]? DirectoryItems { get; set; } #endif } } diff --git a/XZP/File.cs b/XZP/File.cs index ef1e6fd..3cb0dfb 100644 --- a/XZP/File.cs +++ b/XZP/File.cs @@ -21,7 +21,7 @@ namespace SabreTools.Models.XZP #if NET48 public DirectoryEntry[] DirectoryEntries { get; set; } #else - public DirectoryEntry[]? DirectoryEntries { get; set; } + public DirectoryEntry?[]? DirectoryEntries { get; set; } #endif /// @@ -30,7 +30,7 @@ namespace SabreTools.Models.XZP #if NET48 public DirectoryEntry[] PreloadDirectoryEntries { get; set; } #else - public DirectoryEntry[]? PreloadDirectoryEntries { get; set; } + public DirectoryEntry?[]? PreloadDirectoryEntries { get; set; } #endif /// @@ -39,7 +39,7 @@ namespace SabreTools.Models.XZP #if NET48 public DirectoryMapping[] PreloadDirectoryMappings { get; set; } #else - public DirectoryMapping[]? PreloadDirectoryMappings { get; set; } + public DirectoryMapping?[]? PreloadDirectoryMappings { get; set; } #endif /// @@ -48,7 +48,7 @@ namespace SabreTools.Models.XZP #if NET48 public DirectoryItem[] DirectoryItems { get; set; } #else - public DirectoryItem[]? DirectoryItems { get; set; } + public DirectoryItem?[]? DirectoryItems { get; set; } #endif ///