Merge branch 'main' into bug/consumer-not-called

FoundatioFx · Nov 25, 2024 · 753515d · 753515d
2 parents b493bcd + 747d62d
commit 753515d
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 13 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+
+- package-ecosystem: nuget
+  directory: "/"
+  schedule:
+    interval: weekly
diff --git a/build/common.props b/build/common.props
@@ -39,7 +39,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
     <PackageReference Include="AsyncFixer" Version="1.6.0" PrivateAssets="All" />
-    <PackageReference Include="MinVer" Version="5.0.0" PrivateAssets="All" />
+    <PackageReference Include="MinVer" Version="6.0.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -27,10 +27,6 @@ services:
       - KAFKA_CFG_TRANSACTION_STATE_LOG_REPLICATION_FACTOR=1
     volumes:
       - "kafkadata:/bitnami"
-    deploy:
-      resources:
-        limits:
-          memory: 1536m
 
   ready:
     image: andrewlock/wait-for-dependencies

diff --git a/samples/Foundatio.Kafka.Publish/Foundatio.Kafka.Publish.csproj b/samples/Foundatio.Kafka.Publish/Foundatio.Kafka.Publish.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Foundatio.Kafka\Foundatio.Kafka.csproj" />

diff --git a/samples/Foundatio.Kafka.Subscribe/Foundatio.Kafka.Subscribe.csproj b/samples/Foundatio.Kafka.Subscribe/Foundatio.Kafka.Subscribe.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Foundatio.Kafka\Foundatio.Kafka.csproj" />

diff --git a/src/Foundatio.Kafka/Foundatio.Kafka.csproj b/src/Foundatio.Kafka/Foundatio.Kafka.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <ItemGroup>
-    <PackageReference Include="Confluent.Kafka" Version="2.5.3" />
+    <PackageReference Include="Confluent.Kafka" Version="2.6.1" />
 
-    <PackageReference Include="Foundatio" Version="11.0.2" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
+    <PackageReference Include="Foundatio" Version="11.0.5" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
     <ProjectReference Include="..\..\..\Foundatio\src\Foundatio\Foundatio.csproj" Condition="'$(ReferenceFoundatioSource)' == 'true'" />
   </ItemGroup>
 </Project>
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -6,13 +6,13 @@
     <NoWarn>$(NoWarn);CS1591;NU1701</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
-    <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
 
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" PrivateAssets="All" />
 
-    <PackageReference Include="Foundatio.TestHarness" Version="11.0.2" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
+    <PackageReference Include="Foundatio.TestHarness" Version="11.0.5" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
     <ProjectReference Include="..\..\..\Foundatio\src\Foundatio.TestHarness\Foundatio.TestHarness.csproj" Condition="'$(ReferenceFoundatioSource)' == 'true'" />
   </ItemGroup>
 </Project>
diff --git a/tests/Foundatio.Kafka.Tests/Messaging/KafkaMessageBusTestBase.cs b/tests/Foundatio.Kafka.Tests/Messaging/KafkaMessageBusTestBase.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Foundatio.Messaging;
 using Foundatio.Tests.Messaging;

diff --git a/tests/Foundatio.Kafka.Tests/Messaging/KafkaMessageBusTests.cs b/tests/Foundatio.Kafka.Tests/Messaging/KafkaMessageBusTests.cs
@@ -105,6 +105,12 @@ public override void CanDisposeWithNoSubscribersOrPublishers()
         base.CanDisposeWithNoSubscribersOrPublishers();
     }
 
+    [Fact]
+    public override Task CanSendMappedMessageAsync()
+    {
+        return base.CanSendMappedMessageAsync();
+    }
+
     [Fact]
     public async Task CanPersistAndNotLoseMessages()
     {