quilin · quilin · Dec 12, 2025 · Dec 12, 2025
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        dotnet-version: [ '6.0' ]
+        dotnet-version: [ '9.0' ]
 
     steps:
       - uses: actions/checkout@v3
@@ -29,7 +29,7 @@ jobs:
       - name: Test
         run: dotnet test . --logger trx --results-directory "TestResults-${{ matrix.dotnet-version }}"
       - name: Upload test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: dotnet-results-${{ matrix.dotnet-version }}
           path: TestResults-${{ matrix.dotnet-version }}

diff --git a/.github/workflows/deploy-nuget.yml b/.github/workflows/deploy-nuget.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: '6.0.x'
+          dotnet-version: '9.0.x'
       - run: dotnet build --configuration Release .
       - name: Create the packages
         run: |

diff --git a/Jamq.Client.sln b/Jamq.Client.sln
@@ -10,6 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "solution-items", "solution-
 	ProjectSection(SolutionItems) = preProject
 		src\Directory.Build.props = src\Directory.Build.props
 		README.md = README.md
+		src\Directory.Packages.props = src\Directory.Packages.props
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{042A1773-4B2B-4D52-A296-9A116CA2594C}"

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -3,8 +3,10 @@
         <Authors>quilin</Authors>
         <Owners>quilin</Owners>
         <PackageTags>RabbitMQ, Kafka, Client</PackageTags>
+        <LangVersion>10</LangVersion>
         <RepositoryUrl>https://github.com/quilin/Jamq.Client</RepositoryUrl>
         <PackageProjectUrl>https://github.com/quilin/Jamq.Client</PackageProjectUrl>
+        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -0,0 +1,18 @@
+<Project>
+    <ItemGroup>
+        <PackageVersion Include="Confluent.Kafka" Version="2.12.0"/>
+        <PackageVersion Include="coverlet.collector" Version="6.0.4"/>
+        <PackageVersion Include="FluentAssertions" Version="7.2.0"/>
+        <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1"/>
+        <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.1"/>
+        <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.1"/>
+        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1"/>
+        <PackageVersion Include="Moq" Version="4.20.72"/>
+        <PackageVersion Include="OpenTelemetry" Version="1.14.0"/>
+        <PackageVersion Include="RabbitMQ.Client" Version="6.8.1"/>
+        <PackageVersion Include="xunit" Version="2.9.3"/>
+        <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5"/>
+        <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="10.0.1"/>
+        <PackageVersion Include="System.Text.Json" Version="10.0.1"/>
+    </ItemGroup>
+</Project>
diff --git a/src/Jamq.Client.Abstractions/Consuming/IsExternalInit.cs b/src/Jamq.Client.Abstractions/Consuming/IsExternalInit.cs
@@ -0,0 +1,3 @@
+namespace System.Runtime.CompilerServices;
+
+internal static class IsExternalInit {}
diff --git a/src/Jamq.Client.Abstractions/Jamq.Client.Abstractions.csproj b/src/Jamq.Client.Abstractions/Jamq.Client.Abstractions.csproj
@@ -1,14 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>netstandard2.1</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <IsPackable>true</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+        <PackageReference Include="System.Diagnostics.DiagnosticSource" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Jamq.Client.DependencyInjection/Jamq.Client.DependencyInjection.csproj b/src/Jamq.Client.DependencyInjection/Jamq.Client.DependencyInjection.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>netstandard2.1</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <IsPackable>true</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Jamq.Client.Kafka.DependencyInjection/Jamq.Client.Kafka.DependencyInjection.csproj b/src/Jamq.Client.Kafka.DependencyInjection/Jamq.Client.Kafka.DependencyInjection.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>netstandard2.1</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <IsPackable>true</IsPackable>

diff --git a/src/Jamq.Client.Kafka/Jamq.Client.Kafka.csproj b/src/Jamq.Client.Kafka/Jamq.Client.Kafka.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>netstandard2.1</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <IsPackable>true</IsPackable>
@@ -14,8 +14,9 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Confluent.Kafka" Version="1.9.2" />
-      <PackageReference Include="OpenTelemetry" Version="1.3.1" />
+      <PackageReference Include="Confluent.Kafka" />
+      <PackageReference Include="OpenTelemetry" />
+      <PackageReference Include="System.Text.Json" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Jamq.Client.OpenTelemetry/Jamq.Client.OpenTelemetry.csproj b/src/Jamq.Client.OpenTelemetry/Jamq.Client.OpenTelemetry.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>netstandard2.1</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <IsPackable>true</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="OpenTelemetry" Version="1.3.1" />
+      <PackageReference Include="OpenTelemetry" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Jamq.Client.Rabbit.DependencyInjection/Jamq.Client.Rabbit.DependencyInjection.csproj b/src/Jamq.Client.Rabbit.DependencyInjection/Jamq.Client.Rabbit.DependencyInjection.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>netstandard2.1</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <IsPackable>true</IsPackable>

diff --git a/src/Jamq.Client.Rabbit/Ensure.cs b/src/Jamq.Client.Rabbit/Ensure.cs
@@ -1,7 +1,6 @@
 using Jamq.Client.Rabbit.Consuming;
 using Jamq.Client.Rabbit.Producing;
 using RabbitMQ.Client;
-using System.Collections.Immutable;
 
 namespace Jamq.Client.Rabbit;
 
@@ -23,11 +22,11 @@ public static QueueDeclareOk Consume(IModel channel, RabbitConsumerParameters pa
                 exchange: parameters.ExchangeName,
                 type: parameters.ExchangeType.ToString().ToLower(),
                 durable: true,
-                arguments: parameters.AdditionalExchangeArguments ?? ImmutableDictionary<string, object>.Empty);
+                arguments: parameters.AdditionalExchangeArguments ?? new Dictionary<string, object>());
         }
 
         var queueArguments = new Dictionary<string, object>(
-            parameters.AdditionalQueueArguments ?? ImmutableDictionary<string, object>.Empty);
+            parameters.AdditionalQueueArguments ?? new Dictionary<string, object>());
 
         var queueName = parameters.Exclusive
             ? parameters.QueueName.WithRandomSuffix()

diff --git a/src/Jamq.Client.Rabbit/Jamq.Client.Rabbit.csproj b/src/Jamq.Client.Rabbit/Jamq.Client.Rabbit.csproj
@@ -1,16 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>netstandard2.1</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <IsPackable>true</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
-        <PackageReference Include="OpenTelemetry" Version="1.3.1" />
-        <PackageReference Include="RabbitMQ.Client" Version="6.3.1" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
+        <PackageReference Include="OpenTelemetry" />
+        <PackageReference Include="RabbitMQ.Client" />
+        <PackageReference Include="System.Text.Json" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Jamq.Client.Tests/Jamq.Client.Tests.csproj b/src/Jamq.Client.Tests/Jamq.Client.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 
@@ -11,17 +11,17 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="FluentAssertions" Version="6.7.0" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-        <PackageReference Include="Moq" Version="4.18.1" />
-        <PackageReference Include="xunit" Version="2.4.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+        <PackageReference Include="FluentAssertions" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" />
+        <PackageReference Include="Moq" />
+        <PackageReference Include="xunit" />
+        <PackageReference Include="xunit.runner.visualstudio">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="3.1.2">
+        <PackageReference Include="coverlet.collector">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>

diff --git a/src/Jamq.Client.Tests/Rabbit/RabbitConsumerBuilderShould.cs b/src/Jamq.Client.Tests/Rabbit/RabbitConsumerBuilderShould.cs
@@ -7,7 +7,6 @@
 using Jamq.Client.Rabbit.Producing;
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
-using Xunit.Abstractions;
 
 namespace Jamq.Client.Tests.Rabbit;
 
@@ -17,8 +16,7 @@ public class RabbitConsumerBuilderShould : IClassFixture<RabbitFixture>
     private readonly Mock<ITestCaller> caller;
 
     public RabbitConsumerBuilderShould(
-        RabbitFixture fixture,
-        ITestOutputHelper testOutputHelper)
+        RabbitFixture fixture)
     {
         this.fixture = fixture;
         caller = new Mock<ITestCaller>();
@@ -27,14 +25,11 @@ public RabbitConsumerBuilderShould(
         fixture.ServiceCollection.AddScoped<Processor>();
         fixture.ServiceCollection.AddScoped<SpecificWrongInterfacedMiddleware>();
 
-        DiagnosticListener.AllListeners.Subscribe(new RabbitFixture.Subscriber(testOutputHelper));
         ActivitySource.AddActivityListener(new ActivityListener
         {
             ShouldListenTo = s => s.Name == Event.SourceName,
             SampleUsingParentId = (ref ActivityCreationOptions<string> _) => ActivitySamplingResult.AllData,
             Sample = (ref ActivityCreationOptions<ActivityContext> _) => ActivitySamplingResult.AllData,
-            ActivityStarted = activity => testOutputHelper.WriteLine($"Activity {activity.DisplayName}:{activity.Id} started at {activity.StartTimeUtc:O}"),
-            ActivityStopped = activity => testOutputHelper.WriteLine($"Activity {activity.DisplayName}:{activity.Id} stopped at {activity.StartTimeUtc + activity.Duration:O} (after {activity.Duration:g})"),
         });
     }
 

diff --git a/src/Jamq.Client.Tests/Rabbit/RabbitFixture.cs b/src/Jamq.Client.Tests/Rabbit/RabbitFixture.cs
@@ -1,6 +1,4 @@
-using System.Diagnostics;
-using Jamq.Client.Abstractions.Consuming;
-using Jamq.Client.Abstractions.Diagnostics;
+using Jamq.Client.Abstractions.Consuming;
 using Jamq.Client.Abstractions.Producing;
 using Jamq.Client.DependencyInjection;
 using Jamq.Client.Rabbit;
@@ -9,7 +7,6 @@
 using Moq;
 using RabbitMQ.Client;
 using RabbitMQ.Client.Events;
-using Xunit.Abstractions;
 
 namespace Jamq.Client.Tests.Rabbit;
 
@@ -82,50 +79,4 @@ public RabbitFixture()
     public void Dispose()
     {
     }
-
-    internal class Subscriber : IObserver<DiagnosticListener>
-    {
-        private readonly ITestOutputHelper testOutputHelper;
-
-        public Subscriber(ITestOutputHelper testOutputHelper)
-        {
-            this.testOutputHelper = testOutputHelper;
-        }
-
-        public void OnCompleted()
-        {
-        }
-
-        public void OnError(Exception error)
-        {
-        }
-
-        public void OnNext(DiagnosticListener value)
-        {
-            if (value.Name == Event.SourceName)
-            {
-                value.Subscribe(new Listener(testOutputHelper));
-            }
-        }
-    }
-
-    private class Listener : IObserver<KeyValuePair<string, object?>>
-    {
-        private readonly ITestOutputHelper testOutputHelper;
-
-        public Listener(ITestOutputHelper testOutputHelper)
-        {
-            this.testOutputHelper = testOutputHelper;
-        }
-
-        public void OnCompleted()
-        {
-        }
-
-        public void OnError(Exception error)
-        {
-        }
-
-        public void OnNext(KeyValuePair<string, object?> keyValue) => testOutputHelper.WriteLine($"{keyValue.Key} - {keyValue.Value}");
-    }
 }
diff --git a/src/Jamq.Client/Consuming/ConsumerBuilder.cs b/src/Jamq.Client/Consuming/ConsumerBuilder.cs
@@ -143,7 +143,7 @@ public IConsumerBuilder Flush()
 
             var parameters = methodInfo.GetParameters();
             if (parameters.Length < 2 ||
-                !parameters.First().ParameterType.IsAssignableTo(typeof(ConsumerContext)) ||
+                !typeof(ConsumerContext).IsAssignableFrom(parameters[0].ParameterType) ||
                 parameters.Last().ParameterType != typeof(CancellationToken))
             {
                 throw ConsumerBuilderMiddlewareConventionException.MismatchParameters(type);

diff --git a/src/Jamq.Client/Jamq.Client.csproj b/src/Jamq.Client/Jamq.Client.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>netstandard2.1</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <IsPackable>true</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Jamq.Client/MethodInfoExtensions.cs b/src/Jamq.Client/MethodInfoExtensions.cs
@@ -0,0 +1,9 @@
+using System.Reflection;
+
+namespace Jamq.Client;
+
+internal static class MethodInfoExtensions
+{
+    public static TResult CreateDelegate<TResult>(this MethodInfo methodInfo, object instance)
+        where TResult : Delegate => (TResult)methodInfo.CreateDelegate(typeof(TResult), instance);
+}
diff --git a/src/Jamq.Client/Producing/ProducerBuilder.cs b/src/Jamq.Client/Producing/ProducerBuilder.cs
@@ -144,7 +144,7 @@ public IProducerBuilder Flush()
 
             var parameters = methodInfo.GetParameters();
             if (parameters.Length < 2 ||
-                !parameters.First().ParameterType.IsAssignableTo(typeof(ProducerContext)) ||
+                !typeof(ProducerContext).IsAssignableFrom(parameters.First().ParameterType) ||
                 parameters.Last().ParameterType != typeof(CancellationToken))
             {
                 throw ProducerBuilderMiddlewareConventionException.MismatchParameters(type);
@@ -160,7 +160,7 @@ public IProducerBuilder Flush()
                     (context, ct) => next((ProducerContext<TKey, TMessage, TNativeProperties>)context, ct));
                 if (parameters.Length == 2)
                 {
-                    return methodInfo.CreateDelegate<ProducerDelegate>(instance).Invoke;
+                    return ((ProducerDelegate) methodInfo.CreateDelegate(typeof(ProducerDelegate), instance)).Invoke;
                 }
 
                 var factory = MiddlewareCompiler
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		namespace System.Runtime.CompilerServices;

		internal static class IsExternalInit {}