diff --git a/src/Ryujinx.Common/Utilities/EmbeddedResources.cs b/src/Ryujinx.Common/Utilities/EmbeddedResources.cs index e22571c966..0e6f4cac54 100644 --- a/src/Ryujinx.Common/Utilities/EmbeddedResources.cs +++ b/src/Ryujinx.Common/Utilities/EmbeddedResources.cs @@ -60,7 +60,7 @@ namespace Ryujinx.Common public async static Task ReadAsync(Assembly assembly, string filename) { - using var stream = GetStream(assembly, filename); + await using var stream = GetStream(assembly, filename); if (stream == null) { return null; @@ -97,7 +97,7 @@ namespace Ryujinx.Common public async static Task ReadAllTextAsync(Assembly assembly, string filename) { - using var stream = GetStream(assembly, filename); + await using var stream = GetStream(assembly, filename); if (stream == null) { return null; diff --git a/src/Ryujinx.Common/Utilities/StreamUtils.cs b/src/Ryujinx.Common/Utilities/StreamUtils.cs index 74b6af5ecf..b8889f58cc 100644 --- a/src/Ryujinx.Common/Utilities/StreamUtils.cs +++ b/src/Ryujinx.Common/Utilities/StreamUtils.cs @@ -59,7 +59,7 @@ namespace Ryujinx.Common.Utilities public static async Task StreamToBytesAsync(Stream input, CancellationToken cancellationToken = default) { - using MemoryStream stream = MemoryStreamManager.Shared.GetStream(); + await using MemoryStream stream = MemoryStreamManager.Shared.GetStream(); await input.CopyToAsync(stream, cancellationToken); diff --git a/src/Ryujinx.Gtk3/Modules/Updater/Updater.cs b/src/Ryujinx.Gtk3/Modules/Updater/Updater.cs index 8b006f63f6..f9864576e8 100644 --- a/src/Ryujinx.Gtk3/Modules/Updater/Updater.cs +++ b/src/Ryujinx.Gtk3/Modules/Updater/Updater.cs @@ -387,9 +387,9 @@ namespace Ryujinx.Modules if (OperatingSystem.IsLinux()) { - using Stream inStream = File.OpenRead(updateFile); - using Stream gzipStream = new GZipInputStream(inStream); - using TarInputStream tarStream = new(gzipStream, Encoding.ASCII); + await using Stream inStream = File.OpenRead(updateFile); + await using Stream gzipStream = new GZipInputStream(inStream); + await using TarInputStream tarStream = new(gzipStream, Encoding.ASCII); updateDialog.ProgressBar.MaxValue = inStream.Length; await Task.Run(() => @@ -429,7 +429,7 @@ namespace Ryujinx.Modules } else { - using Stream inStream = File.OpenRead(updateFile); + await using Stream inStream = File.OpenRead(updateFile); using ZipFile zipFile = new(inStream); updateDialog.ProgressBar.MaxValue = zipFile.Count; diff --git a/src/Ryujinx.Gtk3/UI/Windows/AmiiboWindow.cs b/src/Ryujinx.Gtk3/UI/Windows/AmiiboWindow.cs index d8c0b0c0da..ad47f1613a 100644 --- a/src/Ryujinx.Gtk3/UI/Windows/AmiiboWindow.cs +++ b/src/Ryujinx.Gtk3/UI/Windows/AmiiboWindow.cs @@ -250,8 +250,8 @@ namespace Ryujinx.UI.Windows try { - using FileStream dlcJsonStream = File.Create(_amiiboJsonPath, 4096, FileOptions.WriteThrough); - dlcJsonStream.Write(Encoding.UTF8.GetBytes(amiiboJsonString)); + await using FileStream dlcJsonStream = File.Create(_amiiboJsonPath, 4096, FileOptions.WriteThrough); + await dlcJsonStream.WriteAsync(Encoding.UTF8.GetBytes(amiiboJsonString)); } catch (Exception exception) { diff --git a/src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs index 8f09568a6b..0d7ea255b2 100644 --- a/src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs @@ -440,8 +440,8 @@ namespace Ryujinx.Ava.UI.ViewModels try { - using FileStream dlcJsonStream = File.Create(_amiiboJsonPath, 4096, FileOptions.WriteThrough); - dlcJsonStream.Write(Encoding.UTF8.GetBytes(amiiboJsonString)); + await using FileStream dlcJsonStream = File.Create(_amiiboJsonPath, 4096, FileOptions.WriteThrough); + await dlcJsonStream.WriteAsync(Encoding.UTF8.GetBytes(amiiboJsonString)); } catch (Exception exception) { @@ -479,7 +479,7 @@ namespace Ryujinx.Ava.UI.ViewModels if (response.IsSuccessStatusCode) { byte[] amiiboPreviewBytes = await response.Content.ReadAsByteArrayAsync(); - using MemoryStream memoryStream = new(amiiboPreviewBytes); + await using MemoryStream memoryStream = new(amiiboPreviewBytes); Bitmap bitmap = new(memoryStream); diff --git a/src/Ryujinx/UI/ViewModels/DownloadableContentManagerViewModel.cs b/src/Ryujinx/UI/ViewModels/DownloadableContentManagerViewModel.cs index 2cd714f447..420af7cb73 100644 --- a/src/Ryujinx/UI/ViewModels/DownloadableContentManagerViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/DownloadableContentManagerViewModel.cs @@ -230,7 +230,7 @@ namespace Ryujinx.Ava.UI.ViewModels return; } - using FileStream containerFile = File.OpenRead(path); + await using FileStream containerFile = File.OpenRead(path); PartitionFileSystem partitionFileSystem = new(); partitionFileSystem.Initialize(containerFile.AsStorage()).ThrowIfFailure(); diff --git a/src/Ryujinx/UI/Views/User/UserProfileImageSelectorView.axaml.cs b/src/Ryujinx/UI/Views/User/UserProfileImageSelectorView.axaml.cs index fabfaa4e80..0361763c2b 100644 --- a/src/Ryujinx/UI/Views/User/UserProfileImageSelectorView.axaml.cs +++ b/src/Ryujinx/UI/Views/User/UserProfileImageSelectorView.axaml.cs @@ -82,7 +82,7 @@ namespace Ryujinx.Ava.UI.Views.User if (result.Count > 0) { - _profile.Image = ProcessProfileImage(File.ReadAllBytes(result[0].Path.LocalPath)); + _profile.Image = ProcessProfileImage(await File.ReadAllBytesAsync(result[0].Path.LocalPath)); _parent.GoBack(); } }