Skip to content

Commit

Permalink
Merge branch 'main' of github.com:FoundatioFx/Foundatio.Kafka
Browse files Browse the repository at this point in the history
  • Loading branch information
niemyjski committed Oct 14, 2024
2 parents 74616f4 + 535038d commit 6e3c266
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 10 deletions.
2 changes: 1 addition & 1 deletion build/common.props
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 4 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# https://raw.githubusercontent.com/bitnami/bitnami-docker-kafka/master/docker-compose.yml
version: "2"

services:
kafka:
hostname: kafka
container_name: kafka
image: docker.io/bitnami/kafka:3.6.1
image: docker.io/bitnami/kafka:3.8.0
ports:
- "9092:9092"
- "29092:29092"
Expand All @@ -28,11 +27,13 @@ services:
- KAFKA_CFG_TRANSACTION_STATE_LOG_REPLICATION_FACTOR=1
volumes:
- "kafkadata:/bitnami"

ready:
image: andrewlock/wait-for-dependencies
command: kafka:9092
depends_on:
- kafka

volumes:
kafkadata:
driver: local
driver: local
4 changes: 2 additions & 2 deletions src/Foundatio.Kafka/Foundatio.Kafka.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="Confluent.Kafka" Version="2.5.2" />
<PackageReference Include="Confluent.Kafka" Version="2.5.3" />

<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>
6 changes: 3 additions & 3 deletions tests/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.1" />
<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>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Threading.Tasks;
using Foundatio.Messaging;
using Foundatio.Tests.Messaging;
Expand Down
6 changes: 6 additions & 0 deletions tests/Foundatio.Kafka.Tests/Messaging/KafkaMessageBusTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,12 @@ public override void CanDisposeWithNoSubscribersOrPublishers()
base.CanDisposeWithNoSubscribersOrPublishers();
}

[Fact]
public override Task CanSendMappedMessageAsync()
{
return base.CanSendMappedMessageAsync();
}

[Fact]
public async Task CanPersistAndNotLoseMessages()
{
Expand Down

0 comments on commit 6e3c266

Please sign in to comment.