From 1eb64ee33f9c012d698f983a63010ddc9e3c4e2c Mon Sep 17 00:00:00 2001 From: inikulshin Date: Fri, 22 Dec 2023 15:38:35 +0200 Subject: [PATCH] Fix compilation warnings (#289) --- .../DockerProxy.cs | 4 ++-- .../EasyNetQ.Management.Client.IntegrationTests.csproj | 1 + .../RabbitMQFixture.cs | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Source/EasyNetQ.Management.Client.IntegrationTests/DockerProxy.cs b/Source/EasyNetQ.Management.Client.IntegrationTests/DockerProxy.cs index ce7adcf5..81586804 100644 --- a/Source/EasyNetQ.Management.Client.IntegrationTests/DockerProxy.cs +++ b/Source/EasyNetQ.Management.Client.IntegrationTests/DockerProxy.cs @@ -51,8 +51,8 @@ public async Task CreateContainerAsync( string image, string name, IDictionary> portMappings, - string networkName = null, - IList envVars = null, + string? networkName = null, + IList? envVars = null, CancellationToken token = default ) { diff --git a/Source/EasyNetQ.Management.Client.IntegrationTests/EasyNetQ.Management.Client.IntegrationTests.csproj b/Source/EasyNetQ.Management.Client.IntegrationTests/EasyNetQ.Management.Client.IntegrationTests.csproj index 72e76853..cc533ba1 100644 --- a/Source/EasyNetQ.Management.Client.IntegrationTests/EasyNetQ.Management.Client.IntegrationTests.csproj +++ b/Source/EasyNetQ.Management.Client.IntegrationTests/EasyNetQ.Management.Client.IntegrationTests.csproj @@ -3,6 +3,7 @@ net7 latest + enable enable ..\..\Assets\EasyNetQ.snk diff --git a/Source/EasyNetQ.Management.Client.IntegrationTests/RabbitMQFixture.cs b/Source/EasyNetQ.Management.Client.IntegrationTests/RabbitMQFixture.cs index 70a97436..92888eff 100644 --- a/Source/EasyNetQ.Management.Client.IntegrationTests/RabbitMQFixture.cs +++ b/Source/EasyNetQ.Management.Client.IntegrationTests/RabbitMQFixture.cs @@ -14,7 +14,7 @@ public sealed class RabbitMqFixture : IAsyncLifetime, IDisposable private readonly string tag; private readonly DockerProxy dockerProxy; private OSPlatform dockerEngineOsPlatform; - private string dockerNetworkName; + private string? dockerNetworkName; public RabbitMqFixture() { @@ -66,13 +66,13 @@ private async Task DisposeAsync(CancellationToken cancellationToken) { await dockerProxy.StopContainerAsync(ContainerName, cancellationToken); await dockerProxy.RemoveContainerAsync(ContainerName, cancellationToken); - if (dockerEngineOsPlatform == OSPlatform.Linux || dockerEngineOsPlatform == OSPlatform.OSX) + if (dockerNetworkName != null) await dockerProxy.DeleteNetworkAsync(dockerNetworkName, cancellationToken); } private async Task CreateNetworkAsync(CancellationToken cancellationToken) { - if (dockerEngineOsPlatform == OSPlatform.Linux || dockerEngineOsPlatform == OSPlatform.OSX) + if (dockerNetworkName != null) await dockerProxy.CreateNetworkAsync(dockerNetworkName, cancellationToken); }