Enable MPQ on .NET Framework 4.0

SabreTools · Nov 21, 2024 · b1aa2fc · b1aa2fc
1 parent cd21c76
commit b1aa2fc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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