Add nuget package and PR workflows

.github/workflows/build_nupkg.yml

@@ -0,0 +1,43 @@
+name: Nuget Pack
+
+on:
+  push:
+    branches: [ "main" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: recursive
+    
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 8.0.x
+        
+    - name: Restore dependencies
+      run: dotnet restore
+      
+    - name: Pack
+      run: dotnet pack
+
+    - name: Upload build
+      uses: actions/upload-artifact@v4
+      with:
+        name: 'Nuget Package'
+        path: 'bin/Release/*.nupkg'
+
+    - name: Upload to rolling
+      uses: ncipollo/release-action@v1.14.0
+      with:
+        allowUpdates: True
+        artifacts: 'bin/Release/*.nupkg'
+        body: 'Last built commit: ${{ github.sha }}'
+        name: 'Rolling Release'
+        prerelease: True
+        replacesArtifacts: True
+        tag: "rolling"
+        updateOnlyUnreleased: True

.github/workflows/check_pr.yml

@@ -0,0 +1,17 @@
+name: Build PR
+
+on: [pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 8.0.x
+      
+    - name: Build
+      run: dotnet build

Extensions.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Text;
 
 namespace SabreTools.Printing
@@ -12,7 +13,7 @@ namespace SabreTools.Printing
         public static StringBuilder AppendLine(this StringBuilder sb, bool? value, string prefixString)
         {
             value ??= false;
-            return sb.AppendLine($"{prefixString}: {value.ToString()}");
+            return sb.AppendLine($"{prefixString}: {value}");
         }
 
         /// <summary>
@@ -147,7 +148,7 @@ namespace SabreTools.Printing
         /// </summary>
         public static StringBuilder AppendLine(this StringBuilder sb, char[]? value, string prefixString)
         {
-            string valueString = (value == null ? "[NULL]" : string.Join(", ", value));
+            string valueString = (value == null ? "[NULL]" : string.Join(", ", value.Select(c => c.ToString()).ToArray()));
             return sb.AppendLine($"{prefixString}: {valueString}");
         }
 
@@ -156,7 +157,7 @@ namespace SabreTools.Printing
         /// </summary>
         public static StringBuilder AppendLine(this StringBuilder sb, short[]? value, string prefixString)
         {
-            string valueString = (value == null ? "[NULL]" : string.Join(", ", value));
+            string valueString = (value == null ? "[NULL]" : string.Join(", ", value.Select(s => s.ToString()).ToArray()));
             return sb.AppendLine($"{prefixString}: {valueString}");
         }
 
@@ -165,7 +166,7 @@ namespace SabreTools.Printing
         /// </summary>
         public static StringBuilder AppendLine(this StringBuilder sb, ushort[]? value, string prefixString)
         {
-            string valueString = (value == null ? "[NULL]" : string.Join(", ", value));
+            string valueString = (value == null ? "[NULL]" : string.Join(", ", value.Select(u => u.ToString()).ToArray()));
             return sb.AppendLine($"{prefixString}: {valueString}");
         }
 
@@ -174,7 +175,7 @@ namespace SabreTools.Printing
         /// </summary>
         public static StringBuilder AppendLine(this StringBuilder sb, int[]? value, string prefixString)
         {
-            string valueString = (value == null ? "[NULL]" : string.Join(", ", value));
+            string valueString = (value == null ? "[NULL]" : string.Join(", ", value.Select(i => i.ToString()).ToArray()));
             return sb.AppendLine($"{prefixString}: {valueString}");
         }
 
@@ -183,7 +184,7 @@ namespace SabreTools.Printing
         /// </summary>
         public static StringBuilder AppendLine(this StringBuilder sb, uint[]? value, string prefixString)
         {
-            string valueString = (value == null ? "[NULL]" : string.Join(", ", value));
+            string valueString = (value == null ? "[NULL]" : string.Join(", ", value.Select(u => u.ToString()).ToArray()));
             return sb.AppendLine($"{prefixString}: {valueString}");
         }
 
@@ -192,7 +193,7 @@ namespace SabreTools.Printing
         /// </summary>
         public static StringBuilder AppendLine(this StringBuilder sb, long[]? value, string prefixString)
         {
-            string valueString = (value == null ? "[NULL]" : string.Join(", ", value));
+            string valueString = (value == null ? "[NULL]" : string.Join(", ", value.Select(l => l.ToString()).ToArray()));
             return sb.AppendLine($"{prefixString}: {valueString}");
         }
 
@@ -201,7 +202,7 @@ namespace SabreTools.Printing
         /// </summary>
         public static StringBuilder AppendLine(this StringBuilder sb, ulong[]? value, string prefixString)
         {
-            string valueString = (value == null ? "[NULL]" : string.Join(", ", value));
+            string valueString = (value == null ? "[NULL]" : string.Join(", ", value.Select(u => u.ToString()).ToArray()));
             return sb.AppendLine($"{prefixString}: {valueString}");
         }
     }

LinearExecutable.cs

@@ -1,5 +1,6 @@
 using System.Text;
 using SabreTools.Models.LinearExecutable;
+using SabreTools.Models.MicrosoftCabinet;
 
 namespace SabreTools.Printing
 {
@@ -447,25 +448,45 @@ namespace SabreTools.Printing
                 builder.AppendLine($"    Target flags: {entry.TargetFlags} (0x{entry.TargetFlags:X})");
 
                 // Source list flag
+#if NET20 || NET35
+                if ((entry.SourceType & FixupRecordSourceType.SourceListFlag) != 0)
+#else
                 if (entry.SourceType.HasFlag(FixupRecordSourceType.SourceListFlag))
+#endif
                     builder.AppendLine(entry.SourceOffsetListCount, "    Source offset list count");
                 else
                     builder.AppendLine(entry.SourceOffset, "    Source offset");
 
                 // OBJECT / TRGOFF
+#if NET20 || NET35
+                if ((entry.TargetFlags & FixupRecordTargetFlags.InternalReference) != 0)
+#else
                 if (entry.TargetFlags.HasFlag(FixupRecordTargetFlags.InternalReference))
+#endif
                 {
                     // 16-bit Object Number/Module Ordinal Flag
+#if NET20 || NET35
+                    if ((entry.TargetFlags & FixupRecordTargetFlags.SixteenBitObjectNumberModuleOrdinalFlag) != 0)
+#else
                     if (entry.TargetFlags.HasFlag(FixupRecordTargetFlags.SixteenBitObjectNumberModuleOrdinalFlag))
+#endif
                         builder.AppendLine(entry.TargetObjectNumberWORD, "    Target object number");
                     else
                         builder.AppendLine(entry.TargetObjectNumberByte, "    Target object number");
 
                     // 16-bit Selector fixup
+#if NET20 || NET35
+                    if ((entry.SourceType & FixupRecordSourceType.SixteenBitSelectorFixup) != 0)
+#else
                     if (!entry.SourceType.HasFlag(FixupRecordSourceType.SixteenBitSelectorFixup))
+#endif
                     {
                         // 32-bit Target Offset Flag
+#if NET20 || NET35
+                        if ((entry.TargetFlags & FixupRecordTargetFlags.ThirtyTwoBitTargetOffsetFlag) != 0)
+#else
                         if (entry.TargetFlags.HasFlag(FixupRecordTargetFlags.ThirtyTwoBitTargetOffsetFlag))
+#endif
                             builder.AppendLine(entry.TargetOffsetDWORD, "    Target offset");
                         else
                             builder.AppendLine(entry.TargetOffsetWORD, "    Target offset");
@@ -473,27 +494,51 @@ namespace SabreTools.Printing
                 }
 
                 // MOD ORD# / IMPORT ORD / ADDITIVE
+#if NET20 || NET35
+                else if ((entry.TargetFlags & FixupRecordTargetFlags.ImportedReferenceByOrdinal) != 0)
+#else
                 else if (entry.TargetFlags.HasFlag(FixupRecordTargetFlags.ImportedReferenceByOrdinal))
+#endif
                 {
                     // 16-bit Object Number/Module Ordinal Flag
-                    if (entry.TargetFlags.HasFlag(FixupRecordTargetFlags.SixteenBitObjectNumberModuleOrdinalFlag))
+#if NET20 || NET35
+                    if ((entry.TargetFlags & FixupRecordTargetFlags.SixteenBitObjectNumberModuleOrdinalFlag) != 0)
+#else
+                    if (!entry.TargetFlags.HasFlag(FixupRecordTargetFlags.SixteenBitObjectNumberModuleOrdinalFlag))
+#endif
                         builder.AppendLine(entry.OrdinalIndexImportModuleNameTableWORD, "    Ordinal index import module name table");
                     else
                         builder.AppendLine(entry.OrdinalIndexImportModuleNameTableByte, "    Ordinal index import module name table");
 
                     // 8-bit Ordinal Flag & 32-bit Target Offset Flag
-                    if (entry.TargetFlags.HasFlag(FixupRecordTargetFlags.EightBitOrdinalFlag))
+#if NET20 || NET35
+                    if ((entry.TargetFlags & FixupRecordTargetFlags.EightBitOrdinalFlag) != 0)
+#else
+                    if (!entry.TargetFlags.HasFlag(FixupRecordTargetFlags.EightBitOrdinalFlag))
+#endif
                         builder.AppendLine(entry.ImportedOrdinalNumberByte, "    Imported ordinal number");
-                    else if (entry.TargetFlags.HasFlag(FixupRecordTargetFlags.ThirtyTwoBitTargetOffsetFlag))
+#if NET20 || NET35
+                    else if ((entry.TargetFlags & FixupRecordTargetFlags.ThirtyTwoBitTargetOffsetFlag) != 0)
+#else
+                    else if (!entry.TargetFlags.HasFlag(FixupRecordTargetFlags.ThirtyTwoBitTargetOffsetFlag))
+#endif
                         builder.AppendLine(entry.ImportedOrdinalNumberDWORD, "    Imported ordinal number");
                     else
                         builder.AppendLine(entry.ImportedOrdinalNumberWORD, "    Imported ordinal number");
 
                     // Additive Fixup Flag
-                    if (entry.TargetFlags.HasFlag(FixupRecordTargetFlags.AdditiveFixupFlag))
+#if NET20 || NET35
+                    if ((entry.TargetFlags & FixupRecordTargetFlags.AdditiveFixupFlag) != 0)
+#else
+                    if (!entry.TargetFlags.HasFlag(FixupRecordTargetFlags.AdditiveFixupFlag))
+#endif
                     {
                         // 32-bit Additive Flag
-                        if (entry.TargetFlags.HasFlag(FixupRecordTargetFlags.ThirtyTwoBitAdditiveFixupFlag))
+#if NET20 || NET35
+                        if ((entry.TargetFlags & FixupRecordTargetFlags.ThirtyTwoBitAdditiveFixupFlag) != 0)
+#else
+                        if (!entry.TargetFlags.HasFlag(FixupRecordTargetFlags.ThirtyTwoBitAdditiveFixupFlag))
+#endif
                             builder.AppendLine(entry.AdditiveFixupValueDWORD, "    Additive fixup value");
                         else
                             builder.AppendLine(entry.AdditiveFixupValueWORD, "    Additive fixup value");
@@ -501,25 +546,45 @@ namespace SabreTools.Printing
                 }
 
                 // MOD ORD# / PROCEDURE NAME OFFSET / ADDITIVE
+#if NET20 || NET35
+                else if ((entry.TargetFlags & FixupRecordTargetFlags.ImportedReferenceByName) != 0)
+#else
                 else if (entry.TargetFlags.HasFlag(FixupRecordTargetFlags.ImportedReferenceByName))
+#endif
                 {
                     // 16-bit Object Number/Module Ordinal Flag
-                    if (entry.TargetFlags.HasFlag(FixupRecordTargetFlags.SixteenBitObjectNumberModuleOrdinalFlag))
+#if NET20 || NET35
+                    if ((entry.TargetFlags & FixupRecordTargetFlags.SixteenBitObjectNumberModuleOrdinalFlag) != 0)
+#else
+                    if (!entry.TargetFlags.HasFlag(FixupRecordTargetFlags.SixteenBitObjectNumberModuleOrdinalFlag))
+#endif
                         builder.AppendLine(entry.OrdinalIndexImportModuleNameTableWORD, "    Ordinal index import module name table");
                     else
                         builder.AppendLine(entry.OrdinalIndexImportModuleNameTableByte, "    Ordinal index import module name table");
 
                     // 32-bit Target Offset Flag
-                    if (entry.TargetFlags.HasFlag(FixupRecordTargetFlags.ThirtyTwoBitTargetOffsetFlag))
+#if NET20 || NET35
+                    if ((entry.TargetFlags & FixupRecordTargetFlags.ThirtyTwoBitTargetOffsetFlag) != 0)
+#else
+                    if (!entry.TargetFlags.HasFlag(FixupRecordTargetFlags.ThirtyTwoBitTargetOffsetFlag))
+#endif
                         builder.AppendLine(entry.OffsetImportProcedureNameTableDWORD, "    Offset import procedure name table");
                     else
                         builder.AppendLine(entry.OffsetImportProcedureNameTableWORD, "    Offset import procedure name table");
 
                     // Additive Fixup Flag
-                    if (entry.TargetFlags.HasFlag(FixupRecordTargetFlags.AdditiveFixupFlag))
+#if NET20 || NET35
+                    if ((entry.TargetFlags & FixupRecordTargetFlags.AdditiveFixupFlag) != 0)
+#else
+                    if (!entry.TargetFlags.HasFlag(FixupRecordTargetFlags.AdditiveFixupFlag))
+#endif
                     {
                         // 32-bit Additive Flag
-                        if (entry.TargetFlags.HasFlag(FixupRecordTargetFlags.ThirtyTwoBitAdditiveFixupFlag))
+#if NET20 || NET35
+                        if ((entry.TargetFlags & FixupRecordTargetFlags.ThirtyTwoBitAdditiveFixupFlag) != 0)
+#else
+                        if (!entry.TargetFlags.HasFlag(FixupRecordTargetFlags.ThirtyTwoBitAdditiveFixupFlag))
+#endif
                             builder.AppendLine(entry.AdditiveFixupValueDWORD, "    Additive fixup value");
                         else
                             builder.AppendLine(entry.AdditiveFixupValueWORD, "    Additive fixup value");
@@ -527,19 +592,35 @@ namespace SabreTools.Printing
                 }
 
                 // ORD # / ADDITIVE
+#if NET20 || NET35
+                else if ((entry.TargetFlags & FixupRecordTargetFlags.InternalReferenceViaEntryTable) != 0)
+#else
                 else if (entry.TargetFlags.HasFlag(FixupRecordTargetFlags.InternalReferenceViaEntryTable))
+#endif
                 {
                     // 16-bit Object Number/Module Ordinal Flag
-                    if (entry.TargetFlags.HasFlag(FixupRecordTargetFlags.SixteenBitObjectNumberModuleOrdinalFlag))
+#if NET20 || NET35
+                    if ((entry.TargetFlags & FixupRecordTargetFlags.SixteenBitObjectNumberModuleOrdinalFlag) != 0)
+#else
+                    if (!entry.TargetFlags.HasFlag(FixupRecordTargetFlags.SixteenBitObjectNumberModuleOrdinalFlag))
+#endif
                         builder.AppendLine(entry.TargetObjectNumberWORD, "    Target object number");
                     else
                         builder.AppendLine(entry.TargetObjectNumberByte, "    Target object number");
 
                     // Additive Fixup Flag
-                    if (entry.TargetFlags.HasFlag(FixupRecordTargetFlags.AdditiveFixupFlag))
+#if NET20 || NET35
+                    if ((entry.TargetFlags & FixupRecordTargetFlags.AdditiveFixupFlag) != 0)
+#else
+                    if (!entry.TargetFlags.HasFlag(FixupRecordTargetFlags.AdditiveFixupFlag))
+#endif
                     {
                         // 32-bit Additive Flag
-                        if (entry.TargetFlags.HasFlag(FixupRecordTargetFlags.ThirtyTwoBitAdditiveFixupFlag))
+#if NET20 || NET35
+                        if ((entry.TargetFlags & FixupRecordTargetFlags.ThirtyTwoBitAdditiveFixupFlag) != 0)
+#else
+                        if (!entry.TargetFlags.HasFlag(FixupRecordTargetFlags.ThirtyTwoBitAdditiveFixupFlag))
+#endif
                             builder.AppendLine(entry.AdditiveFixupValueDWORD, "    Additive fixup value");
                         else
                             builder.AppendLine(entry.AdditiveFixupValueWORD, "    Additive fixup value");

MicrosoftCabinet.cs

@@ -42,7 +42,11 @@ namespace SabreTools.Printing
             builder.AppendLine(header.SetID, "  Set ID");
             builder.AppendLine(header.CabinetIndex, "  Cabinet index");
 
+#if NET20 || NET35
+            if ((header.Flags & HeaderFlags.RESERVE_PRESENT) != 0)
+#else
             if (header.Flags.HasFlag(HeaderFlags.RESERVE_PRESENT))
+#endif
             {
                 builder.AppendLine(header.HeaderReservedSize, "  Header reserved size");
                 builder.AppendLine(header.FolderReservedSize, "  Folder reserved size");
@@ -50,13 +54,21 @@ namespace SabreTools.Printing
                 builder.AppendLine(header.ReservedData, "  Reserved data");
             }
 
+#if NET20 || NET35
+            if ((header.Flags & HeaderFlags.PREV_CABINET) != 0)
+#else
             if (header.Flags.HasFlag(HeaderFlags.PREV_CABINET))
+#endif
             {
                 builder.AppendLine(header.CabinetPrev, "  Previous cabinet");
                 builder.AppendLine(header.DiskPrev, "  Previous disk");
             }
 
+#if NET20 || NET35
+            if ((header.Flags & HeaderFlags.NEXT_CABINET) != 0)
+#else
             if (header.Flags.HasFlag(HeaderFlags.NEXT_CABINET))
+#endif
             {
                 builder.AppendLine(header.CabinetNext, "  Next cabinet");
                 builder.AppendLine(header.DiskNext, "  Next disk");

PortableExecutable.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using System.Xml;
 using SabreTools.ASN1;
@@ -921,13 +922,13 @@ namespace SabreTools.Printing
                 return;
             }
 
-            Print(table, level: 0, types: new List<object>(), builder);
+            Print(table, level: 0, types: [], builder);
             builder.AppendLine();
         }
 
         private static void Print(ResourceDirectoryTable table, int level, List<object> types, StringBuilder builder)
         {
-            string padding = new string(' ', (level + 1) * 2);
+            string padding = new(' ', (level + 1) * 2);
 
             builder.AppendLine(level, $"{padding}Table level");
             builder.AppendLine(table.Characteristics, $"{padding}Characteristics");
@@ -956,7 +957,7 @@ namespace SabreTools.Printing
                     if (entry == null)
                         continue;
 
-                    var newTypes = new List<object>(types ?? new List<object>());
+                    var newTypes = new List<object>(types ?? []);
                     if (entry.Name?.UnicodeString != null)
                         newTypes.Add(Encoding.UTF8.GetString(entry.Name.UnicodeString));
                     else
@@ -969,7 +970,7 @@ namespace SabreTools.Printing
 
         private static void PrintResourceDirectoryEntry(ResourceDirectoryEntry entry, int level, List<object> types, StringBuilder builder)
         {
-            string padding = new string(' ', (level + 1) * 2);
+            string padding = new(' ', (level + 1) * 2);
 
             builder.AppendLine(level, $"{padding}Item level");
             if (entry.NameOffset != default)
@@ -990,10 +991,10 @@ namespace SabreTools.Printing
 
         private static void PrintResourceDataEntry(ResourceDataEntry entry, int level, List<object> types, StringBuilder builder)
         {
-            string padding = new string(' ', (level + 1) * 2);
+            string padding = new(' ', (level + 1) * 2);
 
             // TODO: Use ordered list of base types to determine the shape of the data
-            builder.AppendLine($"{padding}Base types: {string.Join(", ", types)}");
+            builder.AppendLine($"{padding}Base types: {string.Join(", ", types.Select(t => t.ToString()).ToArray())}");
 
             builder.AppendLine(level, $"{padding}Entry level");
             builder.AppendLine(entry.DataRVA, $"{padding}Data RVA");
@@ -1084,25 +1085,25 @@ namespace SabreTools.Printing
 
         private static void PrintResourceRT_CURSOR(ResourceDataEntry entry, int level, StringBuilder builder)
         {
-            string padding = new string(' ', (level + 1) * 2);
+            string padding = new(' ', (level + 1) * 2);
             builder.AppendLine($"{padding}Hardware-dependent cursor resource found, not parsed yet");
         }
 
         private static void PrintResourceRT_BITMAP(ResourceDataEntry entry, int level, StringBuilder builder)
         {
-            string padding = new string(' ', (level + 1) * 2);
+            string padding = new(' ', (level + 1) * 2);
             builder.AppendLine($"{padding}Bitmap resource found, not parsed yet");
         }
 
         private static void PrintResourceRT_ICON(ResourceDataEntry entry, int level, StringBuilder builder)
         {
-            string padding = new string(' ', (level + 1) * 2);
+            string padding = new(' ', (level + 1) * 2);
             builder.AppendLine($"{padding}Hardware-dependent icon resource found, not parsed yet");
         }
 
         private static void PrintResourceRT_MENU(ResourceDataEntry entry, int level, StringBuilder builder)
         {
-            string padding = new string(' ', (level + 1) * 2);
+            string padding = new(' ', (level + 1) * 2);
 
             MenuResource? menu = null;
             try { menu = entry.AsMenu(); } catch { }
@@ -1192,7 +1193,7 @@ namespace SabreTools.Printing
 
         private static void PrintResourceRT_DIALOG(ResourceDataEntry entry, int level, StringBuilder builder)
         {
-            string padding = new string(' ', (level + 1) * 2);
+            string padding = new(' ', (level + 1) * 2);
 
             DialogBoxResource? dialogBox = null;
             try { dialogBox = entry.AsDialogBox(); } catch { }
@@ -1327,7 +1328,7 @@ namespace SabreTools.Printing
 
         private static void PrintResourceRT_STRING(ResourceDataEntry entry, int level, StringBuilder builder)
         {
-            string padding = new string(' ', (level + 1) * 2);
+            string padding = new(' ', (level + 1) * 2);
 
             Dictionary<int, string?>? stringTable = null;
             try { stringTable = entry.AsStringTable(); } catch { }
@@ -1347,19 +1348,19 @@ namespace SabreTools.Printing
 
         private static void PrintResourceRT_FONTDIR(ResourceDataEntry entry, int level, StringBuilder builder)
         {
-            string padding = new string(' ', (level + 1) * 2);
+            string padding = new(' ', (level + 1) * 2);
             builder.AppendLine($"{padding}Font directory resource found, not parsed yet");
         }
 
         private static void PrintResourceRT_FONT(ResourceDataEntry entry, int level, StringBuilder builder)
         {
-            string padding = new string(' ', (level + 1) * 2);
+            string padding = new(' ', (level + 1) * 2);
             builder.AppendLine($"{padding}Font resource found, not parsed yet");
         }
 
         private static void PrintResourceRT_ACCELERATOR(ResourceDataEntry entry, int level, StringBuilder builder)
         {
-            string padding = new string(' ', (level + 1) * 2);
+            string padding = new(' ', (level + 1) * 2);
 
             AcceleratorTableEntry[]? acceleratorTable = null;
             try { acceleratorTable = entry.AsAcceleratorTableResource(); } catch { }
@@ -1382,7 +1383,7 @@ namespace SabreTools.Printing
 
         private static void PrintResourceRT_RCDATA(ResourceDataEntry entry, int level, StringBuilder builder)
         {
-            string padding = new string(' ', (level + 1) * 2);
+            string padding = new(' ', (level + 1) * 2);
             builder.AppendLine($"{padding}Application-defined resource found, not parsed yet");
 
             // Then print the data, if needed
@@ -1425,7 +1426,7 @@ namespace SabreTools.Printing
 
         private static void PrintResourceRT_MESSAGETABLE(ResourceDataEntry entry, int level, StringBuilder builder)
         {
-            string padding = new string(' ', (level + 1) * 2);
+            string padding = new(' ', (level + 1) * 2);
 
             MessageResourceData? messageTable = null;
             try { messageTable = entry.AsMessageResourceData(); } catch { }
@@ -1492,19 +1493,19 @@ namespace SabreTools.Printing
 
         private static void PrintResourceRT_GROUP_CURSOR(ResourceDataEntry entry, int level, StringBuilder builder)
         {
-            string padding = new string(' ', (level + 1) * 2);
+            string padding = new(' ', (level + 1) * 2);
             builder.AppendLine($"{padding}Hardware-independent cursor resource found, not parsed yet");
         }
 
         private static void PrintResourceRT_GROUP_ICON(ResourceDataEntry entry, int level, StringBuilder builder)
         {
-            string padding = new string(' ', (level + 1) * 2);
+            string padding = new(' ', (level + 1) * 2);
             builder.AppendLine($"{padding}Hardware-independent icon resource found, not parsed yet");
         }
 
         private static void PrintResourceRT_VERSION(ResourceDataEntry entry, int level, StringBuilder builder)
         {
-            string padding = new string(' ', (level + 1) * 2);
+            string padding = new(' ', (level + 1) * 2);
 
             VersionInfo? versionInfo = null;
             try { versionInfo = entry.AsVersionInfo(); } catch { }
@@ -1625,37 +1626,37 @@ namespace SabreTools.Printing
 
         private static void PrintResourceRT_DLGINCLUDE(ResourceDataEntry entry, int level, StringBuilder builder)
         {
-            string padding = new string(' ', (level + 1) * 2);
+            string padding = new(' ', (level + 1) * 2);
             builder.AppendLine($"{padding}External header resource found, not parsed yet");
         }
 
         private static void PrintResourceRT_PLUGPLAY(ResourceDataEntry entry, int level, StringBuilder builder)
         {
-            string padding = new string(' ', (level + 1) * 2);
+            string padding = new(' ', (level + 1) * 2);
             builder.AppendLine($"{padding}Plug and Play resource found, not parsed yet");
         }
 
         private static void PrintResourceRT_VXD(ResourceDataEntry entry, int level, StringBuilder builder)
         {
-            string padding = new string(' ', (level + 1) * 2);
+            string padding = new(' ', (level + 1) * 2);
             builder.AppendLine($"{padding}VXD found, not parsed yet");
         }
 
         private static void PrintResourceRT_ANICURSOR(ResourceDataEntry entry, int level, StringBuilder builder)
         {
-            string padding = new string(' ', (level + 1) * 2);
+            string padding = new(' ', (level + 1) * 2);
             builder.AppendLine($"{padding}Animated cursor found, not parsed yet");
         }
 
         private static void PrintResourceRT_ANIICON(ResourceDataEntry entry, int level, StringBuilder builder)
         {
-            string padding = new string(' ', (level + 1) * 2);
+            string padding = new(' ', (level + 1) * 2);
             builder.AppendLine($"{padding}Animated icon found, not parsed yet");
         }
 
         private static void PrintResourceRT_HTML(ResourceDataEntry entry, int level, StringBuilder builder)
         {
-            string padding = new string(' ', (level + 1) * 2);
+            string padding = new(' ', (level + 1) * 2);
             builder.AppendLine($"{padding}HTML resource found, not parsed yet");
 
             //if (entry.Data != null)
@@ -1668,7 +1669,7 @@ namespace SabreTools.Printing
 
         private static void PrintResourceRT_MANIFEST(ResourceDataEntry entry, int level, StringBuilder builder)
         {
-            string padding = new string(' ', (level + 1) * 2);
+            string padding = new(' ', (level + 1) * 2);
 
             AssemblyManifest? assemblyManifest = null;
             try { assemblyManifest = entry.AsAssemblyManifest(); } catch { }
@@ -1886,7 +1887,7 @@ namespace SabreTools.Printing
 
         private static void PrintResourceUNKNOWN(ResourceDataEntry entry, int level, object resourceType, StringBuilder builder)
         {
-            string padding = new string(' ', (level + 1) * 2);
+            string padding = new(' ', (level + 1) * 2);
 
             // Print the type first
             if (resourceType is uint numericType)

SabreTools.Printing.csproj

@@ -2,17 +2,17 @@
 
   <PropertyGroup>
     <!-- Assembly Properties -->
-    <TargetFrameworks>net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
     <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <Version>1.2.0</Version>
+    <Version>1.3.1</Version>
 
     <!-- Package Properties -->
     <Authors>Matt Nadareski</Authors>
     <Description>Pretty-printing library for various models</Description>
-    <Copyright>Copyright (c) Matt Nadareski 2022-2023</Copyright>
+    <Copyright>Copyright (c) Matt Nadareski 2022-2024</Copyright>
     <PackageProjectUrl>https://github.com/SabreTools/</PackageProjectUrl>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <RepositoryUrl>https://github.com/SabreTools/SabreTools.Printing</RepositoryUrl>
@@ -22,14 +22,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="README.md" Pack="true" PackagePath=""/>
+    <None Include="README.md" Pack="true" PackagePath="" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SabreTools.ASN1" Version="1.2.0" />
-    <PackageReference Include="SabreTools.IO" Version="1.2.0" />
-    <PackageReference Include="SabreTools.Models" Version="1.2.0" />
-    <PackageReference Include="SabreTools.Serialization" Version="1.2.0" />
+    <PackageReference Include="SabreTools.ASN1" Version="1.3.0" />
+    <PackageReference Include="SabreTools.IO" Version="1.3.0" />
+    <PackageReference Include="SabreTools.Models" Version="1.3.0" />
+    <PackageReference Include="SabreTools.Serialization" Version="1.3.2" />
   </ItemGroup>
   
 </Project>

XMID.cs

@@ -10,7 +10,7 @@ namespace SabreTools.Printing
             builder.AppendLine("Xbox Media Identifier Information:");
             builder.AppendLine("-------------------------");
             builder.AppendLine(xmid.PublisherIdentifier, "Publisher identifier");
-            if (!string.IsNullOrWhiteSpace(xmid.PublisherIdentifier) && Publishers.ContainsKey(xmid.PublisherIdentifier ?? string.Empty))
+            if (!string.IsNullOrEmpty(xmid.PublisherIdentifier) && Publishers.ContainsKey(xmid.PublisherIdentifier ?? string.Empty))
                 builder.AppendLine(Publishers[xmid.PublisherIdentifier ?? string.Empty], "Publisher");
             builder.AppendLine(xmid.GameID, "Game ID");
             builder.AppendLine(xmid.VersionNumber, "Version number");

XeMID.cs

@@ -10,7 +10,7 @@ namespace SabreTools.Printing
             builder.AppendLine("Xbox Media Identifier Information:");
             builder.AppendLine("-------------------------");
             builder.AppendLine(xemid.PublisherIdentifier, "Publisher identifier");
-            if (!string.IsNullOrWhiteSpace(xemid.PublisherIdentifier) && Publishers.ContainsKey(xemid.PublisherIdentifier ?? string.Empty))
+            if (!string.IsNullOrEmpty(xemid.PublisherIdentifier) && Publishers.ContainsKey(xemid.PublisherIdentifier ?? string.Empty))
                 builder.AppendLine(Publishers[xemid.PublisherIdentifier ?? string.Empty], "Publisher");
             builder.AppendLine(xemid.PlatformIdentifier, "Platform identifier");
             builder.AppendLine(xemid.GameID, "Game ID");