Skip to content

Commit

Permalink
Merge branch 'main' into bug/consumer-not-called
Browse files Browse the repository at this point in the history
  • Loading branch information
niemyjski committed Sep 3, 2024
2 parents 3edd4bf + 347feac commit eebfa32
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ on: [push, pull_request]

jobs:
build:
uses: FoundatioFx/Foundatio/.github/workflows/build-workflow.yml@master
uses: FoundatioFx/Foundatio/.github/workflows/build-workflow.yml@main
secrets: inherit
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.3.0" />
<PackageReference Include="Confluent.Kafka" Version="2.5.2" />

<PackageReference Include="Foundatio" Version="10.7.1" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
<PackageReference Include="Foundatio" Version="11.0.2" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
<ProjectReference Include="..\..\..\Foundatio\src\Foundatio\Foundatio.csproj" Condition="'$(ReferenceFoundatioSource)' == 'true'" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/Foundatio.Kafka/Messaging/KafkaMessageBusOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ public class KafkaMessageBusOptions : SharedMessageBusOptions
public bool? CheckCrcs { get; set; }

/// <summary>
/// <inheritdoc cref="ConsumerConfig.AllowAutoCreateTopics"/>
/// <inheritdoc cref="ClientConfig.AllowAutoCreateTopics"/>
/// </summary>
public bool? AllowAutoCreateTopics { get; set; }
}
Expand Down
10 changes: 5 additions & 5 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.9.0" />
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />

<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" PrivateAssets="All" />
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" PrivateAssets="All" />

<PackageReference Include="Foundatio.TestHarness" Version="10.7.1" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
<PackageReference Include="Foundatio.TestHarness" Version="11.0.2" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
<ProjectReference Include="..\..\..\Foundatio\src\Foundatio.TestHarness\Foundatio.TestHarness.csproj" Condition="'$(ReferenceFoundatioSource)' == 'true'" />
</ItemGroup>
</Project>
5 changes: 5 additions & 0 deletions tests/Foundatio.Kafka.Tests/Foundatio.Kafka.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,9 @@
<ItemGroup>
<ProjectReference Include="..\..\src\Foundatio.Kafka\Foundatio.Kafka.csproj" />
</ItemGroup>
<ItemGroup>
<Content Include="..\..\docker-compose.yml">
<Link>docker-compose.yml</Link>
</Content>
</ItemGroup>
</Project>

0 comments on commit eebfa32

Please sign in to comment.