Fix more nullability locations

2026-02-16 21:37:05 +00:00 · 2023-10-25 23:33:51 -04:00
parent 9a3dcf70de
commit cb3846261a
53 changed files with 75 additions and 52 deletions
--- a/BinaryObjectScanner/FileType/BFPK.cs
+++ b/BinaryObjectScanner/FileType/BFPK.cs
@@ -31,7 +31,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            try
--- a/BinaryObjectScanner/FileType/BSP.cs
+++ b/BinaryObjectScanner/FileType/BSP.cs
@@ -30,7 +30,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            try
--- a/BinaryObjectScanner/FileType/BZip2.cs
+++ b/BinaryObjectScanner/FileType/BZip2.cs
@@ -31,9 +31,12 @@ namespace BinaryObjectScanner.FileType
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
+            if (stream == null)
+                return null;
+
            try
            {
                // Create a temp output directory
--- a/BinaryObjectScanner/FileType/CFB.cs
+++ b/BinaryObjectScanner/FileType/CFB.cs
@@ -31,7 +31,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            try
--- a/BinaryObjectScanner/FileType/GCF.cs
+++ b/BinaryObjectScanner/FileType/GCF.cs
@@ -30,7 +30,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            try
--- a/BinaryObjectScanner/FileType/GZIP.cs
+++ b/BinaryObjectScanner/FileType/GZIP.cs
@@ -31,9 +31,12 @@ namespace BinaryObjectScanner.FileType
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
+            if (stream == null)
+                return null;
+
            try
            {
                // Create a temp output directory
--- a/BinaryObjectScanner/FileType/InstallShieldArchiveV3.cs
+++ b/BinaryObjectScanner/FileType/InstallShieldArchiveV3.cs
@@ -31,7 +31,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            try
--- a/BinaryObjectScanner/FileType/InstallShieldCAB.cs
+++ b/BinaryObjectScanner/FileType/InstallShieldCAB.cs
@@ -31,7 +31,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            // Get the name of the first cabinet file or header
--- a/BinaryObjectScanner/FileType/MPQ.cs
+++ b/BinaryObjectScanner/FileType/MPQ.cs
@@ -33,7 +33,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
 #if NET6_0_OR_GREATER
--- a/BinaryObjectScanner/FileType/MicrosoftCAB.cs
+++ b/BinaryObjectScanner/FileType/MicrosoftCAB.cs
@@ -32,7 +32,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            return null;
--- a/BinaryObjectScanner/FileType/MicrosoftLZ.cs
+++ b/BinaryObjectScanner/FileType/MicrosoftLZ.cs
@@ -31,7 +31,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            try
--- a/BinaryObjectScanner/FileType/PAK.cs
+++ b/BinaryObjectScanner/FileType/PAK.cs
@@ -29,7 +29,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            try
--- a/BinaryObjectScanner/FileType/PFF.cs
+++ b/BinaryObjectScanner/FileType/PFF.cs
@@ -29,7 +29,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            try
--- a/BinaryObjectScanner/FileType/PKZIP.cs
+++ b/BinaryObjectScanner/FileType/PKZIP.cs
@@ -31,9 +31,12 @@ namespace BinaryObjectScanner.FileType
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
+            if (stream == null)
+                return null;
+
            try
            {
                // Create a temp output directory
--- a/BinaryObjectScanner/FileType/Quantum.cs
+++ b/BinaryObjectScanner/FileType/Quantum.cs
@@ -29,7 +29,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            try
--- a/BinaryObjectScanner/FileType/RAR.cs
+++ b/BinaryObjectScanner/FileType/RAR.cs
@@ -31,9 +31,12 @@ namespace BinaryObjectScanner.FileType
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
+            if (stream == null)
+                return null;
+
            try
            {
                // Create a temp output directory
--- a/BinaryObjectScanner/FileType/SFFS.cs
+++ b/BinaryObjectScanner/FileType/SFFS.cs
@@ -70,7 +70,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            return null;
--- a/BinaryObjectScanner/FileType/SGA.cs
+++ b/BinaryObjectScanner/FileType/SGA.cs
@@ -32,7 +32,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            try
--- a/BinaryObjectScanner/FileType/SevenZip.cs
+++ b/BinaryObjectScanner/FileType/SevenZip.cs
@@ -31,7 +31,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            try
--- a/BinaryObjectScanner/FileType/TapeArchive.cs
+++ b/BinaryObjectScanner/FileType/TapeArchive.cs
@@ -31,9 +31,12 @@ namespace BinaryObjectScanner.FileType
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
+            if (stream == null)
+                return null;
+
            try
            {
                // Create a temp output directory
--- a/BinaryObjectScanner/FileType/VBSP.cs
+++ b/BinaryObjectScanner/FileType/VBSP.cs
@@ -29,7 +29,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            try
--- a/BinaryObjectScanner/FileType/VPK.cs
+++ b/BinaryObjectScanner/FileType/VPK.cs
@@ -31,7 +31,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            try
--- a/BinaryObjectScanner/FileType/WAD.cs
+++ b/BinaryObjectScanner/FileType/WAD.cs
@@ -29,7 +29,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            try
--- a/BinaryObjectScanner/FileType/XZ.cs
+++ b/BinaryObjectScanner/FileType/XZ.cs
@@ -30,7 +30,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            try
--- a/BinaryObjectScanner/FileType/XZP.cs
+++ b/BinaryObjectScanner/FileType/XZP.cs
@@ -30,7 +30,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            try
--- a/BinaryObjectScanner/Interfaces/IExtractable.cs
+++ b/BinaryObjectScanner/Interfaces/IExtractable.cs
@@ -32,7 +32,7 @@ namespace BinaryObjectScanner.Interfaces
 #if NET48
        string Extract(Stream stream, string file, bool includeDebug);
 #else
-        string? Extract(Stream stream, string file, bool includeDebug);
+        string? Extract(Stream? stream, string file, bool includeDebug);
 #endif
    }
 }
--- a/BinaryObjectScanner/Packer/ASPack.cs
+++ b/BinaryObjectScanner/Packer/ASPack.cs
@@ -74,7 +74,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            return null;
--- a/BinaryObjectScanner/Packer/AdvancedInstaller.cs
+++ b/BinaryObjectScanner/Packer/AdvancedInstaller.cs
@@ -53,7 +53,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            return null;
--- a/BinaryObjectScanner/Packer/Armadillo.cs
+++ b/BinaryObjectScanner/Packer/Armadillo.cs
@@ -65,7 +65,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            return null;
--- a/BinaryObjectScanner/Packer/AutoPlayMediaStudio.cs
+++ b/BinaryObjectScanner/Packer/AutoPlayMediaStudio.cs
@@ -57,7 +57,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            return null;
--- a/BinaryObjectScanner/Packer/CExe.cs
+++ b/BinaryObjectScanner/Packer/CExe.cs
@@ -73,7 +73,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            try
--- a/BinaryObjectScanner/Packer/EXEStealth.cs
+++ b/BinaryObjectScanner/Packer/EXEStealth.cs
@@ -102,7 +102,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            return null;
--- a/BinaryObjectScanner/Packer/EmbeddedExecutable.cs
+++ b/BinaryObjectScanner/Packer/EmbeddedExecutable.cs
@@ -52,7 +52,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            try
--- a/BinaryObjectScanner/Packer/GenteeInstaller.cs
+++ b/BinaryObjectScanner/Packer/GenteeInstaller.cs
@@ -56,7 +56,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            return null;
--- a/BinaryObjectScanner/Packer/HyperTechCrackProof.cs
+++ b/BinaryObjectScanner/Packer/HyperTechCrackProof.cs
@@ -55,7 +55,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            return null;
--- a/BinaryObjectScanner/Packer/InnoSetup.cs
+++ b/BinaryObjectScanner/Packer/InnoSetup.cs
@@ -81,7 +81,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            return null;
--- a/BinaryObjectScanner/Packer/InstallAnywhere.cs
+++ b/BinaryObjectScanner/Packer/InstallAnywhere.cs
@@ -52,7 +52,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            return null;
--- a/BinaryObjectScanner/Packer/InstallerVISE.cs
+++ b/BinaryObjectScanner/Packer/InstallerVISE.cs
@@ -54,7 +54,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            return null;
--- a/BinaryObjectScanner/Packer/IntelInstallationFramework.cs
+++ b/BinaryObjectScanner/Packer/IntelInstallationFramework.cs
@@ -57,7 +57,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            return null;
--- a/BinaryObjectScanner/Packer/MicrosoftCABSFX.cs
+++ b/BinaryObjectScanner/Packer/MicrosoftCABSFX.cs
@@ -71,7 +71,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            return null;
--- a/BinaryObjectScanner/Packer/NSIS.cs
+++ b/BinaryObjectScanner/Packer/NSIS.cs
@@ -56,7 +56,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            return null;
--- a/BinaryObjectScanner/Packer/NeoLite.cs
+++ b/BinaryObjectScanner/Packer/NeoLite.cs
@@ -61,7 +61,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            return null;
--- a/BinaryObjectScanner/Packer/PECompact.cs
+++ b/BinaryObjectScanner/Packer/PECompact.cs
@@ -65,7 +65,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            return null;
--- a/BinaryObjectScanner/Packer/Petite.cs
+++ b/BinaryObjectScanner/Packer/Petite.cs
@@ -48,7 +48,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            return null;
--- a/BinaryObjectScanner/Packer/SetupFactory.cs
+++ b/BinaryObjectScanner/Packer/SetupFactory.cs
@@ -62,7 +62,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            return null;
--- a/BinaryObjectScanner/Packer/SevenZipSFX.cs
+++ b/BinaryObjectScanner/Packer/SevenZipSFX.cs
@@ -69,7 +69,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            return null;
--- a/BinaryObjectScanner/Packer/Shrinker.cs
+++ b/BinaryObjectScanner/Packer/Shrinker.cs
@@ -49,7 +49,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            return null;
--- a/BinaryObjectScanner/Packer/UPX.cs
+++ b/BinaryObjectScanner/Packer/UPX.cs
@@ -87,7 +87,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            return null;
--- a/BinaryObjectScanner/Packer/WinRARSFX.cs
+++ b/BinaryObjectScanner/Packer/WinRARSFX.cs
@@ -54,7 +54,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            try
--- a/BinaryObjectScanner/Packer/WinZipSFX.cs
+++ b/BinaryObjectScanner/Packer/WinZipSFX.cs
@@ -88,7 +88,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            try
--- a/BinaryObjectScanner/Packer/WiseInstaller.cs
+++ b/BinaryObjectScanner/Packer/WiseInstaller.cs
@@ -100,7 +100,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            try
--- a/BinaryObjectScanner/Packer/dotFuscator.cs
+++ b/BinaryObjectScanner/Packer/dotFuscator.cs
@@ -52,7 +52,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
        public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
        {
            return null;
--- a/BinaryObjectScanner/Utilities/Dictionary.cs
+++ b/BinaryObjectScanner/Utilities/Dictionary.cs
@@ -116,7 +116,11 @@ namespace BinaryObjectScanner.Utilities
        /// </summary>
        /// <param name="original">Dictionary to strip values from</param>
        /// <param name="pathToPrepend">Path to strip from the keys</param>
+#if NET48
        public static void PrependToKeys(ConcurrentDictionary<string, ConcurrentQueue<string>> original, string pathToPrepend)
+#else
+        public static void PrependToKeys(ConcurrentDictionary<string, ConcurrentQueue<string>>? original, string pathToPrepend)
+#endif
        {
            // If the dictionary is missing, we can't do anything
            if (original == null)
@@ -146,7 +150,11 @@ namespace BinaryObjectScanner.Utilities
        /// </summary>
        /// <param name="original">Dictionary to strip values from</param>
        /// <param name="pathToStrip">Path to strip from the keys</param>
+#if NET48
        public static void StripFromKeys(ConcurrentDictionary<string, ConcurrentQueue<string>> original, string pathToStrip)
+#else
+        public static void StripFromKeys(ConcurrentDictionary<string, ConcurrentQueue<string>>? original, string? pathToStrip)
+#endif
        {
            // If either is missing, we can't do anything
            if (original == null || string.IsNullOrEmpty(pathToStrip))