diff --git a/Directory.Packages.props b/Directory.Packages.props
index aa5e34eb4..a4c955822 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -4,31 +4,31 @@
true
-
-
-
+
+
+
-
+
-
+
-
-
+
+
-
+
-
+
@@ -40,7 +40,7 @@
-
+
@@ -62,14 +62,14 @@
-
+
-
+
diff --git a/src/Testcontainers.Mosquitto/MosquittoBuilder.cs b/src/Testcontainers.Mosquitto/MosquittoBuilder.cs
index d02a53319..a21d148a4 100644
--- a/src/Testcontainers.Mosquitto/MosquittoBuilder.cs
+++ b/src/Testcontainers.Mosquitto/MosquittoBuilder.cs
@@ -60,6 +60,8 @@ public override MosquittoContainer Build()
{
Validate();
+ const string allowAnonymous = "allow_anonymous true";
+
// Maybe we should move this into the startup callback.
var mosquittoConfig = new StringWriter();
mosquittoConfig.NewLine = "\n";
@@ -76,13 +78,13 @@ public override MosquittoContainer Build()
mosquittoConfig.WriteLine("# MQTT, unencrypted, unauthenticated");
mosquittoConfig.WriteLine($"listener {MqttPort} 0.0.0.0");
mosquittoConfig.WriteLine("protocol mqtt");
- mosquittoConfig.WriteLine("allow_anonymous true");
+ mosquittoConfig.WriteLine(allowAnonymous);
mosquittoConfig.WriteLine();
mosquittoConfig.WriteLine("# MQTT over WebSockets, unencrypted, unauthenticated");
mosquittoConfig.WriteLine($"listener {MqttWsPort} 0.0.0.0");
mosquittoConfig.WriteLine("protocol websockets");
- mosquittoConfig.WriteLine("allow_anonymous true");
+ mosquittoConfig.WriteLine(allowAnonymous);
if (DockerResourceConfiguration.TlsEnabled)
{
@@ -90,7 +92,7 @@ public override MosquittoContainer Build()
mosquittoConfig.WriteLine("# MQTT, encrypted, unauthenticated");
mosquittoConfig.WriteLine($"listener {MqttTlsPort} 0.0.0.0");
mosquittoConfig.WriteLine("protocol mqtt");
- mosquittoConfig.WriteLine("allow_anonymous true");
+ mosquittoConfig.WriteLine(allowAnonymous);
mosquittoConfig.WriteLine("tls_version tlsv1.2");
mosquittoConfig.WriteLine($"certfile {CertificateFilePath}");
mosquittoConfig.WriteLine($"keyfile {CertificateKeyFilePath}");
@@ -99,7 +101,7 @@ public override MosquittoContainer Build()
mosquittoConfig.WriteLine("# MQTT over WebSockets, encrypted, unauthenticated");
mosquittoConfig.WriteLine($"listener {MqttWssPort} 0.0.0.0");
mosquittoConfig.WriteLine("protocol websockets");
- mosquittoConfig.WriteLine("allow_anonymous true");
+ mosquittoConfig.WriteLine(allowAnonymous);
mosquittoConfig.WriteLine("tls_version tlsv1.2");
mosquittoConfig.WriteLine($"certfile {CertificateFilePath}");
mosquittoConfig.WriteLine($"keyfile {CertificateKeyFilePath}");
diff --git a/src/Testcontainers/Clients/DockerApiClient.cs b/src/Testcontainers/Clients/DockerApiClient.cs
index d2cc9dedd..bfc6b2d25 100644
--- a/src/Testcontainers/Clients/DockerApiClient.cs
+++ b/src/Testcontainers/Clients/DockerApiClient.cs
@@ -117,6 +117,7 @@ await RuntimeInitialized.WaitAsync(ct)
runtimeInfo.AppendLine(" Labels: ");
runtimeInfo.Append(string.Join(Environment.NewLine, labels.Select(label => " " + label)));
}
+
Logger.LogInformation("{RuntimeInfo}", runtimeInfo);
}
catch (Exception e)
diff --git a/tests/Testcontainers.Platform.Windows.Tests/SkipOnLinuxEngineAttribute.cs b/tests/Testcontainers.Platform.Windows.Tests/SkipOnLinuxEngineAttribute.cs
index f2fbb08a1..ae7641927 100644
--- a/tests/Testcontainers.Platform.Windows.Tests/SkipOnLinuxEngineAttribute.cs
+++ b/tests/Testcontainers.Platform.Windows.Tests/SkipOnLinuxEngineAttribute.cs
@@ -5,7 +5,10 @@ public sealed class SkipOnLinuxEngineAttribute : FactAttribute
{
private static readonly bool IsLinuxEngineEnabled = DockerCli.PlatformIsEnabled(DockerCli.DockerPlatform.Linux);
- public SkipOnLinuxEngineAttribute()
+ public SkipOnLinuxEngineAttribute(
+ [CallerFilePath] [CanBeNull] string sourceFilePath = null,
+ [CallerLineNumber] int sourceLineNumber = -1)
+ : base(sourceFilePath, sourceLineNumber)
{
if (IsLinuxEngineEnabled)
{
diff --git a/tests/Testcontainers.Platform.Windows.Tests/Usings.cs b/tests/Testcontainers.Platform.Windows.Tests/Usings.cs
index 30832d99e..00a6de2d0 100644
--- a/tests/Testcontainers.Platform.Windows.Tests/Usings.cs
+++ b/tests/Testcontainers.Platform.Windows.Tests/Usings.cs
@@ -1,4 +1,5 @@
global using System;
+global using System.Runtime.CompilerServices;
global using System.Threading.Tasks;
global using DotNet.Testcontainers.Builders;
global using DotNet.Testcontainers.Commons;
diff --git a/tests/Testcontainers.Tests/Unit/Builders/DockerConfigTest.cs b/tests/Testcontainers.Tests/Unit/Builders/DockerConfigTest.cs
index 7584dd3fe..de6c53836 100644
--- a/tests/Testcontainers.Tests/Unit/Builders/DockerConfigTest.cs
+++ b/tests/Testcontainers.Tests/Unit/Builders/DockerConfigTest.cs
@@ -8,6 +8,7 @@ namespace DotNet.Testcontainers.Tests.Unit
using DotNet.Testcontainers.Builders;
using DotNet.Testcontainers.Commons;
using DotNet.Testcontainers.Configurations;
+ using JetBrains.Annotations;
using Xunit;
public static class DockerConfigTests
@@ -152,7 +153,10 @@ public void ReturnsConfiguredEndpointWhenDockerHostIsSet()
private sealed class SkipIfHostOrContextIsSet : FactAttribute
{
- public SkipIfHostOrContextIsSet()
+ public SkipIfHostOrContextIsSet(
+ [CallerFilePath] [CanBeNull] string sourceFilePath = null,
+ [CallerLineNumber] int sourceLineNumber = -1)
+ : base(sourceFilePath, sourceLineNumber)
{
const string reason = "The Docker CLI doesn't know about ~/.testcontainers.properties file.";
var dockerHost = PropertiesFileConfiguration.Instance.GetDockerHost();