From aba4395139f77b9ba37363826ec49435a7e15ab0 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Thu, 3 Oct 2024 14:46:35 -0400
Subject: [PATCH] Enable Windows libraries on .NET Framework 4.0

---
 BinaryObjectScanner/BinaryObjectScanner.csproj | 8 ++++----
 BinaryObjectScanner/FileType/MicrosoftCAB.cs   | 2 +-
 README.md                                      | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/BinaryObjectScanner/BinaryObjectScanner.csproj b/BinaryObjectScanner/BinaryObjectScanner.csproj
index 3a61bf73..bc4a522d 100644
--- a/BinaryObjectScanner/BinaryObjectScanner.csproj
+++ b/BinaryObjectScanner/BinaryObjectScanner.csproj
@@ -31,7 +31,7 @@
     <DefineConstants>$(DefineConstants);WIN</DefineConstants>
   </PropertyGroup>
 
-  <!-- Exclude certain parts of external modules for .NET Framework 4.5.2 and above -->
+  <!-- Exclude certain parts of external modules for .NET Framework 4.0 and above -->
   <PropertyGroup>
     <DefaultItemExcludes>
       $(DefaultItemExcludes);
@@ -44,8 +44,8 @@
     </DefaultItemExcludes>
   </PropertyGroup>
 
-  <!-- Exclude all external modules for .NET Framework 2.0, .NET Framework 3.5, .NET Framework 4.0 or non-Windows builds -->
-  <PropertyGroup Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`)) OR $(TargetFramework.StartsWith(`net40`)) OR !$(RuntimeIdentifier.StartsWith(`win-`))">
+  <!-- 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-`))">
     <DefaultItemExcludes>
       $(DefaultItemExcludes);
       _EXTERNAL\**
@@ -53,7 +53,7 @@
   </PropertyGroup>
 
   <!-- These are needed for dealing with native Windows DLLs -->
-  <ItemGroup Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND $(RuntimeIdentifier.StartsWith(`win-x86`))">
+  <ItemGroup Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND $(RuntimeIdentifier.StartsWith(`win-x86`))">
     <Content Include="*.dll">
       <Pack>true</Pack>
       <PackagePath>contentFiles;content</PackagePath>
diff --git a/BinaryObjectScanner/FileType/MicrosoftCAB.cs b/BinaryObjectScanner/FileType/MicrosoftCAB.cs
index 711bd421..440adeb9 100644
--- a/BinaryObjectScanner/FileType/MicrosoftCAB.cs
+++ b/BinaryObjectScanner/FileType/MicrosoftCAB.cs
@@ -1,6 +1,6 @@
 using System.IO;
 using BinaryObjectScanner.Interfaces;
-#if (NET452_OR_GREATER || NETCOREAPP) && WIN
+#if (NET40_OR_GREATER || NETCOREAPP) && WIN
 using LibMSPackN;
 #endif
 
diff --git a/README.md b/README.md
index c9078b49..7363df57 100644
--- a/README.md
+++ b/README.md
@@ -9,10 +9,10 @@ C# protection, packer, and archive scanning library. This currently compiles as
 The following non-project libraries (or ports thereof) are used for file handling:
 
 - [LessIO](https://github.com/activescott/LessIO) - Used by libmspack4n for IO handling
-- [libmspack4n](https://github.com/activescott/libmspack4n) MS-CAB extraction [Unused in .NET Frawework 2.0/3.5/4.0, non-Windows, and non-x86 builds due to Windows-specific libraries]
+- [libmspack4n](https://github.com/activescott/libmspack4n) MS-CAB extraction [Unused in .NET Frawework 2.0/3.5, non-Windows, and non-x86 builds due to Windows-specific libraries]
 - [OpenMcdf](https://github.com/ironfede/openmcdf) - MSI extraction
 - [SharpCompress](https://github.com/adamhathcock/sharpcompress) - Common archive format extraction
-- [StormLibSharp](https://github.com/robpaveza/stormlibsharp) - MoPaQ extraction [Unused in .NET Frawework 2.0/3.5/4.0, non-Windows, and non-x86  builds due to Windows-specific libraries]
+- [StormLibSharp](https://github.com/robpaveza/stormlibsharp) - MoPaQ extraction [Unused in .NET Frawework 2.0/3.5, non-Windows, and non-x86  builds due to Windows-specific libraries]
 - [UnshieldSharp](https://github.com/mnadareski/UnshieldSharp) - InstallShield CAB extraction
 - [WiseUnpacker](https://github.com/mnadareski/WiseUnpacker) - Wise Installer extraction