chore: Keep ConfigureAwait in macro if-else

testcontainers · Dec 27, 2023 · ed07855 · ed07855
1 parent 40597dd
commit ed07855
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/Testcontainers/Clients/TestcontainersClient.cs b/src/Testcontainers/Clients/TestcontainersClient.cs
@@ -271,10 +271,11 @@ public async Task<byte[]> ReadFileAsync(string id, string filePath, Cancellation
 
 #if NETSTANDARD2_0
         _ = await tarInputStream.ReadAsync(readBytes, 0, readBytes.Length, ct)
+          .ConfigureAwait(false);
 #else
         _ = await tarInputStream.ReadAsync(readBytes, ct)
-#endif
           .ConfigureAwait(false);
+#endif
 
         return readBytes;
       }

diff --git a/src/Testcontainers/Containers/ResourceReaper.cs b/src/Testcontainers/Containers/ResourceReaper.cs
@@ -308,10 +308,11 @@ await tcpClient.ConnectAsync(host, port)
               {
 #if NETSTANDARD2_0
                 await stream.WriteAsync(sendBytes, 0, sendBytes.Length, ct)
+                  .ConfigureAwait(false);
 #else
                 await stream.WriteAsync(sendBytes, ct)
-#endif
                   .ConfigureAwait(false);
+#endif
 
                 await stream.FlushAsync(ct)
                   .ConfigureAwait(false);
@@ -322,10 +323,11 @@ await stream.FlushAsync(ct)
                 {
 #if NETSTANDARD2_0
                   var numberOfBytes = await stream.ReadAsync(readBytes, 0, readBytes.Length, ct)
+                    .ConfigureAwait(false);
 #else
                   var numberOfBytes = await stream.ReadAsync(readBytes, ct)
-#endif
                     .ConfigureAwait(false);
+#endif
 
                   if (numberOfBytes == 0)
                   {
@@ -367,10 +369,11 @@ await Task.Delay(TimeSpan.FromSeconds(RetryTimeoutInSeconds), ct)
               // Keep the connection to Ryuk up.
 #if NETSTANDARD2_0
               _ = await stream.ReadAsync(readBytes, 0, readBytes.Length, _maintainConnectionCts.Token)
+                .ConfigureAwait(false);
 #else
               _ = await stream.ReadAsync(readBytes, _maintainConnectionCts.Token)
-#endif
                 .ConfigureAwait(false);
+#endif
             }
           }
           catch (OperationCanceledException)

diff --git a/src/Testcontainers/Containers/TarOutputMemoryStream.cs b/src/Testcontainers/Containers/TarOutputMemoryStream.cs
@@ -76,10 +76,11 @@ await PutNextEntryAsync(tarEntry, ct)
 
 #if NETSTANDARD2_0
       await WriteAsync(fileContent, 0, fileContent.Length, ct)
+        .ConfigureAwait(false);
 #else
       await WriteAsync(fileContent, ct)
-#endif
         .ConfigureAwait(false);
+#endif
 
       await CloseEntryAsync(ct)
         .ConfigureAwait(false);