Update dependencies and refactor for .NET 8 support

yang-xiaodong · yang-xiaodong · commit 7eec04f523d9 · 2025-07-27T22:00:41.000+08:00
- Added `System.Data.Common` using directive in `AppDbContext.cs`.
- Modified `CapNpgsqlRelationalConnection` constructor to use `DbDataSource`.
- Added pragma warning for internal EF Core API usage.
- Updated `Npgsql.EntityFrameworkCore.PostgreSQL` to version `9.0.4`.
- Introduced new subscriber method `Subscriber2` in `ValuesController.cs`.
- Updated `Microsoft.AspNetCore.Authentication.JwtBearer` to `8.0.7`.
- Updated `Microsoft.EntityFrameworkCore.SqlServer` to `8.0.18`.
- Changed target framework to `net8.0` across multiple projects.
- Updated `Microsoft.EntityFrameworkCore.Relational` to `8.0.18`.
- Updated `Microsoft.Data.SqlClient` to `6.1.0`.
- Updated `KubernetesClient` to `17.0.4`.
- Refactored `DiagnosticListener` for improved null checks and exception handling.
- Removed multi-targeting in `DotNetCore.CAP.Pulsar.csproj`, now targets only `net8.0`.
- Updated `DotNetCore.CAP.csproj` to target `net8.0` and `net9.0`, with package references updated to `9.0.7`.
diff --git a/samples/Sample.Kafka.PostgreSql/AppDbContext.cs b/samples/Sample.Kafka.PostgreSql/AppDbContext.cs
@@ -7,6 +7,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure.Internal;
+using System.Data.Common;
 
 namespace Sample.Kafka.PostgreSql
 {
@@ -34,16 +35,19 @@ public AppDbContext(DbContextOptions<AppDbContext> options)
         public DbSet<Person> Persons { get; set; }
     }
 
+#pragma warning disable EF1001 // Internal EF Core API usage.
+
     public class CapNpgsqlRelationalConnection : NpgsqlRelationalConnection
     {
         private readonly ICapPublisher _cap;
 
-        public CapNpgsqlRelationalConnection(RelationalConnectionDependencies dependencies, INpgsqlSingletonOptions options)
-            : base(dependencies, options)
+        protected CapNpgsqlRelationalConnection(RelationalConnectionDependencies dependencies, DbDataSource dataSource) : base(dependencies, dataSource)
         {
             _cap = dependencies.CurrentContext.Context.GetService<ICapPublisher>();
         }
 
+#pragma warning restore EF1001
+
         public override void CommitTransaction()
         {
             if (_cap.Transaction != null)
diff --git a/samples/Sample.Kafka.PostgreSql/Sample.Kafka.PostgreSql.csproj b/samples/Sample.Kafka.PostgreSql/Sample.Kafka.PostgreSql.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Dapper" Version="2.1.66" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.11" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\DotNetCore.CAP.Dashboard\DotNetCore.CAP.Dashboard.csproj" />
diff --git a/samples/Sample.RabbitMQ.MySql/Controllers/ValuesController.cs b/samples/Sample.RabbitMQ.MySql/Controllers/ValuesController.cs
@@ -81,5 +81,13 @@ public void Subscriber(DateTime time)
         {
             Console.WriteLine("Publishing time:" + time);
         }
+
+
+        [NonAction]
+        [CapSubscribe("sample.rabbitmq.test")]
+        public void Subscriber2(string message)
+        {
+            Console.WriteLine("Publishing message:" + message);
+        }
     }
 }
diff --git a/samples/Sample.RabbitMQ.MySql/Sample.RabbitMQ.MySql.csproj b/samples/Sample.RabbitMQ.MySql/Sample.RabbitMQ.MySql.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Dapper" Version="2.1.66" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.7" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.3" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.3" /> 
   </ItemGroup>
diff --git a/samples/Sample.RabbitMQ.SqlServer/Sample.RabbitMQ.SqlServer.csproj b/samples/Sample.RabbitMQ.SqlServer/Sample.RabbitMQ.SqlServer.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Dapper" Version="2.1.66" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.11" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.18" />
     <PackageReference Include="NameGenerator" Version="2.0.4" />
   </ItemGroup>
  
diff --git a/src/DotNetCore.CAP.AmazonSQS/DotNetCore.CAP.AmazonSQS.csproj b/src/DotNetCore.CAP.AmazonSQS/DotNetCore.CAP.AmazonSQS.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 	<Nullable>enable</Nullable>
     <PackageTags>$(PackageTags);AmazonSQS;SQS</PackageTags>
   </PropertyGroup>
diff --git a/src/DotNetCore.CAP.AzureServiceBus/DotNetCore.CAP.AzureServiceBus.csproj b/src/DotNetCore.CAP.AzureServiceBus/DotNetCore.CAP.AzureServiceBus.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 	<Nullable>enable</Nullable>
     <PackageTags>$(PackageTags);AzureServiceBus</PackageTags>
   </PropertyGroup>
diff --git a/src/DotNetCore.CAP.Dashboard.K8s/DotNetCore.CAP.Dashboard.K8s.csproj b/src/DotNetCore.CAP.Dashboard.K8s/DotNetCore.CAP.Dashboard.K8s.csproj
@@ -1,11 +1,11 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="KubernetesClient" Version="15.0.1" />
+		<PackageReference Include="KubernetesClient" Version="17.0.4" />
 	</ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\DotNetCore.CAP.Dashboard\DotNetCore.CAP.Dashboard.csproj" />
diff --git a/src/DotNetCore.CAP.Dashboard/DotNetCore.CAP.Dashboard.csproj b/src/DotNetCore.CAP.Dashboard/DotNetCore.CAP.Dashboard.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<LangVersion>default</LangVersion>
 		<Nullable>disable</Nullable>
 	</PropertyGroup>
diff --git a/src/DotNetCore.CAP.InMemoryStorage/DotNetCore.CAP.InMemoryStorage.csproj b/src/DotNetCore.CAP.InMemoryStorage/DotNetCore.CAP.InMemoryStorage.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 	<Nullable>enable</Nullable>
     <PackageTags>$(PackageTags);InMemory</PackageTags>
   </PropertyGroup>
diff --git a/src/DotNetCore.CAP.Kafka/DotNetCore.CAP.Kafka.csproj b/src/DotNetCore.CAP.Kafka/DotNetCore.CAP.Kafka.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 	<Nullable>enable</Nullable>
     <PackageTags>$(PackageTags);Kafka</PackageTags>
   </PropertyGroup>
diff --git a/src/DotNetCore.CAP.MongoDB/DotNetCore.CAP.MongoDB.csproj b/src/DotNetCore.CAP.MongoDB/DotNetCore.CAP.MongoDB.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 	<Nullable>enable</Nullable>
     <PackageTags>$(PackageTags);MongoDB</PackageTags>
   </PropertyGroup>
diff --git a/src/DotNetCore.CAP.MySql/DotNetCore.CAP.MySql.csproj b/src/DotNetCore.CAP.MySql/DotNetCore.CAP.MySql.csproj
@@ -1,13 +1,13 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<Nullable>enable</Nullable>
 		<PackageTags>$(PackageTags);MySQL</PackageTags>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.36" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.18" />
 		<PackageReference Include="MySqlConnector" Version="2.4.0" />
 		<ProjectReference Include="..\DotNetCore.CAP\DotNetCore.CAP.csproj" />
 	</ItemGroup>
diff --git a/src/DotNetCore.CAP.NATS/DotNetCore.CAP.NATS.csproj b/src/DotNetCore.CAP.NATS/DotNetCore.CAP.NATS.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 	<Nullable>enable</Nullable>
     <PackageTags>$(PackageTags);NATS</PackageTags>
   </PropertyGroup>
diff --git a/src/DotNetCore.CAP.OpenTelemetry/DiagnosticListener.cs b/src/DotNetCore.CAP.OpenTelemetry/DiagnosticListener.cs
@@ -40,7 +40,7 @@ public void OnNext(KeyValuePair<string, object?> evt)
                     var eventData = (CapEventDataPubStore)evt.Value!;
                     ActivityContext parentContext = Propagator.Extract(default, eventData.Message, (msg, key) =>
                     {
-                        if (msg.Headers.TryGetValue(key, out var value)) return new[] { value };
+                        if (msg.Headers.TryGetValue(key, out var value) && value != null) return new string[] { value };
                         return Enumerable.Empty<string>();
                     }).ActivityContext;
 
@@ -83,7 +83,7 @@ public void OnNext(KeyValuePair<string, object?> evt)
                     if (Activity.Current is { } activity)
                     {
                         var exception = eventData.Exception!;
-                        activity.SetStatus(Status.Error.WithDescription(exception.Message));
+                        activity.SetStatus(ActivityStatusCode.Error, exception.Message);
                         activity.RecordException(exception);
                         activity.Stop();
                     }
@@ -142,7 +142,7 @@ public void OnNext(KeyValuePair<string, object?> evt)
                     if (Activity.Current is { } activity)
                     {
                         var exception = eventData.Exception!;
-                        activity.SetStatus(Status.Error.WithDescription(exception.Message));
+                        activity.SetStatus(ActivityStatusCode.Error, exception.Message);
                         activity.RecordException(exception);
                         activity.Stop();
                     }
@@ -153,7 +153,7 @@ public void OnNext(KeyValuePair<string, object?> evt)
                     var eventData = (CapEventDataSubStore)evt.Value!;
                     var parentContext = Propagator.Extract(default, eventData.TransportMessage, (msg, key) =>
                     {
-                        if (msg.Headers.TryGetValue(key, out var value)) return new[] { value };
+                        if (msg.Headers.TryGetValue(key, out var value) && value != null) return new string[] { value };
                         return Enumerable.Empty<string>();
                     });
 
@@ -196,7 +196,7 @@ public void OnNext(KeyValuePair<string, object?> evt)
                     if (Activity.Current is { } activity)
                     {
                         var exception = eventData.Exception!;
-                        activity.SetStatus(Status.Error.WithDescription(exception.Message));
+                        activity.SetStatus(ActivityStatusCode.Error, exception.Message);
                         activity.RecordException(exception);
                         activity.Stop();
                     }
@@ -208,7 +208,7 @@ public void OnNext(KeyValuePair<string, object?> evt)
                     var eventData = (CapEventDataSubExecute)evt.Value!;
                     var propagatedContext = Propagator.Extract(default, eventData.Message, (msg, key) =>
                     {
-                        if (msg.Headers.TryGetValue(key, out var value)) return new[] { value };
+                        if (msg.Headers.TryGetValue(key, out var value) && value != null) return new string[] { value };
                         return Enumerable.Empty<string>();
                     });
 
@@ -251,7 +251,7 @@ public void OnNext(KeyValuePair<string, object?> evt)
                     if (Activity.Current is { } activity)
                     {
                         var exception = eventData.Exception!;
-                        activity.SetStatus(Status.Error.WithDescription(exception.Message));
+                        activity.SetStatus(ActivityStatusCode.Error, exception.Message);
                         activity.RecordException(exception);
                         activity.Stop();
                     }
diff --git a/src/DotNetCore.CAP.OpenTelemetry/DotNetCore.CAP.OpenTelemetry.csproj b/src/DotNetCore.CAP.OpenTelemetry/DotNetCore.CAP.OpenTelemetry.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 	<Nullable>enable</Nullable>
 	<Description>CAP instrumentation for OpenTelemetry .NET</Description>
     <PackageTags>$(PackageTags);distributed-tracing;opentelemetry;</PackageTags>
diff --git a/src/DotNetCore.CAP.PostgreSql/DotNetCore.CAP.PostgreSql.csproj b/src/DotNetCore.CAP.PostgreSql/DotNetCore.CAP.PostgreSql.csproj
@@ -1,12 +1,12 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<PackageTags>$(PackageTags);PostgreSQL</PackageTags>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.36" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.18" />
 		<PackageReference Include="Npgsql" Version="9.0.3" />
 		<ProjectReference Include="..\DotNetCore.CAP\DotNetCore.CAP.csproj" />
 	</ItemGroup>
diff --git a/src/DotNetCore.CAP.Pulsar/DotNetCore.CAP.Pulsar.csproj b/src/DotNetCore.CAP.Pulsar/DotNetCore.CAP.Pulsar.csproj
@@ -1,22 +1,15 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
-	<Nullable>enable</Nullable>
-    <PackageTags>$(PackageTags);Pulsar</PackageTags>
-	<NoWarn>CS0067</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\DotNetCore.CAP\DotNetCore.CAP.csproj" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' != 'net8.0' ">
-    <PackageReference Include="Pulsar.Client" Version="2.16.0" />
-  </ItemGroup>
-  
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
-    <PackageReference Include="Pulsar.Client" Version="3.9.5" />
-  </ItemGroup>
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<Nullable>enable</Nullable>
+		<PackageTags>$(PackageTags);Pulsar</PackageTags>
+		<NoWarn>CS0067</NoWarn>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\DotNetCore.CAP\DotNetCore.CAP.csproj" />
+		<PackageReference Include="Pulsar.Client" Version="3.9.5" />
+	</ItemGroup>
 
 </Project>
diff --git a/src/DotNetCore.CAP.RabbitMQ/DotNetCore.CAP.RabbitMQ.csproj b/src/DotNetCore.CAP.RabbitMQ/DotNetCore.CAP.RabbitMQ.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 	<Nullable>enable</Nullable>
     <PackageTags>$(PackageTags);RabbitMQ</PackageTags>
   </PropertyGroup>
diff --git a/src/DotNetCore.CAP.RedisStreams/DotNetCore.CAP.RedisStreams.csproj b/src/DotNetCore.CAP.RedisStreams/DotNetCore.CAP.RedisStreams.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+		<TargetFramework>net8.0</TargetFramework>
 		<Nullable>enable</Nullable>
 		<PackageTags>$(PackageTags);RedisStreams</PackageTags>
 		<LangVersion>preview</LangVersion>
diff --git a/src/DotNetCore.CAP.SqlServer/DotNetCore.CAP.SqlServer.csproj b/src/DotNetCore.CAP.SqlServer/DotNetCore.CAP.SqlServer.csproj
@@ -1,14 +1,14 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<Nullable>enable</Nullable>
 		<PackageTags>$(PackageTags);SQL Server</PackageTags>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.36" />
-		<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.18" />
+		<PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.0" />
 		<ProjectReference Include="..\DotNetCore.CAP\DotNetCore.CAP.csproj" />
 	</ItemGroup>
 
diff --git a/src/DotNetCore.CAP/DotNetCore.CAP.csproj b/src/DotNetCore.CAP/DotNetCore.CAP.csproj
@@ -1,33 +1,27 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
-  
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
-	<Nullable>enable</Nullable>
-  </PropertyGroup>
-  
-  <PropertyGroup>
-	<GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <NoWarn>1701;1702;1705;CS1591</NoWarn>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
-  </PropertyGroup>
-  
-  <ItemGroup>
-    <None Include="..\..\README.md">
-      <Pack>True</Pack>
-      <PackagePath>\</PackagePath>
-    </None>
-  </ItemGroup>
-  
-  <ItemGroup Condition=" '$(TargetFramework)' != 'net8.0' ">
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.4" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.1" />
-  </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
-	<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.7" />
-	<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.7" />
-	<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.7" />
-  </ItemGroup>
-	
+	<PropertyGroup>
+		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+		<NoWarn>1701;1702;1705;CS1591</NoWarn>
+		<PackageReadmeFile>README.md</PackageReadmeFile>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<None Include="..\..\README.md">
+			<Pack>True</Pack>
+			<PackagePath>\</PackagePath>
+		</None>
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.7" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.7" />
+		<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.7" />
+	</ItemGroup>
+
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`using Microsoft.Extensions.DependencyInjection;`
`8`	`8`	`using Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal;`
`9`	`9`	`using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure.Internal;`
	`10`	`+using System.Data.Common;`
`10`	`11`
`11`	`12`	`namespace Sample.Kafka.PostgreSql`
`12`	`13`	`{`
`@@ -34,16 +35,19 @@ public AppDbContext(DbContextOptions<AppDbContext> options)`
`34`	`35`	`public DbSet<Person> Persons { get; set; }`
`35`	`36`	`}`
`36`	`37`
	`38`	`+#pragma warning disable EF1001 // Internal EF Core API usage.`
	`39`	`+`
`37`	`40`	`public class CapNpgsqlRelationalConnection : NpgsqlRelationalConnection`
`38`	`41`	`{`
`39`	`42`	`private readonly ICapPublisher _cap;`
`40`	`43`
`41`		`- public CapNpgsqlRelationalConnection(RelationalConnectionDependencies dependencies, INpgsqlSingletonOptions options)`
`42`		`- : base(dependencies, options)`
	`44`	`+ protected CapNpgsqlRelationalConnection(RelationalConnectionDependencies dependencies, DbDataSource dataSource) : base(dependencies, dataSource)`
`43`	`45`	`{`
`44`	`46`	`_cap = dependencies.CurrentContext.Context.GetService<ICapPublisher>();`
`45`	`47`	`}`
`46`	`48`
	`49`	`+#pragma warning restore EF1001`
	`50`	`+`
`47`	`51`	`public override void CommitTransaction()`
`48`	`52`	`{`
`49`	`53`	`if (_cap.Transaction != null)`
Original file line number	Diff line number	Diff line change
`@@ -81,5 +81,13 @@ public void Subscriber(DateTime time)`
`81`	`81`	`{`
`82`	`82`	`Console.WriteLine("Publishing time:" + time);`
`83`	`83`	`}`
	`84`	`+`
	`85`	`+`
	`86`	`+ [NonAction]`
	`87`	`+ [CapSubscribe("sample.rabbitmq.test")]`
	`88`	`+ public void Subscriber2(string message)`
	`89`	`+ {`
	`90`	`+ Console.WriteLine("Publishing message:" + message);`
	`91`	`+ }`
`84`	`92`	`}`
`85`	`93`	`}`