diff --git a/AACSMediaKeyBlock.cs b/AACSMediaKeyBlock.cs index c9caa9c..db18861 100644 --- a/AACSMediaKeyBlock.cs +++ b/AACSMediaKeyBlock.cs @@ -14,11 +14,7 @@ namespace SabreTools.Printing Print(builder, mediaKeyBlock.Records); } -#if NET48 - private static void Print(StringBuilder builder, Record[] records) -#else private static void Print(StringBuilder builder, Record?[]? records) -#endif { builder.AppendLine(" Records Information:"); builder.AppendLine(" -------------------------"); @@ -37,11 +33,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, Record record, int index) -#else private static void Print(StringBuilder builder, Record? record, int index) -#endif { builder.AppendLine($" Record Entry {index}"); if (record == null) @@ -85,11 +77,7 @@ namespace SabreTools.Printing } } -#if NET48 private static void Print(StringBuilder builder, EndOfMediaKeyBlockRecord record) -#else - private static void Print(StringBuilder builder, EndOfMediaKeyBlockRecord record) -#endif { if (record == null) return; @@ -97,11 +85,7 @@ namespace SabreTools.Printing builder.AppendLine(record.SignatureData, " Signature data"); } -#if NET48 - private static void Print(StringBuilder builder, ExplicitSubsetDifferenceRecord record) -#else private static void Print(StringBuilder builder, ExplicitSubsetDifferenceRecord? record) -#endif { if (record == null) return; @@ -130,11 +114,7 @@ namespace SabreTools.Printing } } -#if NET48 - private static void Print(StringBuilder builder, MediaKeyDataRecord record) -#else private static void Print(StringBuilder builder, MediaKeyDataRecord? record) -#endif { if (record == null) return; @@ -154,11 +134,7 @@ namespace SabreTools.Printing } } -#if NET48 - private static void Print(StringBuilder builder, SubsetDifferenceIndexRecord record) -#else private static void Print(StringBuilder builder, SubsetDifferenceIndexRecord? record) -#endif { if (record == null) return; @@ -179,11 +155,7 @@ namespace SabreTools.Printing } } -#if NET48 - private static void Print(StringBuilder builder, TypeAndVersionRecord record) -#else private static void Print(StringBuilder builder, TypeAndVersionRecord? record) -#endif { if (record == null) return; @@ -192,11 +164,7 @@ namespace SabreTools.Printing builder.AppendLine(record.VersionNumber, " Version number"); } -#if NET48 - private static void Print(StringBuilder builder, DriveRevocationListRecord record) -#else private static void Print(StringBuilder builder, DriveRevocationListRecord? record) -#endif { if (record == null) return; @@ -247,11 +215,7 @@ namespace SabreTools.Printing } } -#if NET48 - private static void Print(StringBuilder builder, HostRevocationListRecord record) -#else private static void Print(StringBuilder builder, HostRevocationListRecord? record) -#endif { if (record == null) return; @@ -302,11 +266,7 @@ namespace SabreTools.Printing } } -#if NET48 - private static void Print(StringBuilder builder, VerifyMediaKeyRecord record) -#else private static void Print(StringBuilder builder, VerifyMediaKeyRecord? record) -#endif { if (record == null) return; @@ -314,11 +274,7 @@ namespace SabreTools.Printing builder.AppendLine(record.CiphertextValue, " Ciphertext value"); } -#if NET48 - private static void Print(StringBuilder builder, CopyrightRecord record) -#else private static void Print(StringBuilder builder, CopyrightRecord? record) -#endif { if (record == null) return; diff --git a/BFPK.cs b/BFPK.cs index f813de6..338f732 100644 --- a/BFPK.cs +++ b/BFPK.cs @@ -15,11 +15,7 @@ namespace SabreTools.Printing Print(builder, archive.Files); } -#if NET48 - private static void Print(StringBuilder builder, Header header) -#else private static void Print(StringBuilder builder, Header? header) -#endif { builder.AppendLine(" Header Information:"); builder.AppendLine(" -------------------------"); @@ -36,11 +32,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, FileEntry[] files) -#else private static void Print(StringBuilder builder, FileEntry?[]? files) -#endif { builder.AppendLine(" File Table Information:"); builder.AppendLine(" -------------------------"); diff --git a/BSP.cs b/BSP.cs index 5651d99..2df650f 100644 --- a/BSP.cs +++ b/BSP.cs @@ -18,11 +18,7 @@ namespace SabreTools.Printing Print(builder, file.Textures); } -#if NET48 - private static void Print(StringBuilder builder, Header header) -#else private static void Print(StringBuilder builder, Header? header) -#endif { builder.AppendLine(" Header Information:"); builder.AppendLine(" -------------------------"); @@ -37,11 +33,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, Lump[] lumps) -#else private static void Print(StringBuilder builder, Lump?[]? lumps) -#endif { builder.AppendLine(" Lumps Information:"); builder.AppendLine(" -------------------------"); @@ -79,11 +71,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, TextureHeader header) -#else private static void Print(StringBuilder builder, TextureHeader? header) -#endif { builder.AppendLine(" Texture Header Information:"); builder.AppendLine(" -------------------------"); @@ -110,11 +98,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, Texture[] textures) -#else private static void Print(StringBuilder builder, Texture?[]? textures) -#endif { builder.AppendLine(" Textures Information:"); builder.AppendLine(" -------------------------"); diff --git a/CFB.cs b/CFB.cs index 269103c..2de4d93 100644 --- a/CFB.cs +++ b/CFB.cs @@ -19,11 +19,7 @@ namespace SabreTools.Printing Print(builder, binary.DirectoryEntries); } -#if NET48 - private static void Print(StringBuilder builder, FileHeader header) -#else private static void Print(StringBuilder builder, FileHeader? header) -#endif { builder.AppendLine(" File Header Information:"); builder.AppendLine(" -------------------------"); @@ -65,11 +61,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, SectorNumber[] sectorNumbers, string name) -#else private static void Print(StringBuilder builder, SectorNumber?[]? sectorNumbers, string name) -#endif { builder.AppendLine($" {name} Sectors Information:"); builder.AppendLine(" -------------------------"); @@ -87,11 +79,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, DirectoryEntry[] directoryEntries) -#else private static void Print(StringBuilder builder, DirectoryEntry?[]? directoryEntries) -#endif { builder.AppendLine(" Directory Entries Information:"); builder.AppendLine(" -------------------------"); diff --git a/CIA.cs b/CIA.cs index 3b6f822..f9487ee 100644 --- a/CIA.cs +++ b/CIA.cs @@ -19,11 +19,7 @@ namespace SabreTools.Printing Print(builder, cia.MetaData); } -#if NET48 - private static void Print(StringBuilder builder, CIAHeader header) -#else private static void Print(StringBuilder builder, CIAHeader? header) -#endif { builder.AppendLine(" CIA Header Information:"); builder.AppendLine(" -------------------------"); @@ -46,11 +42,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, Certificate[] certificateChain) -#else private static void Print(StringBuilder builder, Certificate?[]? certificateChain) -#endif { builder.AppendLine(" Certificate Chain Information:"); builder.AppendLine(" -------------------------"); @@ -106,11 +98,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, Ticket ticket) -#else private static void Print(StringBuilder builder, Ticket? ticket) -#endif { builder.AppendLine(" Ticket Information:"); builder.AppendLine(" -------------------------"); @@ -215,11 +203,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, TitleMetadata tmd) -#else private static void Print(StringBuilder builder, TitleMetadata? tmd) -#endif { builder.AppendLine(" Title Metadata Information:"); builder.AppendLine(" -------------------------"); @@ -362,11 +346,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, NCCHHeader[] partitions) -#else private static void Print(StringBuilder builder, NCCHHeader?[]? partitions) -#endif { builder.AppendLine(" NCCH Partition Header Information:"); builder.AppendLine(" -------------------------"); @@ -446,11 +426,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, MetaData metaData) -#else private static void Print(StringBuilder builder, MetaData? metaData) -#endif { builder.AppendLine(" Meta Data Information:"); builder.AppendLine(" -------------------------"); diff --git a/Extensions.cs b/Extensions.cs index 0f246bd..37b2e4f 100644 --- a/Extensions.cs +++ b/Extensions.cs @@ -9,50 +9,27 @@ namespace SabreTools.Printing /// /// Append a line containing a boolean to a StringBuilder /// -#if NET48 - public static StringBuilder AppendLine(this StringBuilder sb, bool value, string prefixString) -#else public static StringBuilder AppendLine(this StringBuilder sb, bool? value, string prefixString) -#endif { -#if NET6_0_OR_GREATER value ??= false; -#endif - return sb.AppendLine($"{prefixString}: {value.ToString()}"); } /// /// Append a line containing a Char to a StringBuilder /// -#if NET48 - public static StringBuilder AppendLine(this StringBuilder sb, char value, string prefixString) -#else public static StringBuilder AppendLine(this StringBuilder sb, char? value, string prefixString) -#endif { -#if NET48 - string valueString = value.ToString(); -#else string valueString = (value == null ? "[NULL]" : value.Value.ToString()); -#endif - return sb.AppendLine($"{prefixString}: {valueString}"); } /// /// Append a line containing a Int8 to a StringBuilder /// -#if NET48 - public static StringBuilder AppendLine(this StringBuilder sb, sbyte value, string prefixString) -#else public static StringBuilder AppendLine(this StringBuilder sb, sbyte? value, string prefixString) -#endif { -#if NET6_0_OR_GREATER value ??= 0; -#endif - string valueString = $"{value} (0x{value:X})"; return sb.AppendLine($"{prefixString}: {valueString}"); } @@ -60,16 +37,9 @@ namespace SabreTools.Printing /// /// Append a line containing a UInt8 to a StringBuilder /// -#if NET48 - public static StringBuilder AppendLine(this StringBuilder sb, byte value, string prefixString) -#else public static StringBuilder AppendLine(this StringBuilder sb, byte? value, string prefixString) -#endif { -#if NET6_0_OR_GREATER value ??= 0; -#endif - string valueString = $"{value} (0x{value:X})"; return sb.AppendLine($"{prefixString}: {valueString}"); } @@ -77,16 +47,9 @@ namespace SabreTools.Printing /// /// Append a line containing a Int16 to a StringBuilder /// -#if NET48 - public static StringBuilder AppendLine(this StringBuilder sb, short value, string prefixString) -#else public static StringBuilder AppendLine(this StringBuilder sb, short? value, string prefixString) -#endif { -#if NET6_0_OR_GREATER value ??= 0; -#endif - string valueString = $"{value} (0x{value:X})"; return sb.AppendLine($"{prefixString}: {valueString}"); } @@ -94,16 +57,9 @@ namespace SabreTools.Printing /// /// Append a line containing a UInt16 to a StringBuilder /// -#if NET48 - public static StringBuilder AppendLine(this StringBuilder sb, ushort value, string prefixString) -#else public static StringBuilder AppendLine(this StringBuilder sb, ushort? value, string prefixString) -#endif { -#if NET6_0_OR_GREATER value ??= 0; -#endif - string valueString = $"{value} (0x{value:X})"; return sb.AppendLine($"{prefixString}: {valueString}"); } @@ -111,16 +67,9 @@ namespace SabreTools.Printing /// /// Append a line containing a Int32 to a StringBuilder /// -#if NET48 - public static StringBuilder AppendLine(this StringBuilder sb, int value, string prefixString) -#else public static StringBuilder AppendLine(this StringBuilder sb, int? value, string prefixString) -#endif { -#if NET6_0_OR_GREATER value ??= 0; -#endif - string valueString = $"{value} (0x{value:X})"; return sb.AppendLine($"{prefixString}: {valueString}"); } @@ -128,16 +77,9 @@ namespace SabreTools.Printing /// /// Append a line containing a UInt32 to a StringBuilder /// -#if NET48 - public static StringBuilder AppendLine(this StringBuilder sb, uint value, string prefixString) -#else public static StringBuilder AppendLine(this StringBuilder sb, uint? value, string prefixString) -#endif { -#if NET6_0_OR_GREATER value ??= 0; -#endif - string valueString = $"{value} (0x{value:X})"; return sb.AppendLine($"{prefixString}: {valueString}"); } @@ -145,16 +87,9 @@ namespace SabreTools.Printing /// /// Append a line containing a Int64 to a StringBuilder /// -#if NET48 - public static StringBuilder AppendLine(this StringBuilder sb, long value, string prefixString) -#else public static StringBuilder AppendLine(this StringBuilder sb, long? value, string prefixString) -#endif { -#if NET6_0_OR_GREATER value ??= 0; -#endif - string valueString = $"{value} (0x{value:X})"; return sb.AppendLine($"{prefixString}: {valueString}"); } @@ -162,16 +97,9 @@ namespace SabreTools.Printing /// /// Append a line containing a UInt64 to a StringBuilder /// -#if NET48 - public static StringBuilder AppendLine(this StringBuilder sb, ulong value, string prefixString) -#else public static StringBuilder AppendLine(this StringBuilder sb, ulong? value, string prefixString) -#endif { -#if NET6_0_OR_GREATER value ??= 0; -#endif - string valueString = $"{value} (0x{value:X})"; return sb.AppendLine($"{prefixString}: {valueString}"); } @@ -179,16 +107,9 @@ namespace SabreTools.Printing /// /// Append a line containing a string to a StringBuilder /// -#if NET48 - public static StringBuilder AppendLine(this StringBuilder sb, string value, string prefixString) -#else public static StringBuilder AppendLine(this StringBuilder sb, string? value, string prefixString) -#endif { -#if NET6_0_OR_GREATER value ??= string.Empty; -#endif - string valueString = value ?? "[NULL]"; return sb.AppendLine($"{prefixString}: {valueString}"); } @@ -196,30 +117,17 @@ namespace SabreTools.Printing /// /// Append a line containing a Guid to a StringBuilder /// -#if NET48 - public static StringBuilder AppendLine(this StringBuilder sb, Guid value, string prefixString) -#else public static StringBuilder AppendLine(this StringBuilder sb, Guid? value, string prefixString) -#endif { -#if NET48 - string valueString = value.ToString(); -#else value ??= Guid.Empty; string valueString = value.Value.ToString(); -#endif - - return sb.AppendLine($"{prefixString}: {value}"); + return sb.AppendLine($"{prefixString}: {valueString}"); } /// /// Append a line containing a UInt8[] value to a StringBuilder /// -#if NET48 - public static StringBuilder AppendLine(this StringBuilder sb, byte[] value, string prefixString) -#else public static StringBuilder AppendLine(this StringBuilder sb, byte[]? value, string prefixString) -#endif { string valueString = (value == null ? "[NULL]" : BitConverter.ToString(value).Replace('-', ' ')); return sb.AppendLine($"{prefixString}: {valueString}"); @@ -228,11 +136,7 @@ namespace SabreTools.Printing /// /// Append a line containing a UInt8[] value as a string to a StringBuilder /// -#if NET48 - public static StringBuilder AppendLine(this StringBuilder sb, byte[] value, string prefixString, Encoding encoding) -#else public static StringBuilder AppendLine(this StringBuilder sb, byte[]? value, string prefixString, Encoding encoding) -#endif { string valueString = (value == null ? "[NULL]" : encoding.GetString(value).Replace("\0", string.Empty)); return sb.AppendLine($"{prefixString}: {valueString}"); @@ -241,11 +145,7 @@ namespace SabreTools.Printing /// /// Append a line containing a Char[] value to a StringBuilder /// -#if NET48 - public static StringBuilder AppendLine(this StringBuilder sb, char[] value, string prefixString) -#else public static StringBuilder AppendLine(this StringBuilder sb, char[]? value, string prefixString) -#endif { string valueString = (value == null ? "[NULL]" : string.Join(", ", value)); return sb.AppendLine($"{prefixString}: {valueString}"); @@ -254,11 +154,7 @@ namespace SabreTools.Printing /// /// Append a line containing a Int16[] value to a StringBuilder /// -#if NET48 - public static StringBuilder AppendLine(this StringBuilder sb, short[] value, string prefixString) -#else public static StringBuilder AppendLine(this StringBuilder sb, short[]? value, string prefixString) -#endif { string valueString = (value == null ? "[NULL]" : string.Join(", ", value)); return sb.AppendLine($"{prefixString}: {valueString}"); @@ -267,11 +163,7 @@ namespace SabreTools.Printing /// /// Append a line containing a UInt16[] value to a StringBuilder /// -#if NET48 - public static StringBuilder AppendLine(this StringBuilder sb, ushort[] value, string prefixString) -#else public static StringBuilder AppendLine(this StringBuilder sb, ushort[]? value, string prefixString) -#endif { string valueString = (value == null ? "[NULL]" : string.Join(", ", value)); return sb.AppendLine($"{prefixString}: {valueString}"); @@ -280,11 +172,7 @@ namespace SabreTools.Printing /// /// Append a line containing a Int32[] value to a StringBuilder /// -#if NET48 - public static StringBuilder AppendLine(this StringBuilder sb, int[] value, string prefixString) -#else public static StringBuilder AppendLine(this StringBuilder sb, int[]? value, string prefixString) -#endif { string valueString = (value == null ? "[NULL]" : string.Join(", ", value)); return sb.AppendLine($"{prefixString}: {valueString}"); @@ -293,11 +181,7 @@ namespace SabreTools.Printing /// /// Append a line containing a UInt32[] value to a StringBuilder /// -#if NET48 - public static StringBuilder AppendLine(this StringBuilder sb, uint[] value, string prefixString) -#else public static StringBuilder AppendLine(this StringBuilder sb, uint[]? value, string prefixString) -#endif { string valueString = (value == null ? "[NULL]" : string.Join(", ", value)); return sb.AppendLine($"{prefixString}: {valueString}"); @@ -306,11 +190,7 @@ namespace SabreTools.Printing /// /// Append a line containing a Int64[] value to a StringBuilder /// -#if NET48 - public static StringBuilder AppendLine(this StringBuilder sb, long[] value, string prefixString) -#else public static StringBuilder AppendLine(this StringBuilder sb, long[]? value, string prefixString) -#endif { string valueString = (value == null ? "[NULL]" : string.Join(", ", value)); return sb.AppendLine($"{prefixString}: {valueString}"); @@ -319,11 +199,7 @@ namespace SabreTools.Printing /// /// Append a line containing a UInt64[] value to a StringBuilder /// -#if NET48 - public static StringBuilder AppendLine(this StringBuilder sb, ulong[] value, string prefixString) -#else public static StringBuilder AppendLine(this StringBuilder sb, ulong[]? value, string prefixString) -#endif { string valueString = (value == null ? "[NULL]" : string.Join(", ", value)); return sb.AppendLine($"{prefixString}: {valueString}"); diff --git a/GCF.cs b/GCF.cs index d29ed64..8d3b171 100644 --- a/GCF.cs +++ b/GCF.cs @@ -47,11 +47,7 @@ namespace SabreTools.Printing Print(builder, file.DataBlockHeader); } -#if NET48 - private static void Print(StringBuilder builder, Header header) -#else private static void Print(StringBuilder builder, Header? header) -#endif { builder.AppendLine(" Header Information:"); builder.AppendLine(" -------------------------"); @@ -76,11 +72,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, BlockEntryHeader header) -#else private static void Print(StringBuilder builder, BlockEntryHeader? header) -#endif { builder.AppendLine(" Block Entry Header Information:"); builder.AppendLine(" -------------------------"); @@ -102,11 +94,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, BlockEntry[] entries) -#else private static void Print(StringBuilder builder, BlockEntry?[]? entries) -#endif { builder.AppendLine(" Block Entries Information:"); builder.AppendLine(" -------------------------"); @@ -138,11 +126,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, FragmentationMapHeader header) -#else private static void Print(StringBuilder builder, FragmentationMapHeader? header) -#endif { builder.AppendLine(" Fragmentation Map Header Information:"); builder.AppendLine(" -------------------------"); @@ -160,11 +144,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, FragmentationMap[] entries) -#else private static void Print(StringBuilder builder, FragmentationMap?[]? entries) -#endif { builder.AppendLine(" Fragmentation Maps Information:"); builder.AppendLine(" -------------------------"); @@ -190,11 +170,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, BlockEntryMapHeader header) -#else private static void Print(StringBuilder builder, BlockEntryMapHeader? header) -#endif { builder.AppendLine(" Block Entry Map Header Information:"); builder.AppendLine(" -------------------------"); @@ -213,11 +189,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, BlockEntryMap[] entries) -#else private static void Print(StringBuilder builder, BlockEntryMap?[]? entries) -#endif { builder.AppendLine(" Block Entry Maps Information:"); builder.AppendLine(" -------------------------"); @@ -244,11 +216,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, DirectoryHeader header) -#else private static void Print(StringBuilder builder, DirectoryHeader? header) -#endif { builder.AppendLine(" Directory Header Information:"); builder.AppendLine(" -------------------------"); @@ -276,11 +244,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, DirectoryEntry[] entries) -#else private static void Print(StringBuilder builder, DirectoryEntry?[]? entries) -#endif { builder.AppendLine(" Directory Entries Information:"); builder.AppendLine(" -------------------------"); @@ -313,11 +277,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, DirectoryInfo1Entry[] entries) -#else private static void Print(StringBuilder builder, DirectoryInfo1Entry?[]? entries) -#endif { builder.AppendLine(" Directory Info 1 Entries Information:"); builder.AppendLine(" -------------------------"); @@ -343,11 +303,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, DirectoryInfo2Entry[] entries) -#else private static void Print(StringBuilder builder, DirectoryInfo2Entry?[]? entries) -#endif { builder.AppendLine(" Directory Info 2 Entries Information:"); builder.AppendLine(" -------------------------"); @@ -373,11 +329,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, DirectoryCopyEntry[] entries) -#else private static void Print(StringBuilder builder, DirectoryCopyEntry?[]? entries) -#endif { builder.AppendLine(" Directory Copy Entries Information:"); builder.AppendLine(" -------------------------"); @@ -403,11 +355,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, DirectoryLocalEntry[] entries) -#else private static void Print(StringBuilder builder, DirectoryLocalEntry?[]? entries) -#endif { builder.AppendLine(" Directory Local Entries Information:"); builder.AppendLine(" -------------------------"); @@ -433,11 +381,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, DirectoryMapHeader header) -#else private static void Print(StringBuilder builder, DirectoryMapHeader? header) -#endif { builder.AppendLine(" Directory Map Header Information:"); builder.AppendLine(" -------------------------"); @@ -453,11 +397,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, DirectoryMapEntry[] entries) -#else private static void Print(StringBuilder builder, DirectoryMapEntry?[]? entries) -#endif { builder.AppendLine(" Directory Map Entries Information:"); builder.AppendLine(" -------------------------"); @@ -483,11 +423,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, ChecksumHeader header) -#else private static void Print(StringBuilder builder, ChecksumHeader? header) -#endif { builder.AppendLine(" Checksum Header Information:"); builder.AppendLine(" -------------------------"); @@ -503,11 +439,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, ChecksumMapHeader header) -#else private static void Print(StringBuilder builder, ChecksumMapHeader? header) -#endif { builder.AppendLine(" Checksum Map Header Information:"); builder.AppendLine(" -------------------------"); @@ -525,11 +457,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, ChecksumMapEntry[] entries) -#else private static void Print(StringBuilder builder, ChecksumMapEntry?[]? entries) -#endif { builder.AppendLine(" Checksum Map Entries Information:"); builder.AppendLine(" -------------------------"); @@ -556,11 +484,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, ChecksumEntry[] entries) -#else private static void Print(StringBuilder builder, ChecksumEntry?[]? entries) -#endif { builder.AppendLine(" Checksum Entries Information:"); builder.AppendLine(" -------------------------"); @@ -586,11 +510,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, DataBlockHeader header) -#else private static void Print(StringBuilder builder, DataBlockHeader? header) -#endif { builder.AppendLine(" Data Block Header Information:"); builder.AppendLine(" -------------------------"); diff --git a/InstallShieldCabinet.cs b/InstallShieldCabinet.cs index 47a52cc..e63ce93 100644 --- a/InstallShieldCabinet.cs +++ b/InstallShieldCabinet.cs @@ -35,17 +35,9 @@ namespace SabreTools.Printing Print(builder, cabinet.Components); } -#if NET48 - private static int GetMajorVersion(CommonHeader header) -#else private static int GetMajorVersion(CommonHeader? header) -#endif { -#if NET48 - uint majorVersion = header.Version; -#else uint majorVersion = header?.Version ?? 0; -#endif if (majorVersion >> 24 == 1) { majorVersion = (majorVersion >> 12) & 0x0F; @@ -60,11 +52,7 @@ namespace SabreTools.Printing return (int)majorVersion; } -#if NET48 - private static void Print(StringBuilder builder, CommonHeader header, int majorVersion) -#else private static void Print(StringBuilder builder, CommonHeader? header, int majorVersion) -#endif { builder.AppendLine(" Common Header Information:"); builder.AppendLine(" -------------------------"); @@ -83,11 +71,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, VolumeHeader header, int majorVersion) -#else private static void Print(StringBuilder builder, VolumeHeader? header, int majorVersion) -#endif { builder.AppendLine(" Volume Header Information:"); builder.AppendLine(" -------------------------"); @@ -132,11 +116,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, Descriptor descriptor) -#else private static void Print(StringBuilder builder, Descriptor? descriptor) -#endif { builder.AppendLine(" Descriptor Information:"); builder.AppendLine(" -------------------------"); @@ -203,11 +183,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, uint[] entries) -#else private static void Print(StringBuilder builder, uint[]? entries) -#endif { builder.AppendLine(" File Descriptor Offsets:"); builder.AppendLine(" -------------------------"); @@ -225,11 +201,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, string[] entries) -#else private static void Print(StringBuilder builder, string?[]? entries) -#endif { builder.AppendLine(" Directory Names:"); builder.AppendLine(" -------------------------"); @@ -247,11 +219,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, FileDescriptor[] entries) -#else private static void Print(StringBuilder builder, FileDescriptor?[]? entries) -#endif { builder.AppendLine(" File Descriptors:"); builder.AppendLine(" -------------------------"); @@ -288,11 +256,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, Dictionary entries, string name) -#else private static void Print(StringBuilder builder, Dictionary? entries, string name) -#endif { builder.AppendLine($" {name} Offsets:"); builder.AppendLine(" -------------------------"); @@ -323,11 +287,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, FileGroup[] entries) -#else private static void Print(StringBuilder builder, FileGroup?[]? entries) -#endif { builder.AppendLine(" File Groups:"); builder.AppendLine(" -------------------------"); @@ -376,11 +336,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, Component[] entries) -#else private static void Print(StringBuilder builder, Component?[]? entries) -#endif { builder.AppendLine(" Components:"); builder.AppendLine(" -------------------------"); diff --git a/LinearExecutable.cs b/LinearExecutable.cs index 131be4a..32909b1 100644 --- a/LinearExecutable.cs +++ b/LinearExecutable.cs @@ -36,11 +36,7 @@ namespace SabreTools.Printing Print(builder, executable.DebugInformation); } -#if NET48 - private static void Print(StringBuilder builder, SabreTools.Models.MSDOS.ExecutableHeader header) -#else private static void Print(StringBuilder builder, SabreTools.Models.MSDOS.ExecutableHeader? header) -#endif { builder.AppendLine(" MS-DOS Stub Header Information:"); builder.AppendLine(" -------------------------"); @@ -77,11 +73,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, InformationBlock block) -#else private static void Print(StringBuilder builder, InformationBlock? block) -#endif { builder.AppendLine(" Information Block Information:"); builder.AppendLine(" -------------------------"); @@ -141,11 +133,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, ObjectTableEntry[] entries) -#else private static void Print(StringBuilder builder, ObjectTableEntry?[]? entries) -#endif { builder.AppendLine(" Object Table Information:"); builder.AppendLine(" -------------------------"); @@ -176,11 +164,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, ObjectPageMapEntry[] entries) -#else private static void Print(StringBuilder builder, ObjectPageMapEntry?[]? entries) -#endif { builder.AppendLine(" Object Page Map Information:"); builder.AppendLine(" -------------------------"); @@ -208,11 +192,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, ResourceTableEntry[] entries) -#else private static void Print(StringBuilder builder, ResourceTableEntry?[]? entries) -#endif { builder.AppendLine(" Resource Table Information:"); builder.AppendLine(" -------------------------"); @@ -242,11 +222,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, ResidentNamesTableEntry[] entries) -#else private static void Print(StringBuilder builder, ResidentNamesTableEntry?[]? entries) -#endif { builder.AppendLine(" Resident Names Table Information:"); builder.AppendLine(" -------------------------"); @@ -274,11 +250,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, EntryTableBundle[] bundles) -#else private static void Print(StringBuilder builder, EntryTableBundle?[]? bundles) -#endif { builder.AppendLine(" Entry Table Information:"); builder.AppendLine(" -------------------------"); @@ -364,11 +336,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, ModuleFormatDirectivesTableEntry[] entries) -#else private static void Print(StringBuilder builder, ModuleFormatDirectivesTableEntry?[]? entries) -#endif { builder.AppendLine(" Module Format Directives Table Information:"); builder.AppendLine(" -------------------------"); @@ -396,11 +364,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, VerifyRecordDirectiveTableEntry[] entries) -#else private static void Print(StringBuilder builder, VerifyRecordDirectiveTableEntry?[]? entries) -#endif { builder.AppendLine(" Verify Record Directive Table Information:"); builder.AppendLine(" -------------------------"); @@ -432,11 +396,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, FixupPageTableEntry[] entries) -#else private static void Print(StringBuilder builder, FixupPageTableEntry?[]? entries) -#endif { builder.AppendLine(" Fix-up Page Table Information:"); builder.AppendLine(" -------------------------"); @@ -462,11 +422,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, FixupRecordTableEntry[] entries) -#else private static void Print(StringBuilder builder, FixupRecordTableEntry?[]? entries) -#endif { builder.AppendLine(" Fix-up Record Table Information:"); builder.AppendLine(" -------------------------"); @@ -614,11 +570,7 @@ namespace SabreTools.Printing } } -#if NET48 - private static void Print(StringBuilder builder, ImportModuleNameTableEntry[] entries) -#else private static void Print(StringBuilder builder, ImportModuleNameTableEntry?[]? entries) -#endif { builder.AppendLine(" Import Module Name Table Information:"); builder.AppendLine(" -------------------------"); @@ -645,11 +597,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, ImportModuleProcedureNameTableEntry[] entries) -#else private static void Print(StringBuilder builder, ImportModuleProcedureNameTableEntry?[]? entries) -#endif { builder.AppendLine(" Import Module Procedure Name Table Information:"); builder.AppendLine(" -------------------------"); @@ -676,11 +624,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, PerPageChecksumTableEntry[] entries) -#else private static void Print(StringBuilder builder, PerPageChecksumTableEntry?[]? entries) -#endif { builder.AppendLine(" Per-Page Checksum Table Information:"); builder.AppendLine(" -------------------------"); @@ -706,11 +650,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, NonResidentNamesTableEntry[] entries) -#else private static void Print(StringBuilder builder, NonResidentNamesTableEntry?[]? entries) -#endif { builder.AppendLine(" Non-Resident Names Table Information:"); builder.AppendLine(" -------------------------"); @@ -738,11 +678,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, DebugInformation di) -#else private static void Print(StringBuilder builder, DebugInformation? di) -#endif { builder.AppendLine(" Debug Information:"); builder.AppendLine(" -------------------------"); diff --git a/MSDOS.cs b/MSDOS.cs index 32098bc..ac7fc03 100644 --- a/MSDOS.cs +++ b/MSDOS.cs @@ -15,11 +15,7 @@ namespace SabreTools.Printing Print(builder, executable.RelocationTable); } -#if NET48 - private static void Print(StringBuilder builder, ExecutableHeader header) -#else private static void Print(StringBuilder builder, ExecutableHeader? header) -#endif { builder.AppendLine(" Header Information:"); builder.AppendLine(" -------------------------"); @@ -47,11 +43,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, RelocationEntry[] entries) -#else private static void Print(StringBuilder builder, RelocationEntry?[]? entries) -#endif { builder.AppendLine(" Relocation Table Information:"); builder.AppendLine(" -------------------------"); diff --git a/MicrosoftCabinet.cs b/MicrosoftCabinet.cs index e401663..dfdc78d 100644 --- a/MicrosoftCabinet.cs +++ b/MicrosoftCabinet.cs @@ -17,11 +17,7 @@ namespace SabreTools.Printing Print(builder, cabinet.Files); } -#if NET48 - private static void Print(StringBuilder builder, CFHEADER header) -#else private static void Print(StringBuilder builder, CFHEADER? header) -#endif { builder.AppendLine(" Header Information:"); builder.AppendLine(" -------------------------"); @@ -69,11 +65,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, CFFOLDER[] entries) -#else private static void Print(StringBuilder builder, CFFOLDER?[]? entries) -#endif { builder.AppendLine(" Folders:"); builder.AppendLine(" -------------------------"); @@ -129,11 +121,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, CFFILE[] entries) -#else private static void Print(StringBuilder builder, CFFILE?[]? entries) -#endif { builder.AppendLine(" Files:"); builder.AppendLine(" -------------------------"); diff --git a/N3DS.cs b/N3DS.cs index 2b995f0..72d1e4a 100644 --- a/N3DS.cs +++ b/N3DS.cs @@ -20,11 +20,7 @@ namespace SabreTools.Printing Print(builder, cart.RomFSHeaders); } -#if NET48 - private static void Print(StringBuilder builder, NCSDHeader header) -#else private static void Print(StringBuilder builder, NCSDHeader? header) -#endif { builder.AppendLine(" NCSD Header Information:"); builder.AppendLine(" -------------------------"); @@ -107,11 +103,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, CardInfoHeader header) -#else private static void Print(StringBuilder builder, CardInfoHeader? header) -#endif { builder.AppendLine(" Card Info Header Information:"); builder.AppendLine(" -------------------------"); @@ -136,11 +128,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, DevelopmentCardInfoHeader header) -#else private static void Print(StringBuilder builder, DevelopmentCardInfoHeader? header) -#endif { builder.AppendLine(" Development Card Info Header Information:"); builder.AppendLine(" -------------------------"); @@ -234,11 +222,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, NCCHHeader[] entries) -#else private static void Print(StringBuilder builder, NCCHHeader?[]? entries) -#endif { builder.AppendLine(" NCCH Partition Header Information:"); builder.AppendLine(" -------------------------"); @@ -318,11 +302,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, NCCHExtendedHeader[] entries) -#else private static void Print(StringBuilder builder, NCCHExtendedHeader?[]? entries) -#endif { builder.AppendLine(" NCCH Extended Header Information:"); builder.AppendLine(" -------------------------"); @@ -546,11 +526,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, ExeFSHeader[] entries) -#else private static void Print(StringBuilder builder, ExeFSHeader?[]? entries) -#endif { builder.AppendLine(" ExeFS Header Information:"); builder.AppendLine(" -------------------------"); @@ -620,11 +596,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, RomFSHeader[] entries) -#else private static void Print(StringBuilder builder, RomFSHeader?[]? entries) -#endif { builder.AppendLine(" RomFS Header Information:"); builder.AppendLine(" -------------------------"); diff --git a/NCF.cs b/NCF.cs index b6a812c..7247cc3 100644 --- a/NCF.cs +++ b/NCF.cs @@ -32,11 +32,7 @@ namespace SabreTools.Printing Print(builder, file.ChecksumEntries); } -#if NET48 - private static void Print(StringBuilder builder, Header header) -#else private static void Print(StringBuilder builder, Header? header) -#endif { builder.AppendLine(" Header Information:"); builder.AppendLine(" -------------------------"); @@ -61,11 +57,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, DirectoryHeader header) -#else private static void Print(StringBuilder builder, DirectoryHeader? header) -#endif { builder.AppendLine(" Directory Header Information:"); builder.AppendLine(" -------------------------"); @@ -93,11 +85,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, DirectoryEntry[] entries) -#else private static void Print(StringBuilder builder, DirectoryEntry?[]? entries) -#endif { builder.AppendLine(" Directory Entries Information:"); builder.AppendLine(" -------------------------"); @@ -130,11 +118,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, DirectoryInfo1Entry[] entries) -#else private static void Print(StringBuilder builder, DirectoryInfo1Entry?[]? entries) -#endif { builder.AppendLine(" Directory Info 1 Entries Information:"); builder.AppendLine(" -------------------------"); @@ -160,11 +144,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, DirectoryInfo2Entry[] entries) -#else private static void Print(StringBuilder builder, DirectoryInfo2Entry?[]? entries) -#endif { builder.AppendLine(" Directory Info 2 Entries Information:"); builder.AppendLine(" -------------------------"); @@ -190,11 +170,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, DirectoryCopyEntry[] entries) -#else private static void Print(StringBuilder builder, DirectoryCopyEntry?[]? entries) -#endif { builder.AppendLine(" Directory Copy Entries Information:"); builder.AppendLine(" -------------------------"); @@ -220,11 +196,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, DirectoryLocalEntry[] entries) -#else private static void Print(StringBuilder builder, DirectoryLocalEntry?[]? entries) -#endif { builder.AppendLine(" Directory Local Entries Information:"); builder.AppendLine(" -------------------------"); @@ -250,11 +222,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, UnknownHeader header) -#else private static void Print(StringBuilder builder, UnknownHeader? header) -#endif { builder.AppendLine(" Unknown Header Information:"); builder.AppendLine(" -------------------------"); @@ -270,11 +238,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, UnknownEntry[] entries) -#else private static void Print(StringBuilder builder, UnknownEntry?[]? entries) -#endif { builder.AppendLine(" Unknown Entries Information:"); builder.AppendLine(" -------------------------"); @@ -300,11 +264,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, ChecksumHeader header) -#else private static void Print(StringBuilder builder, ChecksumHeader? header) -#endif { builder.AppendLine(" Checksum Header Information:"); builder.AppendLine(" -------------------------"); @@ -320,11 +280,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, ChecksumMapHeader header) -#else private static void Print(StringBuilder builder, ChecksumMapHeader? header) -#endif { builder.AppendLine(" Checksum Map Header Information:"); builder.AppendLine(" -------------------------"); @@ -342,11 +298,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, ChecksumMapEntry[] entries) -#else private static void Print(StringBuilder builder, ChecksumMapEntry?[]? entries) -#endif { builder.AppendLine(" Checksum Map Entries Information:"); builder.AppendLine(" -------------------------"); @@ -373,11 +325,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, ChecksumEntry[] entries) -#else private static void Print(StringBuilder builder, ChecksumEntry?[]? entries) -#endif { builder.AppendLine(" Checksum Entries Information:"); builder.AppendLine(" -------------------------"); diff --git a/NewExecutable.cs b/NewExecutable.cs index dce8e47..9d3a3c8 100644 --- a/NewExecutable.cs +++ b/NewExecutable.cs @@ -29,11 +29,7 @@ namespace SabreTools.Printing Print(builder, executable.NonResidentNameTable); } -#if NET48 - private static void Print(StringBuilder builder, SabreTools.Models.MSDOS.ExecutableHeader header) -#else private static void Print(StringBuilder builder, SabreTools.Models.MSDOS.ExecutableHeader? header) -#endif { builder.AppendLine(" MS-DOS Stub Header Information:"); builder.AppendLine(" -------------------------"); @@ -70,11 +66,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, ExecutableHeader header) -#else private static void Print(StringBuilder builder, ExecutableHeader? header) -#endif { builder.AppendLine(" Header Information:"); builder.AppendLine(" -------------------------"); @@ -119,11 +111,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, SegmentTableEntry[] entries) -#else private static void Print(StringBuilder builder, SegmentTableEntry?[]? entries) -#endif { builder.AppendLine(" Segment Table Information:"); builder.AppendLine(" -------------------------"); @@ -152,11 +140,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, ResourceTable table) -#else private static void Print(StringBuilder builder, ResourceTable? table) -#endif { builder.AppendLine(" Resource Table Information:"); builder.AppendLine(" -------------------------"); @@ -225,13 +209,12 @@ namespace SabreTools.Printing foreach (var typeAndNameString in table.TypeAndNameStrings) { builder.AppendLine($" Resource Type/Name Offset {typeAndNameString.Key}"); -#if NET6_0_OR_GREATER if (typeAndNameString.Value == null) { builder.AppendLine(" [NULL]"); continue; } -#endif + builder.AppendLine(typeAndNameString.Value.Length, " Length"); builder.AppendLine(typeAndNameString.Value.Text, " Text", Encoding.ASCII); } @@ -239,11 +222,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, ResidentNameTableEntry[] entries) -#else private static void Print(StringBuilder builder, ResidentNameTableEntry?[]? entries) -#endif { builder.AppendLine(" Resident-Name Table Information:"); builder.AppendLine(" -------------------------"); @@ -271,11 +250,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, ModuleReferenceTableEntry[] entries, SabreTools.Models.MSDOS.ExecutableHeader stub, ExecutableHeader header) -#else private static void Print(StringBuilder builder, ModuleReferenceTableEntry?[]? entries, SabreTools.Models.MSDOS.ExecutableHeader? stub, ExecutableHeader? header) -#endif { builder.AppendLine(" Module-Reference Table Information:"); builder.AppendLine(" -------------------------"); @@ -297,20 +272,12 @@ namespace SabreTools.Printing continue; } -#if NET48 - builder.AppendLine($" Offset: {entry.Offset} (adjusted to be {entry.Offset + stub.NewExeHeaderAddr + header.ImportedNamesTableOffset})"); -#else builder.AppendLine($" Offset: {entry.Offset} (adjusted to be {entry.Offset + (stub?.NewExeHeaderAddr ?? 0) + (header?.ImportedNamesTableOffset ?? 0)})"); -#endif } builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, Dictionary entries) -#else private static void Print(StringBuilder builder, Dictionary? entries) -#endif { builder.AppendLine(" Imported-Name Table Information:"); builder.AppendLine(" -------------------------"); @@ -324,24 +291,19 @@ namespace SabreTools.Printing foreach (var entry in entries) { builder.AppendLine($" Imported-Name Table at Offset {entry.Key}"); -#if NET6_0_OR_GREATER - if (entry.Value == null) - { - builder.AppendLine(" [NULL]"); - continue; - } -#endif + if (entry.Value == null) + { + builder.AppendLine(" [NULL]"); + continue; + } + builder.AppendLine(entry.Value.Length, " Length"); builder.AppendLine(entry.Value.NameString, " Name string", Encoding.ASCII); } builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, EntryTableBundle[] entries) -#else private static void Print(StringBuilder builder, EntryTableBundle?[]? entries) -#endif { builder.AppendLine(" Entry Table Information:"); builder.AppendLine(" -------------------------"); @@ -381,11 +343,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, NonResidentNameTableEntry[] entries) -#else private static void Print(StringBuilder builder, NonResidentNameTableEntry?[]? entries) -#endif { builder.AppendLine(" Nonresident-Name Table Information:"); builder.AppendLine(" -------------------------"); diff --git a/Nitro.cs b/Nitro.cs index 39f1621..a130d56 100644 --- a/Nitro.cs +++ b/Nitro.cs @@ -18,11 +18,7 @@ namespace SabreTools.Printing Print(builder, cart.FileAllocationTable); } -#if NET48 - private static void Print(StringBuilder builder, CommonHeader header) -#else private static void Print(StringBuilder builder, CommonHeader? header) -#endif { builder.AppendLine(" Common Header Information:"); builder.AppendLine(" -------------------------"); @@ -76,11 +72,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, ExtendedDSiHeader header) -#else private static void Print(StringBuilder builder, ExtendedDSiHeader? header) -#endif { builder.AppendLine(" Extended DSi Header Information:"); builder.AppendLine(" -------------------------"); @@ -142,11 +134,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, byte[] secureArea) -#else private static void Print(StringBuilder builder, byte[]? secureArea) -#endif { builder.AppendLine(" Secure Area Information:"); builder.AppendLine(" -------------------------"); @@ -154,11 +142,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, NameTable table) -#else private static void Print(StringBuilder builder, NameTable? table) -#endif { builder.AppendLine(" Name Table Information:"); builder.AppendLine(" -------------------------"); @@ -174,11 +158,7 @@ namespace SabreTools.Printing Print(builder, table.NameList); } -#if NET48 - private static void Print(StringBuilder builder, FolderAllocationTableEntry[] entries) -#else private static void Print(StringBuilder builder, FolderAllocationTableEntry?[]? entries) -#endif { builder.AppendLine(" Folder Allocation Table:"); builder.AppendLine(" -------------------------"); @@ -215,11 +195,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, NameListEntry[] entries) -#else private static void Print(StringBuilder builder, NameListEntry?[]? entries) -#endif { builder.AppendLine(" Name List:"); builder.AppendLine(" -------------------------"); @@ -248,11 +224,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, FileAllocationTableEntry[] entries) -#else private static void Print(StringBuilder builder, FileAllocationTableEntry?[]? entries) -#endif { builder.AppendLine(" File Allocation Table:"); builder.AppendLine(" -------------------------"); diff --git a/PAK.cs b/PAK.cs index 5764d53..0a53c8f 100644 --- a/PAK.cs +++ b/PAK.cs @@ -15,11 +15,7 @@ namespace SabreTools.Printing Print(builder, file.DirectoryItems); } -#if NET48 - private static void Print(StringBuilder builder, Header header) -#else private static void Print(StringBuilder builder, Header? header) -#endif { builder.AppendLine(" Header Information:"); builder.AppendLine(" -------------------------"); @@ -36,11 +32,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, DirectoryItem[] entries) -#else private static void Print(StringBuilder builder, DirectoryItem?[]? entries) -#endif { builder.AppendLine(" Directory Items Information:"); builder.AppendLine(" -------------------------"); diff --git a/PFF.cs b/PFF.cs index 82c045a..7e61e8c 100644 --- a/PFF.cs +++ b/PFF.cs @@ -16,11 +16,7 @@ namespace SabreTools.Printing Print(builder, archive.Footer); } -#if NET48 - private static void Print(StringBuilder builder, Header header) -#else private static void Print(StringBuilder builder, Header? header) -#endif { builder.AppendLine(" Header Information:"); builder.AppendLine(" -------------------------"); @@ -39,11 +35,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, Segment[] segments) -#else private static void Print(StringBuilder builder, Segment?[]? segments) -#endif { builder.AppendLine(" Segments Information:"); builder.AppendLine(" -------------------------"); @@ -75,11 +67,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, Footer footer) -#else private static void Print(StringBuilder builder, Footer? footer) -#endif { builder.AppendLine(" Footer Information:"); builder.AppendLine(" -------------------------"); diff --git a/PlayJAudioFile.cs b/PlayJAudioFile.cs index 413a243..d841c12 100644 --- a/PlayJAudioFile.cs +++ b/PlayJAudioFile.cs @@ -25,11 +25,7 @@ namespace SabreTools.Printing } } -#if NET48 - private static void Print(StringBuilder builder, AudioHeader header) -#else private static void Print(StringBuilder builder, AudioHeader? header) -#endif { builder.AppendLine(" Audio Header Information:"); builder.AppendLine(" -------------------------"); @@ -103,11 +99,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, UnknownBlock1 block) -#else private static void Print(StringBuilder builder, UnknownBlock1? block) -#endif { builder.AppendLine(" Unknown Block 1 Information:"); builder.AppendLine(" -------------------------"); @@ -123,32 +115,22 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, uint value) -#else private static void Print(StringBuilder builder, uint? value) -#endif { builder.AppendLine(" Unknown Value 2 Information:"); builder.AppendLine(" -------------------------"); -#if NET6_0_OR_GREATER if (value == null) { builder.AppendLine(" No unknown block 1r"); builder.AppendLine(); return; } -#endif builder.AppendLine(value, " Value"); builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, UnknownBlock3 block) -#else private static void Print(StringBuilder builder, UnknownBlock3? block) -#endif { builder.AppendLine(" Unknown Block 3 Information:"); builder.AppendLine(" -------------------------"); @@ -163,11 +145,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, uint count, DataFile[] entries) -#else private static void Print(StringBuilder builder, uint count, DataFile?[]? entries) -#endif { builder.AppendLine(" Data Files Information:"); builder.AppendLine(" -------------------------"); diff --git a/PortableExecutable.cs b/PortableExecutable.cs index 59ebdb4..3fd4931 100644 --- a/PortableExecutable.cs +++ b/PortableExecutable.cs @@ -39,11 +39,7 @@ namespace SabreTools.Printing Print(builder, executable.ResourceDirectoryTable); } -#if NET48 - private static void Print(StringBuilder builder, SabreTools.Models.MSDOS.ExecutableHeader header) -#else private static void Print(StringBuilder builder, SabreTools.Models.MSDOS.ExecutableHeader? header) -#endif { builder.AppendLine(" MS-DOS Stub Header Information:"); builder.AppendLine(" -------------------------"); @@ -80,11 +76,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, string signature, COFFFileHeader header) -#else private static void Print(StringBuilder builder, string? signature, COFFFileHeader? header) -#endif { builder.AppendLine(" COFF File Header Information:"); builder.AppendLine(" -------------------------"); @@ -106,11 +98,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, OptionalHeader header, SectionHeader[] table) -#else private static void Print(StringBuilder builder, OptionalHeader? header, SectionHeader?[]? table) -#endif { builder.AppendLine(" Optional Header Information:"); builder.AppendLine(" -------------------------"); @@ -282,11 +270,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, SectionHeader[] table) -#else private static void Print(StringBuilder builder, SectionHeader?[]? table) -#endif { builder.AppendLine(" Section Table Information:"); builder.AppendLine(" -------------------------"); @@ -297,11 +281,7 @@ namespace SabreTools.Printing return; } -#if NET48 - for (int i = 0; i < table.Length; i++) -#else - for (int i = 0; i < table!.Length; i++) -#endif + for (int i = 0; i < table!.Length; i++) { var entry = table[i]; builder.AppendLine($" Section Table Entry {i}"); @@ -328,11 +308,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, COFFSymbolTableEntry[] symbolTable) -#else private static void Print(StringBuilder builder, COFFSymbolTableEntry?[]? symbolTable) -#endif { builder.AppendLine(" COFF Symbol Table Information:"); builder.AppendLine(" -------------------------"); @@ -468,11 +444,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, COFFStringTable stringTable) -#else private static void Print(StringBuilder builder, COFFStringTable? stringTable) -#endif { builder.AppendLine(" COFF String Table Information:"); builder.AppendLine(" -------------------------"); @@ -486,22 +458,14 @@ namespace SabreTools.Printing builder.AppendLine(stringTable.TotalSize, " Total size"); for (int i = 0; i < stringTable.Strings.Length; i++) { -#if NET48 - string entry = stringTable.Strings[i]; -#else string? entry = stringTable.Strings[i]; -#endif builder.AppendLine($" COFF String Table Entry {i})"); builder.AppendLine(entry, " Value"); } builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, AttributeCertificateTableEntry[] entries) -#else private static void Print(StringBuilder builder, AttributeCertificateTableEntry?[]? entries) -#endif { builder.AppendLine(" Attribute Certificate Table Information:"); builder.AppendLine(" -------------------------"); @@ -570,11 +534,7 @@ namespace SabreTools.Printing } } -#if NET48 - private static void Print(StringBuilder builder, DelayLoadDirectoryTable table) -#else private static void Print(StringBuilder builder, DelayLoadDirectoryTable? table) -#endif { builder.AppendLine(" Delay-Load Directory Table Information:"); builder.AppendLine(" -------------------------"); @@ -596,11 +556,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, BaseRelocationBlock[] entries, SectionHeader[] table) -#else private static void Print(StringBuilder builder, BaseRelocationBlock?[]? entries, SectionHeader?[]? table) -#endif { builder.AppendLine(" Base Relocation Table Information:"); builder.AppendLine(" -------------------------"); @@ -637,13 +593,12 @@ namespace SabreTools.Printing { var typeOffsetFieldEntry = baseRelocationTableEntry.TypeOffsetFieldEntries[j]; builder.AppendLine($" Type and Offset Entry {j}"); -#if NET6_0_OR_GREATER - if (typeOffsetFieldEntry == null) - { - builder.AppendLine(" [NULL]"); - continue; - } -#endif + if (typeOffsetFieldEntry == null) + { + builder.AppendLine(" [NULL]"); + continue; + } + builder.AppendLine($" Type: {typeOffsetFieldEntry.BaseRelocationType} (0x{typeOffsetFieldEntry.BaseRelocationType:X})"); builder.AppendLine(typeOffsetFieldEntry.Offset, " Offset"); } @@ -651,11 +606,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, DebugTable table) -#else private static void Print(StringBuilder builder, DebugTable? table) -#endif { builder.AppendLine(" Debug Table Information:"); builder.AppendLine(" -------------------------"); @@ -689,11 +640,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, ExportTable table) -#else private static void Print(StringBuilder builder, ExportTable? table) -#endif { builder.AppendLine(" Export Table Information:"); builder.AppendLine(" -------------------------"); @@ -802,11 +749,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, ImportTable table, SectionHeader[] sectionTable) -#else private static void Print(StringBuilder builder, ImportTable? table, SectionHeader?[]? sectionTable) -#endif { builder.AppendLine(" Import Table Information:"); builder.AppendLine(" -------------------------"); @@ -967,11 +910,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, ResourceDirectoryTable table) -#else private static void Print(StringBuilder builder, ResourceDirectoryTable? table) -#endif { builder.AppendLine(" Resource Directory Table Information:"); builder.AppendLine(" -------------------------"); @@ -1165,11 +1104,7 @@ namespace SabreTools.Printing { string padding = new string(' ', (level + 1) * 2); -#if NET48 - MenuResource menu = null; -#else MenuResource? menu = null; -#endif try { menu = entry.AsMenu(); } catch { } if (menu == null) { @@ -1259,11 +1194,7 @@ namespace SabreTools.Printing { string padding = new string(' ', (level + 1) * 2); -#if NET48 - DialogBoxResource dialogBox = null; -#else DialogBoxResource? dialogBox = null; -#endif try { dialogBox = entry.AsDialogBox(); } catch { } if (dialogBox == null) { @@ -1398,11 +1329,7 @@ namespace SabreTools.Printing { string padding = new string(' ', (level + 1) * 2); -#if NET48 - Dictionary stringTable = null; -#else Dictionary? stringTable = null; -#endif try { stringTable = entry.AsStringTable(); } catch { } if (stringTable == null) { @@ -1413,11 +1340,7 @@ namespace SabreTools.Printing foreach (var kvp in stringTable) { int index = kvp.Key; -#if NET48 - string stringValue = kvp.Value; -#else string? stringValue = kvp.Value; -#endif builder.AppendLine(stringValue, $"{padding}String entry {index}"); } } @@ -1438,11 +1361,7 @@ namespace SabreTools.Printing { string padding = new string(' ', (level + 1) * 2); -#if NET48 - AcceleratorTableEntry[] acceleratorTable = null; -#else AcceleratorTableEntry[]? acceleratorTable = null; -#endif try { acceleratorTable = entry.AsAcceleratorTableResource(); } catch { } if (acceleratorTable == null) { @@ -1474,11 +1393,7 @@ namespace SabreTools.Printing else { int offset = 0; -#if NET48 - byte[] magic = entry.Data.ReadBytes(ref offset, Math.Min(entry.Data.Length, 16)); -#else byte[]? magic = entry.Data.ReadBytes(ref offset, Math.Min(entry.Data.Length, 16)); -#endif if (magic == null) { @@ -1512,11 +1427,7 @@ namespace SabreTools.Printing { string padding = new string(' ', (level + 1) * 2); -#if NET48 - MessageResourceData messageTable = null; -#else MessageResourceData? messageTable = null; -#endif try { messageTable = entry.AsMessageResourceData(); } catch { } if (messageTable == null) { @@ -1595,11 +1506,7 @@ namespace SabreTools.Printing { string padding = new string(' ', (level + 1) * 2); -#if NET48 - VersionInfo versionInfo = null; -#else VersionInfo? versionInfo = null; -#endif try { versionInfo = entry.AsVersionInfo(); } catch { } if (versionInfo == null) { @@ -1763,11 +1670,7 @@ namespace SabreTools.Printing { string padding = new string(' ', (level + 1) * 2); -#if NET48 - AssemblyManifest assemblyManifest = null; -#else AssemblyManifest? assemblyManifest = null; -#endif try { assemblyManifest = entry.AsAssemblyManifest(); } catch { } if (assemblyManifest == null) { @@ -2001,12 +1904,8 @@ namespace SabreTools.Printing else { int offset = 0; -#if NET48 - byte[] magic = entry.Data.ReadBytes(ref offset, Math.Min(entry.Data.Length, 16)); -#else - byte[]? magic = entry.Data.ReadBytes(ref offset, Math.Min(entry.Data.Length, 16)); -#endif + byte[]? magic = entry.Data.ReadBytes(ref offset, Math.Min(entry.Data.Length, 16)); if (magic == null) { // No-op diff --git a/Quantum.cs b/Quantum.cs index 83f878e..dcb72e3 100644 --- a/Quantum.cs +++ b/Quantum.cs @@ -17,11 +17,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, Header header) -#else private static void Print(StringBuilder builder, Header? header) -#endif { builder.AppendLine(" Header Information:"); builder.AppendLine(" -------------------------"); @@ -41,11 +37,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, FileDescriptor[] entries) -#else private static void Print(StringBuilder builder, FileDescriptor?[]? entries) -#endif { builder.AppendLine(" File List Information:"); builder.AppendLine(" -------------------------"); diff --git a/SGA.cs b/SGA.cs index 55507ee..8ac883f 100644 --- a/SGA.cs +++ b/SGA.cs @@ -19,11 +19,7 @@ namespace SabreTools.Printing // TODO: Should we print the string table? } -#if NET48 - private static void Print(StringBuilder builder, Header header) -#else private static void Print(StringBuilder builder, Header? header) -#endif { builder.AppendLine(" Header Information:"); builder.AppendLine(" -------------------------"); @@ -58,11 +54,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, Directory directory) -#else private static void Print(StringBuilder builder, Directory? directory) -#endif { builder.AppendLine(" Directory Information:"); builder.AppendLine(" -------------------------"); @@ -110,11 +102,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, DirectoryHeader4 header) -#else private static void Print(StringBuilder builder, DirectoryHeader4? header) -#endif { builder.AppendLine(" Directory Header Information:"); builder.AppendLine(" -------------------------"); @@ -136,11 +124,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, DirectoryHeader5 header) -#else private static void Print(StringBuilder builder, DirectoryHeader5? header) -#endif { builder.AppendLine(" Directory Header Information:"); builder.AppendLine(" -------------------------"); @@ -162,11 +146,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, DirectoryHeader7 header) -#else private static void Print(StringBuilder builder, DirectoryHeader7? header) -#endif { builder.AppendLine(" Directory Header Information:"); builder.AppendLine(" -------------------------"); @@ -190,11 +170,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, Section4[] sections) -#else private static void Print(StringBuilder builder, Section4?[]? sections) -#endif { builder.AppendLine(" Sections Information:"); builder.AppendLine(" -------------------------"); @@ -226,11 +202,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, Section5[] sections) -#else private static void Print(StringBuilder builder, Section5?[]? sections) -#endif { builder.AppendLine(" Sections Information:"); builder.AppendLine(" -------------------------"); @@ -262,11 +234,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, Folder4[] folders) -#else private static void Print(StringBuilder builder, Folder4?[]? folders) -#endif { builder.AppendLine(" Folders Information:"); builder.AppendLine(" -------------------------"); @@ -297,11 +265,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, Folder5[] folders) -#else private static void Print(StringBuilder builder, Folder5?[]? folders) -#endif { builder.AppendLine(" Folders Information:"); builder.AppendLine(" -------------------------"); @@ -332,11 +296,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, File4[] files) -#else private static void Print(StringBuilder builder, File4?[]? files) -#endif { builder.AppendLine(" Files Information:"); builder.AppendLine(" -------------------------"); @@ -369,11 +329,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, File6[] files) -#else private static void Print(StringBuilder builder, File6?[]? files) -#endif { builder.AppendLine(" Files Information:"); builder.AppendLine(" -------------------------"); @@ -407,11 +363,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, File7[] files) -#else private static void Print(StringBuilder builder, File7?[]? files) -#endif { builder.AppendLine(" Files Information:"); builder.AppendLine(" -------------------------"); diff --git a/SabreTools.Printing.csproj b/SabreTools.Printing.csproj index e6c5d7e..cf9ccf7 100644 --- a/SabreTools.Printing.csproj +++ b/SabreTools.Printing.csproj @@ -4,8 +4,10 @@ net48;net6.0;net7.0;net8.0 win-x86;win-x64;linux-x64;osx-x64 + latest + enable + true 1.1.2 - true Matt Nadareski @@ -19,10 +21,6 @@ MIT - - enable - - diff --git a/VBSP.cs b/VBSP.cs index e887a52..011f500 100644 --- a/VBSP.cs +++ b/VBSP.cs @@ -15,11 +15,7 @@ namespace SabreTools.Printing Print(builder, file.Header); } -#if NET48 - private static void Print(StringBuilder builder, Header header) -#else private static void Print(StringBuilder builder, Header? header) -#endif { builder.AppendLine(" Header Information:"); builder.AppendLine(" -------------------------"); @@ -38,11 +34,7 @@ namespace SabreTools.Printing Print(builder, header.Lumps); } -#if NET48 - private static void Print(StringBuilder builder, Lump[] lumps) -#else private static void Print(StringBuilder builder, Lump?[]? lumps) -#endif { builder.AppendLine(" Lumps Information:"); builder.AppendLine(" -------------------------"); diff --git a/VPK.cs b/VPK.cs index 6cd2b1b..81320df 100644 --- a/VPK.cs +++ b/VPK.cs @@ -17,11 +17,7 @@ namespace SabreTools.Printing Print(builder, file.DirectoryItems); } -#if NET48 - private static void Print(StringBuilder builder, Header header) -#else private static void Print(StringBuilder builder, Header? header) -#endif { builder.AppendLine(" Header Information:"); builder.AppendLine(" -------------------------"); @@ -38,11 +34,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, ExtendedHeader header) -#else private static void Print(StringBuilder builder, ExtendedHeader? header) -#endif { builder.AppendLine(" Extended Header Information:"); builder.AppendLine(" -------------------------"); @@ -60,11 +52,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, ArchiveHash[] entries) -#else private static void Print(StringBuilder builder, ArchiveHash?[]? entries) -#endif { builder.AppendLine(" Archive Hashes Information:"); builder.AppendLine(" -------------------------"); @@ -93,11 +81,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, DirectoryItem[] entries) -#else private static void Print(StringBuilder builder, DirectoryItem?[]? entries) -#endif { builder.AppendLine(" Directory Items Information:"); builder.AppendLine(" -------------------------"); @@ -130,11 +114,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, DirectoryEntry entry) -#else private static void Print(StringBuilder builder, DirectoryEntry? entry) -#endif { builder.AppendLine(" Directory Entry:"); builder.AppendLine(" -------------------------"); diff --git a/WAD.cs b/WAD.cs index a2e3621..e87b866 100644 --- a/WAD.cs +++ b/WAD.cs @@ -16,11 +16,7 @@ namespace SabreTools.Printing Print(builder, file.LumpInfos); } -#if NET48 - private static void Print(StringBuilder builder, Header header) -#else private static void Print(StringBuilder builder, Header? header) -#endif { builder.AppendLine(" Header Information:"); builder.AppendLine(" -------------------------"); @@ -37,11 +33,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, Lump[] entries) -#else private static void Print(StringBuilder builder, Lump?[]? entries) -#endif { builder.AppendLine(" Lumps Information:"); builder.AppendLine(" -------------------------"); @@ -74,11 +66,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, LumpInfo[] entries) -#else private static void Print(StringBuilder builder, LumpInfo?[]? entries) -#endif { builder.AppendLine(" Lump Infos Information:"); builder.AppendLine(" -------------------------"); diff --git a/XZP.cs b/XZP.cs index 58ad678..f416016 100644 --- a/XZP.cs +++ b/XZP.cs @@ -19,11 +19,7 @@ namespace SabreTools.Printing Print(builder, file.Footer); } -#if NET48 - private static void Print(StringBuilder builder, Header header) -#else private static void Print(StringBuilder builder, Header? header) -#endif { builder.AppendLine(" Header Information:"); builder.AppendLine(" -------------------------"); @@ -46,11 +42,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, DirectoryEntry[] entries, string prefix) -#else private static void Print(StringBuilder builder, DirectoryEntry?[]? entries, string prefix) -#endif { builder.AppendLine($" {prefix} Entries Information:"); builder.AppendLine(" -------------------------"); @@ -78,11 +70,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, DirectoryMapping[] entries) -#else private static void Print(StringBuilder builder, DirectoryMapping?[]? entries) -#endif { builder.AppendLine(" Preload Directory Mappings Information:"); builder.AppendLine(" -------------------------"); @@ -108,11 +96,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, DirectoryItem[] entries) -#else private static void Print(StringBuilder builder, DirectoryItem?[]? entries) -#endif { builder.AppendLine(" Directory Items Information:"); builder.AppendLine(" -------------------------"); @@ -141,11 +125,7 @@ namespace SabreTools.Printing builder.AppendLine(); } -#if NET48 - private static void Print(StringBuilder builder, Footer footer) -#else private static void Print(StringBuilder builder, Footer? footer) -#endif { builder.AppendLine(" Footer Information:"); builder.AppendLine(" -------------------------");