From 555dbd592cb659ab5eca38598218af1e68c6224d Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Wed, 28 Dec 2022 22:31:46 -0800 Subject: [PATCH] Re-disable MS-CAB extraction on .NET 6.0 --- BurnOutSharp/FileType/MicrosoftCAB.cs | 4 ++++ README.md | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/BurnOutSharp/FileType/MicrosoftCAB.cs b/BurnOutSharp/FileType/MicrosoftCAB.cs index ee4d5597..fabb4b97 100644 --- a/BurnOutSharp/FileType/MicrosoftCAB.cs +++ b/BurnOutSharp/FileType/MicrosoftCAB.cs @@ -35,6 +35,10 @@ namespace BurnOutSharp.FileType public ConcurrentDictionary> Scan(Scanner scanner, Stream stream, string file) { #if NET6_0_OR_GREATER + // TODO: LibMSPackSharp still has issues with certain CAB files + // TODO: Re-enable CAB extraction for .NET 6.0 once LibMSPackSharp is fixed or an alternative is found + return null; + // If the cab file itself fails try { diff --git a/README.md b/README.md index 5aadc907..97b73077 100644 --- a/README.md +++ b/README.md @@ -157,7 +157,7 @@ Below is a list of container formats that are supported in some way: | InstallShield Archive V3 (Z) | No | Yes | Yes | Via `UnshieldSharp` | | InstallShield CAB | No | Yes | Yes | Via `UnshieldSharp` | | Linear Executable | No | No | No | Skeleton only | -| Microsoft cabinet file | Yes | Yes | Yes | Via `WixToolset.Dtf` / `LibMSPackSharp` | +| Microsoft cabinet file | Yes | Yes | Yes | Via `WixToolset.Dtf` / ~~`LibMSPackSharp`~~ (Currently disabled) | | MoPaQ game data archive (MPQ) | No | Yes | Yes | Via `StormLibSharp` | | Microsoft installation package (MSI) | No | Yes | Yes | Via `OpenMcdf` | | MS-DOS Executable | Yes | Yes | No | Incomplete |