Adopted further C# 14 and .NET 10 features (#1158)

This commit is contained in:
Thorsten Sommer authored and GitHub committed 2026-11-04 14:04:10 +01:00
1 parent f649febf88
commit f0fa1411c8
40 files changed
+545 -56

No files matched your search

@@ -31,7 +31,7 @@ public static class DataBackupReader
DataBackupManifest? manifest;
try
{
await using var manifestStream = manifestEntry.Open();
await using var manifestStream = await manifestEntry.OpenAsync(token);
manifest = await JsonSerializer.DeserializeAsync<DataBackupManifest>(manifestStream, DataBackupFormat.JSON_OPTIONS, token);
}
catch (JsonException)
@@ -50,7 +50,7 @@ public static class DataBackupWriter
var buffer = new byte[BUFFER_SIZE];
progress?.Report(new(DataBackupPhase.WRITING, 0, totalFiles));
using (var archive = new ZipArchive(target, ZipArchiveMode.Create, leaveOpen: true))
await using (var archive = await ZipArchive.CreateAsync(target, ZipArchiveMode.Create, leaveOpen: true, entryNameEncoding: null, token))
{
var settingsEntry = DataBackupContents.ENTRIES.First(entry => entry.Kind is DataBackupEntryKind.SETTINGS);
await using (var settingsStream = new MemoryStream(Encoding.UTF8.GetBytes(sources.SettingsJson), writable: false))
@@ -179,7 +179,7 @@ public static class DataBackupWriter
using var hash = IncrementalHash.CreateHash(HashAlgorithmName.SHA256);
long size = 0;
await using (var entryStream = entry.Open())
await using (var entryStream = await entry.OpenAsync(token))
{
int read;
while ((read = await source.ReadAsync(buffer, token)) > 0)
@@ -47,7 +47,7 @@ public static class DataRestorePreparer
Discard(target);
try
{
using var archive = ZipFile.OpenRead(archivePath);
await using var archive = await ZipFile.OpenReadAsync(archivePath, token);
var manifestResult = await DataBackupReader.ReadManifestAsync(archive, token);
if (manifestResult.Manifest is not { } manifest)
return new(false, false, manifestResult.Issue);
@@ -218,7 +218,7 @@ public static class DataRestorePreparer
using var hash = IncrementalHash.CreateHash(HashAlgorithmName.SHA256);
long size = 0;
await using (var source = file.Entry.Open())
await using (var source = await file.Entry.OpenAsync(token))
await using (var destination = new FileStream(file.DestinationPath, FileMode.CreateNew, FileAccess.Write, FileShare.None, BUFFER_SIZE, FileOptions.Asynchronous | FileOptions.SequentialScan))
{
int read;