diff --git a/ExtractionTool/ExtractionTool.csproj b/ExtractionTool/ExtractionTool.csproj
index ae4e6145..d46e706d 100644
--- a/ExtractionTool/ExtractionTool.csproj
+++ b/ExtractionTool/ExtractionTool.csproj
@@ -50,7 +50,7 @@
-
+
\ No newline at end of file
diff --git a/InfoPrint/InfoPrint.csproj b/InfoPrint/InfoPrint.csproj
index 293c49a4..2899ad81 100644
--- a/InfoPrint/InfoPrint.csproj
+++ b/InfoPrint/InfoPrint.csproj
@@ -33,7 +33,7 @@
-
+
diff --git a/SabreTools.Data.Extensions.Test/SabreTools.Data.Extensions.Test.csproj b/SabreTools.Data.Extensions.Test/SabreTools.Data.Extensions.Test.csproj
index b28b71f9..08507f24 100644
--- a/SabreTools.Data.Extensions.Test/SabreTools.Data.Extensions.Test.csproj
+++ b/SabreTools.Data.Extensions.Test/SabreTools.Data.Extensions.Test.csproj
@@ -9,9 +9,9 @@
-
+
-
+
diff --git a/SabreTools.Metadata.DatFiles.Test/SabreTools.Metadata.DatFiles.Test.csproj b/SabreTools.Metadata.DatFiles.Test/SabreTools.Metadata.DatFiles.Test.csproj
index f9247871..f47d2e50 100644
--- a/SabreTools.Metadata.DatFiles.Test/SabreTools.Metadata.DatFiles.Test.csproj
+++ b/SabreTools.Metadata.DatFiles.Test/SabreTools.Metadata.DatFiles.Test.csproj
@@ -9,10 +9,10 @@
-
-
+
+
-
+
diff --git a/SabreTools.Metadata.DatFiles/SabreTools.Metadata.DatFiles.csproj b/SabreTools.Metadata.DatFiles/SabreTools.Metadata.DatFiles.csproj
index 571c86ad..82c256a3 100644
--- a/SabreTools.Metadata.DatFiles/SabreTools.Metadata.DatFiles.csproj
+++ b/SabreTools.Metadata.DatFiles/SabreTools.Metadata.DatFiles.csproj
@@ -46,7 +46,7 @@
-
+
diff --git a/SabreTools.Metadata.DatItems.Test/SabreTools.Metadata.DatItems.Test.csproj b/SabreTools.Metadata.DatItems.Test/SabreTools.Metadata.DatItems.Test.csproj
index 96508e81..8c7fce53 100644
--- a/SabreTools.Metadata.DatItems.Test/SabreTools.Metadata.DatItems.Test.csproj
+++ b/SabreTools.Metadata.DatItems.Test/SabreTools.Metadata.DatItems.Test.csproj
@@ -9,10 +9,10 @@
-
-
+
+
-
+
diff --git a/SabreTools.Metadata.DatItems/SabreTools.Metadata.DatItems.csproj b/SabreTools.Metadata.DatItems/SabreTools.Metadata.DatItems.csproj
index 412b0bb0..a1bc3846 100644
--- a/SabreTools.Metadata.DatItems/SabreTools.Metadata.DatItems.csproj
+++ b/SabreTools.Metadata.DatItems/SabreTools.Metadata.DatItems.csproj
@@ -32,7 +32,7 @@
-
+
diff --git a/SabreTools.Metadata.Filter.Test/SabreTools.Metadata.Filter.Test.csproj b/SabreTools.Metadata.Filter.Test/SabreTools.Metadata.Filter.Test.csproj
index a93b2ae5..e8c900c9 100644
--- a/SabreTools.Metadata.Filter.Test/SabreTools.Metadata.Filter.Test.csproj
+++ b/SabreTools.Metadata.Filter.Test/SabreTools.Metadata.Filter.Test.csproj
@@ -19,9 +19,9 @@
-
+
-
+
diff --git a/SabreTools.Metadata.Reports/SabreTools.Metadata.Reports.csproj b/SabreTools.Metadata.Reports/SabreTools.Metadata.Reports.csproj
index 22474e4f..c99b5a16 100644
--- a/SabreTools.Metadata.Reports/SabreTools.Metadata.Reports.csproj
+++ b/SabreTools.Metadata.Reports/SabreTools.Metadata.Reports.csproj
@@ -37,7 +37,7 @@
-
+
diff --git a/SabreTools.ObjectIdentifier.Test/SabreTools.ObjectIdentifier.Test.csproj b/SabreTools.ObjectIdentifier.Test/SabreTools.ObjectIdentifier.Test.csproj
index e502adba..09767076 100644
--- a/SabreTools.ObjectIdentifier.Test/SabreTools.ObjectIdentifier.Test.csproj
+++ b/SabreTools.ObjectIdentifier.Test/SabreTools.ObjectIdentifier.Test.csproj
@@ -9,9 +9,9 @@
-
+
-
+
diff --git a/SabreTools.Serialization.CrossModel.Test/SabreTools.Serialization.CrossModel.Test.csproj b/SabreTools.Serialization.CrossModel.Test/SabreTools.Serialization.CrossModel.Test.csproj
index cc249f1d..bbb9ebd9 100644
--- a/SabreTools.Serialization.CrossModel.Test/SabreTools.Serialization.CrossModel.Test.csproj
+++ b/SabreTools.Serialization.CrossModel.Test/SabreTools.Serialization.CrossModel.Test.csproj
@@ -9,10 +9,10 @@
-
-
+
+
-
+
diff --git a/SabreTools.Serialization.CrossModel/SabreTools.Serialization.CrossModel.csproj b/SabreTools.Serialization.CrossModel/SabreTools.Serialization.CrossModel.csproj
index 668de8b0..3509b41a 100644
--- a/SabreTools.Serialization.CrossModel/SabreTools.Serialization.CrossModel.csproj
+++ b/SabreTools.Serialization.CrossModel/SabreTools.Serialization.CrossModel.csproj
@@ -31,7 +31,7 @@
-
+
diff --git a/SabreTools.Serialization.Readers.Test/SabreTools.Serialization.Readers.Test.csproj b/SabreTools.Serialization.Readers.Test/SabreTools.Serialization.Readers.Test.csproj
index 78e34c9b..762824c9 100644
--- a/SabreTools.Serialization.Readers.Test/SabreTools.Serialization.Readers.Test.csproj
+++ b/SabreTools.Serialization.Readers.Test/SabreTools.Serialization.Readers.Test.csproj
@@ -9,9 +9,9 @@
-
+
-
+
diff --git a/SabreTools.Serialization.Readers/SabreTools.Serialization.Readers.csproj b/SabreTools.Serialization.Readers/SabreTools.Serialization.Readers.csproj
index b743e530..bd048503 100644
--- a/SabreTools.Serialization.Readers/SabreTools.Serialization.Readers.csproj
+++ b/SabreTools.Serialization.Readers/SabreTools.Serialization.Readers.csproj
@@ -36,7 +36,7 @@
-
+
diff --git a/SabreTools.Serialization.Writers.Test/SabreTools.Serialization.Writers.Test.csproj b/SabreTools.Serialization.Writers.Test/SabreTools.Serialization.Writers.Test.csproj
index 2c5fa973..f9c98749 100644
--- a/SabreTools.Serialization.Writers.Test/SabreTools.Serialization.Writers.Test.csproj
+++ b/SabreTools.Serialization.Writers.Test/SabreTools.Serialization.Writers.Test.csproj
@@ -9,9 +9,9 @@
-
+
-
+
diff --git a/SabreTools.Serialization.Writers/SabreTools.Serialization.Writers.csproj b/SabreTools.Serialization.Writers/SabreTools.Serialization.Writers.csproj
index 6cdff6f7..a47e64d2 100644
--- a/SabreTools.Serialization.Writers/SabreTools.Serialization.Writers.csproj
+++ b/SabreTools.Serialization.Writers/SabreTools.Serialization.Writers.csproj
@@ -32,7 +32,7 @@
-
+
diff --git a/SabreTools.Serialization/SabreTools.Serialization.csproj b/SabreTools.Serialization/SabreTools.Serialization.csproj
index c461997f..404b0559 100644
--- a/SabreTools.Serialization/SabreTools.Serialization.csproj
+++ b/SabreTools.Serialization/SabreTools.Serialization.csproj
@@ -58,13 +58,13 @@
-
-
+
+
-
+
diff --git a/SabreTools.Wrappers.Test/SabreTools.Wrappers.Test.csproj b/SabreTools.Wrappers.Test/SabreTools.Wrappers.Test.csproj
index a1befefa..d0d6d320 100644
--- a/SabreTools.Wrappers.Test/SabreTools.Wrappers.Test.csproj
+++ b/SabreTools.Wrappers.Test/SabreTools.Wrappers.Test.csproj
@@ -19,10 +19,10 @@
-
+
-
+
diff --git a/SabreTools.Wrappers/BZip2.Extraction.cs b/SabreTools.Wrappers/BZip2.Extraction.cs
index 5278a31c..3ffd7ee2 100644
--- a/SabreTools.Wrappers/BZip2.Extraction.cs
+++ b/SabreTools.Wrappers/BZip2.Extraction.cs
@@ -1,6 +1,7 @@
using System;
using System.IO;
-using SabreTools.IO.Compression.BZip2;
+using Nanook.GrindCore;
+using Nanook.GrindCore.BZip2;
using SabreTools.IO.Extensions;
namespace SabreTools.Wrappers
@@ -21,7 +22,7 @@ namespace SabreTools.Wrappers
try
{
// Try opening the stream
- using var bz2File = new BZip2InputStream(_dataSource, true);
+ using var bz2File = new BZip2Stream(_dataSource, new CompressionOptions { LeaveOpen = true, Type = CompressionType.Decompress});
// Ensure directory separators are consistent
string filename = Guid.NewGuid().ToString();
diff --git a/SabreTools.Wrappers/PortableExecutable.Extraction.cs b/SabreTools.Wrappers/PortableExecutable.Extraction.cs
index 761547ab..6397f1f1 100644
--- a/SabreTools.Wrappers/PortableExecutable.Extraction.cs
+++ b/SabreTools.Wrappers/PortableExecutable.Extraction.cs
@@ -1,6 +1,7 @@
using System;
using System.IO;
-using SabreTools.IO.Compression.BZip2;
+using Nanook.GrindCore;
+using Nanook.GrindCore.BZip2;
using SabreTools.IO.Compression.zlib;
using SabreTools.IO.Extensions;
using SabreTools.Matching;
@@ -595,7 +596,7 @@ namespace SabreTools.Wrappers
// Try opening the stream
using var ms = new MemoryStream(bz2Data);
- using var bz2File = new BZip2InputStream(ms, false);
+ using var bz2File = new BZip2Stream(ms, new CompressionOptions { LeaveOpen = false, Type = CompressionType.Decompress});
// Try to read the decompressed data
byte[] data = bz2File.ReadBytes(extracted);
diff --git a/SabreTools.Wrappers/SabreTools.Wrappers.csproj b/SabreTools.Wrappers/SabreTools.Wrappers.csproj
index 87c15ea0..3835f450 100644
--- a/SabreTools.Wrappers/SabreTools.Wrappers.csproj
+++ b/SabreTools.Wrappers/SabreTools.Wrappers.csproj
@@ -43,10 +43,10 @@
-
-
+
+
-
+