From b1aa2fc73a24d104033070cc3b3e5225db7e4312 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Thu, 21 Nov 2024 10:40:10 -0500
Subject: [PATCH] Enable MPQ on .NET Framework 4.0

---
 BinaryObjectScanner/BinaryObjectScanner.csproj | 8 --------
 BinaryObjectScanner/FileType/MPQ.cs            | 2 +-
 ExtractionTool/Program.cs                      | 2 +-
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/BinaryObjectScanner/BinaryObjectScanner.csproj b/BinaryObjectScanner/BinaryObjectScanner.csproj
index 8838c5de..11979dfa 100644
--- a/BinaryObjectScanner/BinaryObjectScanner.csproj
+++ b/BinaryObjectScanner/BinaryObjectScanner.csproj
@@ -44,14 +44,6 @@
         </DefaultItemExcludes>
     </PropertyGroup>
 
-    <!-- Exclude all StormLibSharp for .NET Framework 4.0 -->
-    <PropertyGroup Condition="$(TargetFramework.StartsWith(`net40`))">
-        <DefaultItemExcludes>
-            $(DefaultItemExcludes);
-            _EXTERNAL\stormlibsharp\src\**
-        </DefaultItemExcludes>
-    </PropertyGroup>
-
     <!-- Exclude all external modules for .NET Framework 2.0, .NET Framework 3.5, or non-Windows
     builds -->
     <PropertyGroup Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`)) OR !$(RuntimeIdentifier.StartsWith(`win-x86`))">
diff --git a/BinaryObjectScanner/FileType/MPQ.cs b/BinaryObjectScanner/FileType/MPQ.cs
index 9cd5e156..00b8201b 100644
--- a/BinaryObjectScanner/FileType/MPQ.cs
+++ b/BinaryObjectScanner/FileType/MPQ.cs
@@ -25,7 +25,7 @@ public bool Extract(string file, string outDir, bool includeDebug)
         /// <inheritdoc/>
         public bool Extract(Stream? stream, string file, string outDir, bool includeDebug)
         {
-#if NET20 || NET35 || NET40 || !WIN
+#if NET20 || NET35 || !WIN
             // Not supported for old .NET due to feature requirements
             // Not supported in non-Windows builds due to DLL requirements
             return false;
diff --git a/ExtractionTool/Program.cs b/ExtractionTool/Program.cs
index 5fa462d3..ce8887d1 100644
--- a/ExtractionTool/Program.cs
+++ b/ExtractionTool/Program.cs
@@ -305,7 +305,7 @@ private static void ExtractFile(string file, string outputDirectory, bool includ
                 Console.WriteLine("Extracting MoPaQ contents");
                 Console.WriteLine();
 
-#if NET20 || NET35 || NET40 || !WIN
+#if NET20 || NET35 || !WIN
                 Console.WriteLine("Extraction is not supported for this framework!");
                 Console.WriteLine();
 #else