chore: Bump System.Text.Json

testcontainers · Oct 10, 2024 · 12cccf9 · 12cccf9
1 parent 159e4bf
commit 12cccf9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -13,7 +13,7 @@
         <PackageVersion Include="ReflectionMagic" Version="5.0.1"/>
         <PackageVersion Include="SharpZipLib" Version="1.4.2"/>
         <PackageVersion Include="SSH.NET" Version="2023.0.0"/>
-        <PackageVersion Include="System.Text.Json" Version="6.0.9"/>
+        <PackageVersion Include="System.Text.Json" Version="6.0.10"/>
         <!-- Unit and integration test dependencies: -->
         <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
         <PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="8.9.1"/>

diff --git a/src/Testcontainers.WebDriver/WebDriverContainer.cs b/src/Testcontainers.WebDriver/WebDriverContainer.cs
@@ -57,7 +57,12 @@ public async Task ExportVideoAsync(string target, CancellationToken ct = default
         var bytes = await _ffmpegContainer.ReadFileAsync(WebDriverBuilder.VideoFilePath, ct)
             .ConfigureAwait(false);
 
+#if NET6_0_OR_GREATER
+        await File.WriteAllBytesAsync(target, bytes, ct)
+            .ConfigureAwait(false);
+#else
         File.WriteAllBytes(target, bytes);
+#endif
     }
 
     /// <inheritdoc />

diff --git a/src/Testcontainers/Containers/ResourceReaper.cs b/src/Testcontainers/Containers/ResourceReaper.cs
@@ -156,7 +156,12 @@ public async ValueTask DisposeAsync()
 
       try
       {
+#if NET8_0_OR_GREATER
+        await _maintainConnectionCts.CancelAsync()
+          .ConfigureAwait(false);
+#else
         _maintainConnectionCts.Cancel();
+#endif
 
         // Close connection before disposing Resource Reaper.
         await _maintainConnectionTask