diff --git a/BinaryObjectScanner/BinaryObjectScanner.csproj b/BinaryObjectScanner/BinaryObjectScanner.csproj index bc4a522d..fb5a117a 100644 --- a/BinaryObjectScanner/BinaryObjectScanner.csproj +++ b/BinaryObjectScanner/BinaryObjectScanner.csproj @@ -31,7 +31,7 @@ $(DefineConstants);WIN - + $(DefaultItemExcludes); @@ -44,8 +44,16 @@ + + + + $(DefaultItemExcludes); + _EXTERNAL\stormlibsharp\src\** + + + - + $(DefaultItemExcludes); _EXTERNAL\** diff --git a/BinaryObjectScanner/FileType/MPQ.cs b/BinaryObjectScanner/FileType/MPQ.cs index 33b135b8..92bd0811 100644 --- a/BinaryObjectScanner/FileType/MPQ.cs +++ b/BinaryObjectScanner/FileType/MPQ.cs @@ -33,7 +33,7 @@ namespace BinaryObjectScanner.FileType try { // Create a temp output directory - string tempPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()); + string tempPath = Path.Combine(Path.GetTempPath(), System.Guid.NewGuid().ToString()); Directory.CreateDirectory(tempPath); using (var mpqArchive = new MpqArchive(file, FileAccess.Read)) @@ -64,18 +64,18 @@ namespace BinaryObjectScanner.FileType Directory.CreateDirectory(Path.GetDirectoryName(tempFile)); mpqArchive.ExtractFile(sub, tempFile); } - catch (Exception ex) + catch (System.Exception ex) { - if (includeDebug) Console.WriteLine(ex); + if (includeDebug) System.Console.WriteLine(ex); } } } return tempPath; } - catch (Exception ex) + catch (System.Exception ex) { - if (includeDebug) Console.WriteLine(ex); + if (includeDebug) System.Console.WriteLine(ex); return null; } #endif diff --git a/BinaryObjectScanner/FileType/MicrosoftCAB.cs b/BinaryObjectScanner/FileType/MicrosoftCAB.cs index 440adeb9..cf006410 100644 --- a/BinaryObjectScanner/FileType/MicrosoftCAB.cs +++ b/BinaryObjectScanner/FileType/MicrosoftCAB.cs @@ -26,7 +26,7 @@ namespace BinaryObjectScanner.FileType /// public string? Extract(Stream? stream, string file, 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 null; @@ -34,7 +34,7 @@ namespace BinaryObjectScanner.FileType try { // Create a temp output directory - string tempPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()); + string tempPath = Path.Combine(Path.GetTempPath(), System.Guid.NewGuid().ToString()); Directory.CreateDirectory(tempPath); using (var cabArchive = new MSCabinet(file)) @@ -48,18 +48,18 @@ namespace BinaryObjectScanner.FileType Directory.CreateDirectory(Path.GetDirectoryName(tempFile)); compressedFile.ExtractTo(tempFile); } - catch (Exception ex) + catch (System.Exception ex) { - if (includeDebug) Console.WriteLine(ex); + if (includeDebug) System.Console.WriteLine(ex); } } } return tempPath; } - catch (Exception ex) + catch (System.Exception ex) { - if (includeDebug) Console.WriteLine(ex); + if (includeDebug) System.Console.WriteLine(ex); return null; } #endif diff --git a/README.md b/README.md index 7363df57..ea63c5b2 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, non-Windows, and non-x86 builds due to Windows-specific libraries] +- [libmspack4n](https://github.com/activescott/libmspack4n) MS-CAB extraction [Unused in .NET Framework 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, non-Windows, and non-x86 builds due to Windows-specific libraries] +- [StormLibSharp](https://github.com/robpaveza/stormlibsharp) - MoPaQ extraction [Unused in .NET Framework 2.0/3.5/4.0, 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