Skip to content

Commit 2e711e2

Browse files
MiguelCostaMiguelCosta
committed
feat: upgrade to dotnet8.0
1 parent 5ad4496 commit 2e711e2

File tree

42 files changed

+175
-151
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+175
-151
lines changed

‎KafkaFlow.sln

+7
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
9696
EndProject
9797
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KafkaFlow.Sample.OpenTelemetry", "samples\KafkaFlow.Sample.OpenTelemetry\KafkaFlow.Sample.OpenTelemetry.csproj", "{E9E8B374-4165-45F2-8DF5-F141E141AC1D}"
9898
EndProject
99+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KafkaFlow.Sample.WildcardConsumer", "samples\KafkaFlow.Sample.WildcardConsumer\KafkaFlow.Sample.WildcardConsumer.csproj", "{8F6CDF12-5316-4AAF-A1F1-264337585698}"
100+
EndProject
99101
Global
100102
GlobalSection(SolutionConfigurationPlatforms) = preSolution
101103
Debug|Any CPU = Debug|Any CPU
@@ -222,6 +224,10 @@ Global
222224
{E9E8B374-4165-45F2-8DF5-F141E141AC1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
223225
{E9E8B374-4165-45F2-8DF5-F141E141AC1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
224226
{E9E8B374-4165-45F2-8DF5-F141E141AC1D}.Release|Any CPU.Build.0 = Release|Any CPU
227+
{8F6CDF12-5316-4AAF-A1F1-264337585698}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
228+
{8F6CDF12-5316-4AAF-A1F1-264337585698}.Debug|Any CPU.Build.0 = Debug|Any CPU
229+
{8F6CDF12-5316-4AAF-A1F1-264337585698}.Release|Any CPU.ActiveCfg = Release|Any CPU
230+
{8F6CDF12-5316-4AAF-A1F1-264337585698}.Release|Any CPU.Build.0 = Release|Any CPU
225231
EndGlobalSection
226232
GlobalSection(SolutionProperties) = preSolution
227233
HideSolutionNode = FALSE
@@ -265,6 +271,7 @@ Global
265271
{1755E8DB-970C-4A24-8B7C-A2BEC1410BEE} = {7A9B997B-DAAC-4004-94F3-32F6B88E0068}
266272
{80080C1D-579E-4AB2-935D-5CFFC51843D8} = {7A9B997B-DAAC-4004-94F3-32F6B88E0068}
267273
{E9E8B374-4165-45F2-8DF5-F141E141AC1D} = {303AE78F-6C96-4DF4-AC89-5C4FD53AFF0B}
274+
{8F6CDF12-5316-4AAF-A1F1-264337585698} = {303AE78F-6C96-4DF4-AC89-5C4FD53AFF0B}
268275
EndGlobalSection
269276
GlobalSection(ExtensibilityGlobals) = postSolution
270277
SolutionGuid = {6AE955B5-16B0-41CF-9F12-66D15B3DD1AB}

‎docker-compose.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
services:
22
zookeeper:
3-
image: confluentinc/cp-zookeeper:7.2.1
3+
image: confluentinc/cp-zookeeper:7.8.0
44
hostname: zookeeper
55
container_name: zookeeper
66
ports:
77
- "2181:2181"
88
environment:
99
ZOOKEEPER_CLIENT_PORT: 2181
1010
ZOOKEEPER_TICK_TIME: 2000
11-
11+
1212
broker:
13-
image: confluentinc/cp-server:7.2.1
13+
image: confluentinc/cp-server:7.8.0
1414
hostname: broker
1515
container_name: broker
1616
depends_on:
@@ -42,9 +42,9 @@ services:
4242
interval: 10s
4343
timeout: 5s
4444
retries: 5
45-
45+
4646
schema-registry:
47-
image: confluentinc/cp-schema-registry:7.2.1
47+
image: confluentinc/cp-schema-registry:7.8.0
4848
hostname: schema-registry
4949
container_name: schema-registry
5050
depends_on:
@@ -56,10 +56,10 @@ services:
5656
SCHEMA_REGISTRY_HOST_NAME: schema-registry
5757
SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: 'broker:29092'
5858
SCHEMA_REGISTRY_LISTENERS: http://0.0.0.0:8081
59-
59+
6060
kafka-tools:
61-
image: confluentinc/cp-kafka:7.0.5
61+
image: confluentinc/cp-kafka:7.8.0
6262
hostname: kafka
6363
container_name: kafka
6464
command: ["tail", "-f", "/dev/null"]
65-
network_mode: "host"
65+
network_mode: "host"

‎samples/KafkaFlow.Sample.BatchOperations/KafkaFlow.Sample.BatchOperations.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<IsPackable>false</IsPackable>
77
<GenerateDocumentationFile>false</GenerateDocumentationFile>
88
<InvariantGlobalization>true</InvariantGlobalization>
@@ -17,7 +17,7 @@
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
20+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

‎samples/KafkaFlow.Sample.ConsumerThrottling/KafkaFlow.Sample.ConsumerThrottling.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<IsPackable>false</IsPackable>
77
<GenerateDocumentationFile>false</GenerateDocumentationFile>
88
<InvariantGlobalization>true</InvariantGlobalization>
@@ -25,8 +25,8 @@
2525
</ItemGroup>
2626

2727
<ItemGroup>
28-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
29-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
28+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
29+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
3030
</ItemGroup>
3131

3232
</Project>

‎samples/KafkaFlow.Sample.Dashboard/KafkaFlow.Sample.Dashboard.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<InvariantGlobalization>true</InvariantGlobalization>
77
</PropertyGroup>

‎samples/KafkaFlow.Sample.FlowControl/KafkaFlow.Sample.FlowControl.csproj

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<IsPackable>false</IsPackable>
77
<GenerateDocumentationFile>false</GenerateDocumentationFile>
8-
<LangVersion>10</LangVersion>
98
<InvariantGlobalization>true</InvariantGlobalization>
109
</PropertyGroup>
1110

@@ -18,7 +17,7 @@
1817
</PropertyGroup>
1918

2019
<ItemGroup>
21-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
20+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
2221
</ItemGroup>
2322

2423
<ItemGroup>

‎samples/KafkaFlow.Sample.OpenTelemetry/KafkaFlow.Sample.OpenTelemetry.csproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<IsPackable>false</IsPackable>
77
<GenerateDocumentationFile>false</GenerateDocumentationFile>
88
<InvariantGlobalization>true</InvariantGlobalization>
99
</PropertyGroup>
1010

1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
14-
<PackageReference Include="OpenTelemetry" Version="1.6.0" />
15-
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.6.0" />
16-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.6.0" />
17-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.6.0" />
13+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
14+
<PackageReference Include="OpenTelemetry" Version="1.9.0" />
15+
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.9.0" />
16+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
17+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
1818
</ItemGroup>
1919

2020

‎samples/KafkaFlow.Sample.PauseConsumerOnError/KafkaFlow.Sample.PauseConsumerOnError.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<IsPackable>false</IsPackable>
@@ -18,7 +18,7 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
21+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
2222
</ItemGroup>
2323

2424
</Project>

‎samples/KafkaFlow.Sample.SchemaRegistry/KafkaFlow.Sample.SchemaRegistry.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<IsPackable>false</IsPackable>
77
<GenerateDocumentationFile>false</GenerateDocumentationFile>
88
<AssemblyName>KafkaFlow.Sample.SchemaRegistry</AssemblyName>
@@ -28,7 +28,7 @@
2828
</ItemGroup>
2929

3030
<ItemGroup>
31-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
31+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
3232
</ItemGroup>
3333

3434
</Project>

‎samples/KafkaFlow.Sample.WebApi/KafkaFlow.Sample.WebApi.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<InvariantGlobalization>true</InvariantGlobalization>
77
<Nullable>enable</Nullable>
@@ -25,9 +25,9 @@
2525
</ItemGroup>
2626

2727
<ItemGroup>
28-
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.1.4" />
29-
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.1.4" />
30-
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.3.0" />
28+
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="7.2.0" />
29+
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="7.2.0" />
30+
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="7.2.0" />
3131
</ItemGroup>
3232

3333

‎samples/KafkaFlow.Sample.WildcardConsumer/KafkaFlow.Sample.WildcardConsumer.csproj

+2-5
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,23 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>
99

1010
<ItemGroup>
1111
<ProjectReference Include="..\..\src\KafkaFlow.Admin\KafkaFlow.Admin.csproj" />
1212
<ProjectReference Include="..\..\src\KafkaFlow.Compressor.Gzip\KafkaFlow.Compressor.Gzip.csproj" />
13-
<ProjectReference Include="..\..\src\KafkaFlow.Compressor\KafkaFlow.Compressor.csproj" />
1413
<ProjectReference Include="..\..\src\KafkaFlow.LogHandler.Console\KafkaFlow.LogHandler.Console.csproj" />
1514
<ProjectReference Include="..\..\src\KafkaFlow.Microsoft.DependencyInjection\KafkaFlow.Microsoft.DependencyInjection.csproj" />
1615
<ProjectReference Include="..\..\src\KafkaFlow.Serializer.JsonCore\KafkaFlow.Serializer.JsonCore.csproj" />
1716
<ProjectReference Include="..\..\src\KafkaFlow.Serializer.ProtobufNet\KafkaFlow.Serializer.ProtobufNet.csproj" />
18-
<ProjectReference Include="..\..\src\KafkaFlow.Serializer\KafkaFlow.Serializer.csproj" />
19-
<ProjectReference Include="..\..\src\KafkaFlow.TypedHandler\KafkaFlow.TypedHandler.csproj" />
2017
<ProjectReference Include="..\..\src\KafkaFlow\KafkaFlow.csproj" />
2118
</ItemGroup>
2219

2320
<ItemGroup>
24-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.17" />
21+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
2522
</ItemGroup>
2623

2724
</Project>

‎samples/KafkaFlow.Sample.WildcardConsumer/Program.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
producerName, _ => { })
2121
.AddConsumer(
2222
consumer => consumer
23-
.Topic($"^{topicPrefix}*") // Any topic starting with `random-topic-*`
23+
.Topic($"^{topicPrefix}*") // Any topic starting with `random-topic-*`
2424
.WithGroupId("random-topic-handler")
2525
.WithBufferSize(5)
2626
.WithWorkersCount(3)
@@ -67,4 +67,4 @@ await producer.ProduceAsync(
6767
Guid.NewGuid().ToString(),
6868
Encoding.UTF8.GetBytes(
6969
$"Message to {input}: {Guid.NewGuid()}"));
70-
}
70+
}

‎samples/KafkaFlow.Sample/KafkaFlow.Sample.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<IsPackable>false</IsPackable>
77
<GenerateDocumentationFile>false</GenerateDocumentationFile>
88
<InvariantGlobalization>true</InvariantGlobalization>
@@ -24,7 +24,7 @@
2424
</ItemGroup>
2525

2626
<ItemGroup>
27-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
27+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
2828
</ItemGroup>
2929

3030
</Project>

‎src/KafkaFlow.Abstractions/Configuration/SaslOauthbearerMethod.cs

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
namespace KafkaFlow.Configuration
1+
namespace KafkaFlow.Configuration;
2+
3+
/// <summary>SaslOauthbearerMethod enum values</summary>
4+
public enum SaslOauthbearerMethod
25
{
3-
/// <summary>SaslOauthbearerMethod enum values</summary>
4-
public enum SaslOauthbearerMethod
5-
{
6-
/// <summary>Default</summary>
7-
Default,
6+
/// <summary>Default</summary>
7+
Default,
88

9-
/// <summary>Oidc</summary>
10-
Oidc,
11-
}
9+
/// <summary>Oidc</summary>
10+
Oidc,
1211
}

‎src/KafkaFlow.Abstractions/KafkaFlow.Abstractions.csproj

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="System.Memory" Version="4.5.5" />
12-
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
11+
<PackageReference Include="System.Memory" Version="4.6.0" />
12+
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.0" />
13+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
1314
</ItemGroup>
1415

1516
</Project>

‎src/KafkaFlow.Admin.Dashboard/KafkaFlow.Admin.Dashboard.csproj

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
66
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
77
<IsPackable>true</IsPackable>
@@ -23,8 +23,9 @@
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.25" />
27-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
26+
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.12" />
27+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
28+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
2829
</ItemGroup>
2930

3031
<ItemGroup>

‎src/KafkaFlow.Admin.WebApi/KafkaFlow.Admin.WebApi.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<OutputType>Library</OutputType>
66
<PackageId>KafkaFlow.Admin.WebApi</PackageId>
77
<Description>Allows KafkaFlow to use the Admin Web API</Description>
@@ -15,6 +15,7 @@
1515

1616
<ItemGroup>
1717
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
18+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
1819
</ItemGroup>
1920

2021
</Project>

‎src/KafkaFlow.Admin/KafkaFlow.Admin.csproj

+4
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,8 @@
1212
<ProjectReference Include="..\KafkaFlow\KafkaFlow.csproj" />
1313
</ItemGroup>
1414

15+
<ItemGroup>
16+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
17+
</ItemGroup>
18+
1519
</Project>

‎src/KafkaFlow.Compressor.Gzip/KafkaFlow.Compressor.Gzip.csproj

+5
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,9 @@
99
<ItemGroup>
1010
<ProjectReference Include="..\KafkaFlow.Abstractions\KafkaFlow.Abstractions.csproj" />
1111
</ItemGroup>
12+
13+
<ItemGroup>
14+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
15+
</ItemGroup>
16+
1217
</Project>

‎src/KafkaFlow.Extensions.Hosting/KafkaFlow.Extensions.Hosting.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
16+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
17+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
1718
</ItemGroup>
1819

1920
</Project>

‎src/KafkaFlow.LogHandler.Console/KafkaFlow.LogHandler.Console.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="System.Text.Json" Version="6.0.11" />
13+
<PackageReference Include="System.Text.Json" Version="8.0.5" />
1414
</ItemGroup>
1515

1616
</Project>

0 commit comments

Comments
 (0)