async usings

Author: SimonCropp

src/Cake.Common/Build/GitHubActions/Commands/Artifact/GitHubActionsArtifactService.cs

@@ -97,8 +97,9 @@ private async Task DownloadArtifact(string signedUrl, DirectoryPath directoryPat
                 {
                     entryDirectory.Create();
                 }
-                using var entryStream = entry.Open();
-                using var fileStream = FileSystem.GetFile(entryPath).OpenWrite();
+
+                await using var entryStream = entry.Open();
+                await using var fileStream = FileSystem.GetFile(entryPath).OpenWrite();
                 await entryStream.CopyToAsync(fileStream);
             }
         }
@@ -304,14 +305,14 @@ private async Task CreateArtifactArchive(DirectoryPath rootPath, IFile[] files,
                 tempArchiveDirectory.Create();
             }
 
-            using var archiveStream = FileSystem.GetFile(tempArchivePath).OpenWrite();
+            await using var archiveStream = FileSystem.GetFile(tempArchivePath).OpenWrite();
             using var archive = new ZipArchive(archiveStream, ZipArchiveMode.Create);
             foreach (var file in files)
             {
                 var relativePath = rootPath.GetRelativePath(file.Path.GetDirectory());
                 var entry = archive.CreateEntry(relativePath.CombineWithFilePath(file.Path.GetFilename()).FullPath, CompressionLevel.SmallestSize);
-                using var entryStream = entry.Open();
-                using var fileStream = file.OpenRead();
+                await using var entryStream = entry.Open();
+                await using var fileStream = file.OpenRead();
                 await fileStream.CopyToAsync(entryStream);
             }
         }

src/Cake.Common/Net/HttpClientExtensions.cs

@@ -27,25 +27,23 @@ public static async Task DownloadFileAsync(this HttpClient client, Uri requestUr
                 contentLength = response.Content.Headers.ContentLength.Value;
             }
 
-            using (var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
-            using (var fileStream = File.Create(path, DefaultBufferSize))
-            {
-                int bytesRead;
-                var totalBytesRead = 0L;
-                var buffer = new byte[DefaultBufferSize];
+            await using var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
+            await using var fileStream = File.Create(path, DefaultBufferSize);
+            int bytesRead;
+            var totalBytesRead = 0L;
+            var buffer = new byte[DefaultBufferSize];
 
-                while ((bytesRead = await responseStream.ReadAsync(buffer, 0, buffer.Length).ConfigureAwait(false)) > 0)
-                {
-                    await fileStream.WriteAsync(buffer, 0, bytesRead).ConfigureAwait(false);
+            while ((bytesRead = await responseStream.ReadAsync(buffer, 0, buffer.Length).ConfigureAwait(false)) > 0)
+            {
+                await fileStream.WriteAsync(buffer, 0, bytesRead).ConfigureAwait(false);
 
-                    totalBytesRead += bytesRead;
+                totalBytesRead += bytesRead;
 
-                    if (contentLength.HasValue)
-                    {
-                        var progressPercentage = totalBytesRead * 1d / (contentLength.Value * 1d);
+                if (contentLength.HasValue)
+                {
+                    var progressPercentage = totalBytesRead * 1d / (contentLength.Value * 1d);
 
-                        progress.Report((int)(progressPercentage * 100));
-                    }
+                    progress.Report((int)(progressPercentage * 100));
                 }
             }
         }