Skip to content

Commit 9021918

Browse files
vhatsuravhatsura
authored
chore: update deps (#35)
1 parent 0ac9890 commit 9021918

File tree

8 files changed

+47
-43
lines changed

8 files changed

+47
-43
lines changed

‎.github/workflows/continuous.integration.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,34 @@
1-
---
21
name: Continuous Integration Check
32

43
on:
54
pull_request:
65
branches: [ main ]
7-
types: [ opened, synchronize, reopened, ready_for_review ]
6+
workflow_dispatch:
87

9-
jobs:
8+
permissions: read-all
9+
10+
env:
11+
GH_PKG_USER: ${{ secrets.GH_PKG_USER }}
12+
GH_PKG_TOKEN: ${{ secrets.GH_PKG_TOKEN }}
1013

14+
jobs:
1115
ci:
16+
name: Continuous Integration Check
1217
runs-on: ubuntu-latest
18+
1319
env:
1420
DOTNET_NOLOGO: true
1521
DOTNET_CLI_TELEMETRY_OPTOUT: true
1622

1723
steps:
18-
- uses: actions/checkout@v3
24+
- uses: actions/checkout@v4
1925
with:
2026
fetch-depth: 0
2127

22-
- name: Setup .NET Core 7.0.x
23-
uses: actions/setup-dotnet@v3
28+
- name: Setup .NET SDK
29+
uses: actions/setup-dotnet@v4
2430
with:
25-
dotnet-version: 7.0.x
31+
dotnet-version: 8.0.x
2632

2733
- name: Install dependencies
2834
run: dotnet restore

‎.github/workflows/linter.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
---
21
name: Lint Code Base
32

43
on:
54
pull_request:
6-
branches: [ main ]
7-
types: [ opened, synchronize, reopened, ready_for_review ]
5+
branches: [main]
86

9-
jobs:
10-
lint:
7+
permissions:
8+
contents: read
9+
statuses: write
1110

11+
jobs:
12+
build:
1213
name: Lint Code Base
1314
runs-on: ubuntu-latest
1415

1516
steps:
1617
- name: Checkout Code
17-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1819
with:
1920
fetch-depth: 0
2021

2122
- name: Lint Code Base
22-
uses: github/super-linter@v5
23+
uses: super-linter/super-linter@v6
2324
env:
2425
VALIDATE_ALL_CODEBASE: false
25-
VALIDATE_EDITORCONFIG: false
2626
DEFAULT_BRANCH: main
2727
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/nuget.publish.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
---
21
name: Publish NuGet package
32

43
on:
@@ -7,6 +6,10 @@ on:
76
push:
87
branches: [ main ]
98

9+
permissions:
10+
contents: read
11+
pull-requests: read
12+
1013
jobs:
1114

1215
publish:
@@ -16,14 +19,14 @@ jobs:
1619
DOTNET_CLI_TELEMETRY_OPTOUT: true
1720

1821
steps:
19-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
2023
with:
2124
fetch-depth: 0
2225

23-
- name: Setup .NET Core 7.0.x
26+
- name: Setup .NET SDK
2427
uses: actions/setup-dotnet@v3
2528
with:
26-
dotnet-version: 7.0.x
29+
dotnet-version: 8.0.x
2730

2831
- name: Install dependencies
2932
run: dotnet restore

‎src/Confluent.Kafka.Extensions.Diagnostics/Confluent.Kafka.Extensions.Diagnostics.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<ImplicitUsings>enable</ImplicitUsings>
55
<Nullable>enable</Nullable>
6-
<TargetFramework>net6.0</TargetFramework>
6+
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
77

88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
99
<IncludeSymbols>true</IncludeSymbols>
@@ -26,12 +26,12 @@
2626
</PropertyGroup>
2727

2828
<ItemGroup>
29-
<PackageReference Include="Confluent.Kafka" Version="[2.2.0, 3.0.0)"/>
29+
<PackageReference Include="Confluent.Kafka" Version="[2.3.0, 3.0.0)"/>
3030
<PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
3131
<PrivateAssets>all</PrivateAssets>
3232
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3333
</PackageReference>
34-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
34+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
3535
<PrivateAssets>all</PrivateAssets>
3636
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3737
</PackageReference>

‎src/Confluent.Kafka.Extensions.Diagnostics/ProducerBuilderExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public static class ProducerBuilderExtensions
1111
public static IProducer<TKey, TValue> BuildWithInstrumentation<TKey, TValue>(
1212
this ProducerBuilder<TKey, TValue> producerBuilder)
1313
{
14-
if (producerBuilder == null) throw new ArgumentNullException(nameof(producerBuilder));
14+
ArgumentNullException.ThrowIfNull(producerBuilder);
1515

1616
return new InstrumentedProducer<TKey, TValue>(producerBuilder.Build());
1717
}

‎tests/Confluent.Kafka.Extensions.Diagnostics.Tests/Confluent.Kafka.Extensions.Diagnostics.Tests.csproj

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,17 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Confluent.Kafka" Version="2.2.0"/>
13-
<PackageReference Include="FluentAssertions" Version="6.11.0"/>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3"/>
15-
<PackageReference Include="Snapshooter.Xunit" Version="0.13.0"/>
16-
<PackageReference Include="TestEnvironment.Docker.Containers.Kafka" Version="2.1.4"/>
17-
<PackageReference Include="xunit" Version="2.5.0"/>
18-
<PackageReference Include="Xunit.Extensions.AssemblyFixture" Version="2.4.1"/>
19-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
12+
<PackageReference Include="FluentAssertions" Version="6.12.0"/>
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0"/>
14+
<PackageReference Include="Snapshooter.Xunit" Version="0.14.1"/>
15+
<PackageReference Include="TestEnvironment.Docker.Containers.Kafka" Version="2.1.6"/>
16+
<PackageReference Include="xunit" Version="2.9.0"/>
17+
<PackageReference Include="Xunit.Extensions.AssemblyFixture" Version="2.6.0"/>
18+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
2019
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2120
<PrivateAssets>all</PrivateAssets>
2221
</PackageReference>
23-
<PackageReference Include="coverlet.collector" Version="6.0.0">
22+
<PackageReference Include="coverlet.collector" Version="6.0.2">
2423
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2524
<PrivateAssets>all</PrivateAssets>
2625
</PackageReference>

‎tests/Confluent.Kafka.Extensions.Diagnostics.Tests/__snapshots__/KafkaDiagnosticsTests.DependentProduce.snap

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
{
22
"Status": "Ok",
33
"StatusDescription": null,
4-
"HasRemoteParent": false,
54
"Kind": "Producer",
6-
"OperationName": "produce_topic publish",
7-
"DisplayName": "produce_topic publish",
5+
"OperationName": "dependent_produce_topic publish",
6+
"DisplayName": "dependent_produce_topic publish",
87
"Source": {
98
"Name": "Confluent.Kafka.Extensions.Diagnostics",
109
"Version": ""
@@ -26,7 +25,7 @@
2625
},
2726
{
2827
"Key": "messaging.destination.name",
29-
"Value": "produce_topic"
28+
"Value": "dependent_produce_topic"
3029
},
3130
{
3231
"Key": "messaging.kafka.destination.partition",
@@ -54,6 +53,5 @@
5453
"IsAllDataRequested": false,
5554
"ActivityTraceFlags": "None",
5655
"ParentSpanId": {},
57-
"IsStopped": true,
5856
"IdFormat": "W3C"
5957
}

‎tests/Confluent.Kafka.Extensions.Diagnostics.Tests/__snapshots__/KafkaDiagnosticsTests.DependentProduceAsync.snap

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
{
22
"Status": "Ok",
33
"StatusDescription": null,
4-
"HasRemoteParent": false,
54
"Kind": "Producer",
6-
"OperationName": "produce_async_topic publish",
7-
"DisplayName": "produce_async_topic publish",
5+
"OperationName": "dependent_produce_async_topic publish",
6+
"DisplayName": "dependent_produce_async_topic publish",
87
"Source": {
98
"Name": "Confluent.Kafka.Extensions.Diagnostics",
109
"Version": ""
@@ -26,15 +25,15 @@
2625
},
2726
{
2827
"Key": "messaging.destination.name",
29-
"Value": "produce_async_topic"
28+
"Value": "dependent_produce_async_topic"
3029
},
3130
{
3231
"Key": "messaging.kafka.destination.partition",
3332
"Value": "0"
3433
},
3534
{
3635
"Key": "messaging.kafka.message.offset",
37-
"Value": "1"
36+
"Value": "0"
3837
}
3938
],
4039
"Events": [],
@@ -54,6 +53,5 @@
5453
"IsAllDataRequested": false,
5554
"ActivityTraceFlags": "None",
5655
"ParentSpanId": {},
57-
"IsStopped": true,
5856
"IdFormat": "W3C"
5957
}

0 commit comments

Comments
 (0)