some nullability

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "csharpier": {
-      "version": "1.2.6",
+      "version": "1.2.5",
       "commands": [
         "csharpier"
       ],

AGENTS.md

@@ -6,25 +6,21 @@ applyTo: '**/*.cs'
 # SharpCompress Development
 
 ## About SharpCompress
-SharpCompress is a pure C# compression library supporting multiple archive formats (Zip, Tar, GZip, BZip2, 7Zip, Rar, LZip, XZ, ZStandard). The project currently targets .NET Framework 4.8, .NET Standard 2.0, .NET 8.0, and .NET 10.0. The library provides both seekable Archive APIs and forward-only Reader/Writer APIs for streaming scenarios.
+SharpCompress is a pure C# compression library supporting multiple archive formats (Zip, Tar, GZip, BZip2, 7Zip, Rar, LZip, XZ, ZStandard) for .NET Framework 4.62, .NET Standard 2.1, .NET 6.0, and .NET 8.0. The library provides both seekable Archive APIs and forward-only Reader/Writer APIs for streaming scenarios.
 
 ## C# Instructions
-- Use language features supported by the current project toolchain (`LangVersion=latest`) and existing codebase patterns.
-- Add comments for non-obvious logic and important design decisions; avoid redundant comments.
+- Always use the latest version C#, currently C# 13 features.
+- Write clear and concise comments for each function.
 - Follow the existing code style and patterns in the codebase.
 
 ## General Instructions
-- **Do not commit or stage changes unless the user explicitly asks for it.**
+- **Agents should NEVER commit to git** - Agents should stage files and leave committing to the user. Only create commits when the user explicitly requests them.
 - Make only high confidence suggestions when reviewing code changes.
 - Write code with good maintainability practices, including comments on why certain design decisions were made.
 - Handle edge cases and write clear exception handling.
 - For libraries or external dependencies, mention their usage and purpose in comments.
 - Preserve backward compatibility when making changes to public APIs.
 
-### Workspace Hygiene
-- Do not edit generated or machine-local files unless required for the task (for example: `bin/`, `obj/`, `*.csproj.user`).
-- Avoid broad formatting-only diffs in unrelated files.
-
 ## Naming Conventions
 
 - Follow PascalCase for component names, method names, and public members.
@@ -68,7 +64,7 @@ SharpCompress is a pure C# compression library supporting multiple archive forma
 
 ## Project Setup and Structure
 
-- The project targets multiple frameworks: .NET Framework 4.8, .NET Standard 2.0, .NET 8.0, and .NET 10.0
+- The project targets multiple frameworks: .NET Framework 4.62, .NET Standard 2.1, .NET 6.0, and .NET 8.0
 - Main library is in `src/SharpCompress/`
 - Tests are in `tests/SharpCompress.Test/`
 - Performance tests are in `tests/SharpCompress.Performance/`
@@ -93,21 +89,13 @@ src/SharpCompress/
 tests/SharpCompress.Test/
   ├── Zip/, Tar/, Rar/, SevenZip/, GZip/, BZip2/  # Format-specific tests
   ├── TestBase.cs      # Base test class with helper methods
-
-tests/
-  ├── SharpCompress.Test/         # Unit/integration tests
-  ├── SharpCompress.Performance/  # Benchmark tests
-  └── TestArchives/               # Test data archives
+  └── TestArchives/    # Test data (not checked into main test project)
 ```
 
 ### Factory Pattern
-Factory implementations can implement one or more interfaces (`IArchiveFactory`, `IReaderFactory`, `IWriterFactory`) depending on format capabilities:
-- `ArchiveFactory.OpenArchive()` - Opens archive API objects from seekable streams/files
-- `ArchiveFactory.OpenAsyncArchive()` - Opens async archive API objects for async archive use cases
-- `ReaderFactory.OpenReader()` - Auto-detects and opens forward-only readers
-- `ReaderFactory.OpenAsyncReader()` - Auto-detects and opens forward-only async readers
-- `WriterFactory.OpenWriter()` - Creates a writer for a specified `ArchiveType`
-- `WriterFactory.OpenAsyncWriter()` - Creates an async writer for async write scenarios
+All format types implement factory interfaces (`IArchiveFactory`, `IReaderFactory`, `IWriterFactory`) for auto-detection:
+- `ReaderFactory.Open()` - Auto-detects format by probing stream
+- `WriterFactory.Open()` - Creates writer for specified `ArchiveType`
 - Factories located in: `src/SharpCompress/Factories/`
 
 ## Nullable Reference Types
@@ -135,9 +123,6 @@ SharpCompress supports multiple archive and compression formats:
 ### Async/Await Patterns
 - All I/O operations support async/await with `CancellationToken`
 - Async methods follow the naming convention: `MethodNameAsync`
-- For async archive scenarios, prefer `ArchiveFactory.OpenAsyncArchive(...)` over sync `OpenArchive(...)`.
-- For async forward-only read scenarios, prefer `ReaderFactory.OpenAsyncReader(...)` over sync `OpenReader(...)`.
-- For async write scenarios, prefer `WriterFactory.OpenAsyncWriter(...)` over sync `OpenWriter(...)`.
 - Key async methods:
   - `WriteEntryToAsync` - Extract entry asynchronously
   - `WriteAllToDirectoryAsync` - Extract all entries asynchronously
@@ -181,32 +166,71 @@ SharpCompress supports multiple archive and compression formats:
 - Test stream disposal and `LeaveStreamOpen` behavior.
 - Test edge cases: empty archives, large files, corrupted archives, encrypted archives.
 
-### Validation Expectations
-- Run targeted tests for the changed area first.
-- Run `dotnet csharpier format .` after code edits.
-- Run `dotnet csharpier check .` before handing off changes.
-
 ### Test Organization
 - Base class: `TestBase` - Provides `TEST_ARCHIVES_PATH`, `SCRATCH_FILES_PATH`, temp directory management
 - Framework: xUnit with AwesomeAssertions
 - Test archives: `tests/TestArchives/` - Use existing archives, don't create new ones unnecessarily
 - Match naming style of nearby test files
 
-### Public API Change Checklist
-- Preserve existing public method signatures and behavior when possible.
-- If a breaking change is unavoidable, document it and provide a migration path.
-- Add or update tests that cover backward compatibility expectations.
-
-### Stream Ownership and Position Checklist
-- Verify `LeaveStreamOpen` behavior for externally owned streams.
-- Validate behavior for both seekable and non-seekable streams.
-- Ensure stream position assumptions are explicit and tested.
-
 ## Common Pitfalls
 
 1. **Don't mix Archive and Reader APIs** - Archive needs seekable stream, Reader doesn't
-2. **Don't mix sync and async open paths** - For async workflows use `OpenAsyncArchive`/`OpenAsyncReader`/`OpenAsyncWriter`, not `OpenArchive`/`OpenReader`/`OpenWriter`
-3. **Solid archives (Rar, 7Zip)** - Use `ExtractAllEntries()` for best performance, not individual entry extraction
-4. **Stream disposal** - Always set `LeaveStreamOpen` explicitly when needed (default is to close)
-5. **Tar + non-seekable stream** - Must provide file size or it will throw
-6. **Format detection** - Use `ReaderFactory.OpenReader()` / `ReaderFactory.OpenAsyncReader()` for auto-detection, test with actual archive files
+2. **Solid archives (Rar, 7Zip)** - Use `ExtractAllEntries()` for best performance, not individual entry extraction
+3. **Stream disposal** - Always set `LeaveStreamOpen` explicitly when needed (default is to close)
+4. **Tar + non-seekable stream** - Must provide file size or it will throw
+6. **Format detection** - Use `ReaderFactory.Open()` for auto-detection, test with actual archive files
+
+### Async Struct-Copy Bug in LZMA RangeCoder
+
+When implementing async methods on mutable `struct` types (like `BitEncoder` and `BitDecoder` in the LZMA RangeCoder), be aware that the async state machine copies the struct when `await` is encountered. This means mutations to struct fields after the `await` point may not persist back to the original struct stored in arrays or fields.
+
+**The Bug:**
+```csharp
+// BAD: async method on mutable struct
+public async ValueTask<uint> DecodeAsync(Decoder decoder, CancellationToken cancellationToken = default)
+{
+    var newBound = (decoder._range >> K_NUM_BIT_MODEL_TOTAL_BITS) * _prob;
+    if (decoder._code < newBound)
+    {
+        decoder._range = newBound;
+        _prob += (K_BIT_MODEL_TOTAL - _prob) >> K_NUM_MOVE_BITS;  // Mutates _prob
+        await decoder.Normalize2Async(cancellationToken).ConfigureAwait(false);  // Struct gets copied here
+        return 0;  // Original _prob update may be lost
+    }
+    // ...
+}
+```
+
+**The Fix:**
+Refactor async methods on mutable structs to perform all struct mutations synchronously before any `await`, or use a helper method to separate the await from the struct mutation:
+
+```csharp
+// GOOD: struct mutations happen synchronously, await is conditional
+public ValueTask<uint> DecodeAsync(Decoder decoder, CancellationToken cancellationToken = default)
+{
+    var newBound = (decoder._range >> K_NUM_BIT_MODEL_TOTAL_BITS) * _prob;
+    if (decoder._code < newBound)
+    {
+        decoder._range = newBound;
+        _prob += (K_BIT_MODEL_TOTAL - _prob) >> K_NUM_MOVE_BITS;  // All mutations complete
+        return DecodeAsyncHelper(decoder.Normalize2Async(cancellationToken), 0);  // Await in helper
+    }
+    decoder._range -= newBound;
+    decoder._code -= newBound;
+    _prob -= (_prob) >> K_NUM_MOVE_BITS;  // All mutations complete
+    return DecodeAsyncHelper(decoder.Normalize2Async(cancellationToken), 1);  // Await in helper
+}
+
+private static async ValueTask<uint> DecodeAsyncHelper(ValueTask normalizeTask, uint result)
+{
+    await normalizeTask.ConfigureAwait(false);
+    return result;
+}
+```
+
+**Why This Matters:**
+In LZMA, the `BitEncoder` and `BitDecoder` structs maintain adaptive probability models in their `_prob` field. When these structs are stored in arrays (e.g., `_models[m]`), the async state machine copy breaks the adaptive model, causing incorrect bit decoding and eventually `DataErrorException` exceptions.
+
+**Related Files:**
+- `src/SharpCompress/Compressors/LZMA/RangeCoder/RangeCoderBit.Async.cs` - Fixed
+- `src/SharpCompress/Compressors/LZMA/RangeCoder/RangeCoderBitTree.Async.cs` - Uses readonly structs, so this pattern doesn't apply

README.md

@@ -26,7 +26,7 @@ RAR is not recommended as it's a proprietary format and the compression is close
 
 7Zip and XZ both are overly complicated. 7Zip does not support streamable formats. XZ has known holes explained here: (http://www.nongnu.org/lzip/xz_inadequate.html) Use Tar/LZip for LZMA compression instead.
 
-ZStandard is an efficient format that works well for streaming with a flexible compression level to tweak the speed/performance trade off you are looking for.
+ZStandard is an efficient format that works well for streaming with a flexible compression level to tweak the speed/performance trade off you are looking for.  We currently only implement decompression for ZStandard but as we leverage the [ZstdSharp](https://github.com/oleg-st/ZstdSharp) library one could likely add compression support without much trouble (PRs are welcome!).
 
 ## A Simple Request
 
@@ -46,8 +46,6 @@ XZ BCJ filters support contributed by Louis-Michel Bergeron, on behalf of aDolus
 
 7Zip implementation based on: https://code.google.com/p/managed-lzma/
 
-Zstandard implementation from: https://github.com/oleg-st/ZstdSharp
-
 LICENSE
 Copyright (c) 2000 - 2011 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
 

docs/API.md

@@ -20,18 +20,14 @@ using (var archive = RarArchive.OpenArchive("file.rar"))
 using (var archive = SevenZipArchive.OpenArchive("file.7z"))
 using (var archive = GZipArchive.OpenArchive("file.gz"))
 
-// With fluent options (preferred)
-var options = ReaderOptions.ForEncryptedArchive("password")
-    .WithArchiveEncoding(new ArchiveEncoding { Default = Encoding.GetEncoding(932) });
-using (var archive = ZipArchive.OpenArchive("encrypted.zip", options))
-
-// Alternative: object initializer
-var options2 = new ReaderOptions
+// With options
+var options = new ReaderOptions
 {
     Password = "password",
     LeaveStreamOpen = true,
     ArchiveEncoding = new ArchiveEncoding { Default = Encoding.GetEncoding(932) }
 };
+using (var archive = ZipArchive.OpenArchive("encrypted.zip", options))
 ```
 
 ### Creating Archives
@@ -48,21 +44,16 @@ using (var archive = ZipArchive.CreateArchive())
 using (var archive = TarArchive.CreateArchive())
 using (var archive = GZipArchive.CreateArchive())
 
-// With fluent options (preferred)
-var options = WriterOptions.ForZip()
-    .WithCompressionLevel(9)
-    .WithLeaveStreamOpen(false);
-using (var archive = ZipArchive.CreateArchive())
-{
-    archive.SaveTo("output.zip", options);
-}
-
-// Alternative: constructor with object initializer
-var options2 = new WriterOptions(CompressionType.Deflate)
+// With options
+var options = new WriterOptions(CompressionType.Deflate)
 {
     CompressionLevel = 9,
     LeaveStreamOpen = false
 };
+using (var archive = ZipArchive.CreateArchive())
+{
+    archive.SaveTo("output.zip", options);
+}
 ```
 
 ---
@@ -81,11 +72,16 @@ using (var archive = ZipArchive.OpenArchive("file.zip"))
     var entry = archive.Entries.FirstOrDefault(e => e.Key == "file.txt");
 
     // Extract all
-    archive.WriteToDirectory(@"C:\output");
+    archive.WriteToDirectory(@"C:\output", new ExtractionOptions
+    {
+        ExtractFullPath = true,
+        Overwrite = true
+    });
 
     // Extract single entry
     var entry = archive.Entries.First();
     entry.WriteToFile(@"C:\output\file.txt");
+    entry.WriteToFile(@"C:\output\file.txt", new ExtractionOptions { Overwrite = true });
 
     // Get entry stream
     using (var stream = entry.OpenEntryStream())
@@ -99,6 +95,7 @@ using (var asyncArchive = await ZipArchive.OpenAsyncArchive("file.zip"))
 {
     await asyncArchive.WriteToDirectoryAsync(
         @"C:\output",
+        new ExtractionOptions { ExtractFullPath = true, Overwrite = true },
         cancellationToken: cancellationToken
     );
 }
@@ -190,6 +187,7 @@ using (var reader = await ReaderFactory.OpenAsyncReader(stream))
     // Async extraction of all entries
     await reader.WriteAllToDirectoryAsync(
         @"C:\output",
+        new ExtractionOptions { ExtractFullPath = true, Overwrite = true },
         cancellationToken
     );
 }
@@ -231,91 +229,43 @@ using (var writer = WriterFactory.OpenWriter(stream, ArchiveType.Zip, Compressio
 
 ### ReaderOptions
 
-Use factory presets and fluent helpers for common configurations:
-
 ```csharp
-// External stream with password and custom encoding
-var options = ReaderOptions.ForExternalStream()
-    .WithPassword("password")
-    .WithArchiveEncoding(new ArchiveEncoding { Default = Encoding.GetEncoding(932) });
-
+var options = new ReaderOptions
+{
+    Password = "password",                          // For encrypted archives
+    LeaveStreamOpen = true,                         // Don't close wrapped stream
+    ArchiveEncoding = new ArchiveEncoding          // Custom character encoding
+    {
+        Default = Encoding.GetEncoding(932)
+    }
+};
 using (var archive = ZipArchive.OpenArchive("file.zip", options))
 {
     // ...
 }
-
-// Common presets
-var safeOptions = ReaderOptions.SafeExtract;      // No overwrite
-var flatOptions = ReaderOptions.FlatExtract;      // No directory structure
-
-// Factory defaults:
-// - file path / FileInfo overloads use LeaveStreamOpen = false
-// - stream overloads use LeaveStreamOpen = true
-```
-
-Alternative: traditional object initializer:
-
-```csharp
-var options = new ReaderOptions
-{
-    Password = "password",
-    LeaveStreamOpen = true,
-    ArchiveEncoding = new ArchiveEncoding { Default = Encoding.GetEncoding(932) }
-};
 ```
 
 ### WriterOptions
 
-Factory methods provide a clean, discoverable way to create writer options:
-
-```csharp
-// Factory methods for common archive types
-var zipOptions = WriterOptions.ForZip()                           // ZIP with Deflate
-    .WithCompressionLevel(9)                                      // 0-9 for Deflate
-    .WithLeaveStreamOpen(false);                                  // Close stream when done
-
-var tarOptions = WriterOptions.ForTar(CompressionType.GZip)       // TAR with GZip
-    .WithLeaveStreamOpen(false);
-
-var gzipOptions = WriterOptions.ForGZip()                         // GZip file
-    .WithCompressionLevel(6);
-
-archive.SaveTo("output.zip", zipOptions);
-```
-
-Alternative: traditional constructor with object initializer:
-
 ```csharp
 var options = new WriterOptions(CompressionType.Deflate)
 {
-    CompressionLevel = 9,
-    LeaveStreamOpen = true,
+    CompressionLevel = 9,                           // 0-9 for Deflate
+    LeaveStreamOpen = true,                         // Don't close stream
 };
 archive.SaveTo("output.zip", options);
 ```
 
-### Extraction behavior
+### ExtractionOptions
 
 ```csharp
-var options = new ReaderOptions
+var options = new ExtractionOptions
 {
     ExtractFullPath = true,                         // Recreate directory structure
     Overwrite = true,                               // Overwrite existing files
     PreserveFileTime = true                         // Keep original timestamps
 };
-
-using (var archive = ZipArchive.OpenArchive("file.zip", options))
-{
-    archive.WriteToDirectory(@"C:\output");
-}
-```
-
-### Options matrix
-
-```text
-ReaderOptions: open-time behavior (password, encoding, stream ownership, extraction defaults)
-WriterOptions: write-time behavior (compression type/level, encoding, stream ownership)
-ZipWriterEntryOptions: per-entry ZIP overrides (compression, level, timestamps, comments, zip64)
+archive.WriteToDirectory(@"C:\output", options);
 ```
 
 ---
@@ -367,9 +317,13 @@ ArchiveType.ZStandard
 try
 {
     using (var archive = ZipArchive.Open("archive.zip", 
-        ReaderOptions.ForEncryptedArchive("password")))
+        new ReaderOptions { Password = "password" }))
     {
-        archive.WriteToDirectory(@"C:\output");
+        archive.WriteToDirectory(@"C:\output", new ExtractionOptions
+        {
+            ExtractFullPath = true,
+            Overwrite = true
+        });
     }
 }
 catch (PasswordRequiredException)
@@ -394,7 +348,7 @@ var progress = new Progress<ProgressReport>(report =>
     Console.WriteLine($"Extracting {report.EntryPath}: {report.PercentComplete}%");
 });
 
-var options = ReaderOptions.ForOwnedFile().WithProgress(progress);
+var options = new ReaderOptions { Progress = progress };
 using (var archive = ZipArchive.OpenArchive("archive.zip", options))
 {
     archive.WriteToDirectory(@"C:\output");
@@ -413,6 +367,7 @@ try
     {
         await archive.WriteToDirectoryAsync(
             @"C:\output",
+            new ExtractionOptions { ExtractFullPath = true, Overwrite = true },
             cancellationToken: cts.Token
         );
     }

docs/ARCHITECTURE.md

@@ -90,7 +90,7 @@ Common types, options, and enumerations used across formats.
 - `ArchiveType.cs` - Enum for archive formats
 - `CompressionType.cs` - Enum for compression methods
 - `ArchiveEncoding.cs` - Character encoding configuration
-- `IExtractionOptions.cs` - Extraction configuration exposed through `ReaderOptions`
+- `ExtractionOptions.cs` - Extraction configuration
 - Format-specific headers: `Zip/Headers/`, `Tar/Headers/`, `Rar/Headers/`, etc.
 
 #### `Compressors/` - Compression Algorithms
@@ -215,13 +215,13 @@ using (var compressor = new DeflateStream(nonDisposingStream))
 public abstract class AbstractArchive : IArchive
 {
     // Template methods
-    public virtual void WriteToDirectory(string destinationDirectory)
+    public virtual void WriteToDirectory(string destinationDirectory, ExtractionOptions options)
     {
         // Common extraction logic
         foreach (var entry in Entries)
         {
             // Call subclass method
-            entry.WriteToFile(destinationPath);
+            entry.WriteToFile(destinationPath, options);
         }
     }
     
@@ -267,7 +267,8 @@ public interface IArchive : IDisposable
 {
     IEnumerable<IEntry> Entries { get; }
     
-    void WriteToDirectory(string destinationDirectory);
+    void WriteToDirectory(string destinationDirectory, 
+                         ExtractionOptions options = null);
     
     IEntry FirstOrDefault(Func<IEntry, bool> predicate);
     
@@ -286,7 +287,8 @@ public interface IReader : IDisposable
     
     bool MoveToNextEntry();
     
-    void WriteEntryToDirectory(string destinationDirectory);
+    void WriteEntryToDirectory(string destinationDirectory,
+                              ExtractionOptions options = null);
     
     Stream OpenEntryStream();
     
@@ -325,7 +327,7 @@ public interface IEntry
     DateTime? LastModifiedTime { get; }
     CompressionType CompressionType { get; }
     
-    void WriteToFile(string fullPath);
+    void WriteToFile(string fullPath, ExtractionOptions options = null);
     void WriteToStream(Stream destinationStream);
     Stream OpenEntryStream();
     

docs/ENCODING.md

@@ -18,9 +18,14 @@ Most archive formats store filenames and metadata as bytes. SharpCompress must c
 using SharpCompress.Common;
 using SharpCompress.Readers;
 
-// Configure encoding using fluent factory method (preferred)
-var options = ReaderOptions.ForEncoding(
-    new ArchiveEncoding { Default = Encoding.GetEncoding(932) });  // cp932 for Japanese
+// Configure encoding before opening archive
+var options = new ReaderOptions
+{
+    ArchiveEncoding = new ArchiveEncoding 
+    { 
+        Default = Encoding.GetEncoding(932)  // cp932 for Japanese
+    }
+};
 
 using (var archive = ZipArchive.OpenArchive("japanese.zip", options))
 {
@@ -29,12 +34,6 @@ using (var archive = ZipArchive.OpenArchive("japanese.zip", options))
         Console.WriteLine(entry.Key);  // Now shows correct characters
     }
 }
-
-// Alternative: object initializer
-var options2 = new ReaderOptions
-{
-    ArchiveEncoding = new ArchiveEncoding { Default = Encoding.GetEncoding(932) }
-};
 ```
 
 ### ArchiveEncoding Properties
@@ -48,8 +47,10 @@ var options2 = new ReaderOptions
 
 **Archive API:**
 ```csharp
-var options = ReaderOptions.ForEncoding(
-    new ArchiveEncoding { Default = Encoding.GetEncoding(932) });
+var options = new ReaderOptions
+{
+    ArchiveEncoding = new ArchiveEncoding { Default = Encoding.GetEncoding(932) }
+};
 using (var archive = ZipArchive.OpenArchive("file.zip", options))
 {
     // Use archive with correct encoding
@@ -58,8 +59,10 @@ using (var archive = ZipArchive.OpenArchive("file.zip", options))
 
 **Reader API:**
 ```csharp
-var options = ReaderOptions.ForEncoding(
-    new ArchiveEncoding { Default = Encoding.GetEncoding(932) });
+var options = new ReaderOptions
+{
+    ArchiveEncoding = new ArchiveEncoding { Default = Encoding.GetEncoding(932) }
+};
 using (var stream = File.OpenRead("file.zip"))
 using (var reader = ReaderFactory.OpenReader(stream, options))
 {
@@ -387,7 +390,11 @@ var options = new ReaderOptions
 
 using (var archive = ZipArchive.OpenArchive("japanese_files.zip", options))
 {
-    archive.WriteToDirectory(@"C:\output");
+    archive.WriteToDirectory(@"C:\output", new ExtractionOptions
+    {
+        ExtractFullPath = true,
+        Overwrite = true
+    });
 }
 // Files extracted with correct Japanese names
 ```

docs/PERFORMANCE.md

@@ -213,7 +213,11 @@ using (var archive = RarArchive.OpenArchive("solid.rar"))
 using (var archive = RarArchive.OpenArchive("solid.rar"))
 {
     // Method 1: Use WriteToDirectory (recommended)
-    archive.WriteToDirectory(@"C:\output");
+    archive.WriteToDirectory(@"C:\output", new ExtractionOptions
+    {
+        ExtractFullPath = true,
+        Overwrite = true
+    });
     
     // Method 2: Use ExtractAllEntries
     archive.ExtractAllEntries();
@@ -333,6 +337,7 @@ using (var archive = ZipArchive.OpenArchive("archive.zip"))
 {
     await archive.WriteToDirectoryAsync(
         @"C:\output",
+        new ExtractionOptions { ExtractFullPath = true, Overwrite = true },
         cancellationToken
     );
 }
@@ -350,7 +355,10 @@ Async doesn't improve performance for:
 // Sync extraction (simpler, same performance on fast I/O)
 using (var archive = ZipArchive.OpenArchive("archive.zip"))
 {
-    archive.WriteToDirectory(@"C:\output");
+    archive.WriteToDirectory(
+        @"C:\output",
+        new ExtractionOptions { ExtractFullPath = true, Overwrite = true }
+    );
 }
 // Simple and fast - no async needed
 ```
@@ -369,6 +377,7 @@ try
     {
         await archive.WriteToDirectoryAsync(
             @"C:\output",
+            new ExtractionOptions { ExtractFullPath = true, Overwrite = true },
             cts.Token
         );
     }

docs/USAGE.md

@@ -6,7 +6,7 @@ SharpCompress now provides full async/await support for all I/O operations. All
 
 **Key Async Methods:**
 - `reader.WriteEntryToAsync(stream, cancellationToken)` - Extract entry asynchronously  
-- `reader.WriteAllToDirectoryAsync(path, cancellationToken)` - Extract all asynchronously
+- `reader.WriteAllToDirectoryAsync(path, options, cancellationToken)` - Extract all asynchronously
 - `writer.WriteAsync(filename, stream, modTime, cancellationToken)` - Write entry asynchronously
 - `writer.WriteAllAsync(directory, pattern, searchOption, cancellationToken)` - Write directory asynchronously
 - `entry.OpenEntryStreamAsync(cancellationToken)` - Open entry stream asynchronously
@@ -40,10 +40,6 @@ To deal with the "correct" rules as well as the expectations of users, I've deci
 
 To be explicit though, consider always using the overloads that use `ReaderOptions` or `WriterOptions` and explicitly set `LeaveStreamOpen` the way you want.
 
-Default behavior in factory APIs:
-- File path / `FileInfo` overloads set `LeaveStreamOpen = false`.
-- Caller-provided `Stream` overloads set `LeaveStreamOpen = true`.
-
 If using Compression Stream classes directly and you don't want the wrapped stream to be closed.  Use the `NonDisposingStream` as a wrapper to prevent the stream being disposed.  The change in 0.21 simplified a lot even though the usage is a bit more convoluted.
 
 ## Samples
@@ -94,14 +90,14 @@ Note: Extracting a solid rar or 7z file needs to be done in sequential order to
 `ExtractAllEntries` is primarily intended for solid archives (like solid Rar) or 7Zip archives, where sequential extraction provides the best performance. For general/simple extraction with any supported archive type, use `archive.WriteToDirectory()` instead.
 
 ```C#
-// Using fluent factory method for extraction options
-using (var archive = RarArchive.OpenArchive("Test.rar",
-    ReaderOptions.ForOwnedFile()
-        .WithExtractFullPath(true)
-        .WithOverwrite(true)))
+using (var archive = RarArchive.OpenArchive("Test.rar"))
 {
     // Simple extraction with RarArchive; this WriteToDirectory pattern works for all archive types
-    archive.WriteToDirectory(@"D:\temp");
+    archive.WriteToDirectory(@"D:\temp", new ExtractionOptions()
+    {
+        ExtractFullPath = true,
+        Overwrite = true
+    });
 }
 ```
 
@@ -130,13 +126,13 @@ var progress = new Progress<ProgressReport>(report =>
     Console.WriteLine($"Extracting {report.EntryPath}: {report.PercentComplete}%");
 });
 
-using (var archive = RarArchive.OpenArchive("archive.rar",
-    ReaderOptions.ForOwnedFile()
-        .WithProgress(progress)
-        .WithExtractFullPath(true)
-        .WithOverwrite(true))) // Must be solid Rar or 7Zip
+using (var archive = RarArchive.OpenArchive("archive.rar", new ReaderOptions { Progress = progress })) // Must be solid Rar or 7Zip
 {
-    archive.WriteToDirectory(@"D:\output");
+    archive.WriteToDirectory(@"D:\output", new ExtractionOptions()
+    {
+        ExtractFullPath = true,
+        Overwrite = true
+    });
 }
 ```
 
@@ -151,7 +147,11 @@ using (var reader = ReaderFactory.OpenReader(stream))
         if (!reader.Entry.IsDirectory)
         {
             Console.WriteLine(reader.Entry.Key);
-            reader.WriteEntryToDirectory(@"C:\temp");
+            reader.WriteEntryToDirectory(@"C:\temp", new ExtractionOptions()
+            {
+                ExtractFullPath = true,
+                Overwrite = true
+            });
         }
     }
 }
@@ -180,10 +180,10 @@ using (var reader = ReaderFactory.OpenReader(stream))
 
 ```C#
 using (Stream stream = File.OpenWrite("C:\\temp.tgz"))
-using (var writer = WriterFactory.OpenWriter(
-    stream,
-    ArchiveType.Tar,
-    WriterOptions.ForTar(CompressionType.GZip).WithLeaveStreamOpen(true)))
+using (var writer = WriterFactory.OpenWriter(stream, ArchiveType.Tar, new WriterOptions(CompressionType.GZip)
+                                                {
+                                                    LeaveOpenStream = true
+                                                }))
 {
     writer.WriteAll("D:\\temp", "*", SearchOption.AllDirectories);
 }
@@ -192,15 +192,15 @@ using (var writer = WriterFactory.OpenWriter(
 ### Extract zip which has non-utf8 encoded filename(cp932)
 
 ```C#
+var opts = new SharpCompress.Readers.ReaderOptions();
 var encoding = Encoding.GetEncoding(932);
-var opts = new ReaderOptions()
-    .WithArchiveEncoding(new ArchiveEncoding
-    {
-        CustomDecoder = (data, x, y) => encoding.GetString(data)
-    });
-
-using var archive = ZipArchive.OpenArchive("test.zip", opts);
-foreach(var entry in archive.Entries)
+opts.ArchiveEncoding = new SharpCompress.Common.ArchiveEncoding();
+opts.ArchiveEncoding.CustomDecoder = (data, x, y) =>
+{
+    return encoding.GetString(data);
+};
+var tr = SharpCompress.Archives.Zip.ZipArchive.OpenArchive("test.zip", opts);
+foreach(var entry in tr.Entries)
 {
     Console.WriteLine($"{entry.Key}");
 }
@@ -238,6 +238,11 @@ using (var reader = ReaderFactory.OpenReader(stream))
 {
     await reader.WriteAllToDirectoryAsync(
         @"D:\temp",
+        new ExtractionOptions()
+        {
+            ExtractFullPath = true,
+            Overwrite = true
+        },
         cancellationToken
     );
 }
@@ -316,6 +321,7 @@ using (var archive = ZipArchive.OpenArchive("archive.zip"))
     // Simple async extraction - works for all archive types
     await archive.WriteToDirectoryAsync(
         @"C:\output",
+        new ExtractionOptions() { ExtractFullPath = true, Overwrite = true },
         cancellationToken
     );
 }

src/SharpCompress/Archives/AbstractArchive.Async.cs

@@ -21,7 +21,7 @@ public abstract partial class AbstractArchive<TEntry, TVolume>
         IAsyncEnumerable<TVolume> volumes
     )
     {
-        foreach (var item in LoadEntries(await volumes.ToListAsync().ConfigureAwait(false)))
+        foreach (var item in LoadEntries(await volumes.ToListAsync()))
         {
             yield return item;
         }
@@ -47,8 +47,8 @@ public abstract partial class AbstractArchive<TEntry, TVolume>
 
     private async ValueTask EnsureEntriesLoadedAsync()
     {
-        await _lazyEntriesAsync.EnsureFullyLoaded().ConfigureAwait(false);
-        await _lazyVolumesAsync.EnsureFullyLoaded().ConfigureAwait(false);
+        await _lazyEntriesAsync.EnsureFullyLoaded();
+        await _lazyVolumesAsync.EnsureFullyLoaded();
     }
 
     private async IAsyncEnumerable<IArchiveEntry> EntriesAsyncCast()
@@ -73,31 +73,29 @@ public abstract partial class AbstractArchive<TEntry, TVolume>
 
     public async ValueTask<IAsyncReader> ExtractAllEntriesAsync()
     {
-        if (!await IsSolidAsync().ConfigureAwait(false) && Type != ArchiveType.SevenZip)
+        if (!await IsSolidAsync() && Type != ArchiveType.SevenZip)
         {
             throw new SharpCompressException(
                 "ExtractAllEntries can only be used on solid archives or 7Zip archives (which require random access)."
             );
         }
-        await EnsureEntriesLoadedAsync().ConfigureAwait(false);
-        return await CreateReaderForSolidExtractionAsync().ConfigureAwait(false);
+        await EnsureEntriesLoadedAsync();
+        return await CreateReaderForSolidExtractionAsync();
     }
 
     public virtual ValueTask<bool> IsSolidAsync() => new(false);
 
     public async ValueTask<bool> IsCompleteAsync()
     {
-        await EnsureEntriesLoadedAsync().ConfigureAwait(false);
-        return await EntriesAsync.AllAsync(x => x.IsComplete).ConfigureAwait(false);
+        await EnsureEntriesLoadedAsync();
+        return await EntriesAsync.AllAsync(x => x.IsComplete);
     }
 
     public async ValueTask<long> TotalSizeAsync() =>
-        await EntriesAsync
-            .AggregateAsync(0L, (total, cf) => total + cf.CompressedSize)
-            .ConfigureAwait(false);
+        await EntriesAsync.AggregateAsync(0L, (total, cf) => total + cf.CompressedSize);
 
     public async ValueTask<long> TotalUncompressedSizeAsync() =>
-        await EntriesAsync.AggregateAsync(0L, (total, cf) => total + cf.Size).ConfigureAwait(false);
+        await EntriesAsync.AggregateAsync(0L, (total, cf) => total + cf.Size);
 
     public ValueTask<bool> IsEncryptedAsync() => new(IsEncrypted);
 

src/SharpCompress/Archives/AbstractArchive.cs

@@ -20,7 +20,7 @@ public abstract partial class AbstractArchive<TEntry, TVolume> : IArchive, IAsyn
     private readonly LazyAsyncReadOnlyCollection<TVolume> _lazyVolumesAsync;
     private readonly LazyAsyncReadOnlyCollection<TEntry> _lazyEntriesAsync;
 
-    public ReaderOptions ReaderOptions { get; protected set; }
+    protected ReaderOptions ReaderOptions { get; }
 
     internal AbstractArchive(ArchiveType type, SourceStream sourceStream)
     {

src/SharpCompress/Archives/AbstractWritableArchive.Async.cs

@@ -5,14 +5,13 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using SharpCompress.Common;
-using SharpCompress.Common.Options;
+using SharpCompress.Writers;
 
 namespace SharpCompress.Archives;
 
-public abstract partial class AbstractWritableArchive<TEntry, TVolume, TOptions>
+public abstract partial class AbstractWritableArchive<TEntry, TVolume>
     where TEntry : IArchiveEntry
     where TVolume : IVolume
-    where TOptions : IWriterOptions
 {
     // Async property moved from main file
     private IAsyncEnumerable<TEntry> OldEntriesAsync =>
@@ -39,7 +38,7 @@ public abstract partial class AbstractWritableArchive<TEntry, TVolume, TOptions>
         if (!removedEntries.Contains(entry))
         {
             removedEntries.Add(entry);
-            await RebuildModifiedCollectionAsync().ConfigureAwait(false);
+            await RebuildModifiedCollectionAsync();
         }
     }
 
@@ -86,7 +85,7 @@ public abstract partial class AbstractWritableArchive<TEntry, TVolume, TOptions>
         }
         var entry = CreateEntry(key, source, size, modified, closeStream);
         newEntries.Add(entry);
-        await RebuildModifiedCollectionAsync().ConfigureAwait(false);
+        await RebuildModifiedCollectionAsync();
         return entry;
     }
 
@@ -106,13 +105,13 @@ public abstract partial class AbstractWritableArchive<TEntry, TVolume, TOptions>
         }
         var entry = CreateDirectoryEntry(key, modified);
         newEntries.Add(entry);
-        await RebuildModifiedCollectionAsync().ConfigureAwait(false);
+        await RebuildModifiedCollectionAsync();
         return entry;
     }
 
     public async ValueTask SaveToAsync(
         Stream stream,
-        TOptions options,
+        WriterOptions options,
         CancellationToken cancellationToken = default
     )
     {
@@ -121,12 +120,4 @@ public abstract partial class AbstractWritableArchive<TEntry, TVolume, TOptions>
         await SaveToAsync(stream, options, OldEntriesAsync, newEntries, cancellationToken)
             .ConfigureAwait(false);
     }
-
-    protected abstract ValueTask SaveToAsync(
-        Stream stream,
-        TOptions options,
-        IAsyncEnumerable<TEntry> oldEntries,
-        IEnumerable<TEntry> newEntries,
-        CancellationToken cancellationToken = default
-    );
 }

src/SharpCompress/Archives/AbstractWritableArchive.cs

@@ -5,25 +5,23 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using SharpCompress.Common;
-using SharpCompress.Common.Options;
 using SharpCompress.IO;
 using SharpCompress.Writers;
 
 namespace SharpCompress.Archives;
 
-public abstract partial class AbstractWritableArchive<TEntry, TVolume, TOptions>
+public abstract partial class AbstractWritableArchive<TEntry, TVolume>
     : AbstractArchive<TEntry, TVolume>,
-        IWritableArchive<TOptions>,
-        IWritableAsyncArchive<TOptions>
+        IWritableArchive,
+        IWritableAsyncArchive
     where TEntry : IArchiveEntry
     where TVolume : IVolume
-    where TOptions : IWriterOptions
 {
     private class RebuildPauseDisposable : IDisposable
     {
-        private readonly AbstractWritableArchive<TEntry, TVolume, TOptions> archive;
+        private readonly AbstractWritableArchive<TEntry, TVolume> archive;
 
-        public RebuildPauseDisposable(AbstractWritableArchive<TEntry, TVolume, TOptions> archive)
+        public RebuildPauseDisposable(AbstractWritableArchive<TEntry, TVolume> archive)
         {
             this.archive = archive;
             archive.pauseRebuilding = true;
@@ -152,15 +150,13 @@ public abstract partial class AbstractWritableArchive<TEntry, TVolume, TOptions>
         long size,
         DateTime? modified,
         CancellationToken cancellationToken
-    ) =>
-        await AddEntryAsync(key, source, closeStream, size, modified, cancellationToken)
-            .ConfigureAwait(false);
+    ) => await AddEntryAsync(key, source, closeStream, size, modified, cancellationToken);
 
     async ValueTask<IArchiveEntry> IWritableAsyncArchive.AddDirectoryEntryAsync(
         string key,
         DateTime? modified,
         CancellationToken cancellationToken
-    ) => await AddDirectoryEntryAsync(key, modified, cancellationToken).ConfigureAwait(false);
+    ) => await AddDirectoryEntryAsync(key, modified, cancellationToken);
 
     public TEntry AddDirectoryEntry(string key, DateTime? modified = null)
     {
@@ -178,7 +174,7 @@ public abstract partial class AbstractWritableArchive<TEntry, TVolume, TOptions>
         return entry;
     }
 
-    public void SaveTo(Stream stream, TOptions options)
+    public void SaveTo(Stream stream, WriterOptions options)
     {
         //reset streams of new entries
         newEntries.Cast<IWritableArchiveEntry>().ForEach(x => x.Stream.Seek(0, SeekOrigin.Begin));
@@ -214,11 +210,19 @@ public abstract partial class AbstractWritableArchive<TEntry, TVolume, TOptions>
 
     protected abstract void SaveTo(
         Stream stream,
-        TOptions options,
+        WriterOptions options,
         IEnumerable<TEntry> oldEntries,
         IEnumerable<TEntry> newEntries
     );
 
+    protected abstract ValueTask SaveToAsync(
+        Stream stream,
+        WriterOptions options,
+        IAsyncEnumerable<TEntry> oldEntries,
+        IEnumerable<TEntry> newEntries,
+        CancellationToken cancellationToken = default
+    );
+
     public override void Dispose()
     {
         base.Dispose();

src/SharpCompress/Archives/ArchiveFactory.Async.cs

@@ -19,9 +19,8 @@ public static partial class ArchiveFactory
         CancellationToken cancellationToken = default
     )
     {
-        readerOptions ??= ReaderOptions.ForExternalStream;
-        var factory = await FindFactoryAsync<IArchiveFactory>(stream, cancellationToken)
-            .ConfigureAwait(false);
+        readerOptions ??= new ReaderOptions();
+        var factory = await FindFactoryAsync<IArchiveFactory>(stream, cancellationToken);
         return factory.OpenAsyncArchive(stream, readerOptions);
     }
 
@@ -41,10 +40,9 @@ public static partial class ArchiveFactory
         CancellationToken cancellationToken = default
     )
     {
-        options ??= ReaderOptions.ForOwnedFile;
+        options ??= new ReaderOptions { LeaveStreamOpen = false };
 
-        var factory = await FindFactoryAsync<IArchiveFactory>(fileInfo, cancellationToken)
-            .ConfigureAwait(false);
+        var factory = await FindFactoryAsync<IArchiveFactory>(fileInfo, cancellationToken);
         return factory.OpenAsyncArchive(fileInfo, options);
     }
 
@@ -64,16 +62,14 @@ public static partial class ArchiveFactory
         var fileInfo = filesArray[0];
         if (filesArray.Length == 1)
         {
-            return await OpenAsyncArchive(fileInfo, options, cancellationToken)
-                .ConfigureAwait(false);
+            return await OpenAsyncArchive(fileInfo, options, cancellationToken);
         }
 
         fileInfo.NotNull(nameof(fileInfo));
-        options ??= ReaderOptions.ForOwnedFile;
+        options ??= new ReaderOptions { LeaveStreamOpen = false };
 
-        var factory = await FindFactoryAsync<IMultiArchiveFactory>(fileInfo, cancellationToken)
-            .ConfigureAwait(false);
-        return factory.OpenAsyncArchive(filesArray, options);
+        var factory = await FindFactoryAsync<IMultiArchiveFactory>(fileInfo, cancellationToken);
+        return factory.OpenAsyncArchive(filesArray, options, cancellationToken);
     }
 
     public static async ValueTask<IAsyncArchive> OpenAsyncArchive(
@@ -93,15 +89,13 @@ public static partial class ArchiveFactory
         var firstStream = streamsArray[0];
         if (streamsArray.Length == 1)
         {
-            return await OpenAsyncArchive(firstStream, options, cancellationToken)
-                .ConfigureAwait(false);
+            return await OpenAsyncArchive(firstStream, options, cancellationToken);
         }
 
         firstStream.NotNull(nameof(firstStream));
-        options ??= ReaderOptions.ForExternalStream;
+        options ??= new ReaderOptions();
 
-        var factory = await FindFactoryAsync<IMultiArchiveFactory>(firstStream, cancellationToken)
-            .ConfigureAwait(false);
+        var factory = await FindFactoryAsync<IMultiArchiveFactory>(firstStream, cancellationToken);
         return factory.OpenAsyncArchive(streamsArray, options);
     }
 
@@ -123,7 +117,7 @@ public static partial class ArchiveFactory
     {
         finfo.NotNull(nameof(finfo));
         using Stream stream = finfo.OpenRead();
-        return await FindFactoryAsync<T>(stream, cancellationToken).ConfigureAwait(false);
+        return await FindFactoryAsync<T>(stream, cancellationToken);
     }
 
     private static async ValueTask<T> FindFactoryAsync<T>(
@@ -146,11 +140,7 @@ public static partial class ArchiveFactory
         {
             stream.Seek(startPosition, SeekOrigin.Begin);
 
-            if (
-                await factory
-                    .IsArchiveAsync(stream, cancellationToken: cancellationToken)
-                    .ConfigureAwait(false)
-            )
+            if (await factory.IsArchiveAsync(stream, cancellationToken: cancellationToken))
             {
                 stream.Seek(startPosition, SeekOrigin.Begin);
 

src/SharpCompress/Archives/ArchiveFactory.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using SharpCompress.Common;
-using SharpCompress.Common.Options;
 using SharpCompress.Factories;
 using SharpCompress.IO;
 using SharpCompress.Readers;
@@ -16,23 +15,22 @@ public static partial class ArchiveFactory
 {
     public static IArchive OpenArchive(Stream stream, ReaderOptions? readerOptions = null)
     {
-        readerOptions ??= ReaderOptions.ForExternalStream;
+        readerOptions ??= new ReaderOptions();
         return FindFactory<IArchiveFactory>(stream).OpenArchive(stream, readerOptions);
     }
 
-    public static IWritableArchive<TOptions> CreateArchive<TOptions>()
-        where TOptions : IWriterOptions
+    public static IWritableArchive CreateArchive(ArchiveType type)
     {
         var factory = Factory
-            .Factories.OfType<IWriteableArchiveFactory<TOptions>>()
-            .FirstOrDefault();
+            .Factories.OfType<IWriteableArchiveFactory>()
+            .FirstOrDefault(item => item.KnownArchiveType == type);
 
         if (factory != null)
         {
             return factory.CreateArchive();
         }
 
-        throw new NotSupportedException("Cannot create Archives of type: " + typeof(TOptions));
+        throw new NotSupportedException("Cannot create Archives of type: " + type);
     }
 
     public static IArchive OpenArchive(string filePath, ReaderOptions? options = null)
@@ -43,7 +41,7 @@ public static partial class ArchiveFactory
 
     public static IArchive OpenArchive(FileInfo fileInfo, ReaderOptions? options = null)
     {
-        options ??= ReaderOptions.ForOwnedFile;
+        options ??= new ReaderOptions { LeaveStreamOpen = false };
 
         return FindFactory<IArchiveFactory>(fileInfo).OpenArchive(fileInfo, options);
     }
@@ -67,7 +65,7 @@ public static partial class ArchiveFactory
         }
 
         fileInfo.NotNull(nameof(fileInfo));
-        options ??= ReaderOptions.ForOwnedFile;
+        options ??= new ReaderOptions { LeaveStreamOpen = false };
 
         return FindFactory<IMultiArchiveFactory>(fileInfo).OpenArchive(filesArray, options);
     }
@@ -88,7 +86,7 @@ public static partial class ArchiveFactory
         }
 
         firstStream.NotNull(nameof(firstStream));
-        options ??= ReaderOptions.ForExternalStream;
+        options ??= new ReaderOptions();
 
         return FindFactory<IMultiArchiveFactory>(firstStream).OpenArchive(streamsArray, options);
     }
@@ -96,11 +94,11 @@ public static partial class ArchiveFactory
     public static void WriteToDirectory(
         string sourceArchive,
         string destinationDirectory,
-        ReaderOptions? options = null
+        ExtractionOptions? options = null
     )
     {
-        using var archive = OpenArchive(sourceArchive, options);
-        archive.WriteToDirectory(destinationDirectory);
+        using var archive = OpenArchive(sourceArchive);
+        archive.WriteToDirectory(destinationDirectory, options);
     }
 
     public static T FindFactory<T>(string path)

src/SharpCompress/Archives/GZip/GZipArchive.Async.cs

@@ -5,7 +5,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using SharpCompress.Common;
 using SharpCompress.Common.GZip;
-using SharpCompress.Common.Options;
+using SharpCompress.IO;
 using SharpCompress.Readers;
 using SharpCompress.Readers.GZip;
 using SharpCompress.Writers;
@@ -24,13 +24,13 @@ public partial class GZipArchive
     )
     {
         using var stream = fileInfo.Open(FileMode.Create, FileAccess.Write);
-        await SaveToAsync(stream, new GZipWriterOptions(CompressionType.GZip), cancellationToken)
+        await SaveToAsync(stream, new WriterOptions(CompressionType.GZip), cancellationToken)
             .ConfigureAwait(false);
     }
 
     protected override async ValueTask SaveToAsync(
         Stream stream,
-        GZipWriterOptions options,
+        WriterOptions options,
         IAsyncEnumerable<GZipArchiveEntry> oldEntries,
         IEnumerable<GZipArchiveEntry> newEntries,
         CancellationToken cancellationToken = default
@@ -40,19 +40,14 @@ public partial class GZipArchive
         {
             throw new InvalidFormatException("Only one entry is allowed in a GZip Archive");
         }
-        await using var writer = new GZipWriter(
-            stream,
-            options as GZipWriterOptions ?? new GZipWriterOptions(options)
-        );
+        using var writer = new GZipWriter(stream, new GZipWriterOptions(options));
         await foreach (
             var entry in oldEntries.WithCancellation(cancellationToken).ConfigureAwait(false)
         )
         {
             if (!entry.IsDirectory)
             {
-                using var entryStream = await entry
-                    .OpenEntryStreamAsync(cancellationToken)
-                    .ConfigureAwait(false);
+                using var entryStream = entry.OpenEntryStream();
                 await writer
                     .WriteAsync(
                         entry.Key.NotNull("Entry Key is null"),
@@ -64,9 +59,7 @@ public partial class GZipArchive
         }
         foreach (var entry in newEntries.Where(x => !x.IsDirectory))
         {
-            using var entryStream = await entry
-                .OpenEntryStreamAsync(cancellationToken)
-                .ConfigureAwait(false);
+            using var entryStream = entry.OpenEntryStream();
             await writer
                 .WriteAsync(entry.Key.NotNull("Entry Key is null"), entryStream, cancellationToken)
                 .ConfigureAwait(false);
@@ -84,13 +77,10 @@ public partial class GZipArchive
         IAsyncEnumerable<GZipVolume> volumes
     )
     {
-        var stream = (await volumes.SingleAsync().ConfigureAwait(false)).Stream;
+        var stream = (await volumes.SingleAsync()).Stream;
         yield return new GZipArchiveEntry(
             this,
-            await GZipFilePart
-                .CreateAsync(stream, ReaderOptions.ArchiveEncoding)
-                .ConfigureAwait(false),
-            ReaderOptions
+            await GZipFilePart.CreateAsync(stream, ReaderOptions.ArchiveEncoding)
         );
     }
 }

src/SharpCompress/Archives/GZip/GZipArchive.Factory.cs

@@ -5,41 +5,43 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using SharpCompress.Common;
+using SharpCompress.Common.GZip;
 using SharpCompress.IO;
 using SharpCompress.Readers;
+using SharpCompress.Readers.GZip;
+using SharpCompress.Writers;
 using SharpCompress.Writers.GZip;
 
 namespace SharpCompress.Archives.GZip;
 
 public partial class GZipArchive
 #if NET8_0_OR_GREATER
-    : IWritableArchiveOpenable<GZipWriterOptions>,
-        IMultiArchiveOpenable<
-            IWritableArchive<GZipWriterOptions>,
-            IWritableAsyncArchive<GZipWriterOptions>
-        >
+    : IWritableArchiveOpenable,
+        IMultiArchiveOpenable<IWritableArchive, IWritableAsyncArchive>
 #endif
 {
-    public static IWritableAsyncArchive<GZipWriterOptions> OpenAsyncArchive(
+    public static IWritableAsyncArchive OpenAsyncArchive(
         string path,
-        ReaderOptions? readerOptions = null
+        ReaderOptions? readerOptions = null,
+        CancellationToken cancellationToken = default
     )
     {
+        cancellationToken.ThrowIfCancellationRequested();
         path.NotNullOrEmpty(nameof(path));
-        return (IWritableAsyncArchive<GZipWriterOptions>)
-            OpenArchive(new FileInfo(path), readerOptions ?? new ReaderOptions());
+        return (IWritableAsyncArchive)OpenArchive(
+            new FileInfo(path),
+            readerOptions ?? new ReaderOptions()
+        );
     }
 
-    public static IWritableArchive<GZipWriterOptions> OpenArchive(
-        string filePath,
-        ReaderOptions? readerOptions = null
-    )
+    public static IWritableArchive OpenArchive(string filePath, ReaderOptions? readerOptions = null)
     {
         filePath.NotNullOrEmpty(nameof(filePath));
         return OpenArchive(new FileInfo(filePath), readerOptions ?? new ReaderOptions());
     }
 
-    public static IWritableArchive<GZipWriterOptions> OpenArchive(
+    public static IWritableArchive OpenArchive(
         FileInfo fileInfo,
         ReaderOptions? readerOptions = null
     )
@@ -54,7 +56,7 @@ public partial class GZipArchive
         );
     }
 
-    public static IWritableArchive<GZipWriterOptions> OpenArchive(
+    public static IWritableArchive OpenArchive(
         IEnumerable<FileInfo> fileInfos,
         ReaderOptions? readerOptions = null
     )
@@ -70,7 +72,7 @@ public partial class GZipArchive
         );
     }
 
-    public static IWritableArchive<GZipWriterOptions> OpenArchive(
+    public static IWritableArchive OpenArchive(
         IEnumerable<Stream> streams,
         ReaderOptions? readerOptions = null
     )
@@ -86,10 +88,7 @@ public partial class GZipArchive
         );
     }
 
-    public static IWritableArchive<GZipWriterOptions> OpenArchive(
-        Stream stream,
-        ReaderOptions? readerOptions = null
-    )
+    public static IWritableArchive OpenArchive(Stream stream, ReaderOptions? readerOptions = null)
     {
         stream.NotNull(nameof(stream));
 
@@ -103,30 +102,49 @@ public partial class GZipArchive
         );
     }
 
-    public static IWritableAsyncArchive<GZipWriterOptions> OpenAsyncArchive(
+    public static IWritableAsyncArchive OpenAsyncArchive(
         Stream stream,
-        ReaderOptions? readerOptions = null
-    ) => (IWritableAsyncArchive<GZipWriterOptions>)OpenArchive(stream, readerOptions);
+        ReaderOptions? readerOptions = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        return (IWritableAsyncArchive)OpenArchive(stream, readerOptions);
+    }
 
-    public static IWritableAsyncArchive<GZipWriterOptions> OpenAsyncArchive(
+    public static IWritableAsyncArchive OpenAsyncArchive(
         FileInfo fileInfo,
-        ReaderOptions? readerOptions = null
-    ) => (IWritableAsyncArchive<GZipWriterOptions>)OpenArchive(fileInfo, readerOptions);
+        ReaderOptions? readerOptions = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        return (IWritableAsyncArchive)OpenArchive(fileInfo, readerOptions);
+    }
 
-    public static IWritableAsyncArchive<GZipWriterOptions> OpenAsyncArchive(
+    public static IWritableAsyncArchive OpenAsyncArchive(
         IReadOnlyList<Stream> streams,
-        ReaderOptions? readerOptions = null
-    ) => (IWritableAsyncArchive<GZipWriterOptions>)OpenArchive(streams, readerOptions);
+        ReaderOptions? readerOptions = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        return (IWritableAsyncArchive)OpenArchive(streams, readerOptions);
+    }
 
-    public static IWritableAsyncArchive<GZipWriterOptions> OpenAsyncArchive(
+    public static IWritableAsyncArchive OpenAsyncArchive(
         IReadOnlyList<FileInfo> fileInfos,
-        ReaderOptions? readerOptions = null
-    ) => (IWritableAsyncArchive<GZipWriterOptions>)OpenArchive(fileInfos, readerOptions);
+        ReaderOptions? readerOptions = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        return (IWritableAsyncArchive)OpenArchive(fileInfos, readerOptions);
+    }
 
-    public static IWritableArchive<GZipWriterOptions> CreateArchive() => new GZipArchive();
+    public static IWritableArchive CreateArchive() => new GZipArchive();
 
-    public static IWritableAsyncArchive<GZipWriterOptions> CreateAsyncArchive() =>
-        new GZipArchive();
+    public static IWritableAsyncArchive CreateAsyncArchive() => new GZipArchive();
 
     public static bool IsGZipFile(string filePath) => IsGZipFile(new FileInfo(filePath));
 

src/SharpCompress/Archives/GZip/GZipArchive.cs

@@ -2,9 +2,10 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using SharpCompress.Common;
 using SharpCompress.Common.GZip;
-using SharpCompress.Common.Options;
 using SharpCompress.IO;
 using SharpCompress.Readers;
 using SharpCompress.Readers.GZip;
@@ -13,8 +14,7 @@ using SharpCompress.Writers.GZip;
 
 namespace SharpCompress.Archives.GZip;
 
-public partial class GZipArchive
-    : AbstractWritableArchive<GZipArchiveEntry, GZipVolume, GZipWriterOptions>
+public partial class GZipArchive : AbstractWritableArchive<GZipArchiveEntry, GZipVolume>
 {
     private GZipArchive(SourceStream sourceStream)
         : base(ArchiveType.GZip, sourceStream) { }
@@ -33,7 +33,7 @@ public partial class GZipArchive
     public void SaveTo(FileInfo fileInfo)
     {
         using var stream = fileInfo.Open(FileMode.Create, FileAccess.Write);
-        SaveTo(stream, new GZipWriterOptions(CompressionType.GZip));
+        SaveTo(stream, new WriterOptions(CompressionType.GZip));
     }
 
     protected override GZipArchiveEntry CreateEntryInternal(
@@ -58,7 +58,7 @@ public partial class GZipArchive
 
     protected override void SaveTo(
         Stream stream,
-        GZipWriterOptions options,
+        WriterOptions options,
         IEnumerable<GZipArchiveEntry> oldEntries,
         IEnumerable<GZipArchiveEntry> newEntries
     )
@@ -67,10 +67,7 @@ public partial class GZipArchive
         {
             throw new InvalidFormatException("Only one entry is allowed in a GZip Archive");
         }
-        using var writer = new GZipWriter(
-            stream,
-            options as GZipWriterOptions ?? new GZipWriterOptions(options)
-        );
+        using var writer = new GZipWriter(stream, new GZipWriterOptions(options));
         foreach (var entry in oldEntries.Concat(newEntries).Where(x => !x.IsDirectory))
         {
             using var entryStream = entry.OpenEntryStream();
@@ -87,8 +84,7 @@ public partial class GZipArchive
         var stream = volumes.Single().Stream;
         yield return new GZipArchiveEntry(
             this,
-            GZipFilePart.Create(stream, ReaderOptions.ArchiveEncoding),
-            ReaderOptions
+            GZipFilePart.Create(stream, ReaderOptions.ArchiveEncoding)
         );
     }
 

src/SharpCompress/Archives/GZip/GZipArchiveEntry.cs

@@ -1,16 +1,15 @@
-using System.IO;
+using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using SharpCompress.Common.GZip;
-using SharpCompress.Common.Options;
 
 namespace SharpCompress.Archives.GZip;
 
 public class GZipArchiveEntry : GZipEntry, IArchiveEntry
 {
-    internal GZipArchiveEntry(GZipArchive archive, GZipFilePart? part, IReaderOptions readerOptions)
-        : base(part, readerOptions) => Archive = archive;
+    internal GZipArchiveEntry(GZipArchive archive, GZipFilePart? part)
+        : base(part) => Archive = archive;
 
     public virtual Stream OpenEntryStream()
     {

src/SharpCompress/Archives/GZip/GZipWritableArchiveEntry.cs

@@ -19,7 +19,7 @@ internal sealed class GZipWritableArchiveEntry : GZipArchiveEntry, IWritableArch
         DateTime? lastModified,
         bool closeStream
     )
-        : base(archive, null, archive.ReaderOptions)
+        : base(archive, null)
     {
         this.stream = stream;
         Key = path;

src/SharpCompress/Archives/IArchive.cs

@@ -12,11 +12,6 @@ public interface IArchive : IDisposable
 
     ArchiveType Type { get; }
 
-    /// <summary>
-    /// The options used when opening this archive, including extraction behavior settings.
-    /// </summary>
-    ReaderOptions ReaderOptions { get; }
-
     /// <summary>
     /// Use this method to extract all entries in an archive in order.
     /// This is primarily for SOLID Rar Archives or 7Zip Archives as they need to be

src/SharpCompress/Archives/IArchiveEntryExtensions.cs

@@ -47,13 +47,11 @@ public static class IArchiveEntryExtensions
             }
 
 #if LEGACY_DOTNET
-            using var entryStream = await archiveEntry
-                .OpenEntryStreamAsync(cancellationToken)
-                .ConfigureAwait(false);
+            using var entryStream = await archiveEntry.OpenEntryStreamAsync(cancellationToken);
 #else
-            await using var entryStream = await archiveEntry
-                .OpenEntryStreamAsync(cancellationToken)
-                .ConfigureAwait(false);
+            await using var entryStream = await archiveEntry.OpenEntryStreamAsync(
+                cancellationToken
+            );
 #endif
             var sourceStream = WrapWithProgress(entryStream, archiveEntry, progress);
             await sourceStream
@@ -102,11 +100,15 @@ public static class IArchiveEntryExtensions
         /// <summary>
         /// Extract to specific directory, retaining filename
         /// </summary>
-        public void WriteToDirectory(string destinationDirectory) =>
+        public void WriteToDirectory(
+            string destinationDirectory,
+            ExtractionOptions? options = null
+        ) =>
             ExtractionMethods.WriteEntryToDirectory(
                 entry,
                 destinationDirectory,
-                (path) => entry.WriteToFile(path)
+                options,
+                entry.WriteToFile
             );
 
         /// <summary>
@@ -114,14 +116,15 @@ public static class IArchiveEntryExtensions
         /// </summary>
         public async ValueTask WriteToDirectoryAsync(
             string destinationDirectory,
+            ExtractionOptions? options = null,
             CancellationToken cancellationToken = default
         ) =>
             await ExtractionMethods
                 .WriteEntryToDirectoryAsync(
                     entry,
                     destinationDirectory,
-                    async (path, ct) =>
-                        await entry.WriteToFileAsync(path, ct).ConfigureAwait(false),
+                    options,
+                    entry.WriteToFileAsync,
                     cancellationToken
                 )
                 .ConfigureAwait(false);
@@ -129,10 +132,11 @@ public static class IArchiveEntryExtensions
         /// <summary>
         /// Extract to specific file
         /// </summary>
-        public void WriteToFile(string destinationFileName) =>
+        public void WriteToFile(string destinationFileName, ExtractionOptions? options = null) =>
             ExtractionMethods.WriteEntryToFile(
                 entry,
                 destinationFileName,
+                options,
                 (x, fm) =>
                 {
                     using var fs = File.Open(destinationFileName, fm);
@@ -145,12 +149,14 @@ public static class IArchiveEntryExtensions
         /// </summary>
         public async ValueTask WriteToFileAsync(
             string destinationFileName,
+            ExtractionOptions? options = null,
             CancellationToken cancellationToken = default
         ) =>
             await ExtractionMethods
                 .WriteEntryToFileAsync(
                     entry,
                     destinationFileName,
+                    options,
                     async (x, fm, ct) =>
                     {
                         using var fs = File.Open(destinationFileName, fm);

src/SharpCompress/Archives/IArchiveExtensions.cs

@@ -14,25 +14,28 @@ public static class IArchiveExtensions
         /// Extract to specific directory with progress reporting
         /// </summary>
         /// <param name="destinationDirectory">The folder to extract into.</param>
+        /// <param name="options">Extraction options.</param>
         /// <param name="progress">Optional progress reporter for tracking extraction progress.</param>
         public void WriteToDirectory(
             string destinationDirectory,
+            ExtractionOptions? options = null,
             IProgress<ProgressReport>? progress = null
         )
         {
             if (archive.IsSolid || archive.Type == ArchiveType.SevenZip)
             {
                 using var reader = archive.ExtractAllEntries();
-                reader.WriteAllToDirectory(destinationDirectory);
+                reader.WriteAllToDirectory(destinationDirectory, options);
             }
             else
             {
-                archive.WriteToDirectoryInternal(destinationDirectory, progress);
+                archive.WriteToDirectoryInternal(destinationDirectory, options, progress);
             }
         }
 
         private void WriteToDirectoryInternal(
             string destinationDirectory,
+            ExtractionOptions? options,
             IProgress<ProgressReport>? progress
         )
         {
@@ -58,7 +61,7 @@ public static class IArchiveExtensions
                     continue;
                 }
 
-                entry.WriteToDirectory(destinationDirectory);
+                entry.WriteToDirectory(destinationDirectory, options);
 
                 bytesRead += entry.Size;
                 progress?.Report(

src/SharpCompress/Archives/IArchiveOpenable.cs

@@ -20,17 +20,20 @@ public interface IArchiveOpenable<TSync, TASync>
 
     public static abstract TASync OpenAsyncArchive(
         string path,
-        ReaderOptions? readerOptions = null
+        ReaderOptions? readerOptions = null,
+        CancellationToken cancellationToken = default
     );
 
     public static abstract TASync OpenAsyncArchive(
         Stream stream,
-        ReaderOptions? readerOptions = null
+        ReaderOptions? readerOptions = null,
+        CancellationToken cancellationToken = default
     );
 
     public static abstract TASync OpenAsyncArchive(
         FileInfo fileInfo,
-        ReaderOptions? readerOptions = null
+        ReaderOptions? readerOptions = null,
+        CancellationToken cancellationToken = default
     );
 }
 

src/SharpCompress/Archives/IAsyncArchiveExtensions.cs

@@ -17,45 +17,44 @@ public static class IAsyncArchiveExtensions
         /// </summary>
         /// <param name="archive">The archive to extract.</param>
         /// <param name="destinationDirectory">The folder to extract into.</param>
+        /// <param name="options">Extraction options.</param>
         /// <param name="progress">Optional progress reporter for tracking extraction progress.</param>
         /// <param name="cancellationToken">Optional cancellation token.</param>
         public async ValueTask WriteToDirectoryAsync(
             string destinationDirectory,
+            ExtractionOptions? options = null,
             IProgress<ProgressReport>? progress = null,
             CancellationToken cancellationToken = default
         )
         {
-            if (
-                await archive.IsSolidAsync().ConfigureAwait(false)
-                || archive.Type == ArchiveType.SevenZip
-            )
+            if (await archive.IsSolidAsync() || archive.Type == ArchiveType.SevenZip)
             {
-                await using var reader = await archive
-                    .ExtractAllEntriesAsync()
-                    .ConfigureAwait(false);
-                await reader
-                    .WriteAllToDirectoryAsync(destinationDirectory, cancellationToken)
-                    .ConfigureAwait(false);
+                await using var reader = await archive.ExtractAllEntriesAsync();
+                await reader.WriteAllToDirectoryAsync(
+                    destinationDirectory,
+                    options,
+                    cancellationToken
+                );
             }
             else
             {
-                await archive
-                    .WriteToDirectoryAsyncInternal(
-                        destinationDirectory,
-                        progress,
-                        cancellationToken
-                    )
-                    .ConfigureAwait(false);
+                await archive.WriteToDirectoryAsyncInternal(
+                    destinationDirectory,
+                    options,
+                    progress,
+                    cancellationToken
+                );
             }
         }
 
         private async ValueTask WriteToDirectoryAsyncInternal(
             string destinationDirectory,
+            ExtractionOptions? options,
             IProgress<ProgressReport>? progress,
             CancellationToken cancellationToken
         )
         {
-            var totalBytes = await archive.TotalUncompressedSizeAsync().ConfigureAwait(false);
+            var totalBytes = await archive.TotalUncompressedSizeAsync();
             var bytesRead = 0L;
             var seenDirectories = new HashSet<string>();
 
@@ -80,7 +79,7 @@ public static class IAsyncArchiveExtensions
                 }
 
                 await entry
-                    .WriteToDirectoryAsync(destinationDirectory, cancellationToken)
+                    .WriteToDirectoryAsync(destinationDirectory, options, cancellationToken)
                     .ConfigureAwait(false);
 
                 bytesRead += entry.Size;

src/SharpCompress/Archives/IMultiArchiveFactory.cs

@@ -50,8 +50,10 @@ public interface IMultiArchiveFactory : IFactory
     /// </summary>
     /// <param name="fileInfos"></param>
     /// <param name="readerOptions">reading options.</param>
+    /// <param name="cancellationToken">Cancellation token.</param>
     IAsyncArchive OpenAsyncArchive(
         IReadOnlyList<FileInfo> fileInfos,
-        ReaderOptions? readerOptions = null
+        ReaderOptions? readerOptions = null,
+        CancellationToken cancellationToken = default
     );
 }

src/SharpCompress/Archives/IMultiArchiveOpenable.cs

@@ -22,12 +22,14 @@ public interface IMultiArchiveOpenable<TSync, TASync>
 
     public static abstract TASync OpenAsyncArchive(
         IReadOnlyList<Stream> streams,
-        ReaderOptions? readerOptions = null
+        ReaderOptions? readerOptions = null,
+        CancellationToken cancellationToken = default
     );
 
     public static abstract TASync OpenAsyncArchive(
         IReadOnlyList<FileInfo> fileInfos,
-        ReaderOptions? readerOptions = null
+        ReaderOptions? readerOptions = null,
+        CancellationToken cancellationToken = default
     );
 }
 #endif

src/SharpCompress/Archives/IWritableArchive.cs

@@ -2,7 +2,6 @@ using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using SharpCompress.Common.Options;
 using SharpCompress.Writers;
 
 namespace SharpCompress.Archives;
@@ -28,23 +27,28 @@ public interface IWritableArchive : IArchive, IWritableArchiveCommon
 
     IArchiveEntry AddDirectoryEntry(string key, DateTime? modified = null);
 
+    /// <summary>
+    /// Saves the archive to the specified stream using the given writer options.
+    /// </summary>
+    void SaveTo(Stream stream, WriterOptions options);
+
     /// <summary>
     /// Removes the specified entry from the archive.
     /// </summary>
     void RemoveEntry(IArchiveEntry entry);
 }
 
-public interface IWritableArchive<TOptions> : IWritableArchive
-    where TOptions : IWriterOptions
-{
-    /// <summary>
-    /// Saves the archive to the specified stream using the given writer options.
-    /// </summary>
-    void SaveTo(Stream stream, TOptions options);
-}
-
 public interface IWritableAsyncArchive : IAsyncArchive, IWritableArchiveCommon
 {
+    /// <summary>
+    /// Asynchronously saves the archive to the specified stream using the given writer options.
+    /// </summary>
+    ValueTask SaveToAsync(
+        Stream stream,
+        WriterOptions options,
+        CancellationToken cancellationToken = default
+    );
+
     /// <summary>
     /// Asynchronously adds an entry to the archive with the specified key, source stream, and options.
     /// </summary>
@@ -71,16 +75,3 @@ public interface IWritableAsyncArchive : IAsyncArchive, IWritableArchiveCommon
     /// </summary>
     ValueTask RemoveEntryAsync(IArchiveEntry entry);
 }
-
-public interface IWritableAsyncArchive<TOptions> : IWritableAsyncArchive
-    where TOptions : IWriterOptions
-{
-    /// <summary>
-    /// Asynchronously saves the archive to the specified stream using the given writer options.
-    /// </summary>
-    ValueTask SaveToAsync(
-        Stream stream,
-        TOptions options,
-        CancellationToken cancellationToken = default
-    );
-}

src/SharpCompress/Archives/IWritableArchiveExtensions.cs

@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using SharpCompress.Common;
-using SharpCompress.Common.Options;
 using SharpCompress.Writers;
 
 namespace SharpCompress.Archives;
@@ -58,23 +57,14 @@ public static class IWritableArchiveExtensions
                 fileInfo.LastWriteTime
             );
         }
-    }
 
-    public static void SaveTo<TOptions>(
-        this IWritableArchive<TOptions> writableArchive,
-        string filePath,
-        TOptions options
-    )
-        where TOptions : IWriterOptions => writableArchive.SaveTo(new FileInfo(filePath), options);
+        public void SaveTo(string filePath, WriterOptions? options = null) =>
+            writableArchive.SaveTo(new FileInfo(filePath), options ?? new(CompressionType.Deflate));
 
-    public static void SaveTo<TOptions>(
-        this IWritableArchive<TOptions> writableArchive,
-        FileInfo fileInfo,
-        TOptions options
-    )
-        where TOptions : IWriterOptions
-    {
-        using var stream = fileInfo.Open(FileMode.Create, FileAccess.Write);
-        writableArchive.SaveTo(stream, options);
+        public void SaveTo(FileInfo fileInfo, WriterOptions? options = null)
+        {
+            using var stream = fileInfo.Open(FileMode.Create, FileAccess.Write);
+            writableArchive.SaveTo(stream, options ?? new(CompressionType.Deflate));
+        }
     }
 }

src/SharpCompress/Archives/IWritableArchiveOpenable.cs

@@ -1,13 +1,10 @@
-using SharpCompress.Common.Options;
-
 #if NET8_0_OR_GREATER
 namespace SharpCompress.Archives;
 
-public interface IWritableArchiveOpenable<TOptions>
-    : IArchiveOpenable<IWritableArchive<TOptions>, IWritableAsyncArchive<TOptions>>
-    where TOptions : IWriterOptions
+public interface IWritableArchiveOpenable
+    : IArchiveOpenable<IWritableArchive, IWritableAsyncArchive>
 {
-    public static abstract IWritableArchive<TOptions> CreateArchive();
-    public static abstract IWritableAsyncArchive<TOptions> CreateAsyncArchive();
+    public static abstract IWritableArchive CreateArchive();
+    public static abstract IWritableAsyncArchive CreateAsyncArchive();
 }
 #endif

src/SharpCompress/Archives/IWritableAsyncArchiveExtensions.cs

@@ -3,7 +3,6 @@ using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using SharpCompress.Common;
-using SharpCompress.Common.Options;
 using SharpCompress.Writers;
 
 namespace SharpCompress.Archives;
@@ -25,15 +24,13 @@ public static class IWritableAsyncArchiveExtensions
                 )
                 {
                     var fileInfo = new FileInfo(path);
-                    await writableArchive
-                        .AddEntryAsync(
-                            path.Substring(filePath.Length),
-                            fileInfo.OpenRead(),
-                            true,
-                            fileInfo.Length,
-                            fileInfo.LastWriteTime
-                        )
-                        .ConfigureAwait(false);
+                    await writableArchive.AddEntryAsync(
+                        path.Substring(filePath.Length),
+                        fileInfo.OpenRead(),
+                        true,
+                        fileInfo.Length,
+                        fileInfo.LastWriteTime
+                    );
                 }
             }
         }
@@ -62,26 +59,28 @@ public static class IWritableAsyncArchiveExtensions
                 fileInfo.LastWriteTime
             );
         }
-    }
 
-    public static ValueTask SaveToAsync<TOptions>(
-        this IWritableAsyncArchive<TOptions> writableArchive,
-        string filePath,
-        TOptions options,
-        CancellationToken cancellationToken = default
-    )
-        where TOptions : IWriterOptions =>
-        writableArchive.SaveToAsync(new FileInfo(filePath), options, cancellationToken);
+        public ValueTask SaveToAsync(
+            string filePath,
+            WriterOptions? options = null,
+            CancellationToken cancellationToken = default
+        ) =>
+            writableArchive.SaveToAsync(
+                new FileInfo(filePath),
+                options ?? new(CompressionType.Deflate),
+                cancellationToken
+            );
 
-    public static async ValueTask SaveToAsync<TOptions>(
-        this IWritableAsyncArchive<TOptions> writableArchive,
-        FileInfo fileInfo,
-        TOptions options,
-        CancellationToken cancellationToken = default
-    )
-        where TOptions : IWriterOptions
-    {
-        using var stream = fileInfo.Open(FileMode.Create, FileAccess.Write);
-        await writableArchive.SaveToAsync(stream, options, cancellationToken).ConfigureAwait(false);
+        public async ValueTask SaveToAsync(
+            FileInfo fileInfo,
+            WriterOptions? options = null,
+            CancellationToken cancellationToken = default
+        )
+        {
+            using var stream = fileInfo.Open(FileMode.Create, FileAccess.Write);
+            await writableArchive
+                .SaveToAsync(stream, options ?? new(CompressionType.Deflate), cancellationToken)
+                .ConfigureAwait(false);
+        }
     }
 }

src/SharpCompress/Archives/IWriteableArchiveFactory.cs

@@ -1,5 +1,3 @@
-using SharpCompress.Common.Options;
-
 namespace SharpCompress.Archives;
 
 /// <summary>
@@ -12,12 +10,11 @@ namespace SharpCompress.Archives;
 /// <item><see cref="Factories.ZipFactory"/></item>
 /// <item><see cref="Factories.GZipFactory"/></item>
 /// </list>
-public interface IWriteableArchiveFactory<TOptions> : Factories.IFactory
-    where TOptions : IWriterOptions
+public interface IWriteableArchiveFactory : Factories.IFactory
 {
     /// <summary>
     /// Creates a new, empty archive, ready to be written.
     /// </summary>
     /// <returns></returns>
-    IWritableArchive<TOptions> CreateArchive();
+    IWritableArchive CreateArchive();
 }

src/SharpCompress/Archives/Rar/FileInfoRarArchiveVolume.cs

@@ -24,7 +24,8 @@ internal class FileInfoRarArchiveVolume : RarVolume
     private static ReaderOptions FixOptions(ReaderOptions options)
     {
         //make sure we're closing streams with fileinfo
-        return options with { LeaveStreamOpen = false };
+        options.LeaveStreamOpen = false;
+        return options;
     }
 
     internal ReadOnlyCollection<RarFilePart> FileParts { get; }

src/SharpCompress/Archives/Rar/RarArchive.Async.cs

@@ -25,13 +25,13 @@ public partial class RarArchive
             }
 
             _disposed = true;
-            await base.DisposeAsync().ConfigureAwait(false);
+            await base.DisposeAsync();
         }
     }
 
     protected override async ValueTask<IAsyncReader> CreateReaderForSolidExtractionAsync()
     {
-        if (await this.IsMultipartVolumeAsync().ConfigureAwait(false))
+        if (await this.IsMultipartVolumeAsync())
         {
             var streams = await VolumesAsync
                 .Select(volume =>
@@ -39,18 +39,15 @@ public partial class RarArchive
                     volume.Stream.Position = 0;
                     return volume.Stream;
                 })
-                .ToListAsync()
-                .ConfigureAwait(false);
+                .ToListAsync();
             return (RarReader)RarReader.OpenReader(streams, ReaderOptions);
         }
 
-        var stream = (await VolumesAsync.FirstAsync().ConfigureAwait(false)).Stream;
+        var stream = (await VolumesAsync.FirstAsync()).Stream;
         stream.Position = 0;
         return (RarReader)RarReader.OpenReader(stream, ReaderOptions);
     }
 
     public override async ValueTask<bool> IsSolidAsync() =>
-        await (await VolumesAsync.CastAsync<RarVolume>().FirstAsync().ConfigureAwait(false))
-            .IsSolidArchiveAsync()
-            .ConfigureAwait(false);
+        await (await VolumesAsync.CastAsync<RarVolume>().FirstAsync()).IsSolidArchiveAsync();
 }

src/SharpCompress/Archives/Rar/RarArchive.Extensions.cs

@@ -25,16 +25,12 @@ public static class RarArchiveExtensions
         /// RarArchive is the first volume of a multi-part archive.  If MultipartVolume is true and IsFirstVolume is false then the first volume file must be missing.
         /// </summary>
         public async ValueTask<bool> IsFirstVolumeAsync() =>
-            (
-                await archive.VolumesAsync.CastAsync<RarVolume>().FirstAsync().ConfigureAwait(false)
-            ).IsFirstVolume;
+            (await archive.VolumesAsync.CastAsync<RarVolume>().FirstAsync()).IsFirstVolume;
 
         /// <summary>
         /// RarArchive is part of a multi-part archive.
         /// </summary>
         public async ValueTask<bool> IsMultipartVolumeAsync() =>
-            (
-                await archive.VolumesAsync.CastAsync<RarVolume>().FirstAsync().ConfigureAwait(false)
-            ).IsMultiVolume;
+            (await archive.VolumesAsync.CastAsync<RarVolume>().FirstAsync()).IsMultiVolume;
     }
 }

src/SharpCompress/Archives/Rar/RarArchive.Factory.cs

@@ -22,9 +22,11 @@ public partial class RarArchive
 {
     public static IRarAsyncArchive OpenAsyncArchive(
         string path,
-        ReaderOptions? readerOptions = null
+        ReaderOptions? readerOptions = null,
+        CancellationToken cancellationToken = default
     )
     {
+        cancellationToken.ThrowIfCancellationRequested();
         path.NotNullOrEmpty(nameof(path));
         return (IRarAsyncArchive)OpenArchive(new FileInfo(path), readerOptions);
     }
@@ -100,33 +102,41 @@ public partial class RarArchive
 
     public static IRarAsyncArchive OpenAsyncArchive(
         Stream stream,
-        ReaderOptions? readerOptions = null
+        ReaderOptions? readerOptions = null,
+        CancellationToken cancellationToken = default
     )
     {
+        cancellationToken.ThrowIfCancellationRequested();
         return (IRarAsyncArchive)OpenArchive(stream, readerOptions);
     }
 
     public static IRarAsyncArchive OpenAsyncArchive(
         FileInfo fileInfo,
-        ReaderOptions? readerOptions = null
+        ReaderOptions? readerOptions = null,
+        CancellationToken cancellationToken = default
     )
     {
+        cancellationToken.ThrowIfCancellationRequested();
         return (IRarAsyncArchive)OpenArchive(fileInfo, readerOptions);
     }
 
     public static IRarAsyncArchive OpenAsyncArchive(
         IReadOnlyList<Stream> streams,
-        ReaderOptions? readerOptions = null
+        ReaderOptions? readerOptions = null,
+        CancellationToken cancellationToken = default
     )
     {
+        cancellationToken.ThrowIfCancellationRequested();
         return (IRarAsyncArchive)OpenArchive(streams, readerOptions);
     }
 
     public static IRarAsyncArchive OpenAsyncArchive(
         IReadOnlyList<FileInfo> fileInfos,
-        ReaderOptions? readerOptions = null
+        ReaderOptions? readerOptions = null,
+        CancellationToken cancellationToken = default
     )
     {
+        cancellationToken.ThrowIfCancellationRequested();
         return (IRarAsyncArchive)OpenArchive(fileInfos, readerOptions);
     }
 

src/SharpCompress/Archives/Rar/RarArchiveEntry.Async.cs

@@ -21,9 +21,9 @@ public partial class RarArchiveEntry
             stream = new RarStream(
                 archive.UnpackV1.Value,
                 FileHeader,
-                await MultiVolumeReadOnlyAsyncStream
-                    .Create(Parts.ToAsyncEnumerable().CastAsync<RarFilePart>())
-                    .ConfigureAwait(false)
+                await MultiVolumeReadOnlyAsyncStream.Create(
+                    Parts.ToAsyncEnumerable().CastAsync<RarFilePart>()
+                )
             );
         }
         else
@@ -31,13 +31,13 @@ public partial class RarArchiveEntry
             stream = new RarStream(
                 archive.UnpackV2017.Value,
                 FileHeader,
-                await MultiVolumeReadOnlyAsyncStream
-                    .Create(Parts.ToAsyncEnumerable().CastAsync<RarFilePart>())
-                    .ConfigureAwait(false)
+                await MultiVolumeReadOnlyAsyncStream.Create(
+                    Parts.ToAsyncEnumerable().CastAsync<RarFilePart>()
+                )
             );
         }
 
-        await stream.InitializeAsync(cancellationToken).ConfigureAwait(false);
+        await stream.InitializeAsync(cancellationToken);
         return stream;
     }
 }

src/SharpCompress/Archives/Rar/RarArchiveEntry.cs

@@ -23,7 +23,6 @@ public partial class RarArchiveEntry : RarEntry, IArchiveEntry
         IEnumerable<RarFilePart> parts,
         ReaderOptions readerOptions
     )
-        : base(readerOptions)
     {
         this.parts = parts.ToList();
         this.archive = archive;

src/SharpCompress/Archives/SevenZip/SevenZipArchive.Async.cs

@@ -21,12 +21,15 @@ public partial class SevenZipArchive
         {
             stream.Position = 0;
             var reader = new ArchiveReader();
-            await reader
-                .OpenAsync(stream, lookForHeader: ReaderOptions.LookForHeader, cancellationToken)
-                .ConfigureAwait(false);
-            _database = await reader
-                .ReadDatabaseAsync(new PasswordProvider(ReaderOptions.Password), cancellationToken)
-                .ConfigureAwait(false);
+            await reader.OpenAsync(
+                stream,
+                lookForHeader: ReaderOptions.LookForHeader,
+                cancellationToken
+            );
+            _database = await reader.ReadDatabaseAsync(
+                new PasswordProvider(ReaderOptions.Password),
+                cancellationToken
+            );
         }
     }
 
@@ -34,8 +37,8 @@ public partial class SevenZipArchive
         IAsyncEnumerable<SevenZipVolume> volumes
     )
     {
-        var stream = (await volumes.SingleAsync().ConfigureAwait(false)).Stream;
-        await LoadFactoryAsync(stream).ConfigureAwait(false);
+        var stream = (await volumes.SingleAsync()).Stream;
+        await LoadFactoryAsync(stream);
         if (_database is null)
         {
             yield break;
@@ -46,8 +49,7 @@ public partial class SevenZipArchive
             var file = _database._files[i];
             entries[i] = new SevenZipArchiveEntry(
                 this,
-                new SevenZipFilePart(stream, _database, i, file, ReaderOptions.ArchiveEncoding),
-                ReaderOptions
+                new SevenZipFilePart(stream, _database, i, file, ReaderOptions.ArchiveEncoding)
             );
         }
         foreach (var group in entries.Where(x => !x.IsDirectory).GroupBy(x => x.FilePart.Folder))

src/SharpCompress/Archives/SevenZip/SevenZipArchive.Factory.cs

@@ -16,8 +16,13 @@ public partial class SevenZipArchive
         IMultiArchiveOpenable<IArchive, IAsyncArchive>
 #endif
 {
-    public static IAsyncArchive OpenAsyncArchive(string path, ReaderOptions? readerOptions = null)
+    public static IAsyncArchive OpenAsyncArchive(
+        string path,
+        ReaderOptions? readerOptions = null,
+        CancellationToken cancellationToken = default
+    )
     {
+        cancellationToken.ThrowIfCancellationRequested();
         path.NotNullOrEmpty("path");
         return (IAsyncArchive)OpenArchive(new FileInfo(path), readerOptions ?? new ReaderOptions());
     }
@@ -86,32 +91,43 @@ public partial class SevenZipArchive
         );
     }
 
-    public static IAsyncArchive OpenAsyncArchive(Stream stream, ReaderOptions? readerOptions = null)
+    public static IAsyncArchive OpenAsyncArchive(
+        Stream stream,
+        ReaderOptions? readerOptions = null,
+        CancellationToken cancellationToken = default
+    )
     {
+        cancellationToken.ThrowIfCancellationRequested();
         return (IAsyncArchive)OpenArchive(stream, readerOptions);
     }
 
     public static IAsyncArchive OpenAsyncArchive(
         FileInfo fileInfo,
-        ReaderOptions? readerOptions = null
+        ReaderOptions? readerOptions = null,
+        CancellationToken cancellationToken = default
     )
     {
+        cancellationToken.ThrowIfCancellationRequested();
         return (IAsyncArchive)OpenArchive(fileInfo, readerOptions);
     }
 
     public static IAsyncArchive OpenAsyncArchive(
         IReadOnlyList<Stream> streams,
-        ReaderOptions? readerOptions = null
+        ReaderOptions? readerOptions = null,
+        CancellationToken cancellationToken = default
     )
     {
+        cancellationToken.ThrowIfCancellationRequested();
         return (IAsyncArchive)OpenArchive(streams, readerOptions);
     }
 
     public static IAsyncArchive OpenAsyncArchive(
         IReadOnlyList<FileInfo> fileInfos,
-        ReaderOptions? readerOptions = null
+        ReaderOptions? readerOptions = null,
+        CancellationToken cancellationToken = default
     )
     {
+        cancellationToken.ThrowIfCancellationRequested();
         return (IAsyncArchive)OpenArchive(fileInfos, readerOptions);
     }
 
@@ -147,7 +163,7 @@ public partial class SevenZipArchive
         cancellationToken.ThrowIfCancellationRequested();
         try
         {
-            return await SignatureMatchAsync(stream, cancellationToken).ConfigureAwait(false);
+            return await SignatureMatchAsync(stream, cancellationToken);
         }
         catch
         {

src/SharpCompress/Archives/SevenZip/SevenZipArchive.cs

@@ -55,8 +55,7 @@ public partial class SevenZipArchive : AbstractArchive<SevenZipArchiveEntry, Sev
                         i,
                         file,
                         ReaderOptions.ArchiveEncoding
-                    ),
-                    ReaderOptions
+                    )
                 );
             }
             foreach (
@@ -182,15 +181,15 @@ public partial class SevenZipArchive : AbstractArchive<SevenZipArchiveEntry, Sev
                 );
             }
 
+            // Wrap with SyncOnlyStream to work around LZMA async bugs
+            // Return a ReadOnlySubStream that reads from the shared folder stream
             return CreateEntryStream(
-                new ReadOnlySubStream(_currentFolderStream, entry.Size, leaveOpen: true)
+                new SyncOnlyStream(
+                    new ReadOnlySubStream(_currentFolderStream, entry.Size, leaveOpen: true)
+                )
             );
         }
 
-        protected override ValueTask<EntryStream> GetEntryStreamAsync(
-            CancellationToken cancellationToken = default
-        ) => new(GetEntryStream());
-
         public override void Dispose()
         {
             _currentFolderStream?.Dispose();

src/SharpCompress/Archives/SevenZip/SevenZipArchiveEntry.cs

@@ -1,28 +1,20 @@
-using System.IO;
+using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using SharpCompress.Common.Options;
 using SharpCompress.Common.SevenZip;
 
 namespace SharpCompress.Archives.SevenZip;
 
 public class SevenZipArchiveEntry : SevenZipEntry, IArchiveEntry
 {
-    internal SevenZipArchiveEntry(
-        SevenZipArchive archive,
-        SevenZipFilePart part,
-        IReaderOptions readerOptions
-    )
-        : base(part, readerOptions) => Archive = archive;
+    internal SevenZipArchiveEntry(SevenZipArchive archive, SevenZipFilePart part)
+        : base(part) => Archive = archive;
 
     public Stream OpenEntryStream() => FilePart.GetCompressedStream();
 
     public async ValueTask<Stream> OpenEntryStreamAsync(
         CancellationToken cancellationToken = default
-    ) =>
-        (
-            await FilePart.GetCompressedStreamAsync(cancellationToken).ConfigureAwait(false)
-        ).NotNull();
+    ) => (await FilePart.GetCompressedStreamAsync(cancellationToken)).NotNull();
 
     public IArchive Archive { get; }
 

src/SharpCompress/Archives/Tar/TarArchive.Async.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using SharpCompress.Common;
-using SharpCompress.Common.Options;
 using SharpCompress.Common.Tar;
 using SharpCompress.Common.Tar.Headers;
 using SharpCompress.IO;
@@ -19,16 +18,13 @@ public partial class TarArchive
 {
     protected override async ValueTask SaveToAsync(
         Stream stream,
-        TarWriterOptions options,
+        WriterOptions options,
         IAsyncEnumerable<TarArchiveEntry> oldEntries,
         IEnumerable<TarArchiveEntry> newEntries,
         CancellationToken cancellationToken = default
     )
     {
-        using var writer = new TarWriter(
-            stream,
-            options as TarWriterOptions ?? new TarWriterOptions(options)
-        );
+        using var writer = new TarWriter(stream, new TarWriterOptions(options));
         await foreach (
             var entry in oldEntries.WithCancellation(cancellationToken).ConfigureAwait(false)
         )
@@ -96,7 +92,7 @@ public partial class TarArchive
         IAsyncEnumerable<TarVolume> volumes
     )
     {
-        var stream = (await volumes.SingleAsync().ConfigureAwait(false)).Stream;
+        var stream = (await volumes.SingleAsync()).Stream;
         if (stream.CanSeek)
         {
             stream.Position = 0;
@@ -127,8 +123,7 @@ public partial class TarArchive
                             var entry = new TarArchiveEntry(
                                 this,
                                 new TarFilePart(previousHeader, stream),
-                                CompressionType.None,
-                                ReaderOptions
+                                CompressionType.None
                             );
 
                             var oldStreamPos = stream.Position;
@@ -136,7 +131,7 @@ public partial class TarArchive
                             using (var entryStream = entry.OpenEntryStream())
                             {
                                 using var memoryStream = new MemoryStream();
-                                await entryStream.CopyToAsync(memoryStream).ConfigureAwait(false);
+                                await entryStream.CopyToAsync(memoryStream);
                                 memoryStream.Position = 0;
                                 var bytes = memoryStream.ToArray();
 
@@ -152,8 +147,7 @@ public partial class TarArchive
                         yield return new TarArchiveEntry(
                             this,
                             new TarFilePart(header, stream),
-                            CompressionType.None,
-                            ReaderOptions
+                            CompressionType.None
                         );
                     }
                 }

src/SharpCompress/Archives/Tar/TarArchive.Factory.cs

@@ -9,29 +9,22 @@ using SharpCompress.Common;
 using SharpCompress.Common.Tar.Headers;
 using SharpCompress.IO;
 using SharpCompress.Readers;
-using SharpCompress.Writers.Tar;
 
 namespace SharpCompress.Archives.Tar;
 
 public partial class TarArchive
 #if NET8_0_OR_GREATER
-    : IWritableArchiveOpenable<TarWriterOptions>,
-        IMultiArchiveOpenable<
-            IWritableArchive<TarWriterOptions>,
-            IWritableAsyncArchive<TarWriterOptions>
-        >
+    : IWritableArchiveOpenable,
+        IMultiArchiveOpenable<IWritableArchive, IWritableAsyncArchive>
 #endif
 {
-    public static IWritableArchive<TarWriterOptions> OpenArchive(
-        string filePath,
-        ReaderOptions? readerOptions = null
-    )
+    public static IWritableArchive OpenArchive(string filePath, ReaderOptions? readerOptions = null)
     {
         filePath.NotNullOrEmpty(nameof(filePath));
         return OpenArchive(new FileInfo(filePath), readerOptions);
     }
 
-    public static IWritableArchive<TarWriterOptions> OpenArchive(
+    public static IWritableArchive OpenArchive(
         FileInfo fileInfo,
         ReaderOptions? readerOptions = null
     )
@@ -46,7 +39,7 @@ public partial class TarArchive
         );
     }
 
-    public static IWritableArchive<TarWriterOptions> OpenArchive(
+    public static IWritableArchive OpenArchive(
         IEnumerable<FileInfo> fileInfos,
         ReaderOptions? readerOptions = null
     )
@@ -62,7 +55,7 @@ public partial class TarArchive
         );
     }
 
-    public static IWritableArchive<TarWriterOptions> OpenArchive(
+    public static IWritableArchive OpenArchive(
         IEnumerable<Stream> streams,
         ReaderOptions? readerOptions = null
     )
@@ -78,10 +71,7 @@ public partial class TarArchive
         );
     }
 
-    public static IWritableArchive<TarWriterOptions> OpenArchive(
-        Stream stream,
-        ReaderOptions? readerOptions = null
-    )
+    public static IWritableArchive OpenArchive(Stream stream, ReaderOptions? readerOptions = null)
     {
         stream.NotNull(nameof(stream));
 
@@ -95,30 +85,55 @@ public partial class TarArchive
         );
     }
 
-    public static IWritableAsyncArchive<TarWriterOptions> OpenAsyncArchive(
+    public static IWritableAsyncArchive OpenAsyncArchive(
         Stream stream,
-        ReaderOptions? readerOptions = null
-    ) => (IWritableAsyncArchive<TarWriterOptions>)OpenArchive(stream, readerOptions);
+        ReaderOptions? readerOptions = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        return (IWritableAsyncArchive)OpenArchive(stream, readerOptions);
+    }
 
-    public static IWritableAsyncArchive<TarWriterOptions> OpenAsyncArchive(
+    public static IWritableAsyncArchive OpenAsyncArchive(
         string path,
-        ReaderOptions? readerOptions = null
-    ) => (IWritableAsyncArchive<TarWriterOptions>)OpenArchive(new FileInfo(path), readerOptions);
+        ReaderOptions? readerOptions = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        return (IWritableAsyncArchive)OpenArchive(new FileInfo(path), readerOptions);
+    }
 
-    public static IWritableAsyncArchive<TarWriterOptions> OpenAsyncArchive(
+    public static IWritableAsyncArchive OpenAsyncArchive(
         FileInfo fileInfo,
-        ReaderOptions? readerOptions = null
-    ) => (IWritableAsyncArchive<TarWriterOptions>)OpenArchive(fileInfo, readerOptions);
+        ReaderOptions? readerOptions = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        return (IWritableAsyncArchive)OpenArchive(fileInfo, readerOptions);
+    }
 
-    public static IWritableAsyncArchive<TarWriterOptions> OpenAsyncArchive(
+    public static IWritableAsyncArchive OpenAsyncArchive(
         IReadOnlyList<Stream> streams,
-        ReaderOptions? readerOptions = null
-    ) => (IWritableAsyncArchive<TarWriterOptions>)OpenArchive(streams, readerOptions);
+        ReaderOptions? readerOptions = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        return (IWritableAsyncArchive)OpenArchive(streams, readerOptions);
+    }
 
-    public static IWritableAsyncArchive<TarWriterOptions> OpenAsyncArchive(
+    public static IWritableAsyncArchive OpenAsyncArchive(
         IReadOnlyList<FileInfo> fileInfos,
-        ReaderOptions? readerOptions = null
-    ) => (IWritableAsyncArchive<TarWriterOptions>)OpenArchive(fileInfos, readerOptions);
+        ReaderOptions? readerOptions = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        return (IWritableAsyncArchive)OpenArchive(fileInfos, readerOptions);
+    }
 
     public static bool IsTarFile(string filePath) => IsTarFile(new FileInfo(filePath));
 
@@ -166,7 +181,7 @@ public partial class TarArchive
 #else
             using var reader = new AsyncBinaryReader(stream, leaveOpen: true);
 #endif
-            var readSucceeded = await tarHeader.ReadAsync(reader).ConfigureAwait(false);
+            var readSucceeded = await tarHeader.ReadAsync(reader);
             var isEmptyArchive =
                 tarHeader.Name?.Length == 0
                 && tarHeader.Size == 0
@@ -181,7 +196,7 @@ public partial class TarArchive
         }
     }
 
-    public static IWritableArchive<TarWriterOptions> CreateArchive() => new TarArchive();
+    public static IWritableArchive CreateArchive() => new TarArchive();
 
-    public static IWritableAsyncArchive<TarWriterOptions> CreateAsyncArchive() => new TarArchive();
+    public static IWritableAsyncArchive CreateAsyncArchive() => new TarArchive();
 }

src/SharpCompress/Archives/Tar/TarArchive.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using SharpCompress.Common;
-using SharpCompress.Common.Options;
 using SharpCompress.Common.Tar;
 using SharpCompress.Common.Tar.Headers;
 using SharpCompress.IO;
@@ -16,8 +15,7 @@ using SharpCompress.Writers.Tar;
 
 namespace SharpCompress.Archives.Tar;
 
-public partial class TarArchive
-    : AbstractWritableArchive<TarArchiveEntry, TarVolume, TarWriterOptions>
+public partial class TarArchive : AbstractWritableArchive<TarArchiveEntry, TarVolume>
 {
     protected override IEnumerable<TarVolume> LoadVolumes(SourceStream sourceStream)
     {
@@ -60,8 +58,7 @@ public partial class TarArchive
                         var entry = new TarArchiveEntry(
                             this,
                             new TarFilePart(previousHeader, stream),
-                            CompressionType.None,
-                            ReaderOptions
+                            CompressionType.None
                         );
 
                         var oldStreamPos = stream.Position;
@@ -83,8 +80,7 @@ public partial class TarArchive
                     yield return new TarArchiveEntry(
                         this,
                         new TarFilePart(header, stream),
-                        CompressionType.None,
-                        ReaderOptions
+                        CompressionType.None
                     );
                 }
             }
@@ -119,15 +115,12 @@ public partial class TarArchive
 
     protected override void SaveTo(
         Stream stream,
-        TarWriterOptions options,
+        WriterOptions options,
         IEnumerable<TarArchiveEntry> oldEntries,
         IEnumerable<TarArchiveEntry> newEntries
     )
     {
-        using var writer = new TarWriter(
-            stream,
-            options as TarWriterOptions ?? new TarWriterOptions(options)
-        );
+        using var writer = new TarWriter(stream, new TarWriterOptions(options));
         foreach (var entry in oldEntries.Concat(newEntries))
         {
             if (entry.IsDirectory)

src/SharpCompress/Archives/Tar/TarArchiveEntry.cs

@@ -1,31 +1,22 @@
-using System.IO;
+using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using SharpCompress.Common;
-using SharpCompress.Common.Options;
 using SharpCompress.Common.Tar;
 
 namespace SharpCompress.Archives.Tar;
 
 public class TarArchiveEntry : TarEntry, IArchiveEntry
 {
-    internal TarArchiveEntry(
-        TarArchive archive,
-        TarFilePart? part,
-        CompressionType compressionType,
-        IReaderOptions readerOptions
-    )
-        : base(part, compressionType, readerOptions) => Archive = archive;
+    internal TarArchiveEntry(TarArchive archive, TarFilePart? part, CompressionType compressionType)
+        : base(part, compressionType) => Archive = archive;
 
     public virtual Stream OpenEntryStream() => Parts.Single().GetCompressedStream().NotNull();
 
     public async ValueTask<Stream> OpenEntryStreamAsync(
         CancellationToken cancellationToken = default
-    ) =>
-        (
-            await Parts.Single().GetCompressedStreamAsync(cancellationToken).ConfigureAwait(false)
-        ).NotNull();
+    ) => (await Parts.Single().GetCompressedStreamAsync(cancellationToken)).NotNull();
 
     #region IArchiveEntry Members
 

src/SharpCompress/Archives/Tar/TarWritableArchiveEntry.cs

@@ -21,7 +21,7 @@ internal sealed class TarWritableArchiveEntry : TarArchiveEntry, IWritableArchiv
         DateTime? lastModified,
         bool closeStream
     )
-        : base(archive, null, compressionType, archive.ReaderOptions)
+        : base(archive, null, compressionType)
     {
         this.stream = stream;
         Key = path;
@@ -36,7 +36,7 @@ internal sealed class TarWritableArchiveEntry : TarArchiveEntry, IWritableArchiv
         string directoryPath,
         DateTime? lastModified
     )
-        : base(archive, null, CompressionType.None, archive.ReaderOptions)
+        : base(archive, null, CompressionType.None)
     {
         stream = null;
         Key = directoryPath;

src/SharpCompress/Archives/Zip/ZipArchive.Async.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using SharpCompress.Common;
-using SharpCompress.Common.Options;
 using SharpCompress.Common.Zip;
 using SharpCompress.Common.Zip.Headers;
 using SharpCompress.IO;
@@ -21,7 +20,7 @@ public partial class ZipArchive
         IAsyncEnumerable<ZipVolume> volumes
     )
     {
-        var vols = await volumes.ToListAsync().ConfigureAwait(false);
+        var vols = await volumes.ToListAsync();
         var volsArray = vols.ToArray();
 
         await foreach (
@@ -55,8 +54,7 @@ public partial class ZipArchive
 
                             yield return new ZipArchiveEntry(
                                 this,
-                                new SeekableZipFilePart(headerFactory.NotNull(), deh, s),
-                                ReaderOptions
+                                new SeekableZipFilePart(headerFactory.NotNull(), deh, s)
                             );
                         }
                         break;
@@ -73,16 +71,13 @@ public partial class ZipArchive
 
     protected override async ValueTask SaveToAsync(
         Stream stream,
-        ZipWriterOptions options,
+        WriterOptions options,
         IAsyncEnumerable<ZipArchiveEntry> oldEntries,
         IEnumerable<ZipArchiveEntry> newEntries,
         CancellationToken cancellationToken = default
     )
     {
-        using var writer = new ZipWriter(
-            stream,
-            options as ZipWriterOptions ?? new ZipWriterOptions(options)
-        );
+        using var writer = new ZipWriter(stream, new ZipWriterOptions(options));
         await foreach (
             var entry in oldEntries.WithCancellation(cancellationToken).ConfigureAwait(false)
         )

src/SharpCompress/Archives/Zip/ZipArchive.Factory.cs

@@ -9,29 +9,22 @@ using SharpCompress.Common.Zip;
 using SharpCompress.Common.Zip.Headers;
 using SharpCompress.IO;
 using SharpCompress.Readers;
-using SharpCompress.Writers.Zip;
 
 namespace SharpCompress.Archives.Zip;
 
 public partial class ZipArchive
 #if NET8_0_OR_GREATER
-    : IWritableArchiveOpenable<ZipWriterOptions>,
-        IMultiArchiveOpenable<
-            IWritableArchive<ZipWriterOptions>,
-            IWritableAsyncArchive<ZipWriterOptions>
-        >
+    : IWritableArchiveOpenable,
+        IMultiArchiveOpenable<IWritableArchive, IWritableAsyncArchive>
 #endif
 {
-    public static IWritableArchive<ZipWriterOptions> OpenArchive(
-        string filePath,
-        ReaderOptions? readerOptions = null
-    )
+    public static IWritableArchive OpenArchive(string filePath, ReaderOptions? readerOptions = null)
     {
         filePath.NotNullOrEmpty(nameof(filePath));
         return OpenArchive(new FileInfo(filePath), readerOptions);
     }
 
-    public static IWritableArchive<ZipWriterOptions> OpenArchive(
+    public static IWritableArchive OpenArchive(
         FileInfo fileInfo,
         ReaderOptions? readerOptions = null
     )
@@ -46,7 +39,7 @@ public partial class ZipArchive
         );
     }
 
-    public static IWritableArchive<ZipWriterOptions> OpenArchive(
+    public static IWritableArchive OpenArchive(
         IEnumerable<FileInfo> fileInfos,
         ReaderOptions? readerOptions = null
     )
@@ -62,7 +55,7 @@ public partial class ZipArchive
         );
     }
 
-    public static IWritableArchive<ZipWriterOptions> OpenArchive(
+    public static IWritableArchive OpenArchive(
         IEnumerable<Stream> streams,
         ReaderOptions? readerOptions = null
     )
@@ -78,10 +71,7 @@ public partial class ZipArchive
         );
     }
 
-    public static IWritableArchive<ZipWriterOptions> OpenArchive(
-        Stream stream,
-        ReaderOptions? readerOptions = null
-    )
+    public static IWritableArchive OpenArchive(Stream stream, ReaderOptions? readerOptions = null)
     {
         stream.NotNull(nameof(stream));
 
@@ -95,30 +85,55 @@ public partial class ZipArchive
         );
     }
 
-    public static IWritableAsyncArchive<ZipWriterOptions> OpenAsyncArchive(
+    public static IWritableAsyncArchive OpenAsyncArchive(
         string path,
-        ReaderOptions? readerOptions = null
-    ) => (IWritableAsyncArchive<ZipWriterOptions>)OpenArchive(path, readerOptions);
+        ReaderOptions? readerOptions = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        return (IWritableAsyncArchive)OpenArchive(path, readerOptions);
+    }
 
-    public static IWritableAsyncArchive<ZipWriterOptions> OpenAsyncArchive(
+    public static IWritableAsyncArchive OpenAsyncArchive(
         Stream stream,
-        ReaderOptions? readerOptions = null
-    ) => (IWritableAsyncArchive<ZipWriterOptions>)OpenArchive(stream, readerOptions);
+        ReaderOptions? readerOptions = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        return (IWritableAsyncArchive)OpenArchive(stream, readerOptions);
+    }
 
-    public static IWritableAsyncArchive<ZipWriterOptions> OpenAsyncArchive(
+    public static IWritableAsyncArchive OpenAsyncArchive(
         FileInfo fileInfo,
-        ReaderOptions? readerOptions = null
-    ) => (IWritableAsyncArchive<ZipWriterOptions>)OpenArchive(fileInfo, readerOptions);
+        ReaderOptions? readerOptions = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        return (IWritableAsyncArchive)OpenArchive(fileInfo, readerOptions);
+    }
 
-    public static IWritableAsyncArchive<ZipWriterOptions> OpenAsyncArchive(
+    public static IWritableAsyncArchive OpenAsyncArchive(
         IReadOnlyList<Stream> streams,
-        ReaderOptions? readerOptions = null
-    ) => (IWritableAsyncArchive<ZipWriterOptions>)OpenArchive(streams, readerOptions);
+        ReaderOptions? readerOptions = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        return (IWritableAsyncArchive)OpenArchive(streams, readerOptions);
+    }
 
-    public static IWritableAsyncArchive<ZipWriterOptions> OpenAsyncArchive(
+    public static IWritableAsyncArchive OpenAsyncArchive(
         IReadOnlyList<FileInfo> fileInfos,
-        ReaderOptions? readerOptions = null
-    ) => (IWritableAsyncArchive<ZipWriterOptions>)OpenArchive(fileInfos, readerOptions);
+        ReaderOptions? readerOptions = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        return (IWritableAsyncArchive)OpenArchive(fileInfos, readerOptions);
+    }
 
     public static bool IsZipFile(string filePath, string? password = null) =>
         IsZipFile(new FileInfo(filePath), password);
@@ -203,8 +218,7 @@ public partial class ZipArchive
             var header = await headerFactory
                 .ReadStreamHeaderAsync(stream)
                 .Where(x => x.ZipHeaderType != ZipHeaderType.Split)
-                .FirstOrDefaultAsync(cancellationToken)
-                .ConfigureAwait(false);
+                .FirstOrDefaultAsync(cancellationToken);
             if (header is null)
             {
                 return false;
@@ -221,9 +235,9 @@ public partial class ZipArchive
         }
     }
 
-    public static IWritableArchive<ZipWriterOptions> CreateArchive() => new ZipArchive();
+    public static IWritableArchive CreateArchive() => new ZipArchive();
 
-    public static IWritableAsyncArchive<ZipWriterOptions> CreateAsyncArchive() => new ZipArchive();
+    public static IWritableAsyncArchive CreateAsyncArchive() => new ZipArchive();
 
     public static async ValueTask<bool> IsZipMultiAsync(
         Stream stream,
@@ -247,7 +261,6 @@ public partial class ZipArchive
                     await foreach (
                         var h in z.ReadSeekableHeaderAsync(stream)
                             .WithCancellation(cancellationToken)
-                            .ConfigureAwait(false)
                     )
                     {
                         x = h;

src/SharpCompress/Archives/Zip/ZipArchive.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using SharpCompress.Common;
-using SharpCompress.Common.Options;
 using SharpCompress.Common.Zip;
 using SharpCompress.Common.Zip.Headers;
 using SharpCompress.Compressors.Deflate;
@@ -17,8 +16,7 @@ using SharpCompress.Writers.Zip;
 
 namespace SharpCompress.Archives.Zip;
 
-public partial class ZipArchive
-    : AbstractWritableArchive<ZipArchiveEntry, ZipVolume, ZipWriterOptions>
+public partial class ZipArchive : AbstractWritableArchive<ZipArchiveEntry, ZipVolume>
 {
     private readonly SeekableZipHeaderFactory? headerFactory;
 
@@ -96,8 +94,7 @@ public partial class ZipArchive
 
                             yield return new ZipArchiveEntry(
                                 this,
-                                new SeekableZipFilePart(headerFactory.NotNull(), deh, s),
-                                ReaderOptions
+                                new SeekableZipFilePart(headerFactory.NotNull(), deh, s)
                             );
                         }
                         break;
@@ -112,20 +109,16 @@ public partial class ZipArchive
         }
     }
 
-    public void SaveTo(Stream stream) =>
-        SaveTo(stream, new ZipWriterOptions(CompressionType.Deflate));
+    public void SaveTo(Stream stream) => SaveTo(stream, new WriterOptions(CompressionType.Deflate));
 
     protected override void SaveTo(
         Stream stream,
-        ZipWriterOptions options,
+        WriterOptions options,
         IEnumerable<ZipArchiveEntry> oldEntries,
         IEnumerable<ZipArchiveEntry> newEntries
     )
     {
-        using var writer = new ZipWriter(
-            stream,
-            options as ZipWriterOptions ?? new ZipWriterOptions(options)
-        );
+        using var writer = new ZipWriter(stream, new ZipWriterOptions(options));
         foreach (var entry in oldEntries.Concat(newEntries))
         {
             if (entry.IsDirectory)

src/SharpCompress/Archives/Zip/ZipArchiveEntry.Async.cs

@@ -15,9 +15,7 @@ public partial class ZipArchiveEntry
         var part = Parts.Single();
         if (part is SeekableZipFilePart seekablePart)
         {
-            return (
-                await seekablePart.GetCompressedStreamAsync(cancellationToken).ConfigureAwait(false)
-            ).NotNull();
+            return (await seekablePart.GetCompressedStreamAsync(cancellationToken)).NotNull();
         }
         return OpenEntryStream();
     }

src/SharpCompress/Archives/Zip/ZipArchiveEntry.cs

@@ -1,20 +1,15 @@
-using System.IO;
+using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using SharpCompress.Common.Options;
 using SharpCompress.Common.Zip;
 
 namespace SharpCompress.Archives.Zip;
 
 public partial class ZipArchiveEntry : ZipEntry, IArchiveEntry
 {
-    internal ZipArchiveEntry(
-        ZipArchive archive,
-        SeekableZipFilePart? part,
-        IReaderOptions readerOptions
-    )
-        : base(part, readerOptions) => Archive = archive;
+    internal ZipArchiveEntry(ZipArchive archive, SeekableZipFilePart? part)
+        : base(part) => Archive = archive;
 
     public virtual Stream OpenEntryStream() => Parts.Single().GetCompressedStream().NotNull();
 

src/SharpCompress/Archives/Zip/ZipWritableArchiveEntry.cs

@@ -21,7 +21,7 @@ internal class ZipWritableArchiveEntry : ZipArchiveEntry, IWritableArchiveEntry
         DateTime? lastModified,
         bool closeStream
     )
-        : base(archive, null, archive.ReaderOptions)
+        : base(archive, null)
     {
         this.stream = stream;
         Key = path;
@@ -36,7 +36,7 @@ internal class ZipWritableArchiveEntry : ZipArchiveEntry, IWritableArchiveEntry
         string directoryPath,
         DateTime? lastModified
     )
-        : base(archive, null, archive.ReaderOptions)
+        : base(archive, null)
     {
         stream = null;
         Key = directoryPath;

src/SharpCompress/Common/Ace/AceEntry.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using SharpCompress.Common.Ace.Headers;
-using SharpCompress.Common.Options;
 
 namespace SharpCompress.Common.Ace;
 
@@ -13,8 +12,7 @@ public class AceEntry : Entry
 {
     private readonly AceFilePart _filePart;
 
-    internal AceEntry(AceFilePart filePart, IReaderOptions readerOptions)
-        : base(readerOptions)
+    internal AceEntry(AceFilePart filePart)
     {
         _filePart = filePart;
     }

src/SharpCompress/Common/Ace/Headers/AceFileHeader.Async.cs

@@ -18,7 +18,7 @@ public sealed partial class AceFileHeader
         CancellationToken cancellationToken = default
     )
     {
-        var headerData = await ReadHeaderAsync(stream, cancellationToken).ConfigureAwait(false);
+        var headerData = await ReadHeaderAsync(stream, cancellationToken);
         if (headerData.Length == 0)
         {
             return null;

src/SharpCompress/Common/Ace/Headers/AceHeader.Async.cs

@@ -19,9 +19,7 @@ public abstract partial class AceHeader
     {
         // Read header CRC (2 bytes) and header size (2 bytes)
         var headerBytes = new byte[4];
-        if (
-            !await stream.ReadFullyAsync(headerBytes, 0, 4, cancellationToken).ConfigureAwait(false)
-        )
+        if (!await stream.ReadFullyAsync(headerBytes, 0, 4, cancellationToken))
         {
             return Array.Empty<byte>();
         }
@@ -35,11 +33,7 @@ public abstract partial class AceHeader
 
         // Read the header data
         var body = new byte[HeaderSize];
-        if (
-            !await stream
-                .ReadFullyAsync(body, 0, HeaderSize, cancellationToken)
-                .ConfigureAwait(false)
-        )
+        if (!await stream.ReadFullyAsync(body, 0, HeaderSize, cancellationToken))
         {
             return Array.Empty<byte>();
         }
@@ -65,7 +59,7 @@ public abstract partial class AceHeader
     )
     {
         var bytes = new byte[14];
-        if (!await stream.ReadFullyAsync(bytes, 0, 14, cancellationToken).ConfigureAwait(false))
+        if (!await stream.ReadFullyAsync(bytes, 0, 14, cancellationToken))
         {
             return false;
         }

src/SharpCompress/Common/Ace/Headers/AceMainHeader.Async.cs

@@ -19,7 +19,7 @@ public sealed partial class AceMainHeader
         CancellationToken cancellationToken = default
     )
     {
-        var headerData = await ReadHeaderAsync(stream, cancellationToken).ConfigureAwait(false);
+        var headerData = await ReadHeaderAsync(stream, cancellationToken);
         if (headerData.Length == 0)
         {
             return null;

src/SharpCompress/Common/Arc/ArcEntry.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using SharpCompress.Common.GZip;
-using SharpCompress.Common.Options;
 using SharpCompress.Common.Tar;
 
 namespace SharpCompress.Common.Arc;
@@ -14,8 +13,7 @@ public class ArcEntry : Entry
 {
     private readonly ArcFilePart? _filePart;
 
-    internal ArcEntry(ArcFilePart? filePart, IReaderOptions readerOptions)
-        : base(readerOptions)
+    internal ArcEntry(ArcFilePart? filePart)
     {
         _filePart = filePart;
     }

src/SharpCompress/Common/Arc/ArcEntryHeader.cs

@@ -41,9 +41,8 @@ public class ArcEntryHeader
     {
         byte[] headerBytes = new byte[29];
         if (
-            await stream
-                .ReadAsync(headerBytes, 0, headerBytes.Length, cancellationToken)
-                .ConfigureAwait(false) != headerBytes.Length
+            await stream.ReadAsync(headerBytes, 0, headerBytes.Length, cancellationToken)
+            != headerBytes.Length
         )
         {
             return null;

src/SharpCompress/Common/Arc/ArcFilePart.Async.cs

@@ -31,9 +31,11 @@ public partial class ArcFilePart
                     compressedStream = new RunLength90Stream(_stream, (int)Header.CompressedSize);
                     break;
                 case CompressionType.Squeezed:
-                    compressedStream = await SqueezeStream
-                        .CreateAsync(_stream, (int)Header.CompressedSize, cancellationToken)
-                        .ConfigureAwait(false);
+                    compressedStream = await SqueezeStream.CreateAsync(
+                        _stream,
+                        (int)Header.CompressedSize,
+                        cancellationToken
+                    );
                     break;
                 case CompressionType.Crunched:
                     if (Header.OriginalSize > 128 * 1024)

src/SharpCompress/Common/ArchiveType.cs

@@ -10,5 +10,4 @@ public enum ArchiveType
     Arc,
     Arj,
     Ace,
-    Lzw,
 }

src/SharpCompress/Common/Arj/ArjEntry.cs

@@ -5,7 +5,6 @@ using System.Text;
 using System.Threading.Tasks;
 using SharpCompress.Common.Arc;
 using SharpCompress.Common.Arj.Headers;
-using SharpCompress.Common.Options;
 
 namespace SharpCompress.Common.Arj;
 
@@ -13,8 +12,7 @@ public class ArjEntry : Entry
 {
     private readonly ArjFilePart _filePart;
 
-    internal ArjEntry(ArjFilePart filePart, IReaderOptions readerOptions)
-        : base(readerOptions)
+    internal ArjEntry(ArjFilePart filePart)
     {
         _filePart = filePart;
     }
@@ -43,9 +41,9 @@ public class ArjEntry : Entry
 
     public override DateTime? LastModifiedTime => _filePart.Header.DateTimeModified.DateTime;
 
-    public override DateTime? CreatedTime => _filePart.Header.DateTimeCreated?.DateTime;
+    public override DateTime? CreatedTime => _filePart.Header.DateTimeCreated.DateTime;
 
-    public override DateTime? LastAccessedTime => _filePart.Header.DateTimeAccessed?.DateTime;
+    public override DateTime? LastAccessedTime => _filePart.Header.DateTimeAccessed.DateTime;
 
     public override DateTime? ArchivedTime => null;
 

src/SharpCompress/Common/Arj/Headers/ArjHeader.Async.cs

@@ -21,7 +21,7 @@ public abstract partial class ArjHeader
     {
         // check for magic bytes
         var magic = new byte[2];
-        if (await stream.ReadAsync(magic, 0, 2, cancellationToken).ConfigureAwait(false) != 2)
+        if (await stream.ReadAsync(magic, 0, 2, cancellationToken) != 2)
         {
             return Array.Empty<byte>();
         }
@@ -33,7 +33,7 @@ public abstract partial class ArjHeader
 
         // read header_size
         byte[] headerBytes = new byte[2];
-        await stream.ReadAsync(headerBytes, 0, 2, cancellationToken).ConfigureAwait(false);
+        await stream.ReadAsync(headerBytes, 0, 2, cancellationToken);
         var headerSize = (ushort)(headerBytes[0] | headerBytes[1] << 8);
         if (headerSize < 1)
         {
@@ -41,16 +41,14 @@ public abstract partial class ArjHeader
         }
 
         var body = new byte[headerSize];
-        var read = await stream
-            .ReadAsync(body, 0, headerSize, cancellationToken)
-            .ConfigureAwait(false);
+        var read = await stream.ReadAsync(body, 0, headerSize, cancellationToken);
         if (read < headerSize)
         {
             return Array.Empty<byte>();
         }
 
         byte[] crc = new byte[4];
-        await stream.ReadFullyAsync(crc, 0, 4, cancellationToken).ConfigureAwait(false);
+        read = await stream.ReadAsync(crc, 0, 4, cancellationToken);
         var checksum = Crc32Stream.Compute(body);
         // Compute the hash value
         if (checksum != BitConverter.ToUInt32(crc, 0))
@@ -70,9 +68,7 @@ public abstract partial class ArjHeader
 
         while (true)
         {
-            int bytesRead = await reader
-                .ReadAsync(buffer, 0, 2, cancellationToken)
-                .ConfigureAwait(false);
+            int bytesRead = await reader.ReadAsync(buffer, 0, 2, cancellationToken);
             if (bytesRead < 2)
             {
                 throw new EndOfStreamException(
@@ -87,9 +83,7 @@ public abstract partial class ArjHeader
             }
 
             byte[] header = new byte[extHeaderSize];
-            bytesRead = await reader
-                .ReadAsync(header, 0, extHeaderSize, cancellationToken)
-                .ConfigureAwait(false);
+            bytesRead = await reader.ReadAsync(header, 0, extHeaderSize, cancellationToken);
             if (bytesRead < extHeaderSize)
             {
                 throw new EndOfStreamException(
@@ -98,9 +92,7 @@ public abstract partial class ArjHeader
             }
 
             byte[] crcextended = new byte[4];
-            bytesRead = await reader
-                .ReadAsync(crcextended, 0, 4, cancellationToken)
-                .ConfigureAwait(false);
+            bytesRead = await reader.ReadAsync(crcextended, 0, 4, cancellationToken);
             if (bytesRead < 4)
             {
                 throw new EndOfStreamException(
@@ -130,7 +122,7 @@ public abstract partial class ArjHeader
     )
     {
         var bytes = new byte[2];
-        if (await stream.ReadAsync(bytes, 0, 2, cancellationToken).ConfigureAwait(false) != 2)
+        if (await stream.ReadAsync(bytes, 0, 2, cancellationToken) != 2)
         {
             return false;
         }

src/SharpCompress/Common/Arj/Headers/ArjLocalHeader.Async.cs

@@ -11,10 +11,10 @@ public partial class ArjLocalHeader
         CancellationToken cancellationToken = default
     )
     {
-        var body = await ReadHeaderAsync(stream, cancellationToken).ConfigureAwait(false);
+        var body = await ReadHeaderAsync(stream, cancellationToken);
         if (body.Length > 0)
         {
-            await ReadExtendedHeadersAsync(stream, cancellationToken).ConfigureAwait(false);
+            await ReadExtendedHeadersAsync(stream, cancellationToken);
             var header = LoadFrom(body);
             header.DataStartPosition = stream.Position;
             return header;

src/SharpCompress/Common/Arj/Headers/ArjLocalHeader.cs

@@ -27,8 +27,8 @@ public partial class ArjLocalHeader : ArjHeader
     public byte FirstChapter { get; set; }
     public byte LastChapter { get; set; }
     public long ExtendedFilePosition { get; set; }
-    public DosDateTime? DateTimeAccessed { get; set; }
-    public DosDateTime? DateTimeCreated { get; set; }
+    public DosDateTime DateTimeAccessed { get; set; } = new DosDateTime(0);
+    public DosDateTime DateTimeCreated { get; set; } = new DosDateTime(0);
     public long OriginalSizeEvenForVolumes { get; set; }
     public string Name { get; set; } = string.Empty;
     public string Comment { get; set; } = string.Empty;
@@ -119,9 +119,11 @@ public partial class ArjLocalHeader : ArjHeader
             if (headerSize >= R9HdrSize)
             {
                 rawTimestamp = ReadInt32();
-                DateTimeAccessed = rawTimestamp != 0 ? new DosDateTime(rawTimestamp) : null;
+                DateTimeAccessed =
+                    rawTimestamp != 0 ? new DosDateTime(rawTimestamp) : new DosDateTime(0);
                 rawTimestamp = ReadInt32();
-                DateTimeCreated = rawTimestamp != 0 ? new DosDateTime(rawTimestamp) : null;
+                DateTimeCreated =
+                    rawTimestamp != 0 ? new DosDateTime(rawTimestamp) : new DosDateTime(0);
                 OriginalSizeEvenForVolumes = ReadInt32();
             }
         }

src/SharpCompress/Common/Arj/Headers/ArjMainHeader.Async.cs

@@ -11,8 +11,8 @@ public partial class ArjMainHeader
         CancellationToken cancellationToken = default
     )
     {
-        var body = await ReadHeaderAsync(stream, cancellationToken).ConfigureAwait(false);
-        await ReadExtendedHeadersAsync(stream, cancellationToken).ConfigureAwait(false);
+        var body = await ReadHeaderAsync(stream, cancellationToken);
+        await ReadExtendedHeadersAsync(stream, cancellationToken);
         return LoadFrom(body);
     }
 }

src/SharpCompress/Common/Entry.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using SharpCompress.Common.Options;
 
 namespace SharpCompress.Common;
 
@@ -88,14 +87,4 @@ public abstract class Entry : IEntry
     /// Entry file attribute.
     /// </summary>
     public virtual int? Attrib => throw new NotImplementedException();
-
-    /// <summary>
-    /// The options used when opening this entry's source (reader or archive).
-    /// </summary>
-    public IReaderOptions Options { get; protected set; }
-
-    protected Entry(IReaderOptions readerOptions)
-    {
-        Options = readerOptions;
-    }
 }

src/SharpCompress/Common/ExtractionMethods.Async.cs

@@ -2,7 +2,6 @@ using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using SharpCompress.Readers;
 
 namespace SharpCompress.Common;
 
@@ -11,7 +10,8 @@ internal static partial class ExtractionMethods
     public static async ValueTask WriteEntryToDirectoryAsync(
         IEntry entry,
         string destinationDirectory,
-        Func<string, CancellationToken, ValueTask> writeAsync,
+        ExtractionOptions? options,
+        Func<string, ExtractionOptions?, CancellationToken, ValueTask> writeAsync,
         CancellationToken cancellationToken = default
     )
     {
@@ -34,9 +34,11 @@ internal static partial class ExtractionMethods
             );
         }
 
+        options ??= new ExtractionOptions() { Overwrite = true };
+
         var file = Path.GetFileName(entry.Key.NotNull("Entry Key is null")).NotNull("File is null");
         file = Utility.ReplaceInvalidFileNameChars(file);
-        if (entry.Options.ExtractFullPath)
+        if (options.ExtractFullPath)
         {
             var folder = Path.GetDirectoryName(entry.Key.NotNull("Entry Key is null"))
                 .NotNull("Directory is null");
@@ -70,9 +72,9 @@ internal static partial class ExtractionMethods
                     "Entry is trying to write a file outside of the destination directory."
                 );
             }
-            await writeAsync(destinationFileName, cancellationToken).ConfigureAwait(false);
+            await writeAsync(destinationFileName, options, cancellationToken).ConfigureAwait(false);
         }
-        else if (entry.Options.ExtractFullPath && !Directory.Exists(destinationFileName))
+        else if (options.ExtractFullPath && !Directory.Exists(destinationFileName))
         {
             Directory.CreateDirectory(destinationFileName);
         }
@@ -81,34 +83,34 @@ internal static partial class ExtractionMethods
     public static async ValueTask WriteEntryToFileAsync(
         IEntry entry,
         string destinationFileName,
+        ExtractionOptions? options,
         Func<string, FileMode, CancellationToken, ValueTask> openAndWriteAsync,
         CancellationToken cancellationToken = default
     )
     {
         if (entry.LinkTarget != null)
         {
-            if (entry.Options.SymbolicLinkHandler is not null)
+            if (options?.WriteSymbolicLink is null)
             {
-                entry.Options.SymbolicLinkHandler(destinationFileName, entry.LinkTarget);
+                throw new ExtractionException(
+                    "Entry is a symbolic link but ExtractionOptions.WriteSymbolicLink delegate is null"
+                );
             }
-            else
-            {
-                ReaderOptions.DefaultSymbolicLinkHandler(destinationFileName, entry.LinkTarget);
-            }
-            return;
+            options.WriteSymbolicLink(destinationFileName, entry.LinkTarget);
         }
         else
         {
             var fm = FileMode.Create;
+            options ??= new ExtractionOptions() { Overwrite = true };
 
-            if (!entry.Options.Overwrite)
+            if (!options.Overwrite)
             {
                 fm = FileMode.CreateNew;
             }
 
             await openAndWriteAsync(destinationFileName, fm, cancellationToken)
                 .ConfigureAwait(false);
-            entry.PreserveExtractionOptions(destinationFileName);
+            entry.PreserveExtractionOptions(destinationFileName, options);
         }
     }
 }

src/SharpCompress/Common/ExtractionMethods.cs

@@ -3,7 +3,6 @@ using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
-using SharpCompress.Readers;
 
 namespace SharpCompress.Common;
 
@@ -24,7 +23,8 @@ internal static partial class ExtractionMethods
     public static void WriteEntryToDirectory(
         IEntry entry,
         string destinationDirectory,
-        Action<string> write
+        ExtractionOptions? options,
+        Action<string, ExtractionOptions?> write
     )
     {
         string destinationFileName;
@@ -46,9 +46,11 @@ internal static partial class ExtractionMethods
             );
         }
 
+        options ??= new ExtractionOptions() { Overwrite = true };
+
         var file = Path.GetFileName(entry.Key.NotNull("Entry Key is null")).NotNull("File is null");
         file = Utility.ReplaceInvalidFileNameChars(file);
-        if (entry.Options.ExtractFullPath)
+        if (options.ExtractFullPath)
         {
             var folder = Path.GetDirectoryName(entry.Key.NotNull("Entry Key is null"))
                 .NotNull("Directory is null");
@@ -82,9 +84,9 @@ internal static partial class ExtractionMethods
                     "Entry is trying to write a file outside of the destination directory."
                 );
             }
-            write(destinationFileName);
+            write(destinationFileName, options);
         }
-        else if (entry.Options.ExtractFullPath && !Directory.Exists(destinationFileName))
+        else if (options.ExtractFullPath && !Directory.Exists(destinationFileName))
         {
             Directory.CreateDirectory(destinationFileName);
         }
@@ -93,32 +95,32 @@ internal static partial class ExtractionMethods
     public static void WriteEntryToFile(
         IEntry entry,
         string destinationFileName,
+        ExtractionOptions? options,
         Action<string, FileMode> openAndWrite
     )
     {
         if (entry.LinkTarget != null)
         {
-            if (entry.Options.SymbolicLinkHandler is not null)
+            if (options?.WriteSymbolicLink is null)
             {
-                entry.Options.SymbolicLinkHandler(destinationFileName, entry.LinkTarget);
+                throw new ExtractionException(
+                    "Entry is a symbolic link but ExtractionOptions.WriteSymbolicLink delegate is null"
+                );
             }
-            else
-            {
-                ReaderOptions.DefaultSymbolicLinkHandler(destinationFileName, entry.LinkTarget);
-            }
-            return;
+            options.WriteSymbolicLink(destinationFileName, entry.LinkTarget);
         }
         else
         {
             var fm = FileMode.Create;
+            options ??= new ExtractionOptions() { Overwrite = true };
 
-            if (!entry.Options.Overwrite)
+            if (!options.Overwrite)
             {
                 fm = FileMode.CreateNew;
             }
 
             openAndWrite(destinationFileName, fm);
-            entry.PreserveExtractionOptions(destinationFileName);
+            entry.PreserveExtractionOptions(destinationFileName, options);
         }
     }
 }

src/SharpCompress/Common/ExtractionOptions.cs

@@ -0,0 +1,40 @@
+using System;
+
+namespace SharpCompress.Common;
+
+public class ExtractionOptions
+{
+    /// <summary>
+    /// overwrite target if it exists
+    /// </summary>
+    public bool Overwrite { get; set; }
+
+    /// <summary>
+    /// extract with internal directory structure
+    /// </summary>
+    public bool ExtractFullPath { get; set; }
+
+    /// <summary>
+    /// preserve file time
+    /// </summary>
+    public bool PreserveFileTime { get; set; }
+
+    /// <summary>
+    /// preserve windows file attributes
+    /// </summary>
+    public bool PreserveAttributes { get; set; }
+
+    /// <summary>
+    /// Delegate for writing symbolic links to disk.
+    /// sourcePath is where the symlink is created.
+    /// targetPath is what the symlink refers to.
+    /// </summary>
+    public delegate void SymbolicLinkWriterDelegate(string sourcePath, string targetPath);
+
+    public SymbolicLinkWriterDelegate WriteSymbolicLink = (sourcePath, targetPath) =>
+    {
+        Console.WriteLine(
+            $"Could not write symlink {sourcePath} -> {targetPath}, for more information please see https://github.com/dotnet/runtime/issues/24271"
+        );
+    };
+}

src/SharpCompress/Common/GZip/GZipEntry.Async.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.IO;
-using SharpCompress.Readers;
 
 namespace SharpCompress.Common.GZip;
 
@@ -8,12 +7,9 @@ public partial class GZipEntry
 {
     internal static async IAsyncEnumerable<GZipEntry> GetEntriesAsync(
         Stream stream,
-        ReaderOptions options
+        OptionsBase options
     )
     {
-        yield return new GZipEntry(
-            await GZipFilePart.CreateAsync(stream, options.ArchiveEncoding).ConfigureAwait(false),
-            options
-        );
+        yield return new GZipEntry(await GZipFilePart.CreateAsync(stream, options.ArchiveEncoding));
     }
 }

src/SharpCompress/Common/GZip/GZipEntry.cs

@@ -1,8 +1,6 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
-using SharpCompress.Common.Options;
-using SharpCompress.Readers;
 
 namespace SharpCompress.Common.GZip;
 
@@ -10,11 +8,7 @@ public partial class GZipEntry : Entry
 {
     private readonly GZipFilePart? _filePart;
 
-    internal GZipEntry(GZipFilePart? filePart, IReaderOptions readerOptions)
-        : base(readerOptions)
-    {
-        _filePart = filePart;
-    }
+    internal GZipEntry(GZipFilePart? filePart) => _filePart = filePart;
 
     public override CompressionType CompressionType => CompressionType.GZip;
 
@@ -44,9 +38,9 @@ public partial class GZipEntry : Entry
 
     internal override IEnumerable<FilePart> Parts => _filePart.Empty();
 
-    internal static IEnumerable<GZipEntry> GetEntries(Stream stream, ReaderOptions options)
+    internal static IEnumerable<GZipEntry> GetEntries(Stream stream, OptionsBase options)
     {
-        yield return new GZipEntry(GZipFilePart.Create(stream, options.ArchiveEncoding), options);
+        yield return new GZipEntry(GZipFilePart.Create(stream, options.ArchiveEncoding));
     }
 
     // Async methods moved to GZipEntry.Async.cs

src/SharpCompress/Common/GZip/GZipFilePart.Async.cs

@@ -19,12 +19,12 @@ internal sealed partial class GZipFilePart
     {
         var part = new GZipFilePart(stream, archiveEncoding);
 
-        await part.ReadAndValidateGzipHeaderAsync(cancellationToken).ConfigureAwait(false);
+        await part.ReadAndValidateGzipHeaderAsync(cancellationToken);
         if (stream.CanSeek)
         {
             var position = stream.Position;
             stream.Position = stream.Length - 8;
-            await part.ReadTrailerAsync(cancellationToken).ConfigureAwait(false);
+            await part.ReadTrailerAsync(cancellationToken);
             stream.Position = position;
             part.EntryStartPosition = position;
         }
@@ -41,7 +41,7 @@ internal sealed partial class GZipFilePart
     {
         // Read and potentially verify the GZIP trailer: CRC32 and  size mod 2^32
         var trailer = new byte[8];
-        _ = await _stream.ReadFullyAsync(trailer, 0, 8, cancellationToken).ConfigureAwait(false);
+        _ = await _stream.ReadFullyAsync(trailer, 0, 8, cancellationToken);
 
         Crc = BinaryPrimitives.ReadUInt32LittleEndian(trailer);
         UncompressedSize = BinaryPrimitives.ReadUInt32LittleEndian(trailer.AsSpan().Slice(4));
@@ -53,7 +53,7 @@ internal sealed partial class GZipFilePart
     {
         // read the header on the first read
         var header = new byte[10];
-        var n = await _stream.ReadAsync(header, 0, 10, cancellationToken).ConfigureAwait(false);
+        var n = await _stream.ReadAsync(header, 0, 10, cancellationToken);
 
         // workitem 8501: handle edge case (decompress empty stream)
         if (n == 0)
@@ -77,29 +77,28 @@ internal sealed partial class GZipFilePart
         {
             // read and discard extra field
             var lengthField = new byte[2];
-            _ = await _stream.ReadAsync(lengthField, 0, 2, cancellationToken).ConfigureAwait(false);
+            _ = await _stream.ReadAsync(lengthField, 0, 2, cancellationToken);
 
             var extraLength = (short)(lengthField[0] + (lengthField[1] * 256));
             var extra = new byte[extraLength];
 
-            if (!await _stream.ReadFullyAsync(extra, cancellationToken).ConfigureAwait(false))
+            if (!await _stream.ReadFullyAsync(extra, cancellationToken))
             {
                 throw new ZlibException("Unexpected end-of-file reading GZIP header.");
             }
         }
         if ((header[3] & 0x08) == 0x08)
         {
-            _name = await ReadZeroTerminatedStringAsync(_stream, cancellationToken)
-                .ConfigureAwait(false);
+            _name = await ReadZeroTerminatedStringAsync(_stream, cancellationToken);
         }
         if ((header[3] & 0x10) == 0x010)
         {
-            await ReadZeroTerminatedStringAsync(_stream, cancellationToken).ConfigureAwait(false);
+            await ReadZeroTerminatedStringAsync(_stream, cancellationToken);
         }
         if ((header[3] & 0x02) == 0x02)
         {
             var buf = new byte[1];
-            _ = await _stream.ReadAsync(buf, 0, 1, cancellationToken).ConfigureAwait(false); // CRC16, ignore
+            _ = await _stream.ReadAsync(buf, 0, 1, cancellationToken); // CRC16, ignore
         }
     }
 
@@ -114,7 +113,7 @@ internal sealed partial class GZipFilePart
         do
         {
             // workitem 7740
-            var n = await stream.ReadAsync(buf1, 0, 1, cancellationToken).ConfigureAwait(false);
+            var n = await stream.ReadAsync(buf1, 0, 1, cancellationToken);
             if (n != 1)
             {
                 throw new ZlibException("Unexpected EOF reading GZIP header.");

src/SharpCompress/Common/GZip/GZipVolume.cs

@@ -9,7 +9,7 @@ public class GZipVolume : Volume
         : base(stream, options, index) { }
 
     public GZipVolume(FileInfo fileInfo, ReaderOptions options)
-        : base(fileInfo.OpenRead(), options with { LeaveStreamOpen = false }) { }
+        : base(fileInfo.OpenRead(), options) => options.LeaveStreamOpen = false;
 
     public override bool IsFirstVolume => true;
 

src/SharpCompress/Common/IEntry.Extensions.cs

@@ -4,9 +4,13 @@ namespace SharpCompress.Common;
 
 internal static class EntryExtensions
 {
-    internal static void PreserveExtractionOptions(this IEntry entry, string destinationFileName)
+    internal static void PreserveExtractionOptions(
+        this IEntry entry,
+        string destinationFileName,
+        ExtractionOptions options
+    )
     {
-        if (entry.Options.PreserveFileTime || entry.Options.PreserveAttributes)
+        if (options.PreserveFileTime || options.PreserveAttributes)
         {
             var nf = new FileInfo(destinationFileName);
             if (!nf.Exists)
@@ -15,7 +19,7 @@ internal static class EntryExtensions
             }
 
             // update file time to original packed time
-            if (entry.Options.PreserveFileTime)
+            if (options.PreserveFileTime)
             {
                 if (entry.CreatedTime.HasValue)
                 {
@@ -33,7 +37,7 @@ internal static class EntryExtensions
                 }
             }
 
-            if (entry.Options.PreserveAttributes)
+            if (options.PreserveAttributes)
             {
                 if (entry.Attrib.HasValue)
                 {

src/SharpCompress/Common/IEntry.cs

@@ -1,5 +1,4 @@
 using System;
-using SharpCompress.Common.Options;
 
 namespace SharpCompress.Common;
 
@@ -22,9 +21,4 @@ public interface IEntry
     DateTime? LastModifiedTime { get; }
     long Size { get; }
     int? Attrib { get; }
-
-    /// <summary>
-    /// The options used when opening this entry's source (reader or archive).
-    /// </summary>
-    IReaderOptions Options { get; }
 }

src/SharpCompress/Common/IsExternalInit.cs

@@ -1,18 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-// This file is required for init-only properties to work on older target frameworks (.NET Framework 4.8, .NET Standard 2.0)
-// The IsExternalInit type is used by the compiler for records and init-only properties
-
-#if NETFRAMEWORK || NETSTANDARD2_0
-using System.ComponentModel;
-
-namespace System.Runtime.CompilerServices;
-
-/// <summary>
-/// Reserved to be used by the compiler for tracking metadata.
-/// This class should not be used by developers in source code.
-/// </summary>
-[EditorBrowsable(EditorBrowsableState.Never)]
-internal static class IsExternalInit { }
-#endif

src/SharpCompress/Common/Lzw/LzwEntry.Async.cs

@@ -1,22 +0,0 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using SharpCompress.Readers;
-
-namespace SharpCompress.Common.Lzw;
-
-public partial class LzwEntry
-{
-    internal static async IAsyncEnumerable<LzwEntry> GetEntriesAsync(
-        Stream stream,
-        ReaderOptions options,
-        [EnumeratorCancellation] CancellationToken cancellationToken = default
-    )
-    {
-        yield return new LzwEntry(
-            await LzwFilePart.CreateAsync(stream, options.ArchiveEncoding, cancellationToken),
-            options
-        );
-    }
-}

src/SharpCompress/Common/Lzw/LzwEntry.cs

@@ -1,53 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using SharpCompress.Common.Options;
-using SharpCompress.Readers;
-
-namespace SharpCompress.Common.Lzw;
-
-public partial class LzwEntry : Entry
-{
-    private readonly LzwFilePart? _filePart;
-
-    internal LzwEntry(LzwFilePart? filePart, IReaderOptions readerOptions)
-        : base(readerOptions)
-    {
-        _filePart = filePart;
-    }
-
-    public override CompressionType CompressionType => CompressionType.Lzw;
-
-    public override long Crc => 0;
-
-    public override string? Key => _filePart?.FilePartName;
-
-    public override string? LinkTarget => null;
-
-    public override long CompressedSize => 0;
-
-    public override long Size => 0;
-
-    public override DateTime? LastModifiedTime => null;
-
-    public override DateTime? CreatedTime => null;
-
-    public override DateTime? LastAccessedTime => null;
-
-    public override DateTime? ArchivedTime => null;
-
-    public override bool IsEncrypted => false;
-
-    public override bool IsDirectory => false;
-
-    public override bool IsSplitAfter => false;
-
-    internal override IEnumerable<FilePart> Parts => _filePart.Empty();
-
-    internal static IEnumerable<LzwEntry> GetEntries(Stream stream, ReaderOptions options)
-    {
-        yield return new LzwEntry(LzwFilePart.Create(stream, options.ArchiveEncoding), options);
-    }
-
-    // Async methods moved to LzwEntry.Async.cs
-}

src/SharpCompress/Common/Lzw/LzwFilePart.Async.cs

@@ -1,23 +0,0 @@
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace SharpCompress.Common.Lzw;
-
-internal sealed partial class LzwFilePart
-{
-    internal static async ValueTask<LzwFilePart> CreateAsync(
-        Stream stream,
-        IArchiveEncoding archiveEncoding,
-        CancellationToken cancellationToken = default
-    )
-    {
-        cancellationToken.ThrowIfCancellationRequested();
-        var part = new LzwFilePart(stream, archiveEncoding);
-
-        // For non-seekable streams, we can't track position, so use 0 since the stream will be
-        // read sequentially from its current position.
-        part.EntryStartPosition = stream.CanSeek ? stream.Position : 0;
-        return part;
-    }
-}

src/SharpCompress/Common/Lzw/LzwFilePart.cs

@@ -1,60 +0,0 @@
-using System.IO;
-using SharpCompress.Compressors.Lzw;
-
-namespace SharpCompress.Common.Lzw;
-
-internal sealed partial class LzwFilePart : FilePart
-{
-    private readonly Stream _stream;
-    private readonly string? _name;
-
-    internal static LzwFilePart Create(Stream stream, IArchiveEncoding archiveEncoding)
-    {
-        var part = new LzwFilePart(stream, archiveEncoding);
-
-        // For non-seekable streams, we can't track position, so use 0 since the stream will be
-        // read sequentially from its current position.
-        part.EntryStartPosition = stream.CanSeek ? stream.Position : 0;
-        return part;
-    }
-
-    private LzwFilePart(Stream stream, IArchiveEncoding archiveEncoding)
-        : base(archiveEncoding)
-    {
-        _stream = stream;
-        _name = DeriveFileName(stream);
-    }
-
-    internal long EntryStartPosition { get; private set; }
-
-    internal override string? FilePartName => _name;
-
-    internal override Stream GetCompressedStream() =>
-        new LzwStream(_stream) { IsStreamOwner = false };
-
-    internal override Stream GetRawStream() => _stream;
-
-    private static string? DeriveFileName(Stream stream)
-    {
-        // Unwrap SharpCompressStream to get to the underlying FileStream
-        var unwrappedStream = stream;
-        if (stream is SharpCompress.IO.IStreamStack streamStack)
-        {
-            unwrappedStream = streamStack.BaseStream();
-        }
-
-        // Try to derive filename from FileStream
-        if (unwrappedStream is FileStream fileStream && !string.IsNullOrEmpty(fileStream.Name))
-        {
-            var fileName = Path.GetFileName(fileStream.Name);
-            // Strip .Z extension if present
-            if (fileName.EndsWith(".Z", System.StringComparison.OrdinalIgnoreCase))
-            {
-                return fileName.Substring(0, fileName.Length - 2);
-            }
-            return fileName;
-        }
-        // Default name for non-file streams
-        return "data";
-    }
-}

src/SharpCompress/Common/Lzw/LzwVolume.cs

@@ -1,17 +0,0 @@
-using System.IO;
-using SharpCompress.Readers;
-
-namespace SharpCompress.Common.Lzw;
-
-public class LzwVolume : Volume
-{
-    public LzwVolume(Stream stream, ReaderOptions? options, int index)
-        : base(stream, options, index) { }
-
-    public LzwVolume(FileInfo fileInfo, ReaderOptions options)
-        : base(fileInfo.OpenRead(), options with { LeaveStreamOpen = false }) { }
-
-    public override bool IsFirstVolume => true;
-
-    public override bool IsMultiVolume => false;
-}

src/SharpCompress/Common/Options/IEncodingOptions.cs

@@ -1,6 +0,0 @@
-namespace SharpCompress.Common.Options;
-
-public interface IEncodingOptions
-{
-    IArchiveEncoding ArchiveEncoding { get; init; }
-}

src/SharpCompress/Common/Options/IExtractionOptions.cs

@@ -1,39 +0,0 @@
-using System;
-
-namespace SharpCompress.Common.Options;
-
-/// <summary>
-/// Options for configuring extraction behavior when extracting archive entries to the filesystem.
-/// </summary>
-public interface IExtractionOptions
-{
-    /// <summary>
-    /// Overwrite target if it exists.
-    /// <para><b>Breaking change:</b> Default changed from false to true in version 0.40.0.</para>
-    /// </summary>
-    bool Overwrite { get; init; }
-
-    /// <summary>
-    /// Extract with internal directory structure.
-    /// <para><b>Breaking change:</b> Default changed from false to true in version 0.40.0.</para>
-    /// </summary>
-    bool ExtractFullPath { get; init; }
-
-    /// <summary>
-    /// Preserve file time.
-    /// <para><b>Breaking change:</b> Default changed from false to true in version 0.40.0.</para>
-    /// </summary>
-    bool PreserveFileTime { get; init; }
-
-    /// <summary>
-    /// Preserve windows file attributes.
-    /// </summary>
-    bool PreserveAttributes { get; init; }
-
-    /// <summary>
-    /// Delegate for writing symbolic links to disk.
-    /// The first parameter is the source path (where the symlink is created).
-    /// The second parameter is the target path (what the symlink refers to).
-    /// </summary>
-    Action<string, string>? SymbolicLinkHandler { get; init; }
-}

src/SharpCompress/Common/Options/IProgressOptions.cs

@@ -1,8 +0,0 @@
-using System;
-
-namespace SharpCompress.Common.Options;
-
-public interface IProgressOptions
-{
-    IProgress<ProgressReport>? Progress { get; init; }
-}

src/SharpCompress/Common/Options/IReaderOptions.cs

@@ -1,15 +0,0 @@
-namespace SharpCompress.Common.Options;
-
-public interface IReaderOptions
-    : IStreamOptions,
-        IEncodingOptions,
-        IProgressOptions,
-        IExtractionOptions
-{
-    bool LookForHeader { get; init; }
-    string? Password { get; init; }
-    bool DisableCheckIncomplete { get; init; }
-    int BufferSize { get; init; }
-    string? ExtensionHint { get; init; }
-    int? RewindableBufferSize { get; init; }
-}

src/SharpCompress/Common/Options/IStreamOptions.cs

@@ -1,6 +0,0 @@
-namespace SharpCompress.Common.Options;
-
-public interface IStreamOptions
-{
-    bool LeaveStreamOpen { get; init; }
-}

src/SharpCompress/Common/Options/IWriterOptions.cs

@@ -1,9 +0,0 @@
-using SharpCompress.Common;
-
-namespace SharpCompress.Common.Options;
-
-public interface IWriterOptions : IStreamOptions, IEncodingOptions, IProgressOptions
-{
-    CompressionType CompressionType { get; init; }
-    int CompressionLevel { get; init; }
-}

src/SharpCompress/Common/OptionsBase.cs

@@ -0,0 +1,11 @@
+namespace SharpCompress.Common;
+
+public class OptionsBase
+{
+    /// <summary>
+    /// SharpCompress will keep the supplied streams open.  Default is true.
+    /// </summary>
+    public bool LeaveStreamOpen { get; set; } = true;
+
+    public IArchiveEncoding ArchiveEncoding { get; set; } = new ArchiveEncoding();
+}

src/SharpCompress/Common/Rar/AsyncRarCryptoBinaryReader.cs

@@ -26,9 +26,7 @@ internal sealed class AsyncRarCryptoBinaryReader : AsyncRarCrcBinaryReader
         var binary = new AsyncRarCryptoBinaryReader(stream);
         if (salt == null)
         {
-            salt = await binary
-                .ReadBytesAsyncBase(EncryptionConstV5.SIZE_SALT30)
-                .ConfigureAwait(false);
+            salt = await binary.ReadBytesAsyncBase(EncryptionConstV5.SIZE_SALT30);
             binary._readCount += EncryptionConstV5.SIZE_SALT30;
         }
         binary._rijndael = new BlockTransformer(cryptKey.Transformer(salt));

src/SharpCompress/Common/Rar/CryptKey3.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Security.Cryptography;
 using System.Text;
 using SharpCompress.Common.Rar.Headers;
@@ -12,7 +10,7 @@ internal class CryptKey3 : ICryptKey
 
     private string _password;
 
-    public CryptKey3(string password) => _password = password ?? "";
+    public CryptKey3(string? password) => _password = password ?? "";
 
     public ICryptoTransform Transformer(byte[] salt)
     {

src/SharpCompress/Common/Rar/Headers/ArchiveCryptHeader.Async.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Threading;
 using System.Threading.Tasks;
 using SharpCompress.Common.Rar;
@@ -27,6 +25,6 @@ internal sealed partial class ArchiveCryptHeader
         CancellationToken cancellationToken = default
     )
     {
-        CryptInfo = await Rar5CryptoInfo.CreateAsync(reader, false).ConfigureAwait(false);
+        CryptInfo = await Rar5CryptoInfo.CreateAsync(reader, false);
     }
 }

src/SharpCompress/Common/Rar/Headers/ArchiveCryptHeader.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 using SharpCompress.Common.Rar;
 using SharpCompress.IO;
 

src/SharpCompress/Common/Rar/Headers/FileHeader.Async.cs

@@ -329,9 +329,7 @@ internal partial class FileHeader
 
         if (HasFlag(FileFlagsV4.SALT))
         {
-            R4Salt = await reader
-                .ReadBytesAsync(EncryptionConstV5.SIZE_SALT30, cancellationToken)
-                .ConfigureAwait(false);
+            R4Salt = await reader.ReadBytesAsync(EncryptionConstV5.SIZE_SALT30, cancellationToken);
         }
         if (HasFlag(FileFlagsV4.EXT_TIME))
         {

src/SharpCompress/Common/Rar/Headers/RarHeaderFactory.Async.cs

@@ -64,19 +64,19 @@ public partial class RarHeaderFactory
 
             if (_isRar5 && _cryptInfo != null)
             {
-                await _cryptInfo
-                    .ReadInitVAsync(new AsyncMarkingBinaryReader(stream))
-                    .ConfigureAwait(false);
-                var _headerKey = new CryptKey5(Options.Password!, _cryptInfo);
+                await _cryptInfo.ReadInitVAsync(new AsyncMarkingBinaryReader(stream));
+                var _headerKey = new CryptKey5(Options.Password.NotNull(), _cryptInfo);
 
-                reader = await AsyncRarCryptoBinaryReader
-                    .Create(stream, _headerKey, _cryptInfo.Salt)
-                    .ConfigureAwait(false);
+                reader = await AsyncRarCryptoBinaryReader.Create(
+                    stream,
+                    _headerKey,
+                    _cryptInfo.Salt
+                );
             }
             else
             {
                 var key = new CryptKey3(Options.Password);
-                reader = await AsyncRarCryptoBinaryReader.Create(stream, key).ConfigureAwait(false);
+                reader = await AsyncRarCryptoBinaryReader.Create(stream, key);
             }
         }
 
@@ -189,7 +189,7 @@ public partial class RarHeaderFactory
                                             Options.Password,
                                             fh.Rar5CryptoInfo.NotNull()
                                         )
-                                        : new CryptKey3(Options.Password)
+                                        : new CryptKey3(Options.Password.NotNull())
                                 );
                             }
                         }

src/SharpCompress/Common/Rar/Headers/RarHeaderFactory.cs

@@ -62,7 +62,7 @@ public partial class RarHeaderFactory
             if (_isRar5 && _cryptInfo != null)
             {
                 _cryptInfo.ReadInitV(new MarkingBinaryReader(stream));
-                var _headerKey = new CryptKey5(Options.Password!, _cryptInfo);
+                var _headerKey = new CryptKey5(Options.Password.NotNull(), _cryptInfo);
 
                 reader = RarCryptoBinaryReader.Create(stream, _headerKey, _cryptInfo.Salt);
             }

src/SharpCompress/Common/Rar/Rar5CryptoInfo.cs

@@ -57,46 +57,47 @@ internal class Rar5CryptoInfo
     )
     {
         var cryptoInfo = new Rar5CryptoInfo();
-        var cryptVersion = await reader
-            .ReadRarVIntUInt32Async(cancellationToken: CancellationToken.None)
-            .ConfigureAwait(false);
+        var cryptVersion = await reader.ReadRarVIntUInt32Async(
+            cancellationToken: CancellationToken.None
+        );
         if (cryptVersion > EncryptionConstV5.VERSION)
         {
             throw new CryptographicException($"Unsupported crypto version of {cryptVersion}");
         }
-        var encryptionFlags = await reader
-            .ReadRarVIntUInt32Async(cancellationToken: CancellationToken.None)
-            .ConfigureAwait(false);
+        var encryptionFlags = await reader.ReadRarVIntUInt32Async(
+            cancellationToken: CancellationToken.None
+        );
         cryptoInfo.UsePswCheck = FlagUtility.HasFlag(
             encryptionFlags,
             EncryptionFlagsV5.CHFL_CRYPT_PSWCHECK
         );
         cryptoInfo.LG2Count = (int)
-            await reader
-                .ReadRarVIntUInt32Async(cancellationToken: CancellationToken.None)
-                .ConfigureAwait(false);
+            await reader.ReadRarVIntUInt32Async(cancellationToken: CancellationToken.None);
         if (cryptoInfo.LG2Count > EncryptionConstV5.CRYPT5_KDF_LG2_COUNT_MAX)
         {
             throw new CryptographicException($"Unsupported LG2 count of {cryptoInfo.LG2Count}.");
         }
 
-        cryptoInfo.Salt = await reader
-            .ReadBytesAsync(EncryptionConstV5.SIZE_SALT50, CancellationToken.None)
-            .ConfigureAwait(false);
+        cryptoInfo.Salt = await reader.ReadBytesAsync(
+            EncryptionConstV5.SIZE_SALT50,
+            CancellationToken.None
+        );
 
         if (readInitV)
         {
-            await cryptoInfo.ReadInitVAsync(reader).ConfigureAwait(false);
+            await cryptoInfo.ReadInitVAsync(reader);
         }
 
         if (cryptoInfo.UsePswCheck)
         {
-            cryptoInfo.PswCheck = await reader
-                .ReadBytesAsync(EncryptionConstV5.SIZE_PSWCHECK, CancellationToken.None)
-                .ConfigureAwait(false);
-            var _pswCheckCsm = await reader
-                .ReadBytesAsync(EncryptionConstV5.SIZE_PSWCHECK_CSUM, CancellationToken.None)
-                .ConfigureAwait(false);
+            cryptoInfo.PswCheck = await reader.ReadBytesAsync(
+                EncryptionConstV5.SIZE_PSWCHECK,
+                CancellationToken.None
+            );
+            var _pswCheckCsm = await reader.ReadBytesAsync(
+                EncryptionConstV5.SIZE_PSWCHECK_CSUM,
+                CancellationToken.None
+            );
 
             var sha = SHA256.Create();
             cryptoInfo.UsePswCheck = sha.ComputeHash(cryptoInfo.PswCheck)
@@ -110,9 +111,7 @@ internal class Rar5CryptoInfo
         InitV = reader.ReadBytes(EncryptionConstV5.SIZE_INITV);
 
     public async ValueTask ReadInitVAsync(AsyncMarkingBinaryReader reader) =>
-        InitV = await reader
-            .ReadBytesAsync(EncryptionConstV5.SIZE_INITV, CancellationToken.None)
-            .ConfigureAwait(false);
+        InitV = await reader.ReadBytesAsync(EncryptionConstV5.SIZE_INITV, CancellationToken.None);
 
     public bool UsePswCheck = false;
 

src/SharpCompress/Common/Rar/RarEntry.cs

@@ -1,5 +1,4 @@
 using System;
-using SharpCompress.Common.Options;
 using SharpCompress.Common.Rar.Headers;
 
 namespace SharpCompress.Common.Rar;
@@ -8,9 +7,6 @@ public abstract class RarEntry : Entry
 {
     internal abstract FileHeader FileHeader { get; }
 
-    protected RarEntry(IReaderOptions readerOptions)
-        : base(readerOptions) { }
-
     /// <summary>
     /// As the V2017 port isn't complete, add this check to use the legacy Rar code.
     /// </summary>

src/SharpCompress/Common/Rar/RarVolume.cs

@@ -118,8 +118,7 @@ public abstract class RarVolume : Volume
                             var buffer = new byte[fh.CompressedSize];
                             await fh
                                 .PackedStream.NotNull()
-                                .ReadFullyAsync(buffer, cancellationToken)
-                                .ConfigureAwait(false);
+                                .ReadFullyAsync(buffer, cancellationToken);
                             Comment = Encoding.UTF8.GetString(buffer, 0, buffer.Length - 1);
                         }
                     }
@@ -185,7 +184,7 @@ public abstract class RarVolume : Volume
 
     public async ValueTask<bool> IsSolidArchiveAsync(CancellationToken cancellationToken = default)
     {
-        await EnsureArchiveHeaderLoadedAsync(cancellationToken).ConfigureAwait(false);
+        await EnsureArchiveHeaderLoadedAsync(cancellationToken);
         return ArchiveHeader?.IsSolid ?? false;
     }
 
@@ -249,7 +248,7 @@ public abstract class RarVolume : Volume
             }
 
             // we only want to load the archive header to avoid overhead but have to do the nasty thing and reset the stream
-            await GetVolumeFilePartsAsync(cancellationToken).FirstAsync().ConfigureAwait(false);
+            await GetVolumeFilePartsAsync(cancellationToken).FirstAsync();
             Stream.Position = 0;
         }
     }

src/SharpCompress/Common/SevenZip/ArchiveDatabase.Async.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;

src/SharpCompress/Common/SevenZip/ArchiveDatabase.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -18,7 +16,7 @@ internal partial class ArchiveDatabase
     internal List<long> _packSizes = new();
     internal List<uint?> _packCrCs = new();
     internal List<CFolder> _folders = new();
-    internal List<int> _numUnpackStreamsVector;
+    internal List<int>? _numUnpackStreamsVector;
     internal List<CFileItem> _files = new();
 
     internal List<long> _packStreamStartPositions = new();
@@ -47,7 +45,7 @@ internal partial class ArchiveDatabase
         _packSizes.Count == 0
         && _packCrCs.Count == 0
         && _folders.Count == 0
-        && _numUnpackStreamsVector.Count == 0
+        && (_numUnpackStreamsVector?.Count ?? 0) == 0
         && _files.Count == 0;
 
     private void FillStartPos()
@@ -94,7 +92,7 @@ internal partial class ArchiveDatabase
 
                     _folderStartFileIndex.Add(i); // check it
 
-                    if (_numUnpackStreamsVector![folderIndex] != 0)
+                    if (_numUnpackStreamsVector.NotNull()[folderIndex] != 0)
                     {
                         break;
                     }