Skip to content

Commit 72175f2

Browse files
Merge pull request #10 from SamhammerAG/ASMO-7536-dotnet10
ASMO-7536: dotnet10 updates
2 parents dd52ee3 + 6393dc4 commit 72175f2

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

.github/workflows/cicd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
id: tag
2121
- uses: actions/setup-dotnet@v4
2222
with:
23-
dotnet-version: 8.0.x
23+
dotnet-version: 10.0.x
2424
- run: echo "::remove-matcher owner=csc::"
2525
- uses: reviewdog/action-setup@v1
2626
- run: dotnet --info

src/Samhammer.Logging.Logstash/BasicAuthenticatedHttpClient.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System.Net.Http;
44
using System.Net.Http.Headers;
55
using System.Text;
6+
using System.Threading;
67
using System.Threading.Tasks;
78
using Microsoft.Extensions.Configuration;
89
using Serilog.Sinks.Http;
@@ -35,11 +36,11 @@ public void Configure(IConfiguration configuration)
3536
throw new NotImplementedException();
3637
}
3738

38-
public async Task<HttpResponseMessage> PostAsync(string requestUri, Stream contentStream)
39+
public async Task<HttpResponseMessage> PostAsync(string requestUri, Stream contentStream, CancellationToken cancellationToken)
3940
{
4041
using (var content = new StreamContent(contentStream))
4142
{
42-
return await client.PostAsync(requestUri, content);
43+
return await client.PostAsync(requestUri, content, cancellationToken);
4344
}
4445
}
4546

src/Samhammer.Logging.Logstash/Samhammer.Logging.Logstash.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
25-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
26-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
24+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.1" />
25+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.1" />
26+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.1" />
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="Serilog.Formatting.Elasticsearch" Version="9.0.3" />
31-
<PackageReference Include="Serilog.Sinks.Http" Version="8.0.0" />
32-
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.376">
30+
<PackageReference Include="Serilog.Formatting.Elasticsearch" Version="10.0.0" />
31+
<PackageReference Include="Serilog.Sinks.Http" Version="9.2.1" />
32+
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
3333
<PrivateAssets>all</PrivateAssets>
3434
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
3535
</PackageReference>

0 commit comments

Comments
 (0)