Merge pull request #441 from KodrAus/chore/dotnet-10

nblumhardt · web-flow · commit 111440edd348 · 2026-01-22T12:24:04.000+10:00
Update to .NET 10
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -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
@@ -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
diff --git a/build/Build.Linux.ps1 b/build/Build.Linux.ps1
@@ -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" },
diff --git a/build/Build.Windows.ps1 b/build/Build.Windows.ps1
@@ -12,7 +12,7 @@ $version = Get-SemVer
 
 Write-Output "Building version $version"
 
-$framework = 'net9.0'
+$framework = 'net10.0'
 
 function Clean-Output
 {
diff --git a/ci.global.json b/ci.global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "9.0.306"
+    "version": "10.0.102"
   }
 }
diff --git a/dockerfiles/seqcli/linux-arm64.Dockerfile b/dockerfiles/seqcli/linux-arm64.Dockerfile
@@ -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"]
 
diff --git a/dockerfiles/seqcli/linux-x64.Dockerfile b/dockerfiles/seqcli/linux-x64.Dockerfile
@@ -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"]
 
diff --git a/src/Roastery/Roastery.csproj b/src/Roastery/Roastery.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
diff --git a/src/SeqCli/SeqCli.csproj b/src/SeqCli/SeqCli.csproj
@@ -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>
@@ -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" />
diff --git a/src/SeqCli/Util/PasswordHash.cs b/src/SeqCli/Util/PasswordHash.cs
@@ -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);
     }
 }
diff --git a/test/SeqCli.EndToEnd/SeqCli.EndToEnd.csproj b/test/SeqCli.EndToEnd/SeqCli.EndToEnd.csproj
@@ -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" />
diff --git a/test/SeqCli.Tests/SeqCli.Tests.csproj b/test/SeqCli.Tests/SeqCli.Tests.csproj
@@ -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>

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ $version = Get-SemVer`
`12`	`12`
`13`	`13`	`Write-Output "Building version $version"`
`14`	`14`
`15`		`-$framework = 'net9.0'`
	`15`	`+$framework = 'net10.0'`
`16`	`16`
`17`	`17`	`function Clean-Output`
`18`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "9.0.306"`
	`3`	`+ "version": "10.0.102"`
`4`	`4`	`}`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ public static byte[] Calculate(string password, byte[] salt)`
`22`	`22`	`if (password == null) throw new ArgumentNullException(nameof(password));`
`23`	`23`	`if (salt == null) throw new ArgumentNullException(nameof(salt));`
`24`	`24`
`25`		`- using var algorithm = new Rfc2898DeriveBytes(password, salt, HashIter, HashAlgorithmName.SHA512);`
`26`		`- return algorithm.GetBytes(HashSize);`
	`25`	`+ return Rfc2898DeriveBytes.Pbkdf2(password, salt, HashIter, HashAlgorithmName.SHA512, HashSize);`
`27`	`26`	`}`
`28`	`27`	`}`