From 2778d480fafcecede0211d32485c48a616a4d3a5 Mon Sep 17 00:00:00 2001
From: Luke Bakken <luke@bakken.io>
Date: Fri, 13 Dec 2024 11:58:00 -0800
Subject: [PATCH 1/2] * Update NuGet packages

Test related package updates.
---
 projects/Directory.Packages.props | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/projects/Directory.Packages.props b/projects/Directory.Packages.props
index 22f9950be..4a6a89550 100644
--- a/projects/Directory.Packages.props
+++ b/projects/Directory.Packages.props
@@ -3,10 +3,10 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="BenchmarkDotNet" Version="0.13.12" />
+    <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
     <PackageVersion Include="Ductus.FluentDocker" Version="2.10.59" />
     <PackageVersion Include="EasyNetQ.Management.Client" Version="3.0.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageVersion Include="Nullable" Version="1.3.1" />
     <PackageVersion Include="OpenTelemetry.Api" Version="1.9.0" />
     <PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.9.0" />
@@ -19,11 +19,11 @@
     <PackageVersion Include="System.Text.Json" Version="8.0.5" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
     <PackageVersion Include="System.Threading.RateLimiting" Version="8.0.0" />
-    <PackageVersion Include="WireMock.Net" Version="1.5.62" />
-    <PackageVersion Include="xunit" Version="2.9.0" />
+    <PackageVersion Include="WireMock.Net" Version="1.6.9" />
+    <PackageVersion Include="xunit" Version="2.9.2" />
     <PackageVersion Include="xunit.abstractions" Version="2.0.3" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
-    <PackageVersion Include="Xunit.SkippableFact" Version="1.4.13" />
+    <PackageVersion Include="Xunit.SkippableFact" Version="1.5.23" />
   </ItemGroup>
   <ItemGroup Condition="$(TargetFramework)=='netstandard2.0'">
     <!--
@@ -38,12 +38,12 @@
     <PackageVersion Include="System.Net.Http.Json" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework'">
     <GlobalPackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
   </ItemGroup>
   <ItemGroup Condition="'$(IsPackable)'=='true'">
     <GlobalPackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
     <GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
-    <GlobalPackageReference Include="MinVer" Version="5.0.0" />
+    <GlobalPackageReference Include="MinVer" Version="6.0.0" />
   </ItemGroup>
 </Project>

From 4dca7a0ee749a7c58ae4cd3101c6e5b86be7f286 Mon Sep 17 00:00:00 2001
From: Luke Bakken <luke@bakken.io>
Date: Fri, 13 Dec 2024 14:07:05 -0800
Subject: [PATCH 2/2] * Fix package version conflict warnings.

* Remove Ductus.FluentDocker - people can start their own RabbitMQ.
---
 projects/Benchmarks/Benchmarks.csproj         |  3 +-
 ...Networking_BasicDeliver_ConnectionChurn.cs | 16 +-----
 ...orking_BasicDeliver_LongLivedConnection.cs |  7 +--
 .../Benchmarks/Networking/RabbitMqBroker.cs   | 50 -------------------
 projects/Directory.Packages.props             |  6 +--
 5 files changed, 6 insertions(+), 76 deletions(-)
 delete mode 100644 projects/Benchmarks/Networking/RabbitMqBroker.cs

diff --git a/projects/Benchmarks/Benchmarks.csproj b/projects/Benchmarks/Benchmarks.csproj
index deae254f2..63b607ad3 100644
--- a/projects/Benchmarks/Benchmarks.csproj
+++ b/projects/Benchmarks/Benchmarks.csproj
@@ -20,7 +20,8 @@
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" />
-    <PackageReference Include="Ductus.FluentDocker" />
+    <PackageReference Include="System.Collections.Immutable" />
+    <PackageReference Include="System.Reflection.Metadata" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/projects/Benchmarks/Networking/Networking_BasicDeliver_ConnectionChurn.cs b/projects/Benchmarks/Networking/Networking_BasicDeliver_ConnectionChurn.cs
index a2542b903..5130da505 100644
--- a/projects/Benchmarks/Networking/Networking_BasicDeliver_ConnectionChurn.cs
+++ b/projects/Benchmarks/Networking/Networking_BasicDeliver_ConnectionChurn.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Text;
+using System.Text;
 using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 using RabbitMQ.Client;
@@ -11,21 +10,8 @@ public class Networking_BasicDeliver
     {
         private const int messageCount = 10000;
 
-        private IDisposable _container;
         private static byte[] _body = Encoding.UTF8.GetBytes("hello world");
 
-        [GlobalSetup]
-        public void GlobalSetup()
-        {
-            _container = RabbitMQBroker.Start();
-        }
-
-        [GlobalCleanup]
-        public void GlobalCleanup()
-        {
-            _container.Dispose();
-        }
-
         [Benchmark(Baseline = true)]
         public async Task Publish_Hello_World()
         {
diff --git a/projects/Benchmarks/Networking/Networking_BasicDeliver_LongLivedConnection.cs b/projects/Benchmarks/Networking/Networking_BasicDeliver_LongLivedConnection.cs
index 0e5d34d61..8b0737f1f 100644
--- a/projects/Benchmarks/Networking/Networking_BasicDeliver_LongLivedConnection.cs
+++ b/projects/Benchmarks/Networking/Networking_BasicDeliver_LongLivedConnection.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Text;
+using System.Text;
 using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 using RabbitMQ.Client;
@@ -9,7 +8,6 @@ namespace Benchmarks.Networking
     [MemoryDiagnoser]
     public class Networking_BasicDeliver_LongLivedConnection
     {
-        private IDisposable _container;
         private IConnection _connection;
 
         private const int messageCount = 10000;
@@ -18,8 +16,6 @@ public class Networking_BasicDeliver_LongLivedConnection
         [GlobalSetup]
         public void GlobalSetup()
         {
-            _container = RabbitMQBroker.Start();
-
             var cf = new ConnectionFactory { ConsumerDispatchConcurrency = 2 };
             // NOTE: https://github.com/dotnet/BenchmarkDotNet/issues/1738
             _connection = EnsureCompleted(cf.CreateConnectionAsync());
@@ -29,7 +25,6 @@ public void GlobalSetup()
         public void GlobalCleanup()
         {
             _connection.Dispose();
-            _container.Dispose();
         }
 
         [Benchmark(Baseline = true)]
diff --git a/projects/Benchmarks/Networking/RabbitMqBroker.cs b/projects/Benchmarks/Networking/RabbitMqBroker.cs
deleted file mode 100644
index 48934afef..000000000
--- a/projects/Benchmarks/Networking/RabbitMqBroker.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using System.Threading;
-
-using Ductus.FluentDocker.Builders;
-using Ductus.FluentDocker.Services;
-using Ductus.FluentDocker.Services.Extensions;
-
-namespace Benchmarks.Networking
-{
-    public class RabbitMQBroker : IDisposable
-    {
-        private readonly IContainerService _service;
-
-        public static IDisposable Start()
-        {
-            var broker = new Builder().UseContainer()
-               .UseImage("rabbitmq")
-               .ExposePort(5672, 5672)
-               .WaitForPort("5672/tcp", 40000 /*40s*/)
-               .ReuseIfExists()
-               .WithName("rabbitmq")
-               .WithEnvironment("NODENAME=rabbit1")
-               .Build()
-               .Start();
-
-            for (int i = 0; i < 10; i++)
-            {
-                var response = broker.Execute("rabbitmqctl --node rabbit1 await_startup");
-                if (response.Success)
-                {
-                    break;
-                }
-
-                Thread.Sleep(1000);
-            }
-
-            return new RabbitMQBroker(broker);
-        }
-
-        public RabbitMQBroker(IContainerService service)
-        {
-            _service = service;
-        }
-
-        public void Dispose()
-        {
-            _service?.Dispose();
-        }
-    }
-}
diff --git a/projects/Directory.Packages.props b/projects/Directory.Packages.props
index 4a6a89550..cf53e6134 100644
--- a/projects/Directory.Packages.props
+++ b/projects/Directory.Packages.props
@@ -4,12 +4,12 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
-    <PackageVersion Include="Ductus.FluentDocker" Version="2.10.59" />
     <PackageVersion Include="EasyNetQ.Management.Client" Version="3.0.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageVersion Include="Nullable" Version="1.3.1" />
     <PackageVersion Include="OpenTelemetry.Api" Version="1.9.0" />
     <PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.9.0" />
+    <PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
     <!--
       Note: do NOT upgrade the System.IO.Pipelines dependency unless necessary
       See https://github.com/rabbitmq/rabbitmq-dotnet-client/pull/1481#pullrequestreview-1847905299
@@ -19,6 +19,7 @@
     <PackageVersion Include="System.Text.Json" Version="8.0.5" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
     <PackageVersion Include="System.Threading.RateLimiting" Version="8.0.0" />
+    <PackageVersion Include="System.Reflection.Metadata" Version="8.0.0" />
     <PackageVersion Include="WireMock.Net" Version="1.6.9" />
     <PackageVersion Include="xunit" Version="2.9.2" />
     <PackageVersion Include="xunit.abstractions" Version="2.0.3" />
@@ -38,9 +39,6 @@
     <PackageVersion Include="System.Net.Http.Json" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework'">
-    <GlobalPackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
-  </ItemGroup>
   <ItemGroup Condition="'$(IsPackable)'=='true'">
     <GlobalPackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
     <GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />