Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to RabbitMQ 7 #34

Merged
merged 3 commits into from
Nov 25, 2024
Merged

Upgrade to RabbitMQ 7 #34

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
597a23c
Upgrade to RabbitMQ 7
niemyjski Nov 22, 2024
754e0eb
Fixed layout
niemyjski Nov 22, 2024
67077a2
Ensure we are running test suite for delayed exchange and regular exc…
niemyjski Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Foundatio.RabbitMQ.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
README.md = README.md
docker-compose.yml = docker-compose.yml
tests\Directory.Build.props = tests\Directory.Build.props
build\Dockerfile = build\Dockerfile
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Foundatio.RabbitMQ", "src\Foundatio.RabbitMQ\Foundatio.RabbitMQ.csproj", "{EAE3607D-73A1-4D02-BDAA-24A37DDA15CB}"
Expand Down
4 changes: 2 additions & 2 deletions build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rabbitmq:3.10-management
FROM rabbitmq:4.0.3-management

COPY rabbitmq_delayed_message_exchange-3.10.0.ez /opt/rabbitmq/plugins
COPY rabbitmq_delayed_message_exchange-4.0.2.ez /opt/rabbitmq/plugins
RUN rabbitmq-plugins enable rabbitmq_delayed_message_exchange
2 changes: 1 addition & 1 deletion build/common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project ToolsVersion="15.0">

<PropertyGroup>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<TargetFrameworks>netstandard2.1</TargetFrameworks>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needed for IAsyncDisposable (unless we add a nuget package ref)

<Product>Foundatio</Product>
<Description>Pluggable foundation blocks for building distributed apps.</Description>
<PackageProjectUrl>https://github.com/FoundatioFx/Foundatio.RabbitMQ</PackageProjectUrl>
Expand Down
Binary file removed build/rabbitmq_delayed_message_exchange-3.10.0.ez
View file
Open in desktop
Binary file not shown.
Binary file added build/rabbitmq_delayed_message_exchange-4.0.2.ez
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
rabbitmq:
image: rabbitmq:3.10-management
image: rabbitmq:4.0.3-management
ports:
- "5672:5672"
- "8080:15672" # management ui - login with guest:guest
Expand Down
6 changes: 6 additions & 0 deletions src/Foundatio.RabbitMQ/Extensions/TaskExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,10 @@ public static ConfiguredTaskAwaitable<TResult> AnyContext<TResult>(this Awaitabl
{
return task.ConfigureAwait(continueOnCapturedContext: false);
}

[DebuggerStepThrough]
public static ConfiguredValueTaskAwaitable AnyContext(this ValueTask task)
{
return task.ConfigureAwait(continueOnCapturedContext: false);
}
}
2 changes: 1 addition & 1 deletion src/Foundatio.RabbitMQ/Foundatio.RabbitMQ.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="RabbitMQ.Client" Version="6.8.1" />
<PackageReference Include="RabbitMQ.Client" Version="7.0.0" />

<PackageReference Include="Foundatio" Version="11.0.5" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
<ProjectReference Include="..\..\..\Foundatio\src\Foundatio\Foundatio.csproj" Condition="'$(ReferenceFoundatioSource)' == 'true'" />
Expand Down
238 changes: 146 additions & 92 deletions src/Foundatio.RabbitMQ/Messaging/RabbitMQMessageBus.cs
View file
Open in desktop

Large diffs are not rendered by default.