starred/sharpcompress
1
0
Fork 0
mirror of https://github.com/adamhathcock/sharpcompress.git synced 2026-09-23 23:45:14 +00:00
Code Issues 975 Packages Projects Releases 25 Wiki Activity

Merge pull request #1211 from adamhathcock/adam/writers-should-async

Browse Source 
Writers should have async API
This commit is contained in:
Adam Hathcock
2026-02-22 13:28:50 +00:00
committed by GitHub
parent 19d11b0882 8d24dff967
commit aec0fca5f8
23 changed files with 312 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/SharpCompress/Archives/ArchiveFactory.Async.cs
View File

@@ -77,7 +77,9 @@ public static partial class ArchiveFactory
var factory = await FindFactoryAsync<IMultiArchiveFactory>(fileInfo, cancellationToken)
.ConfigureAwait(false);
return factory.OpenAsyncArchive(filesArray, options);
return await factory
.OpenAsyncArchive(filesArray, options, cancellationToken)
.ConfigureAwait(false);
}
public static async ValueTask<IAsyncArchive> OpenAsyncArchive(
@@ -106,7 +108,9 @@ public static partial class ArchiveFactory
var factory = await FindFactoryAsync<IMultiArchiveFactory>(firstStream, cancellationToken)
.ConfigureAwait(false);
return factory.OpenAsyncArchive(streamsArray, options);
return await factory
.OpenAsyncArchive(streamsArray, options, cancellationToken)
.ConfigureAwait(false);
}
public static ValueTask<T> FindFactoryAsync<T>(

15
src/SharpCompress/Archives/IMultiArchiveFactory.cs
View File

@@ -1,6 +1,7 @@
using System.Collections.Generic;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using SharpCompress.Factories;
using SharpCompress.Readers;
@@ -33,9 +34,12 @@ public interface IMultiArchiveFactory : IFactory
/// </summary>
/// <param name="streams"></param>
/// <param name="readerOptions">reading options.</param>
IAsyncArchive OpenAsyncArchive(
/// <param name="cancellationToken">Cancellation token.</param>
/// <returns>A <see cref="ValueTask{TResult}"/> containing the opened async archive.</returns>
ValueTask<IAsyncArchive> OpenAsyncArchive(
IReadOnlyList<Stream> streams,
ReaderOptions? readerOptions = null
ReaderOptions? readerOptions = null,
CancellationToken cancellationToken = default
);
/// <summary>
@@ -50,8 +54,11 @@ public interface IMultiArchiveFactory : IFactory
/// </summary>
/// <param name="fileInfos"></param>
/// <param name="readerOptions">reading options.</param>
IAsyncArchive OpenAsyncArchive(
/// <param name="cancellationToken">Cancellation token.</param>
/// <returns>A <see cref="ValueTask{TResult}"/> containing the opened async archive.</returns>
ValueTask<IAsyncArchive> OpenAsyncArchive(
IReadOnlyList<FileInfo> fileInfos,
ReaderOptions? readerOptions = null
ReaderOptions? readerOptions = null,
CancellationToken cancellationToken = default
);
}

31
src/SharpCompress/Factories/GZipFactory.cs
View File

@@ -95,10 +95,17 @@ public class GZipFactory
) => GZipArchive.OpenArchive(streams, readerOptions);
/// <inheritdoc/>
public IAsyncArchive OpenAsyncArchive(
public async ValueTask<IAsyncArchive> OpenAsyncArchive(
IReadOnlyList<Stream> streams,
ReaderOptions? readerOptions = null
) => (IAsyncArchive)OpenArchive(streams, readerOptions);
ReaderOptions? readerOptions = null,
CancellationToken cancellationToken = default
)
{
cancellationToken.ThrowIfCancellationRequested();
return await GZipArchive
.OpenAsyncArchive(streams, readerOptions, cancellationToken)
.ConfigureAwait(false);
}
/// <inheritdoc/>
public IArchive OpenArchive(
@@ -107,10 +114,17 @@ public class GZipFactory
) => GZipArchive.OpenArchive(fileInfos, readerOptions);
/// <inheritdoc/>
public IAsyncArchive OpenAsyncArchive(
public async ValueTask<IAsyncArchive> OpenAsyncArchive(
IReadOnlyList<FileInfo> fileInfos,
ReaderOptions? readerOptions = null
) => (IAsyncArchive)OpenArchive(fileInfos, readerOptions);
ReaderOptions? readerOptions = null,
CancellationToken cancellationToken = default
)
{
cancellationToken.ThrowIfCancellationRequested();
return await GZipArchive
.OpenAsyncArchive(fileInfos, readerOptions, cancellationToken)
.ConfigureAwait(false);
}
#endregion
@@ -191,14 +205,15 @@ public class GZipFactory
}
/// <inheritdoc/>
public IAsyncWriter OpenAsyncWriter(
public ValueTask<IAsyncWriter> OpenAsyncWriter(
Stream stream,
IWriterOptions writerOptions,
CancellationToken cancellationToken = default
)
{
cancellationToken.ThrowIfCancellationRequested();
return (IAsyncWriter)OpenWriter(stream, writerOptions);
var writer = OpenWriter(stream, writerOptions);
return new((IAsyncWriter)writer);
}
#endregion

23
src/SharpCompress/Factories/RarFactory.cs
View File

@@ -90,10 +90,17 @@ public class RarFactory : Factory, IArchiveFactory, IMultiArchiveFactory, IReade
) => RarArchive.OpenArchive(streams, readerOptions);
/// <inheritdoc/>
public IAsyncArchive OpenAsyncArchive(
public async ValueTask<IAsyncArchive> OpenAsyncArchive(
IReadOnlyList<Stream> streams,
ReaderOptions? readerOptions = null
) => (IAsyncArchive)OpenArchive(streams, readerOptions);
ReaderOptions? readerOptions = null,
CancellationToken cancellationToken = default
)
{
cancellationToken.ThrowIfCancellationRequested();
return await RarArchive
.OpenAsyncArchive(streams, readerOptions, cancellationToken)
.ConfigureAwait(false);
}
/// <inheritdoc/>
public IArchive OpenArchive(
@@ -102,12 +109,16 @@ public class RarFactory : Factory, IArchiveFactory, IMultiArchiveFactory, IReade
) => RarArchive.OpenArchive(fileInfos, readerOptions);
/// <inheritdoc/>
public IAsyncArchive OpenAsyncArchive(
public async ValueTask<IAsyncArchive> OpenAsyncArchive(
IReadOnlyList<FileInfo> fileInfos,
ReaderOptions? readerOptions = null
ReaderOptions? readerOptions = null,
CancellationToken cancellationToken = default
)
{
return (IAsyncArchive)OpenArchive(fileInfos, readerOptions);
cancellationToken.ThrowIfCancellationRequested();
return await RarArchive
.OpenAsyncArchive(fileInfos, readerOptions, cancellationToken)
.ConfigureAwait(false);
}
#endregion

26
src/SharpCompress/Factories/SevenZipFactory.cs
View File

@@ -85,10 +85,17 @@ public class SevenZipFactory : Factory, IArchiveFactory, IMultiArchiveFactory
) => SevenZipArchive.OpenArchive(streams, readerOptions);
/// <inheritdoc/>
public IAsyncArchive OpenAsyncArchive(
public async ValueTask<IAsyncArchive> OpenAsyncArchive(
IReadOnlyList<Stream> streams,
ReaderOptions? readerOptions = null
) => (IAsyncArchive)OpenArchive(streams, readerOptions);
ReaderOptions? readerOptions = null,
CancellationToken cancellationToken = default
)
{
cancellationToken.ThrowIfCancellationRequested();
return await SevenZipArchive
.OpenAsyncArchive(streams, readerOptions, cancellationToken)
.ConfigureAwait(false);
}
/// <inheritdoc/>
public IArchive OpenArchive(
@@ -97,10 +104,17 @@ public class SevenZipFactory : Factory, IArchiveFactory, IMultiArchiveFactory
) => SevenZipArchive.OpenArchive(fileInfos, readerOptions);
/// <inheritdoc/>
public IAsyncArchive OpenAsyncArchive(
public async ValueTask<IAsyncArchive> OpenAsyncArchive(
IReadOnlyList<FileInfo> fileInfos,
ReaderOptions? readerOptions = null
) => (IAsyncArchive)OpenArchive(fileInfos, readerOptions);
ReaderOptions? readerOptions = null,
CancellationToken cancellationToken = default
)
{
cancellationToken.ThrowIfCancellationRequested();
return await SevenZipArchive
.OpenAsyncArchive(fileInfos, readerOptions, cancellationToken)
.ConfigureAwait(false);
}
#endregion

31
src/SharpCompress/Factories/TarFactory.cs
View File

@@ -279,10 +279,17 @@ public class TarFactory
) => TarArchive.OpenArchive(streams, readerOptions);
/// <inheritdoc/>
public IAsyncArchive OpenAsyncArchive(
public async ValueTask<IAsyncArchive> OpenAsyncArchive(
IReadOnlyList<Stream> streams,
ReaderOptions? readerOptions = null
) => (IAsyncArchive)OpenArchive(streams, readerOptions);
ReaderOptions? readerOptions = null,
CancellationToken cancellationToken = default
)
{
cancellationToken.ThrowIfCancellationRequested();
return await TarArchive
.OpenAsyncArchive(streams, readerOptions, cancellationToken)
.ConfigureAwait(false);
}
/// <inheritdoc/>
public IArchive OpenArchive(
@@ -291,10 +298,17 @@ public class TarFactory
) => TarArchive.OpenArchive(fileInfos, readerOptions);
/// <inheritdoc/>
public IAsyncArchive OpenAsyncArchive(
public async ValueTask<IAsyncArchive> OpenAsyncArchive(
IReadOnlyList<FileInfo> fileInfos,
ReaderOptions? readerOptions = null
) => (IAsyncArchive)OpenArchive(fileInfos, readerOptions);
ReaderOptions? readerOptions = null,
CancellationToken cancellationToken = default
)
{
cancellationToken.ThrowIfCancellationRequested();
return await TarArchive
.OpenAsyncArchive(fileInfos, readerOptions, cancellationToken)
.ConfigureAwait(false);
}
#endregion
@@ -394,14 +408,15 @@ public class TarFactory
}
/// <inheritdoc/>
public IAsyncWriter OpenAsyncWriter(
public ValueTask<IAsyncWriter> OpenAsyncWriter(
Stream stream,
IWriterOptions writerOptions,
CancellationToken cancellationToken = default
)
{
cancellationToken.ThrowIfCancellationRequested();
return (IAsyncWriter)OpenWriter(stream, writerOptions);
var writer = OpenWriter(stream, writerOptions);
return new((IAsyncWriter)writer);
}
#endregion

31
src/SharpCompress/Factories/ZipFactory.cs
View File

@@ -163,10 +163,17 @@ public class ZipFactory
) => ZipArchive.OpenArchive(streams, readerOptions);
/// <inheritdoc/>
public IAsyncArchive OpenAsyncArchive(
public async ValueTask<IAsyncArchive> OpenAsyncArchive(
IReadOnlyList<Stream> streams,
ReaderOptions? readerOptions = null
) => (IAsyncArchive)OpenArchive(streams, readerOptions);
ReaderOptions? readerOptions = null,
CancellationToken cancellationToken = default
)
{
cancellationToken.ThrowIfCancellationRequested();
return await ZipArchive
.OpenAsyncArchive(streams, readerOptions, cancellationToken)
.ConfigureAwait(false);
}
/// <inheritdoc/>
public IArchive OpenArchive(
@@ -175,10 +182,17 @@ public class ZipFactory
) => ZipArchive.OpenArchive(fileInfos, readerOptions);
/// <inheritdoc/>
public IAsyncArchive OpenAsyncArchive(
public async ValueTask<IAsyncArchive> OpenAsyncArchive(
IReadOnlyList<FileInfo> fileInfos,
ReaderOptions? readerOptions = null
) => (IAsyncArchive)OpenArchive(fileInfos, readerOptions);
ReaderOptions? readerOptions = null,
CancellationToken cancellationToken = default
)
{
cancellationToken.ThrowIfCancellationRequested();
return await ZipArchive
.OpenAsyncArchive(fileInfos, readerOptions, cancellationToken)
.ConfigureAwait(false);
}
#endregion
@@ -219,14 +233,15 @@ public class ZipFactory
}
/// <inheritdoc/>
public IAsyncWriter OpenAsyncWriter(
public ValueTask<IAsyncWriter> OpenAsyncWriter(
Stream stream,
IWriterOptions writerOptions,
CancellationToken cancellationToken = default
)
{
cancellationToken.ThrowIfCancellationRequested();
return (IAsyncWriter)OpenWriter(stream, writerOptions);
var writer = OpenWriter(stream, writerOptions);
return new((IAsyncWriter)writer);
}
#endregion

5
src/SharpCompress/Readers/ReaderFactory.Async.cs
View File

@@ -35,14 +35,15 @@ public static partial class ReaderFactory
/// <param name="options"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
public static ValueTask<IAsyncReader> OpenAsyncReader(
public static async ValueTask<IAsyncReader> OpenAsyncReader(
FileInfo fileInfo,
ReaderOptions? options = null,
CancellationToken cancellationToken = default
)
{
options ??= ReaderOptions.ForOwnedFile;
return OpenAsyncReader(fileInfo.OpenRead(), options, cancellationToken);
var stream = fileInfo.OpenAsyncReadStream(cancellationToken);
return await OpenAsyncReader(stream, options, cancellationToken).ConfigureAwait(false);
}
public static async ValueTask<IAsyncReader> OpenAsyncReader(

6
src/SharpCompress/Readers/Tar/TarReader.Factory.cs
View File

@@ -133,14 +133,16 @@ public partial class TarReader
return new TarReader(sharpCompressStream, readerOptions, CompressionType.None);
}
public static ValueTask<IAsyncReader> OpenAsyncReader(
public static async ValueTask<IAsyncReader> OpenAsyncReader(
FileInfo fileInfo,
ReaderOptions? readerOptions = null,
CancellationToken cancellationToken = default
)
{
readerOptions ??= new ReaderOptions() { LeaveStreamOpen = false };
return OpenAsyncReader(fileInfo.OpenRead(), readerOptions, cancellationToken);
var stream = fileInfo.OpenAsyncReadStream(cancellationToken);
return await OpenAsyncReader(stream, readerOptions, cancellationToken)
.ConfigureAwait(false);
}
public static IReader OpenReader(string filePath, ReaderOptions? readerOptions = null)

2
src/SharpCompress/SharpCompress.csproj
View File

@@ -31,7 +31,7 @@
<PropertyGroup Condition=" '$(TargetFramework)' == 'net48' Or '$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netstandard2.1' ">
<DefineConstants>$(DefineConstants);LEGACY_DOTNET</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0' Or '$(TargetFramework)' == 'net10.0' ">
<PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net10.0' ">
<IsTrimmable>true</IsTrimmable>
<IsAotCompatible>true</IsAotCompatible>
</PropertyGroup>

104
src/SharpCompress/Utility.Async.cs
View File

@@ -120,4 +120,108 @@ internal static partial class Utility
return (total >= count);
}
}
/// <summary>
/// Opens a file stream for asynchronous writing.
/// Uses File.OpenHandle with FileOptions.Asynchronous on .NET 8.0+ for optimal performance.
/// Falls back to FileStream constructor with async options on legacy frameworks.
/// </summary>
/// <param name="path">The file path to open.</param>
/// <param name="cancellationToken">Cancellation token.</param>
/// <returns>A FileStream configured for asynchronous operations.</returns>
public static Stream OpenAsyncWriteStream(string path, CancellationToken cancellationToken)
{
cancellationToken.ThrowIfCancellationRequested();
#if NET8_0_OR_GREATER
// Use File.OpenHandle with async options for .NET 8.0+
var handle = File.OpenHandle(
path,
FileMode.Create,
FileAccess.Write,
FileShare.None,
FileOptions.Asynchronous
);
return new FileStream(handle, FileAccess.Write);
#else
// For older target frameworks, use FileStream constructor with async options
return new FileStream(
path,
FileMode.Create,
FileAccess.Write,
FileShare.None,
bufferSize: 4096, //default
FileOptions.Asynchronous
);
#endif
}
/// <summary>
/// Opens a file stream for asynchronous writing from a FileInfo.
/// Uses File.OpenHandle with FileOptions.Asynchronous on .NET 8.0+ for optimal performance.
/// Falls back to FileStream constructor with async options on legacy frameworks.
/// </summary>
/// <param name="fileInfo">The FileInfo to open.</param>
/// <param name="cancellationToken">Cancellation token.</param>
/// <returns>A FileStream configured for asynchronous operations.</returns>
public static Stream OpenAsyncWriteStream(
this FileInfo fileInfo,
CancellationToken cancellationToken
)
{
fileInfo.NotNull(nameof(fileInfo));
return OpenAsyncWriteStream(fileInfo.FullName, cancellationToken);
}
/// <summary>
/// Opens a file stream for asynchronous reading.
/// Uses File.OpenHandle with FileOptions.Asynchronous on .NET 8.0+ for optimal performance.
/// Falls back to FileStream constructor with async options on legacy frameworks.
/// </summary>
/// <param name="path">The file path to open.</param>
/// <param name="cancellationToken">Cancellation token.</param>
/// <returns>A FileStream configured for asynchronous operations.</returns>
public static Stream OpenAsyncReadStream(string path, CancellationToken cancellationToken)
{
cancellationToken.ThrowIfCancellationRequested();
#if NET8_0_OR_GREATER
// Use File.OpenHandle with async options for .NET 8.0+
var handle = File.OpenHandle(
path,
FileMode.Open,
FileAccess.Read,
FileShare.Read,
FileOptions.Asynchronous
);
return new FileStream(handle, FileAccess.Read);
#else
// For older target frameworks, use FileStream constructor with async options
return new FileStream(
path,
FileMode.Open,
FileAccess.Read,
FileShare.Read,
bufferSize: 4096,
FileOptions.Asynchronous
);
#endif
}
/// <summary>
/// Opens a file stream for asynchronous reading from a FileInfo.
/// Uses File.OpenHandle with FileOptions.Asynchronous on .NET 8.0+ for optimal performance.
/// Falls back to FileStream constructor with async options on legacy frameworks.
/// </summary>
/// <param name="fileInfo">The FileInfo to open.</param>
/// <param name="cancellationToken">Cancellation token.</param>
/// <returns>A FileStream configured for asynchronous operations.</returns>
public static Stream OpenAsyncReadStream(
this FileInfo fileInfo,
CancellationToken cancellationToken
)
{
fileInfo.NotNull(nameof(fileInfo));
return OpenAsyncReadStream(fileInfo.FullName, cancellationToken);
}
}

3
src/SharpCompress/Writers/IWriterFactory.cs
View File

@@ -1,5 +1,6 @@
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using SharpCompress.Common.Options;
using SharpCompress.Factories;
@@ -9,7 +10,7 @@ public interface IWriterFactory : IFactory
{
IWriter OpenWriter(Stream stream, IWriterOptions writerOptions);
IAsyncWriter OpenAsyncWriter(
ValueTask<IAsyncWriter> OpenAsyncWriter(
Stream stream,
IWriterOptions writerOptions,
CancellationToken cancellationToken = default

46
src/SharpCompress/Writers/WriterFactory.cs
View File

@@ -2,6 +2,7 @@ using System;
using System.IO;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using SharpCompress.Common;
using SharpCompress.Common.Options;
@@ -26,10 +27,14 @@ public static class WriterFactory
)
{
fileInfo.NotNull(nameof(fileInfo));
return OpenWriter(fileInfo.OpenWrite(), archiveType, writerOptions);
return OpenWriter(
fileInfo.OpenWrite(),
archiveType,
writerOptions.WithLeaveStreamOpen(false)
);
}
public static IAsyncWriter OpenAsyncWriter(
public static async ValueTask<IAsyncWriter> OpenAsyncWriter(
string filePath,
ArchiveType archiveType,
IWriterOptions writerOptions,
@@ -37,15 +42,16 @@ public static class WriterFactory
)
{
filePath.NotNullOrEmpty(nameof(filePath));
return OpenAsyncWriter(
new FileInfo(filePath),
archiveType,
writerOptions,
cancellationToken
);
return await OpenAsyncWriter(
new FileInfo(filePath),
archiveType,
writerOptions,
cancellationToken
)
.ConfigureAwait(false);
}
public static IAsyncWriter OpenAsyncWriter(
public static async ValueTask<IAsyncWriter> OpenAsyncWriter(
FileInfo fileInfo,
ArchiveType archiveType,
IWriterOptions writerOptions,
@@ -53,12 +59,14 @@ public static class WriterFactory
)
{
fileInfo.NotNull(nameof(fileInfo));
return OpenAsyncWriter(
fileInfo.Open(FileMode.Create, FileAccess.Write),
archiveType,
writerOptions,
cancellationToken
);
var stream = fileInfo.OpenAsyncWriteStream(cancellationToken);
return await OpenAsyncWriter(
stream,
archiveType,
writerOptions.WithLeaveStreamOpen(false),
cancellationToken
)
.ConfigureAwait(false);
}
public static IWriter OpenWriter(
@@ -86,8 +94,8 @@ public static class WriterFactory
/// <param name="archiveType">The archive type.</param>
/// <param name="writerOptions">Writer options.</param>
/// <param name="cancellationToken">Cancellation token.</param>
/// <returns>A task that returns an IWriter.</returns>
public static IAsyncWriter OpenAsyncWriter(
/// <returns>A <see cref="ValueTask{TResult}"/> containing the async writer.</returns>
public static async ValueTask<IAsyncWriter> OpenAsyncWriter(
Stream stream,
ArchiveType archiveType,
IWriterOptions writerOptions,
@@ -100,7 +108,9 @@ public static class WriterFactory
if (factory != null)
{
return factory.OpenAsyncWriter(stream, writerOptions, cancellationToken);
return await factory
.OpenAsyncWriter(stream, writerOptions, cancellationToken)
.ConfigureAwait(false);
}
throw new NotSupportedException("Archive Type does not have a Writer: " + archiveType);

26
src/SharpCompress/Writers/WriterOptionsExtensions.cs
View File

@@ -3,6 +3,9 @@ using SharpCompress.Common;
using SharpCompress.Common.Options;
using SharpCompress.Compressors;
using SharpCompress.Providers;
using SharpCompress.Writers.GZip;
using SharpCompress.Writers.Tar;
using SharpCompress.Writers.Zip;
namespace SharpCompress.Writers;
@@ -22,6 +25,29 @@ public static class WriterOptionsExtensions
bool leaveStreamOpen
) => options with { LeaveStreamOpen = leaveStreamOpen };
/// <summary>
/// Creates a copy with the specified LeaveStreamOpen value.
/// Works with any IWriterOptions implementation.
/// </summary>
/// <param name="options">The source options.</param>
/// <param name="leaveStreamOpen">Whether to leave the stream open.</param>
/// <returns>A new options instance with the specified LeaveStreamOpen value.</returns>
public static IWriterOptions WithLeaveStreamOpen(
this IWriterOptions options,
bool leaveStreamOpen
) =>
options switch
{
WriterOptions writerOptions => writerOptions with { LeaveStreamOpen = leaveStreamOpen },
ZipWriterOptions zipOptions => zipOptions with { LeaveStreamOpen = leaveStreamOpen },
TarWriterOptions tarOptions => tarOptions with { LeaveStreamOpen = leaveStreamOpen },
GZipWriterOptions gzipOptions => gzipOptions with { LeaveStreamOpen = leaveStreamOpen },
_ => throw new NotSupportedException(
$"Cannot set LeaveStreamOpen on options of type {options.GetType().Name}. "
+ "Options must be a record type implementing IWriterOptions."
),
};
/// <summary>
/// Creates a copy with the specified compression level.
/// </summary>

6
src/SharpCompress/packages.lock.json
View File

@@ -488,12 +488,6 @@
}
},
"net9.0": {
"Microsoft.NET.ILLink.Tasks": {
"type": "Direct",
"requested": "[9.0.11, )",
"resolved": "9.0.11",
"contentHash": "vvB9rtDmWaXgYkViT00KORBVmA3pcYsHlgd9vOPqL9sf5bKy3rvLMF1+sI1uUfVj28S3itirHlHmX5/kcpZKNw=="
},
"Microsoft.NETFramework.ReferenceAssemblies": {
"type": "Direct",
"requested": "[1.0.3, )",

2
tests/SharpCompress.Performance/Benchmarks/TarBenchmarks.cs
View File

@@ -147,7 +147,7 @@ public class TarBenchmarks : ArchiveBenchmarkBase
public async Task TarCreateSmallFilesAsync()
{
using var outputStream = new MemoryStream();
await using var writer = WriterFactory.OpenAsyncWriter(
await using var writer = await WriterFactory.OpenAsyncWriter(
outputStream,
ArchiveType.Tar,
new WriterOptions(CompressionType.None) { LeaveStreamOpen = true }

2
tests/SharpCompress.Performance/Benchmarks/ZipBenchmarks.cs
View File

@@ -137,7 +137,7 @@ public class ZipBenchmarks : ArchiveBenchmarkBase
public async Task ZipCreateSmallFilesAsync()
{
using var outputStream = new MemoryStream();
await using var writer = WriterFactory.OpenAsyncWriter(
await using var writer = await WriterFactory.OpenAsyncWriter(
outputStream,
ArchiveType.Zip,
new WriterOptions(CompressionType.Deflate) { LeaveStreamOpen = true }

4
tests/SharpCompress.Test/ArchiveTests.cs
View File

@@ -383,7 +383,7 @@ public class ArchiveTests : ReaderTests
return WriterFactory.OpenWriter(stream, ArchiveType.Zip, writerOptions);
}
protected static IAsyncWriter CreateWriterWithLevelAsync(
protected static async ValueTask<IAsyncWriter> CreateWriterWithLevelAsync(
Stream stream,
CompressionType compressionType,
int? compressionLevel = null
@@ -392,7 +392,7 @@ public class ArchiveTests : ReaderTests
var writerOptions = compressionLevel.HasValue
? new WriterOptions(compressionType, compressionLevel.Value) { LeaveStreamOpen = true }
: new WriterOptions(compressionType) { LeaveStreamOpen = true };
return WriterFactory.OpenAsyncWriter(
return await WriterFactory.OpenAsyncWriter(
new AsyncOnlyStream(stream),
ArchiveType.Zip,
writerOptions

2
tests/SharpCompress.Test/GZip/AsyncTests.cs
View File

@@ -104,7 +104,7 @@ public class AsyncTests : TestBase
await using (var stream = File.Create(outputPath))
#endif
using (
var writer = WriterFactory.OpenAsyncWriter(
var writer = await WriterFactory.OpenAsyncWriter(
new AsyncOnlyStream(stream),
ArchiveType.Zip,
new WriterOptions(CompressionType.Deflate) { LeaveStreamOpen = false }

4
tests/SharpCompress.Test/GZip/GZipWriterAsyncTests.cs
View File

@@ -23,8 +23,8 @@ public class GZipWriterAsyncTests : WriterTests
FileAccess.Write
)
)
await using (
var writer = WriterFactory.OpenAsyncWriter(
using (
var writer = await WriterFactory.OpenAsyncWriter(
new AsyncOnlyStream(stream),
ArchiveType.GZip,
new WriterOptions(CompressionType.GZip)

4
tests/SharpCompress.Test/Tar/TarArchiveAsyncTests.cs
View File

@@ -35,7 +35,7 @@ public class TarArchiveAsyncTests : ArchiveTests
using (Stream stream = File.OpenWrite(Path.Combine(SCRATCH2_FILES_PATH, archive)))
{
using (
var writer = WriterFactory.OpenAsyncWriter(
var writer = await WriterFactory.OpenAsyncWriter(
new AsyncOnlyStream(stream),
ArchiveType.Tar,
new WriterOptions(CompressionType.None) { LeaveStreamOpen = false }
@@ -94,7 +94,7 @@ public class TarArchiveAsyncTests : ArchiveTests
// Step 1: create a tar file containing a file with a long name
using (Stream stream = File.OpenWrite(Path.Combine(SCRATCH2_FILES_PATH, archive)))
using (
var writer = WriterFactory.OpenAsyncWriter(
var writer = await WriterFactory.OpenAsyncWriter(
new AsyncOnlyStream(stream),
ArchiveType.Tar,
new WriterOptions(CompressionType.None) { LeaveStreamOpen = false }

2
tests/SharpCompress.Test/WriterTests.cs
View File

@@ -70,7 +70,7 @@ public class WriterTests : TestBase
writerOptions.ArchiveEncoding.Default = encoding ?? Encoding.Default;
using var writer = WriterFactory.OpenAsyncWriter(
await using var writer = await WriterFactory.OpenAsyncWriter(
stream,
_type,
writerOptions,

14
tests/SharpCompress.Test/Zip/ZipMemoryArchiveWithCrcAsyncTests.cs
View File

@@ -61,7 +61,11 @@ public class ZipTypesLevelsWithCrcRatioAsyncTests : ArchiveTests
// Create zip archive in memory
using var zipStream = new MemoryStream();
using (
var writer = CreateWriterWithLevelAsync(zipStream, compressionType, compressionLevel)
var writer = await CreateWriterWithLevelAsync(
zipStream,
compressionType,
compressionLevel
)
)
{
await writer.WriteAsync($"file1_{sizeMb}MiB.txt", new MemoryStream(file1Data));
@@ -131,7 +135,7 @@ public class ZipTypesLevelsWithCrcRatioAsyncTests : ArchiveTests
};
using (
var writer = WriterFactory.OpenAsyncWriter(
var writer = await WriterFactory.OpenAsyncWriter(
new AsyncOnlyStream(zipStream),
ArchiveType.Zip,
writerOptions
@@ -198,7 +202,11 @@ public class ZipTypesLevelsWithCrcRatioAsyncTests : ArchiveTests
// Create archive with specified compression and level
using var zipStream = new MemoryStream();
using (
var writer = CreateWriterWithLevelAsync(zipStream, compressionType, compressionLevel)
var writer = await CreateWriterWithLevelAsync(
zipStream,
compressionType,
compressionLevel
)
)
{
await writer.WriteAsync(