Skip to content

Update to .NET 10 #441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nblumhardt merged 3 commits into from
Jan 22, 2026
Merged

Update to .NET 10 #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca100ec
update to .NET 10
KodrAus Jan 21, 2026
eab25ef
update some missed .NET version refs
KodrAus Jan 21, 2026
52cbdac
update libicu on arm
KodrAus Jan 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Setup
uses: actions/setup-dotnet@v4
with:
dotnet-version: 9.0.x
dotnet-version: 10.0.x
- name: Build and Publish
env:
DOTNET_CLI_TELEMETRY_OPTOUT: true
Expand All @@ -48,7 +48,7 @@ jobs:
- name: Setup
uses: actions/setup-dotnet@v4
with:
dotnet-version: 9.0.x
dotnet-version: 10.0.x
- name: Configure Docker
run: |
docker run --privileged --rm linuxkit/binfmt:bebbae0c1100ebf7bf2ad4dfb9dfd719cf0ef132
Expand Down
2 changes: 1 addition & 1 deletion build/Build.Linux.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ $version = Get-SemVer

Write-Output "Building version $version"

$framework = "net9.0"
$framework = "net10.0"
$image = "datalust/seqcli"
$archs = @(
@{ rid = "x64"; platform = "linux/amd64" },
Expand Down
2 changes: 1 addition & 1 deletion build/Build.Windows.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ $version = Get-SemVer

Write-Output "Building version $version"

$framework = 'net9.0'
$framework = 'net10.0'

function Clean-Output
{
Expand Down
2 changes: 1 addition & 1 deletion ci.global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "9.0.306"
"version": "10.0.102"
}
}
6 changes: 3 additions & 3 deletions dockerfiles/seqcli/linux-arm64.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
FROM ubuntu:22.04
FROM ubuntu:24.04

RUN apt-get update \
&& apt-get install -y --no-install-recommends \
ca-certificates \
libc6 \
libgcc1 \
libgssapi-krb5-2 \
libicu70 \
libicu-dev \
libssl3 \
libstdc++6 \
zlib1g \
&& rm -rf /var/lib/apt/lists/*

COPY src/SeqCli/bin/Release/net9.0/linux-arm64/publish /bin/seqcli
COPY src/SeqCli/bin/Release/net10.0/linux-arm64/publish /bin/seqcli

ENTRYPOINT ["/bin/seqcli/seqcli"]

Expand Down
6 changes: 3 additions & 3 deletions dockerfiles/seqcli/linux-x64.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
FROM ubuntu:22.04
FROM ubuntu:24.04

RUN apt-get update \
&& apt-get install -y --no-install-recommends \
ca-certificates \
libc6 \
libgcc1 \
libgssapi-krb5-2 \
libicu70 \
libicu-dev \
libssl3 \
libstdc++6 \
zlib1g \
&& rm -rf /var/lib/apt/lists/*

COPY src/SeqCli/bin/Release/net9.0/linux-x64/publish /bin/seqcli
COPY src/SeqCli/bin/Release/net10.0/linux-x64/publish /bin/seqcli

ENTRYPOINT ["/bin/seqcli/seqcli"]

Expand Down
2 changes: 1 addition & 1 deletion src/Roastery/Roastery.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
</PropertyGroup>

Expand Down
12 changes: 6 additions & 6 deletions src/SeqCli/SeqCli.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<AssemblyName>seqcli</AssemblyName>
<ApplicationIcon>..\..\asset\SeqCli.ico</ApplicationIcon>
<RuntimeIdentifiers>win-x64;linux-x64;linux-musl-x64;osx-x64;linux-arm64;linux-musl-arm64;osx-arm64</RuntimeIdentifiers>
Expand Down Expand Up @@ -37,13 +37,13 @@
<PackageReference Include="Serilog.Expressions" Version="5.0.0" />
<PackageReference Include="Serilog.Formatting.Compact" Version="3.0.0" />
<PackageReference Include="Serilog.Formatting.Compact.Reader" Version="4.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
<PackageReference Include="Autofac" Version="8.4.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
<PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
<PackageReference Include="Autofac" Version="9.0.0" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
<PackageReference Include="Superpower" Version="3.1.0" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="9.0.10" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="9.0.10" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="10.0.2" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="10.0.2" />
<PackageReference Include="Serilog.Sinks.Seq" Version="9.0.0" />
<PackageReference Include="Seq.Apps" Version="2023.4.0" />
<PackageReference Include="Seq.Syntax" Version="1.1.0" />
Expand Down
3 changes: 1 addition & 2 deletions src/SeqCli/Util/PasswordHash.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ public static byte[] Calculate(string password, byte[] salt)
if (password == null) throw new ArgumentNullException(nameof(password));
if (salt == null) throw new ArgumentNullException(nameof(salt));

using var algorithm = new Rfc2898DeriveBytes(password, salt, HashIter, HashAlgorithmName.SHA512);
return algorithm.GetBytes(HashSize);
return Rfc2898DeriveBytes.Pbkdf2(password, salt, HashIter, HashAlgorithmName.SHA512, HashSize);
}
}
2 changes: 1 addition & 1 deletion test/SeqCli.EndToEnd/SeqCli.EndToEnd.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit" Version="2.9.3" />
Expand Down
4 changes: 2 additions & 2 deletions test/SeqCli.Tests/SeqCli.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PrivateAssets>all</PrivateAssets>
Expand Down