Code Quality: Convert into await using statement or declaration (#16694)

andreistaravoitau · web-flow · commit 02c232036804 · 2025-01-25T21:49:39.000-05:00
diff --git a/src/Files.App/Extensions/ImageSourceExtensions.cs b/src/Files.App/Extensions/ImageSourceExtensions.cs
@@ -20,7 +20,7 @@ internal static async Task<byte[]> ToByteArrayAsync(this IInputStream stream)
 				return null;
 			}
 
-			using var readStream = stream.AsStreamForRead();
+			await using var readStream = stream.AsStreamForRead();
 
 			return await readStream.ToByteArrayAsync();
 		}
diff --git a/src/Files.App/Services/App/AppUpdateSideloadService.cs b/src/Files.App/Services/App/AppUpdateSideloadService.cs
@@ -134,8 +134,8 @@ public async Task CheckAndUpdateFilesLauncherAsync()
 
 				if (File.Exists(destHashFilePath))
 				{
-					using var srcStream = (await srcHashFile.OpenReadAsync()).AsStream();
-					using var destStream = File.OpenRead(destHashFilePath);
+					await using var srcStream = (await srcHashFile.OpenReadAsync()).AsStream();
+					await using var destStream = File.OpenRead(destHashFilePath);
 
 					hashEqual = HashEqual(srcStream, destStream);
 				}
diff --git a/src/Files.App/Services/App/AppUpdateStoreService.cs b/src/Files.App/Services/App/AppUpdateStoreService.cs
@@ -186,8 +186,8 @@ public async Task CheckAndUpdateFilesLauncherAsync()
 
 				if (Path.Exists(destHashFilePath))
 				{
-					using var srcStream = (await srcHashFile.OpenReadAsync()).AsStream();
-					using var destStream = File.OpenRead(destHashFilePath);
+					await using var srcStream = (await srcHashFile.OpenReadAsync()).AsStream();
+					await using var destStream = File.OpenRead(destHashFilePath);
 
 					hashEqual = HashEqual(srcStream, destStream);
 				}
diff --git a/src/Files.App/Utils/Cloud/Detector/GoogleDriveCloudDetector.cs b/src/Files.App/Utils/Cloud/Detector/GoogleDriveCloudDetector.cs
@@ -38,9 +38,9 @@ await FilesystemTasks.Wrap(() => StorageFile.GetFileFromPathAsync(Path.Combine(a
 
 			// Build the connection and sql command
 			SQLitePCL.Batteries_V2.Init();
-			using var database = new SqliteConnection($"Data Source='{syncDbPath}'");
-			using var cmdRoot = new SqliteCommand("SELECT * FROM roots", database);
-			using var cmdMedia = new SqliteCommand("SELECT * FROM media WHERE fs_type=10", database);
+			await using var database = new SqliteConnection($"Data Source='{syncDbPath}'");
+			await using var cmdRoot = new SqliteCommand("SELECT * FROM roots", database);
+			await using var cmdMedia = new SqliteCommand("SELECT * FROM media WHERE fs_type=10", database);
 
 			// Open the connection and execute the command
 			database.Open();
diff --git a/src/Files.App/Utils/Cloud/Detector/SynologyDriveCloudDetector.cs b/src/Files.App/Utils/Cloud/Detector/SynologyDriveCloudDetector.cs
@@ -33,9 +33,9 @@ protected override async IAsyncEnumerable<ICloudProvider> GetProviders()
 
 			// Build the connection and SQL command
 			SQLitePCL.Batteries_V2.Init();
-			using var database = new SqliteConnection($"Data Source='{syncDbPath}'");
-			using var cmdConnection = new SqliteCommand("SELECT * FROM connection_table", database);
-			using var cmdTable = new SqliteCommand("SELECT * FROM session_table", database);
+			await using var database = new SqliteConnection($"Data Source='{syncDbPath}'");
+			await using var cmdConnection = new SqliteCommand("SELECT * FROM connection_table", database);
+			await using var cmdTable = new SqliteCommand("SELECT * FROM session_table", database);
 
 			// Open the connection and execute the command
 			database.Open();
diff --git a/src/Files.App/Utils/Shell/LaunchHelper.cs b/src/Files.App/Utils/Shell/LaunchHelper.cs
@@ -204,8 +204,8 @@ private static async Task<bool> HandleApplicationLaunch(string application, stri
 								if (!hFileSrc.IsInvalid && !hFileDst.IsInvalid)
 								{
 									// Copy ADS to temp folder and open
-									using (var inStream = new FileStream(hFileSrc.DangerousGetHandle(), FileAccess.Read))
-									using (var outStream = new FileStream(hFileDst.DangerousGetHandle(), FileAccess.Write))
+									await using (var inStream = new FileStream(hFileSrc.DangerousGetHandle(), FileAccess.Read))
+									await using (var outStream = new FileStream(hFileDst.DangerousGetHandle(), FileAccess.Write))
 									{
 										await inStream.CopyToAsync(outStream);
 										await outStream.FlushAsync();
diff --git a/src/Files.App/Utils/Storage/Operations/ShellFilesystemOperations.cs b/src/Files.App/Utils/Storage/Operations/ShellFilesystemOperations.cs
@@ -61,7 +61,7 @@ public async Task<IStorageHistory> CopyItemsAsync(IList<IStorageItemWithPath> so
 
 			var operationID = Guid.NewGuid().ToString();
 
-			using var r = cancellationToken.Register(CancelOperation, operationID, false);
+			await using var r = cancellationToken.Register(CancelOperation, operationID, false);
 
 			var sourceReplace = sourceNoSkip.Zip(collisionsNoSkip, (src, coll) => new { src, coll }).Where(item => item.coll == FileNameConflictResolveOptionType.ReplaceExisting).Select(item => item.src);
 			var destinationReplace = destinationNoSkip.Zip(collisionsNoSkip, (src, coll) => new { src, coll }).Where(item => item.coll == FileNameConflictResolveOptionType.ReplaceExisting).Select(item => item.src);
@@ -371,7 +371,7 @@ public async Task<IStorageHistory> DeleteItemsAsync(IList<IStorageItemWithPath>
 			}
 
 			var operationID = Guid.NewGuid().ToString();
-			using var r = cancellationToken.Register(CancelOperation, operationID, false);
+			await using var r = cancellationToken.Register(CancelOperation, operationID, false);
 
 			var (success, response) = await FileOperationsHelpers.DeleteItemAsync(deleteFilePaths.ToArray(), permanently, MainWindow.Instance.WindowHandle.ToInt64(), asAdmin, progress, operationID);
 
@@ -483,7 +483,7 @@ public async Task<IStorageHistory> MoveItemsAsync(IList<IStorageItemWithPath> so
 			var collisionsNoSkip = collisions.Where(c => c != FileNameConflictResolveOptionType.Skip);
 			var operationID = Guid.NewGuid().ToString();
 
-			using var r = cancellationToken.Register(CancelOperation, operationID, false);
+			await using var r = cancellationToken.Register(CancelOperation, operationID, false);
 
 			var sourceReplace = sourceNoSkip.Zip(collisionsNoSkip, (src, coll) => new { src, coll }).Where(item => item.coll == FileNameConflictResolveOptionType.ReplaceExisting).Select(item => item.src);
 			var destinationReplace = destinationNoSkip.Zip(collisionsNoSkip, (src, coll) => new { src, coll }).Where(item => item.coll == FileNameConflictResolveOptionType.ReplaceExisting).Select(item => item.src);
@@ -736,7 +736,7 @@ public async Task<IStorageHistory> RestoreItemsFromTrashAsync(IList<IStorageItem
 			StatusCenterItemProgressModel fsProgress = new(progress, true, FileSystemStatusCode.InProgress);
 			fsProgress.Report();
 			var operationID = Guid.NewGuid().ToString();
-			using var r = cancellationToken.Register(CancelOperation, operationID, false);
+			await using var r = cancellationToken.Register(CancelOperation, operationID, false);
 
 			var moveResult = new ShellOperationResult();
 			var (status, response) = await FileOperationsHelpers.MoveItemAsync(source.Select(s => s.Path).ToArray(), [.. destination], false, MainWindow.Instance.WindowHandle.ToInt64(), asAdmin, progress, operationID);
diff --git a/src/Files.App/Utils/Storage/StorageBaseItems/BaseStorageFile.cs b/src/Files.App/Utils/Storage/StorageBaseItems/BaseStorageFile.cs
@@ -158,7 +158,7 @@ public static IAsyncOperation<BaseStorageFile> GetFileFromPathAsync(string path)
 		public async Task<string> ReadTextAsync(int maxLength = -1)
 		{
 			using var inputStream = await OpenReadAsync();
-			using var stream = inputStream.AsStreamForRead();
+			await using var stream = inputStream.AsStreamForRead();
 			using var dataReader = new StreamReader(stream, true);
 			StringBuilder builder = new();
 			int charsRead, charsToRead;
diff --git a/src/Files.App/Utils/Storage/StorageItems/FtpStorageFile.cs b/src/Files.App/Utils/Storage/StorageItems/FtpStorageFile.cs
@@ -171,13 +171,13 @@ public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destin
 
 				if (destFolder is ICreateFileWithStream cwsf)
 				{
-					using var inStream = await ftpClient.OpenRead(FtpPath, token: cancellationToken);
+					await using var inStream = await ftpClient.OpenRead(FtpPath, token: cancellationToken);
 					return await cwsf.CreateFileAsync(inStream, desiredNewName, option.Convert());
 				}
 				else
 				{
 					BaseStorageFile file = await destFolder.CreateFileAsync(desiredNewName, option.Convert());
-					using var stream = await file.OpenStreamForWriteAsync();
+					await using var stream = await file.OpenStreamForWriteAsync();
 					return await ftpClient.DownloadStream(stream, FtpPath, token: cancellationToken) ? file : null;
 				}
 			}, ((IPasswordProtectedItem)this).RetryWithCredentialsAsync));
@@ -279,7 +279,7 @@ private async void FtpDataStreamingHandlerAsync(StreamedFileDataRequest request)
 					return;
 				}
 
-				using (var outStream = request.AsStreamForWrite())
+				await using (var outStream = request.AsStreamForWrite())
 				{
 					await ftpClient.DownloadStream(outStream, FtpPath);
 					await outStream.FlushAsync();
diff --git a/src/Files.App/Utils/Storage/StorageItems/NativeStorageFile.cs b/src/Files.App/Utils/Storage/StorageItems/NativeStorageFile.cs
@@ -83,8 +83,8 @@ public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destin
 				else
 				{
 					destFile.CreateFile();
-					using (var inStream = await this.OpenStreamForReadAsync())
-					using (var outStream = await destFile.OpenStreamForWriteAsync())
+					await using (var inStream = await this.OpenStreamForReadAsync())
+					await using (var outStream = await destFile.OpenStreamForWriteAsync())
 					{
 						await inStream.CopyToAsync(outStream);
 						await outStream.FlushAsync();
@@ -248,8 +248,8 @@ public override IAsyncAction RenameAsync(string desiredName, NameCollisionOption
 				else
 				{
 					destFile.CreateFile();
-					using (var inStream = await this.OpenStreamForReadAsync())
-					using (var outStream = await destFile.OpenStreamForWriteAsync())
+					await using (var inStream = await this.OpenStreamForReadAsync())
+					await using (var outStream = await destFile.OpenStreamForWriteAsync())
 					{
 						await inStream.CopyToAsync(outStream);
 						await outStream.FlushAsync();
diff --git a/src/Files.App/Utils/Storage/StorageItems/SystemStorageFile.cs b/src/Files.App/Utils/Storage/StorageItems/SystemStorageFile.cs
@@ -69,14 +69,14 @@ public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destin
 					}
 					else if (destFolder is ICreateFileWithStream cwsf)
 					{
-						using var inStream = await this.OpenStreamForReadAsync();
+						await using var inStream = await this.OpenStreamForReadAsync();
 						return await cwsf.CreateFileAsync(inStream, desiredNewName, option.Convert());
 					}
 					else
 					{
 						var destFile = await destFolder.CreateFileAsync(desiredNewName, option.Convert());
-						using (var inStream = await this.OpenStreamForReadAsync())
-						using (var outStream = await destFile.OpenStreamForWriteAsync())
+						await using (var inStream = await this.OpenStreamForReadAsync())
+						await using (var outStream = await destFile.OpenStreamForWriteAsync())
 						{
 							await inStream.CopyToAsync(outStream);
 							await outStream.FlushAsync();
@@ -93,8 +93,8 @@ public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destin
 							option == NameCollisionOption.ReplaceExisting);
 						if (!hFile.IsInvalid)
 						{
-							using (var inStream = await this.OpenStreamForReadAsync())
-							using (var outStream = new FileStream(hFile, FileAccess.Write))
+							await using (var inStream = await this.OpenStreamForReadAsync())
+							await using (var outStream = new FileStream(hFile, FileAccess.Write))
 							{
 								await inStream.CopyToAsync(outStream);
 								await outStream.FlushAsync();
@@ -140,8 +140,8 @@ public override IAsyncAction CopyAndReplaceAsync(IStorageFile fileToReplace)
 		{
 			return AsyncInfo.Run(async (cancellationToken) =>
 			{
-				using var inStream = await this.OpenStreamForReadAsync();
-				using var outStream = await fileToReplace.OpenStreamForWriteAsync();
+				await using var inStream = await this.OpenStreamForReadAsync();
+				await using var outStream = await fileToReplace.OpenStreamForWriteAsync();
 
 				await inStream.CopyToAsync(outStream);
 				await outStream.FlushAsync();
@@ -151,8 +151,8 @@ public override IAsyncAction MoveAndReplaceAsync(IStorageFile fileToReplace)
 		{
 			return AsyncInfo.Run(async (cancellationToken) =>
 			{
-				using var inStream = await this.OpenStreamForReadAsync();
-				using var outStream = await fileToReplace.OpenStreamForWriteAsync();
+				await using var inStream = await this.OpenStreamForReadAsync();
+				await using var outStream = await fileToReplace.OpenStreamForWriteAsync();
 
 				await inStream.CopyToAsync(outStream);
 				await outStream.FlushAsync();
diff --git a/src/Files.App/Utils/Storage/StorageItems/VirtualStorageFile.cs b/src/Files.App/Utils/Storage/StorageItems/VirtualStorageFile.cs
@@ -50,7 +50,7 @@ private async void StreamedFileWriterAsync(StreamedFileDataRequest request)
 		{
 			try
 			{
-				using (var stream = request.AsStreamForWrite())
+				await using (var stream = request.AsStreamForWrite())
 				{
 					await Contents.CopyToAsync(stream);
 					await stream.FlushAsync();
@@ -119,14 +119,14 @@ public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destin
 
 				if (destFolder is ICreateFileWithStream cwsf)
 				{
-					using var inStream = await this.OpenStreamForReadAsync();
+					await using var inStream = await this.OpenStreamForReadAsync();
 					return await cwsf.CreateFileAsync(inStream, desiredNewName, option.Convert());
 				}
 				else
 				{
 					var destFile = await destFolder.CreateFileAsync(desiredNewName, option.Convert());
-					using (var inStream = await this.OpenStreamForReadAsync())
-					using (var outStream = await destFile.OpenStreamForWriteAsync())
+					await using (var inStream = await this.OpenStreamForReadAsync())
+					await using (var outStream = await destFile.OpenStreamForWriteAsync())
 					{
 						await inStream.CopyToAsync(outStream);
 						await outStream.FlushAsync();
diff --git a/src/Files.App/Utils/Storage/StorageItems/VirtualStorageItem.cs b/src/Files.App/Utils/Storage/StorageItems/VirtualStorageItem.cs
@@ -87,7 +87,7 @@ private async void StreamedFileWriterAsync(StreamedFileDataRequest request)
 		{
 			try
 			{
-				using (var stream = request.AsStreamForWrite())
+				await using (var stream = request.AsStreamForWrite())
 				{
 					await stream.FlushAsync();
 				}
diff --git a/src/Files.App/Utils/Storage/StorageItems/ZipStorageFile.cs b/src/Files.App/Utils/Storage/StorageItems/ZipStorageFile.cs
@@ -254,7 +254,7 @@ public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destin
 				else
 				{
 					var destFile = await destFolder.CreateFileAsync(desiredNewName, option.Convert());
-					using var outStream = await destFile.OpenStreamForWriteAsync();
+					await using var outStream = await destFile.OpenStreamForWriteAsync();
 					await SafetyExtensions.WrapAsync(() => zipFile.ExtractFileAsync(entry.Index, outStream), async (_, exception) =>
 					{
 						await destFile.DeleteAsync();
@@ -281,7 +281,7 @@ public override IAsyncAction CopyAndReplaceAsync(IStorageFile fileToReplace)
 				}
 
 				using var hDestFile = fileToReplace.CreateSafeFileHandle(FileAccess.ReadWrite);
-				using (var outStream = new FileStream(hDestFile, FileAccess.Write))
+				await using (var outStream = new FileStream(hDestFile, FileAccess.Write))
 				{
 					await zipFile.ExtractFileAsync(entry.Index, outStream);
 				}
@@ -323,14 +323,15 @@ public override IAsyncAction RenameAsync(string desiredName, NameCollisionOption
 					}
 					using (var ms = new MemoryStream())
 					{
-						using (var archiveStream = await OpenZipFileAsync(FileAccessMode.Read))
+						await using (var archiveStream = await OpenZipFileAsync(FileAccessMode.Read))
 						{
 							SevenZipCompressor compressor = new SevenZipCompressor() { CompressionMode = CompressionMode.Append };
 							compressor.SetFormatFromExistingArchive(archiveStream);
 							var fileName = IO.Path.GetRelativePath(containerPath, IO.Path.Combine(IO.Path.GetDirectoryName(Path), desiredName));
 							await compressor.ModifyArchiveAsync(archiveStream, new Dictionary<int, string>() { { index, fileName } }, Credentials.Password, ms);
 						}
-						using (var archiveStream = await OpenZipFileAsync(FileAccessMode.ReadWrite))
+
+						await using (var archiveStream = await OpenZipFileAsync(FileAccessMode.ReadWrite))
 						{
 							ms.Position = 0;
 							await ms.CopyToAsync(archiveStream);
@@ -371,13 +372,13 @@ public override IAsyncAction DeleteAsync(StorageDeleteOption option)
 					}
 					using (var ms = new MemoryStream())
 					{
-						using (var archiveStream = await OpenZipFileAsync(FileAccessMode.Read))
+						await using (var archiveStream = await OpenZipFileAsync(FileAccessMode.Read))
 						{
 							SevenZipCompressor compressor = new SevenZipCompressor() { CompressionMode = CompressionMode.Append };
 							compressor.SetFormatFromExistingArchive(archiveStream);
 							await compressor.ModifyArchiveAsync(archiveStream, new Dictionary<int, string>() { { index, null } }, Credentials.Password, ms);
 						}
-						using (var archiveStream = await OpenZipFileAsync(FileAccessMode.ReadWrite))
+						await using (var archiveStream = await OpenZipFileAsync(FileAccessMode.ReadWrite))
 						{
 							ms.Position = 0;
 							await ms.CopyToAsync(archiveStream);
@@ -505,7 +506,7 @@ private StreamedFileDataRequestedHandler ZipDataStreamingHandler(string name)
 					}
 					else
 					{
-						using (var outStream = request.AsStreamForWrite())
+						await using (var outStream = request.AsStreamForWrite())
 						{
 							await zipFile.ExtractFileAsync(entry.Index, outStream);
 						}
diff --git a/src/Files.App/Utils/Storage/StorageItems/ZipStorageFolder.cs b/src/Files.App/Utils/Storage/StorageItems/ZipStorageFolder.cs
diff --git a/src/Files.App/ViewModels/Properties/HashesViewModel.cs b/src/Files.App/ViewModels/Properties/HashesViewModel.cs

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ internal static async Task<byte[]> ToByteArrayAsync(this IInputStream stream)`
`20`	`20`	`return null;`
`21`	`21`	`}`
`22`	`22`
`23`		`- using var readStream = stream.AsStreamForRead();`
	`23`	`+ await using var readStream = stream.AsStreamForRead();`
`24`	`24`
`25`	`25`	`return await readStream.ToByteArrayAsync();`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,8 +134,8 @@ public async Task CheckAndUpdateFilesLauncherAsync()`
`134`	`134`
`135`	`135`	`if (File.Exists(destHashFilePath))`
`136`	`136`	`{`
`137`		`- using var srcStream = (await srcHashFile.OpenReadAsync()).AsStream();`
`138`		`- using var destStream = File.OpenRead(destHashFilePath);`
	`137`	`+ await using var srcStream = (await srcHashFile.OpenReadAsync()).AsStream();`
	`138`	`+ await using var destStream = File.OpenRead(destHashFilePath);`
`139`	`139`
`140`	`140`	`hashEqual = HashEqual(srcStream, destStream);`
`141`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -186,8 +186,8 @@ public async Task CheckAndUpdateFilesLauncherAsync()`
`186`	`186`
`187`	`187`	`if (Path.Exists(destHashFilePath))`
`188`	`188`	`{`
`189`		`- using var srcStream = (await srcHashFile.OpenReadAsync()).AsStream();`
`190`		`- using var destStream = File.OpenRead(destHashFilePath);`
	`189`	`+ await using var srcStream = (await srcHashFile.OpenReadAsync()).AsStream();`
	`190`	`+ await using var destStream = File.OpenRead(destHashFilePath);`
`191`	`191`
`192`	`192`	`hashEqual = HashEqual(srcStream, destStream);`
`193`	`193`	`}`
Original file line number	Diff line number	Diff line change
`@@ -204,8 +204,8 @@ private static async Task<bool> HandleApplicationLaunch(string application, stri`
`204`	`204`	`if (!hFileSrc.IsInvalid && !hFileDst.IsInvalid)`
`205`	`205`	`{`
`206`	`206`	`// Copy ADS to temp folder and open`
`207`		`- using (var inStream = new FileStream(hFileSrc.DangerousGetHandle(), FileAccess.Read))`
`208`		`- using (var outStream = new FileStream(hFileDst.DangerousGetHandle(), FileAccess.Write))`
	`207`	`+ await using (var inStream = new FileStream(hFileSrc.DangerousGetHandle(), FileAccess.Read))`
	`208`	`+ await using (var outStream = new FileStream(hFileDst.DangerousGetHandle(), FileAccess.Write))`
`209`	`209`	`{`
`210`	`210`	`await inStream.CopyToAsync(outStream);`
`211`	`211`	`await outStream.FlushAsync();`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ public static IAsyncOperation<BaseStorageFile> GetFileFromPathAsync(string path)`
`158`	`158`	`public async Task<string> ReadTextAsync(int maxLength = -1)`
`159`	`159`	`{`
`160`	`160`	`using var inputStream = await OpenReadAsync();`
`161`		`- using var stream = inputStream.AsStreamForRead();`
	`161`	`+ await using var stream = inputStream.AsStreamForRead();`
`162`	`162`	`using var dataReader = new StreamReader(stream, true);`
`163`	`163`	`StringBuilder builder = new();`
`164`	`164`	`int charsRead, charsToRead;`
Original file line number	Diff line number	Diff line change
`@@ -171,13 +171,13 @@ public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destin`
`171`	`171`
`172`	`172`	`if (destFolder is ICreateFileWithStream cwsf)`
`173`	`173`	`{`
`174`		`- using var inStream = await ftpClient.OpenRead(FtpPath, token: cancellationToken);`
	`174`	`+ await using var inStream = await ftpClient.OpenRead(FtpPath, token: cancellationToken);`
`175`	`175`	`return await cwsf.CreateFileAsync(inStream, desiredNewName, option.Convert());`
`176`	`176`	`}`
`177`	`177`	`else`
`178`	`178`	`{`
`179`	`179`	`BaseStorageFile file = await destFolder.CreateFileAsync(desiredNewName, option.Convert());`
`180`		`- using var stream = await file.OpenStreamForWriteAsync();`
	`180`	`+ await using var stream = await file.OpenStreamForWriteAsync();`
`181`	`181`	`return await ftpClient.DownloadStream(stream, FtpPath, token: cancellationToken) ? file : null;`
`182`	`182`	`}`
`183`	`183`	`}, ((IPasswordProtectedItem)this).RetryWithCredentialsAsync));`
`@@ -279,7 +279,7 @@ private async void FtpDataStreamingHandlerAsync(StreamedFileDataRequest request)`
`279`	`279`	`return;`
`280`	`280`	`}`
`281`	`281`
`282`		`- using (var outStream = request.AsStreamForWrite())`
	`282`	`+ await using (var outStream = request.AsStreamForWrite())`
`283`	`283`	`{`
`284`	`284`	`await ftpClient.DownloadStream(outStream, FtpPath);`
`285`	`285`	`await outStream.FlushAsync();`
Original file line number	Diff line number	Diff line change
`@@ -83,8 +83,8 @@ public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destin`
`83`	`83`	`else`
`84`	`84`	`{`
`85`	`85`	`destFile.CreateFile();`
`86`		`- using (var inStream = await this.OpenStreamForReadAsync())`
`87`		`- using (var outStream = await destFile.OpenStreamForWriteAsync())`
	`86`	`+ await using (var inStream = await this.OpenStreamForReadAsync())`
	`87`	`+ await using (var outStream = await destFile.OpenStreamForWriteAsync())`
`88`	`88`	`{`
`89`	`89`	`await inStream.CopyToAsync(outStream);`
`90`	`90`	`await outStream.FlushAsync();`
`@@ -248,8 +248,8 @@ public override IAsyncAction RenameAsync(string desiredName, NameCollisionOption`
`248`	`248`	`else`
`249`	`249`	`{`
`250`	`250`	`destFile.CreateFile();`
`251`		`- using (var inStream = await this.OpenStreamForReadAsync())`
`252`		`- using (var outStream = await destFile.OpenStreamForWriteAsync())`
	`251`	`+ await using (var inStream = await this.OpenStreamForReadAsync())`
	`252`	`+ await using (var outStream = await destFile.OpenStreamForWriteAsync())`
`253`	`253`	`{`
`254`	`254`	`await inStream.CopyToAsync(outStream);`
`255`	`255`	`await outStream.FlushAsync();`