Skip to content

Commit e3e666b

Browse files
tobias-tenglertobias-tengler
authored
Update RabbitMQ.Client to 7.0.0 and .NET to 10.0.100-rc.1 (#155)
1 parent 33fc35a commit e3e666b

6 files changed

Lines changed: 117 additions & 714 deletions

File tree

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-preview.4.25258.110",
3+
"version": "10.0.100-rc.1.25451.107",
44
"rollForward": "minor"
55
}
66
}

‎src/Directory.Packages.props‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@
2828
<!-- .NET 10 Packages -->
2929
<ItemGroup Condition=" '$(TargetFramework)' == 'net10.0' ">
3030

31-
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.0-preview.4.25258.110" />
32-
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0-preview.4.25258.110" />
33-
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.4.25258.110" />
34-
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-preview.4.25258.110" />
35-
<PackageVersion Include="System.Text.Json" Version="10.0.0-preview.4.25258.110" />
36-
<PackageVersion Include="System.Net.Http.Json" Version="10.0.0-preview.4.25258.110" />
37-
<PackageVersion Include="System.Collections.Immutable" Version="10.0.0-preview.4.25258.110" />
31+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.0-rc.1.25451.107" />
32+
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0-rc.1.25451.107" />
33+
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.1.25451.107" />
34+
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-rc.1.25451.107" />
35+
<PackageVersion Include="System.Text.Json" Version="10.0.0-rc.1.25451.107" />
36+
<PackageVersion Include="System.Net.Http.Json" Version="10.0.0-rc.1.25451.107" />
37+
<PackageVersion Include="System.Collections.Immutable" Version="10.0.0-rc.1.25451.107" />
3838
</ItemGroup>
3939

4040
<ItemGroup>
@@ -63,7 +63,7 @@
6363
<PackageVersion Include="Neo4j.Driver" Version="4.4.0" />
6464
<PackageVersion Include="RavenDB.Client" Version="4.2.124" />
6565

66-
<PackageVersion Include="RabbitMQ.Client" Version="5.1.2" />
66+
<PackageVersion Include="RabbitMQ.Client" Version="7.0.0" />
6767
<PackageVersion Include="AlterNats.Hosting" Version="1.0.6" />
6868

6969
<PackageVersion Include="StackExchange.Redis" Version="2.8.37" />

‎src/RabbitMQ.Tests/RabbitMQResourceTests.cs‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
using System.Text;
1+
using System.Threading.Tasks;
22
using RabbitMQ.Client;
3-
using RabbitMQ.Client.Events;
43
using Squadron;
54
using Xunit;
65

@@ -9,24 +8,25 @@ namespace RabbitMQ.Tests;
98
public class RabbitMQResourceTests(RabbitMQResource rabbitMqResource) : IClassFixture<RabbitMQResource>
109
{
1110
[Fact]
12-
public void CreateConnectionFactory_SendMessage_NoError()
11+
public async Task CreateConnectionFactory_SendMessage_NoError()
1312
{
1413
//Act
1514
ConnectionFactory factory = rabbitMqResource.CreateConnectionFactory();
1615

17-
using (IConnection connection = factory.CreateConnection())
18-
using (IModel channel = connection.CreateModel())
19-
{
20-
channel.QueueDeclare(queue: "foo",
21-
durable: false,
22-
exclusive: false,
23-
autoDelete: false,
24-
arguments: null);
25-
26-
channel.BasicPublish(exchange: "",
27-
routingKey: "bar",
28-
basicProperties: null,
29-
body: Encoding.UTF8.GetBytes("Hello RabbitMQ"));
30-
}
16+
await using IConnection connection = await factory.CreateConnectionAsync();
17+
await using IChannel channel = await connection.CreateChannelAsync();
18+
19+
await channel.QueueDeclareAsync(queue: "foo",
20+
durable: false,
21+
exclusive: false,
22+
autoDelete: false,
23+
arguments: null);
24+
25+
await channel.BasicPublishAsync(
26+
exchange: "",
27+
routingKey: "bar",
28+
mandatory: false,
29+
basicProperties: new BasicProperties(),
30+
body: "Hello RabbitMQ"u8.ToArray());
3131
}
3232
}

‎src/RabbitMQ/RabbitMQStatus.cs‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,35 +25,33 @@ public RabbitMQStatus(string connectionString)
2525
}
2626

2727
/// <inheritdoc/>
28-
public Task<Status> IsReadyAsync(CancellationToken cancellationToken)
28+
public async Task<Status> IsReadyAsync(CancellationToken cancellationToken)
2929
{
3030
var factory = new ConnectionFactory()
3131
{
3232
Uri = new Uri(_connectionString)
3333
};
34-
using (IConnection connection = CreateConnection(factory))
35-
using (IModel channel = connection.CreateModel())
36-
{
37-
return Task.FromResult(new Status
38-
{
39-
IsReady = channel.IsOpen,
40-
Message = connection.ToString()
41-
});
42-
}
34+
await using IConnection connection = await CreateConnectionAsync(factory, cancellationToken);
35+
await using IChannel channel = await connection.CreateChannelAsync(cancellationToken: cancellationToken);
36+
37+
return new Status { IsReady = channel.IsOpen, Message = connection.ToString()! };
4338
}
4439

45-
private static IConnection CreateConnection(
46-
IConnectionFactory connectionFactory)
40+
private static async Task<IConnection> CreateConnectionAsync(
41+
IConnectionFactory connectionFactory,
42+
CancellationToken cancellationToken)
4743
{
48-
string hostname = ((ConnectionFactory)connectionFactory).HostName;
49-
return connectionFactory
50-
.CreateConnection(new List<AmqpTcpEndpoint>
44+
var hostname = ((ConnectionFactory)connectionFactory).HostName;
45+
46+
return await connectionFactory.CreateConnectionAsync(
47+
new List<AmqpTcpEndpoint>
5148
{
5249
new AmqpTcpEndpoint(
5350
connectionFactory.Uri,
5451
new SslOption(
55-
serverName:hostname,
52+
serverName: hostname,
5653
enabled: false))
57-
});
54+
},
55+
cancellationToken);
5856
}
5957
}

0 commit comments

Comments
 (0)