diff --git a/Directory.Build.props b/Directory.Build.props
index 84417be..270ca22 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -11,7 +11,7 @@
https://github.com/squidex/squidex
true
snupkg
- 6.8.4
+ 6.8.5
diff --git a/assets/Squidex.Assets.Tests/TempAssetFileTests.cs b/assets/Squidex.Assets.Tests/TempAssetFileTests.cs
index ecaff8e..f3e0b59 100644
--- a/assets/Squidex.Assets.Tests/TempAssetFileTests.cs
+++ b/assets/Squidex.Assets.Tests/TempAssetFileTests.cs
@@ -26,9 +26,7 @@ public async Task Should_construct()
[Fact]
public async Task Should_construct_from_other_file()
{
- var source =
- new DelegateAssetFile("fileName", "file/type", 1024, ct =>
- new ValueTask(new MemoryStream()));
+ var source = new DelegateAssetFile("fileName", "file/type", 1024, () => new MemoryStream());
await using (var result = TempAssetFile.Create(source))
{
diff --git a/assets/Squidex.Assets.TusAdapter/AssetTusFile.cs b/assets/Squidex.Assets.TusAdapter/AssetTusFile.cs
index a57cb83..7279856 100644
--- a/assets/Squidex.Assets.TusAdapter/AssetTusFile.cs
+++ b/assets/Squidex.Assets.TusAdapter/AssetTusFile.cs
@@ -113,10 +113,9 @@ public ValueTask DisposeAsync()
return stream.DisposeAsync();
}
- public ValueTask OpenReadAsync(
- CancellationToken ct = default)
+ public Stream OpenRead()
{
- return new ValueTask(new NonDisposingStream(stream));
+ return new NonDisposingStream(stream);
}
public Task GetContentAsync(
diff --git a/assets/Squidex.Assets/DelegateAssetFile.cs b/assets/Squidex.Assets/DelegateAssetFile.cs
index 44fefdb..30d7f28 100644
--- a/assets/Squidex.Assets/DelegateAssetFile.cs
+++ b/assets/Squidex.Assets/DelegateAssetFile.cs
@@ -9,7 +9,7 @@ namespace Squidex.Assets;
public class DelegateAssetFile : IAssetFile
{
- private readonly Func> openStream;
+ private readonly Func openStream;
public string FileName { get; }
@@ -17,13 +17,8 @@ public class DelegateAssetFile : IAssetFile
public long FileSize { get; }
- public DelegateAssetFile(string fileName, string mimeType, long fileSize, Func openStream)
- : this(fileName, mimeType, fileSize, _ => new ValueTask(openStream()))
- {
- }
-
public DelegateAssetFile(string fileName, string mimeType, long fileSize,
- Func> openStream)
+ Func openStream)
{
ArgumentException.ThrowIfNullOrWhiteSpace(fileName);
ArgumentException.ThrowIfNullOrWhiteSpace(mimeType);
@@ -36,14 +31,14 @@ public DelegateAssetFile(string fileName, string mimeType, long fileSize,
this.openStream = openStream;
}
- public ValueTask OpenReadAsync(
- CancellationToken ct = default)
+ public Stream OpenRead()
{
- return openStream(ct);
+ return openStream();
}
public ValueTask DisposeAsync()
{
+ GC.SuppressFinalize(this);
return default;
}
}
diff --git a/assets/Squidex.Assets/IAssetFile.cs b/assets/Squidex.Assets/IAssetFile.cs
index 667681b..f0fe19d 100644
--- a/assets/Squidex.Assets/IAssetFile.cs
+++ b/assets/Squidex.Assets/IAssetFile.cs
@@ -15,6 +15,5 @@ public interface IAssetFile : IAsyncDisposable
string MimeType { get; }
- ValueTask OpenReadAsync(
- CancellationToken ct = default);
+ Stream OpenRead();
}
diff --git a/assets/TusTestServer/Controller/TusController.cs b/assets/TusTestServer/Controller/TusController.cs
index 283c278..999637a 100644
--- a/assets/TusTestServer/Controller/TusController.cs
+++ b/assets/TusTestServer/Controller/TusController.cs
@@ -64,7 +64,7 @@ public async Task Tus()
return result;
}
- await using var fileStream = await file.OpenReadAsync(HttpContext.RequestAborted);
+ await using var fileStream = file.OpenRead();
var name = file.FileName;
diff --git a/assets/TusTestServer/Utils.cs b/assets/TusTestServer/Utils.cs
index e3093bc..15b1bde 100644
--- a/assets/TusTestServer/Utils.cs
+++ b/assets/TusTestServer/Utils.cs
@@ -33,7 +33,7 @@ public static void UseMyTus(this WebApplication app, string path) where T : I
{
var file = (IAssetFile)(await eventContext.GetFileAsync());
- await using var fileStream = await file.OpenReadAsync(eventContext.CancellationToken);
+ await using var fileStream = file.OpenRead();
var name = file.FileName;