Upgrade to RabbitMQ 7

FoundatioFx · Nov 22, 2024 · 597a23c · 597a23c
1 parent af9c814
commit 597a23c
Show file tree

Hide file tree

Showing 9 changed files with 158 additions and 97 deletions.
diff --git a/Foundatio.RabbitMQ.sln b/Foundatio.RabbitMQ.sln
@@ -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}"

diff --git a/build/Dockerfile b/build/Dockerfile
@@ -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
diff --git a/build/common.props b/build/common.props
@@ -1,7 +1,7 @@
 <Project ToolsVersion="15.0">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1</TargetFrameworks>
     <Product>Foundatio</Product>
     <Description>Pluggable foundation blocks for building distributed apps.</Description>
     <PackageProjectUrl>https://github.com/FoundatioFx/Foundatio.RabbitMQ</PackageProjectUrl>

diff --git a/build/rabbitmq_delayed_message_exchange-3.10.0.ez b/build/rabbitmq_delayed_message_exchange-3.10.0.ez
diff --git a/build/rabbitmq_delayed_message_exchange-4.0.2.ez b/build/rabbitmq_delayed_message_exchange-4.0.2.ez
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -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

diff --git a/src/Foundatio.RabbitMQ/Extensions/TaskExtensions.cs b/src/Foundatio.RabbitMQ/Extensions/TaskExtensions.cs
@@ -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);
+    }
 }
diff --git a/src/Foundatio.RabbitMQ/Foundatio.RabbitMQ.csproj b/src/Foundatio.RabbitMQ/Foundatio.RabbitMQ.csproj
@@ -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'" />

diff --git a/src/Foundatio.RabbitMQ/Messaging/RabbitMQMessageBus.cs b/src/Foundatio.RabbitMQ/Messaging/RabbitMQMessageBus.cs