In-depth cleanup with .NET 10 concepts

Author: mnadareski

SabreTools.Serialization/Extensions/CDROM.cs

@@ -138,24 +138,15 @@ public ISO9660Stream(Stream inputStream)
 
             /// <inheritdoc/>
             public override long Length
-            {
-                get
-                {
-                    return (_baseStream.Length / Constants.CDROMSectorSize) * _isoSectorSize;
-                }
-            }
+                => (_baseStream.Length / Constants.CDROMSectorSize) * _isoSectorSize;
 
             /// <inheritdoc/>
             public override void SetLength(long value)
-            {
-                throw new NotSupportedException("Setting the length of this stream is not supported.");
-            }
+                => throw new NotSupportedException("Setting the length of this stream is not supported.");
 
             /// <inheritdoc/>
             public override void Write(byte[] buffer, int offset, int count)
-            {
-                throw new NotSupportedException("Writing to this stream is not supported.");
-            }
+                => throw new NotSupportedException("Writing to this stream is not supported.");
 
             /// <inheritdoc/>
             protected override void Dispose(bool disposing)

SabreTools.Serialization/Extensions/PortableExecutable.cs

@@ -18,10 +18,10 @@ public static class PortableExecutable
         /// <param name="rva">Relative virtual address to convert</param>
         /// <param name="sections">Array of sections to check against</param>
         /// <returns>Physical address, 0 on error</returns>
-        public static uint ConvertVirtualAddress(this uint rva, SectionHeader[]? sections)
+        public static uint ConvertVirtualAddress(this uint rva, SectionHeader[] sections)
         {
             // If we have an invalid section table, we can't do anything
-            if (sections == null || sections.Length == 0)
+            if (sections.Length == 0)
                 return 0;
 
             // If the RVA is 0, we just return 0 because it's invalid
@@ -69,7 +69,7 @@ public static uint ConvertVirtualAddress(this uint rva, SectionHeader[]? section
         /// <param name="rva">Relative virtual address to convert</param>
         /// <param name="sections">Array of sections to check against</param>
         /// <returns>Section index, null on error</returns>
-        public static int ContainingSectionIndex(this uint rva, SectionHeader[]? sections)
+        public static int ContainingSectionIndex(this uint rva, SectionHeader[] sections)
         {
             // If we have an invalid section table, we can't do anything
             if (sections == null || sections.Length == 0)
@@ -1282,10 +1282,10 @@ public static PopupMenuItem ParsePopupMenuItem(this byte[] data, ref int offset)
         /// <param name="data">Data to parse</param>
         /// <param name="offset">Offset into the byte array</param>
         /// <returns>A filled ResourceHeader on success, null on error</returns>
-        public static Data.Models.PortableExecutable.Resource.ResourceHeader ParseResourceHeader(this byte[] data, ref int offset)
+        public static Models.PortableExecutable.Resource.ResourceHeader ParseResourceHeader(this byte[] data, ref int offset)
         {
             // Read in the table
-            var obj = new Data.Models.PortableExecutable.Resource.ResourceHeader();
+            var obj = new Models.PortableExecutable.Resource.ResourceHeader();
 
             obj.DataSize = data.ReadUInt32LittleEndian(ref offset);
             obj.HeaderSize = data.ReadUInt32LittleEndian(ref offset);

SabreTools.Serialization/Extensions/TypeLengthValue.cs

@@ -13,7 +13,7 @@ public static class TypeLengthValue
         /// </summary>
         /// <param name="paddingLevel">Padding level of the item when formatting</param>
         /// <returns>String representing the TypeLengthValue, if possible</returns>
-        public static string Format(this Data.Models.ASN1.TypeLengthValue tlv, int paddingLevel = 0)
+        public static string Format(this Models.ASN1.TypeLengthValue tlv, int paddingLevel = 0)
         {
             // Create the left-padding string
             string padding = new(' ', paddingLevel);
@@ -38,7 +38,7 @@ public static string Format(this Data.Models.ASN1.TypeLengthValue tlv, int paddi
             if (tlv.Type.HasFlag(ASN1Type.V_ASN1_CONSTRUCTED))
 #endif
             {
-                if (tlv.Value is not SabreTools.Data.Models.ASN1.TypeLengthValue[] valueAsObjectArray)
+                if (tlv.Value is not Models.ASN1.TypeLengthValue[] valueAsObjectArray)
                 {
                     formatBuilder.Append(", Value: [INVALID DATA TYPE]");
                     return formatBuilder.ToString();

SabreTools.Serialization/Readers/AACS.cs

@@ -65,9 +65,7 @@ public class AACS : BaseBinaryReader<MediaKeyBlock>
         private static Record? ParseRecord(Stream data)
         {
             // The first 4 bytes are the type and length
-            RecordType type = (RecordType)data.ReadByteValue();
-            uint recordLength = data.ReadUInt24LittleEndian();
-            data.SeekIfPossible(-4, SeekOrigin.Current);
+            RecordType type = (RecordType)data.PeekByteValue();
 
             // Create a record based on the type
             return type switch

SabreTools.Serialization/Readers/PortableExecutable.cs

@@ -293,6 +293,7 @@ public class PortableExecutable : BaseBinaryReader<Executable>
 
                 #endregion
 
+                // TODO: Pre-parse known resource types
                 #region Resource Directory Table
 
                 // Should also be in a '.rsrc' section

SabreTools.Serialization/Wrappers/CFB.Extraction.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using System.Text;
 using SabreTools.Data.Models.CFB;
-#if NETFRAMEWORK || NETSTANDARD
+#if NETFRAMEWORK || NETSTANDARD2_0
 using SabreTools.IO.Extensions;
 #endif
 

SabreTools.Serialization/Wrappers/CHD.Printing.cs

@@ -37,7 +37,7 @@ public void PrintInformation(StringBuilder builder)
                     Print(builder, v5);
                     break;
                 default:
-                    builder.AppendLine("Unrecognized header type");
+                    builder.AppendLine($"Unrecognized header type: {Model}");
                     builder.AppendLine();
                     break;
             }

SabreTools.Serialization/Wrappers/IExtractable.cs

@@ -3,6 +3,7 @@ namespace SabreTools.Serialization.Wrappers
     /// <summary>
     /// Represents an item that is extractable
     /// </summary>
+    /// TODO: Investigate whether it's possible to do an ExtractToStream
     public interface IExtractable
     {
         /// <summary>

SabreTools.Serialization/Wrappers/ISO9660.Printing.cs

@@ -31,9 +31,9 @@ public void PrintInformation(StringBuilder builder)
             Print(builder, Model.DirectoryDescriptors, encoding);
         }
 
-        protected static void Print(StringBuilder builder, byte[]? systemArea)
+        protected static void Print(StringBuilder builder, byte[] systemArea)
         {
-            if (systemArea == null || systemArea.Length == 0)
+            if (systemArea.Length == 0)
                 builder.AppendLine(systemArea, "  System Area");
             else if (Array.TrueForAll(systemArea, b => b == 0))
                 builder.AppendLine("Zeroed", "  System Area");

SabreTools.Serialization/Wrappers/InstallShieldArchiveV3.cs

@@ -94,8 +94,6 @@ public Dictionary<int, int> FileDirMap
 
                 return field;
             }
-
-            private set;
         } = null;
 
         /// <summary>