diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a52a1c06..dfbd102e 100644 --- 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 index 21fca84a..1d3279b8 100644 --- 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 index d18263e9..6fd0ff3e 100644 --- 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 index 345f67e3..c2af57a3 100644 --- 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 index 68d201b3..8be10413 100644 --- a/dockerfiles/seqcli/linux-arm64.Dockerfile +++ b/dockerfiles/seqcli/linux-arm64.Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 +FROM ubuntu:24.04 RUN apt-get update \ && apt-get install -y --no-install-recommends \ @@ -6,13 +6,13 @@ RUN apt-get update \ 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 index 308c2a37..6b454e21 100644 --- a/dockerfiles/seqcli/linux-x64.Dockerfile +++ b/dockerfiles/seqcli/linux-x64.Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 +FROM ubuntu:24.04 RUN apt-get update \ && apt-get install -y --no-install-recommends \ @@ -6,13 +6,13 @@ RUN apt-get update \ 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 index ea919e7c..8b6a076c 100644 --- a/src/Roastery/Roastery.csproj +++ b/src/Roastery/Roastery.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 enable diff --git a/src/SeqCli/SeqCli.csproj b/src/SeqCli/SeqCli.csproj index 1b417cd2..6d99f8a8 100644 --- a/src/SeqCli/SeqCli.csproj +++ b/src/SeqCli/SeqCli.csproj @@ -1,7 +1,7 @@  Exe - net9.0 + net10.0 seqcli ..\..\asset\SeqCli.ico win-x64;linux-x64;linux-musl-x64;osx-x64;linux-arm64;linux-musl-arm64;osx-arm64 @@ -37,13 +37,13 @@ - - - + + + - - + + diff --git a/src/SeqCli/Util/PasswordHash.cs b/src/SeqCli/Util/PasswordHash.cs index 91576624..925031eb 100644 --- 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); } } \ No newline at end of file diff --git a/test/SeqCli.EndToEnd/SeqCli.EndToEnd.csproj b/test/SeqCli.EndToEnd/SeqCli.EndToEnd.csproj index 797cf88c..00eec61a 100644 --- a/test/SeqCli.EndToEnd/SeqCli.EndToEnd.csproj +++ b/test/SeqCli.EndToEnd/SeqCli.EndToEnd.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 diff --git a/test/SeqCli.Tests/SeqCli.Tests.csproj b/test/SeqCli.Tests/SeqCli.Tests.csproj index b15422c9..41b33c8d 100644 --- a/test/SeqCli.Tests/SeqCli.Tests.csproj +++ b/test/SeqCli.Tests/SeqCli.Tests.csproj @@ -1,9 +1,9 @@  - net9.0 + net10.0 - + all