Add .NET 9 to target frameworks

mnadareski · mnadareski · commit 864fa8d3f80c · 2024-11-13T04:26:26.000-05:00
diff --git a/BinaryObjectScanner/FileType/LDSCRYPT.cs b/BinaryObjectScanner/FileType/LDSCRYPT.cs
@@ -28,8 +28,12 @@ public class LDSCRYPT : IDetectable
                 byte[] magic = new byte[16];
                 int read = stream.Read(magic, 0, 16);
 
+#if NET20
+                if (Extensions.StartsWith(magic, new byte?[] { 0x4C, 0x44, 0x53, 0x43, 0x52, 0x59, 0x50, 0x54 }))
+#else
                 if (magic.StartsWith(new byte?[] { 0x4C, 0x44, 0x53, 0x43, 0x52, 0x59, 0x50, 0x54 }))
-                    return "Link Data Security encrypted file";
+#endif
+                return "Link Data Security encrypted file";
             }
             catch (Exception ex)
             {
diff --git a/BinaryObjectScanner/FileType/PLJ.cs b/BinaryObjectScanner/FileType/PLJ.cs
@@ -28,7 +28,11 @@ public class PLJ : IDetectable
                 byte[] magic = new byte[16];
                 int read = stream.Read(magic, 0, 16);
 
+#if NET20
+                if (Extensions.StartsWith(magic, new byte?[] { 0xFF, 0x9D, 0x53, 0x4B }))
+#else
                 if (magic.StartsWith(new byte?[] { 0xFF, 0x9D, 0x53, 0x4B }))
+#endif
                     return "PlayJ Audio File";
             }
             catch (Exception ex)
diff --git a/BinaryObjectScanner/FileType/RealArcadeInstaller.cs b/BinaryObjectScanner/FileType/RealArcadeInstaller.cs
@@ -32,7 +32,11 @@ public class RealArcadeInstaller : IDetectable
 
                 // RASGI2.0
                 // Found in the ".rgs" files in IA item "Nova_RealArcadeCD_USA".
+#if NET20
+                if (Extensions.StartsWith(magic, new byte?[] { 0x52, 0x41, 0x53, 0x47, 0x49, 0x32, 0x2E, 0x30 }))
+#else
                 if (magic.StartsWith(new byte?[] { 0x52, 0x41, 0x53, 0x47, 0x49, 0x32, 0x2E, 0x30 }))
+#endif
                     return "RealArcade Installer";
             }
             catch (Exception ex)
diff --git a/BinaryObjectScanner/FileType/RealArcadeMezzanine.cs b/BinaryObjectScanner/FileType/RealArcadeMezzanine.cs
@@ -32,7 +32,11 @@ public class RealArcadeMezzanine : IDetectable
 
                 // XZip2.0
                 // Found in the ".mez" files in IA item "Nova_RealArcadeCD_USA".
+#if NET20
+                if (Extensions.StartsWith(magic, new byte?[] { 0x58, 0x5A, 0x69, 0x70, 0x32, 0x2E, 0x30 }))
+#else
                 if (magic.StartsWith(new byte?[] { 0x58, 0x5A, 0x69, 0x70, 0x32, 0x2E, 0x30 }))
+#endif
                     return "RealArcade Mezzanine";
             }
             catch (Exception ex)
diff --git a/BinaryObjectScanner/FileType/SFFS.cs b/BinaryObjectScanner/FileType/SFFS.cs
@@ -29,8 +29,12 @@ public class SFFS : IExtractable, IDetectable
                 byte[] magic = new byte[16];
                 int read = stream.Read(magic, 0, 16);
 
+#if NET20
+                if (Extensions.StartsWith(magic, new byte?[] { 0x53, 0x46, 0x46, 0x53 }))
+#else
                 if (magic.StartsWith(new byte?[] { 0x53, 0x46, 0x46, 0x53 }))
-                    return "StarForce Filesystem Container";
+#endif
+                return "StarForce Filesystem Container";
             }
             catch (Exception ex)
             {
diff --git a/BinaryObjectScanner/Packer/EmbeddedExecutable.cs b/BinaryObjectScanner/Packer/EmbeddedExecutable.cs
@@ -22,8 +22,15 @@ public class EmbeddedExecutable : IExtractableExecutable<PortableExecutable>
                 return null;
 
             // Get the resources that have an executable signature
-            if (pex.ResourceData?.Any(kvp => kvp.Value is byte[] ba && ba.StartsWith(SabreTools.Models.MSDOS.Constants.SignatureBytes)) == true)
+            if (pex.ResourceData?.Any(kvp => kvp.Value is byte[] ba
+#if NET20
+                && Extensions.StartsWith(ba, SabreTools.Models.MSDOS.Constants.SignatureBytes)) == true)
+#else
+                && ba.StartsWith(SabreTools.Models.MSDOS.Constants.SignatureBytes)) == true)
+#endif
+            {
                 return "Embedded Executable";
+            }
 
             return null;
         }
@@ -41,7 +48,11 @@ public bool Extract(string file, PortableExecutable pex, string outDir, bool inc
                 var resources = pex.ResourceData
                     .Where(kvp => kvp.Value != null && kvp.Value is byte[])
                     .Select(kvp => kvp.Value as byte[])
+#if NET20
+                    .Where(b => b != null && Extensions.StartsWith(b, SabreTools.Models.MSDOS.Constants.SignatureBytes))
+#else
                     .Where(b => b != null && b.StartsWith(SabreTools.Models.MSDOS.Constants.SignatureBytes))
+#endif
                     .ToList();
 
                 for (int i = 0; i < resources.Count; i++)
diff --git a/BinaryObjectScanner/Packer/WiseInstaller.cs b/BinaryObjectScanner/Packer/WiseInstaller.cs
@@ -156,7 +156,11 @@ public bool Extract(string file, PortableExecutable pex, string outDir, bool inc
 
                 // If the first entry is PKZIP, we assume it's an embedded zipfile
                 var magic = overlayData.ReadBytes(ref overlayOffset, 4); overlayOffset -= 4;
+#if NET20
+                bool pkzip = Extensions.StartsWith(magic, new byte?[] { (byte)'P', (byte)'K' });
+#else
                 bool pkzip = magic?.StartsWith(new byte?[] { (byte)'P', (byte)'K' }) ?? false;
+#endif
 
                 // Create the output directory
                 Directory.CreateDirectory(outDir);
diff --git a/BinaryObjectScanner/Progress.cs b/BinaryObjectScanner/Progress.cs
@@ -8,6 +8,16 @@
 
 namespace System
 {
+    /// <summary>Defines a provider for progress updates.</summary>
+    /// <typeparam name="T">The type of progress update value.</typeparam>
+    /// <see href="https://github.com/dotnet/runtime/blob/main/src/libraries/System.Private.CoreLib/src/System/IProgress.cs"/>
+    public interface IProgress<in T>
+    {
+        /// <summary>Reports a progress update.</summary>
+        /// <param name="value">The value of the updated progress.</param>
+        void Report(T value);
+    }
+
     /// <summary>
     /// Provides an IProgress{T} that invokes callbacks for each reported progress value.
     /// </summary>
diff --git a/BinaryObjectScanner/Protection/ActiveMARK.cs b/BinaryObjectScanner/Protection/ActiveMARK.cs
diff --git a/BinaryObjectScanner/Protection/CDDVDCops.cs b/BinaryObjectScanner/Protection/CDDVDCops.cs
@@ -228,13 +228,10 @@ public IEnumerable<string> CheckDirectoryPath(string path, IEnumerable<string>?
             if (fileContent == null)
                 return null;
 
-#if NET20 || NET35 || NET40
             byte[] versionBytes = new byte[4];
             Array.Copy(fileContent, positions[0] + 15, versionBytes, 0, 4);
             char[] version = Array.ConvertAll(versionBytes, b => (char)b);
-#else
-            char[] version = new ArraySegment<byte>(fileContent, positions[0] + 15, 4).Select(b => (char)b).ToArray();
-#endif
+
             if (version[0] == 0x00)
                 return string.Empty;
 
diff --git a/BinaryObjectScanner/Protection/LaserLok.cs b/BinaryObjectScanner/Protection/LaserLok.cs
@@ -64,7 +64,11 @@ public class LaserLok : IExecutableCheck<PortableExecutable>, IPathCheck
             ];
             int endDosStub = (int)(pex.Model.Stub?.Header?.NewExeHeaderAddr ?? 0);
             int position = -1;
+#if NET20
+            bool containsCheck = Extensions.FirstPosition(pex.StubExecutableData ?? [], check, out position);
+#else
             bool containsCheck = pex.StubExecutableData?.FirstPosition(check, out position) ?? false;
+#endif
 
             // Check the executable tables
             bool containsCheck2 = Array.Exists(pex.Model.ImportTable?.HintNameTable ?? [], hnte => hnte?.Name == "GetModuleHandleA")
@@ -90,7 +94,11 @@ public class LaserLok : IExecutableCheck<PortableExecutable>, IPathCheck
                     0x45, 0x4C, 0x33, 0x32, 0x2E, 0x64, 0x6C, 0x6C,
                     0x00, 0xEB, 0x79, 0x01, null, null, null, null,
                 ];
+#if NET20
+                containsCheck2 = Extensions.FirstPosition(pex.GetFirstSectionData(".text") ?? [], check2, out position2);
+#else
                 containsCheck2 = pex.GetFirstSectionData(".text")?.FirstPosition(check2, out position2) ?? false;
+#endif
             }
             else
             {
@@ -161,7 +169,11 @@ private static string GetBuild(byte[]? sectionContent, bool versionTwo)
                 0x55, 0x6E, 0x6B, 0x6F, 0x77, 0x6E, 0x00, 0x55,
                 0x6E, 0x6B, 0x6F, 0x77, 0x6E
             ];
+#if NET20
+            if (!Extensions.FirstPosition(sectionContent, check, out int position))
+#else
             if (!sectionContent.FirstPosition(check, out int position))
+#endif
                 return "(Build unknown)";
 
             string year, month, day;
diff --git a/BinaryObjectScanner/Protection/SVKP.cs b/BinaryObjectScanner/Protection/SVKP.cs
@@ -37,42 +37,74 @@ public class SVKProtector : IExecutableCheck<PortableExecutable>, IPathCheck
             if (pex.EntryPointData != null)
             {
                 // Found in the SVKP 1.05 demo.
+#if NET20
+                if (Extensions.StartsWith(pex.EntryPointData, new byte?[]
+#else
                 if (pex.EntryPointData.StartsWith(new byte?[]
+#endif
                 {
                     0xEB, 0x03, 0xC7, 0x84, 0xE8, 0x60, 0xEB, 0x03,
                     0xC7, 0x84, 0xE8, 0xEB, 0x03, 0xC7, 0x84, 0x9A,
                     0xE8, 0x00, 0x00, 0x00, 0x00, 0x5D, 0x81, 0xED,
                     0x15, 0x00, 0x00, 0x00, 0xEB, 0x03, 0xC7, 0x84,
                     0xE9, 0x64, 0xA0
+#if NET20
                 }))
+#else
+                }))
+#endif
                     return "SVKP v1.05";
 
                 // Found in the SVKP 1.051 demo.
+#if NET20
+                if (Extensions.StartsWith(pex.EntryPointData, new byte?[]
+#else
                 if (pex.EntryPointData.StartsWith(new byte?[]
+#endif
                 {
                     0x60, 0xEB, 0x03, 0xC7, 0x84, 0xE8, 0xEB, 0x03,
                     0xC7, 0x84, 0x9A, 0xE8, 0x00, 0x00, 0x00, 0x00,
                     0x5D, 0x81, 0xED, 0x10, 0x00, 0x00, 0x00, 0xEB,
                     0x03, 0xC7, 0x84, 0xE9, 0x64, 0xA0, 0x23, 0x00,
                     0x00, 0x00, 0xEB
+#if NET20
+                }))
+#else
                 }))
+#endif
                     return "SVKP v1.051";
 
                 // Found in the SVKP 1.11 demo.
+#if NET20
+                if (Extensions.StartsWith(pex.EntryPointData, new byte?[]
+#else
                 if (pex.EntryPointData.StartsWith(new byte?[]
+#endif
                 {
                     0x60, 0xE8, null, null, null, null, 0x5D, 0x81,
                     0xED, 0x06, null, null, null, 0x64, 0xA0, 0x23
+#if NET20
                 }))
+#else
+                }))
+#endif
                     return "SVKP v1.11";
 
                 // Found in the SVKP 1.32 demo and Redump entry 84122.
+#if NET20
+                if (Extensions.StartsWith(pex.EntryPointData, new byte?[]
+#else
                 if (pex.EntryPointData.StartsWith(new byte?[]
+#endif
                 {
                     0x60, 0xE8, 0x00, 0x00, 0x00, 0x00, 0x5D, 0x81,
                     0xED, 0x06, 0x00, 0x00, 0x00, 0xEB, 0x05, 0xB8,
                     null, null, null, null, 0x64, 0xA0, 0x23
+#if NET20
+                }))
+#else
                 }))
+#endif
                     return "SVKP v1.3+";
             }
 
diff --git a/BinaryObjectScanner/Protection/SolidShield.cs b/BinaryObjectScanner/Protection/SolidShield.cs
@@ -210,7 +210,11 @@ public IEnumerable<string> CheckDirectoryPath(string path, IEnumerable<string>?
                     0x6C, 0x65, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6F,
                     0x6E, 0x00, 0x00, 0x00, 0x00
                 ];
+#if NET20
+                if (Extensions.FirstPosition(fileContent, check2, out int position2))
+#else
                 if (fileContent.FirstPosition(check2, out int position2))
+#endif
                 {
                     position2--; // TODO: Verify this subtract
                     return $"2 + Tagès {fileContent[position2 + 0x38]}.{fileContent[position2 + 0x38 + 4]}.{fileContent[position2 + 0x38 + 8]}.{fileContent[position + 0x38 + 12]}";
diff --git a/ExtractionTool/Program.cs b/ExtractionTool/Program.cs
@@ -76,7 +76,7 @@ private static void ExtractFile(string file, string outputDirectory, bool includ
             byte[] magic = new byte[16];
             try
             {
-                stream.Read(magic, 0, 16);
+                int read = stream.Read(magic, 0, 16);
                 stream.Seek(0, SeekOrigin.Begin);
             }
             catch (Exception ex)

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,12 @@ public class LDSCRYPT : IDetectable`
`28`	`28`	`byte[] magic = new byte[16];`
`29`	`29`	`int read = stream.Read(magic, 0, 16);`
`30`	`30`
	`31`	`+#if NET20`
	`32`	`+ if (Extensions.StartsWith(magic, new byte?[] { 0x4C, 0x44, 0x53, 0x43, 0x52, 0x59, 0x50, 0x54 }))`
	`33`	`+#else`
`31`	`34`	`if (magic.StartsWith(new byte?[] { 0x4C, 0x44, 0x53, 0x43, 0x52, 0x59, 0x50, 0x54 }))`
`32`		`- return "Link Data Security encrypted file";`
	`35`	`+#endif`
	`36`	`+ return "Link Data Security encrypted file";`
`33`	`37`	`}`
`34`	`38`	`catch (Exception ex)`
`35`	`39`	`{`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,12 @@ public class SFFS : IExtractable, IDetectable`
`29`	`29`	`byte[] magic = new byte[16];`
`30`	`30`	`int read = stream.Read(magic, 0, 16);`
`31`	`31`
	`32`	`+#if NET20`
	`33`	`+ if (Extensions.StartsWith(magic, new byte?[] { 0x53, 0x46, 0x46, 0x53 }))`
	`34`	`+#else`
`32`	`35`	`if (magic.StartsWith(new byte?[] { 0x53, 0x46, 0x46, 0x53 }))`
`33`		`- return "StarForce Filesystem Container";`
	`36`	`+#endif`
	`37`	`+ return "StarForce Filesystem Container";`
`34`	`38`	`}`
`35`	`39`	`catch (Exception ex)`
`36`	`40`	`{`