Skip to content

Commit 4dca7a0

Browse files
committed
* Fix package version conflict warnings.
* Remove Ductus.FluentDocker - people can start their own RabbitMQ.
1 parent 2778d48 commit 4dca7a0

File tree

5 files changed

+6
-76
lines changed

5 files changed

+6
-76
lines changed

projects/Benchmarks/Benchmarks.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020

2121
<ItemGroup>
2222
<PackageReference Include="BenchmarkDotNet" />
23-
<PackageReference Include="Ductus.FluentDocker" />
23+
<PackageReference Include="System.Collections.Immutable" />
24+
<PackageReference Include="System.Reflection.Metadata" />
2425
</ItemGroup>
2526

2627
<ItemGroup>

projects/Benchmarks/Networking/Networking_BasicDeliver_ConnectionChurn.cs

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
using System.Text;
1+
using System.Text;
32
using System.Threading.Tasks;
43
using BenchmarkDotNet.Attributes;
54
using RabbitMQ.Client;
@@ -11,21 +10,8 @@ public class Networking_BasicDeliver
1110
{
1211
private const int messageCount = 10000;
1312

14-
private IDisposable _container;
1513
private static byte[] _body = Encoding.UTF8.GetBytes("hello world");
1614

17-
[GlobalSetup]
18-
public void GlobalSetup()
19-
{
20-
_container = RabbitMQBroker.Start();
21-
}
22-
23-
[GlobalCleanup]
24-
public void GlobalCleanup()
25-
{
26-
_container.Dispose();
27-
}
28-
2915
[Benchmark(Baseline = true)]
3016
public async Task Publish_Hello_World()
3117
{

projects/Benchmarks/Networking/Networking_BasicDeliver_LongLivedConnection.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
using System.Text;
1+
using System.Text;
32
using System.Threading.Tasks;
43
using BenchmarkDotNet.Attributes;
54
using RabbitMQ.Client;
@@ -9,7 +8,6 @@ namespace Benchmarks.Networking
98
[MemoryDiagnoser]
109
public class Networking_BasicDeliver_LongLivedConnection
1110
{
12-
private IDisposable _container;
1311
private IConnection _connection;
1412

1513
private const int messageCount = 10000;
@@ -18,8 +16,6 @@ public class Networking_BasicDeliver_LongLivedConnection
1816
[GlobalSetup]
1917
public void GlobalSetup()
2018
{
21-
_container = RabbitMQBroker.Start();
22-
2319
var cf = new ConnectionFactory { ConsumerDispatchConcurrency = 2 };
2420
// NOTE: https://github.com/dotnet/BenchmarkDotNet/issues/1738
2521
_connection = EnsureCompleted(cf.CreateConnectionAsync());
@@ -29,7 +25,6 @@ public void GlobalSetup()
2925
public void GlobalCleanup()
3026
{
3127
_connection.Dispose();
32-
_container.Dispose();
3328
}
3429

3530
[Benchmark(Baseline = true)]

projects/Benchmarks/Networking/RabbitMqBroker.cs

Lines changed: 0 additions & 50 deletions
This file was deleted.

projects/Directory.Packages.props

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
</PropertyGroup>
55
<ItemGroup>
66
<PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
7-
<PackageVersion Include="Ductus.FluentDocker" Version="2.10.59" />
87
<PackageVersion Include="EasyNetQ.Management.Client" Version="3.0.0" />
98
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
109
<PackageVersion Include="Nullable" Version="1.3.1" />
1110
<PackageVersion Include="OpenTelemetry.Api" Version="1.9.0" />
1211
<PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.9.0" />
12+
<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
1313
<!--
1414
Note: do NOT upgrade the System.IO.Pipelines dependency unless necessary
1515
See https://github.com/rabbitmq/rabbitmq-dotnet-client/pull/1481#pullrequestreview-1847905299
@@ -19,6 +19,7 @@
1919
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
2020
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
2121
<PackageVersion Include="System.Threading.RateLimiting" Version="8.0.0" />
22+
<PackageVersion Include="System.Reflection.Metadata" Version="8.0.0" />
2223
<PackageVersion Include="WireMock.Net" Version="1.6.9" />
2324
<PackageVersion Include="xunit" Version="2.9.2" />
2425
<PackageVersion Include="xunit.abstractions" Version="2.0.3" />
@@ -38,9 +39,6 @@
3839
<PackageVersion Include="System.Net.Http.Json" Version="8.0.1" />
3940
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
4041
</ItemGroup>
41-
<ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework'">
42-
<GlobalPackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
43-
</ItemGroup>
4442
<ItemGroup Condition="'$(IsPackable)'=='true'">
4543
<GlobalPackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
4644
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />

0 commit comments

Comments
 (0)