From 82c1fa19810bfa20df5fdfba75f9e541b5a21a99 Mon Sep 17 00:00:00 2001 From: Timothy Coleman Date: Tue, 17 Dec 2024 18:02:34 +0000 Subject: [PATCH 1/3] see what happens --- Dockerfile | 2 +- src/Directory.Build.props | 2 +- src/Directory.Build.targets | 3 ++- src/EventStore.Core.Tests/FakePlugin/FakePlugin.csproj | 2 +- src/EventStore.Core.XUnit.Tests/PluginLoaderTests.cs | 2 +- .../EventStore.Projections.Core.XUnit.Tests.csproj | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index dd3171131c2..07083bec185 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,7 +47,7 @@ FROM build as publish ARG RUNTIME=linux-x64 RUN dotnet publish --configuration=Release --runtime=${RUNTIME} --self-contained \ - --framework=net8.0 --output /publish EventStore.ClusterNode + --framework=net9.0 --output /publish EventStore.ClusterNode # "runtime" image FROM mcr.microsoft.com/dotnet/runtime-deps:8.0-${CONTAINER_RUNTIME} AS runtime diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 6506d7b5f02..0f2fc6adbd2 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -10,7 +10,7 @@ false Copyright 2012-2024 Event Store Ltd https://eventstore.com/blog/ - net8.0 + net9.0 12.0 AnyCPU;x64;ARM64 false diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 80ae31a5f37..f7878255cf8 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -1,5 +1,6 @@ - true + + false diff --git a/src/EventStore.Core.Tests/FakePlugin/FakePlugin.csproj b/src/EventStore.Core.Tests/FakePlugin/FakePlugin.csproj index 291db711dd0..ad050ed9431 100644 --- a/src/EventStore.Core.Tests/FakePlugin/FakePlugin.csproj +++ b/src/EventStore.Core.Tests/FakePlugin/FakePlugin.csproj @@ -1,5 +1,5 @@ - net8.0 + net9.0 diff --git a/src/EventStore.Core.XUnit.Tests/PluginLoaderTests.cs b/src/EventStore.Core.XUnit.Tests/PluginLoaderTests.cs index 746c6e716bb..b57c674ab41 100644 --- a/src/EventStore.Core.XUnit.Tests/PluginLoaderTests.cs +++ b/src/EventStore.Core.XUnit.Tests/PluginLoaderTests.cs @@ -91,7 +91,7 @@ private static async Task BuildFakePlugin(DirectoryInfo outputFolder) { using var process = new Process { StartInfo = new ProcessStartInfo { FileName = "dotnet", - Arguments = $"publish --configuration {BuildConfiguration} --framework=net8.0 --output {outputFolder.FullName}", + Arguments = $"publish --configuration {BuildConfiguration} --framework=net9.0 --output {outputFolder.FullName}", WorkingDirectory = PluginSourceDirectory, UseShellExecute = false, RedirectStandardError = true, diff --git a/src/EventStore.Projections.Core.XUnit.Tests/EventStore.Projections.Core.XUnit.Tests.csproj b/src/EventStore.Projections.Core.XUnit.Tests/EventStore.Projections.Core.XUnit.Tests.csproj index dda0edd059c..e95d8451785 100644 --- a/src/EventStore.Projections.Core.XUnit.Tests/EventStore.Projections.Core.XUnit.Tests.csproj +++ b/src/EventStore.Projections.Core.XUnit.Tests/EventStore.Projections.Core.XUnit.Tests.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable enable From e88b29c6003c33fdceece5ceb2ef9b232430f786 Mon Sep 17 00:00:00 2001 From: Timothy Coleman Date: Wed, 18 Dec 2024 06:57:54 +0000 Subject: [PATCH 2/3] wip --- .github/workflows/build-container-reusable.yml | 4 ++-- .github/workflows/build-reusable.yml | 4 ++-- .github/workflows/common.yml | 4 ++-- README.md | 2 +- build.sh | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-container-reusable.yml b/.github/workflows/build-container-reusable.yml index ad33f13a273..8d3a8dc6f58 100644 --- a/.github/workflows/build-container-reusable.yml +++ b/.github/workflows/build-container-reusable.yml @@ -18,10 +18,10 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Install net8.0 + - name: Install net9.0 uses: actions/setup-dotnet@v3 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x - name: Setup QEMU uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx diff --git a/.github/workflows/build-reusable.yml b/.github/workflows/build-reusable.yml index 86ffb6b240d..4ced53d1202 100644 --- a/.github/workflows/build-reusable.yml +++ b/.github/workflows/build-reusable.yml @@ -27,10 +27,10 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: 3.1.x - - name: Install net8.0 + - name: Install net9.0 uses: actions/setup-dotnet@v3 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x - name: Clear Nuget Cache shell: powershell if: inputs.os == 'windows-2019' diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml index 5c1f1a9df6b..41496e030ff 100644 --- a/.github/workflows/common.yml +++ b/.github/workflows/common.yml @@ -24,10 +24,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: Install net8.0 + - name: Install net9.0 uses: actions/setup-dotnet@v3 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x - name: Scan for Vulnerabilities run: | cd src diff --git a/README.md b/README.md index 53687aa2b2e..b40a4097160 100644 --- a/README.md +++ b/README.md @@ -117,7 +117,7 @@ The build scripts: `build.sh` and `build.ps1` are also available for Linux and W To start a single node, you can then run: ``` -dotnet ./src/EventStore.ClusterNode/bin/x64/Release/net8.0/EventStore.ClusterNode.dll --dev --db ./tmp/data --index ./tmp/index --log ./tmp/log +dotnet ./src/EventStore.ClusterNode/bin/x64/Release/net9.0/EventStore.ClusterNode.dll --dev --db ./tmp/data --index ./tmp/index --log ./tmp/log ``` ### Running the tests diff --git a/build.sh b/build.sh index 163c7f4ab63..270ee8b0a9a 100755 --- a/build.sh +++ b/build.sh @@ -10,7 +10,7 @@ COPYRIGHT="Copyright 2021 Event Store Ltd. All rights reserved." CONFIGURATION="Release" BUILD_UI="no" -NET_FRAMEWORK="net8.0" +NET_FRAMEWORK="net9.0" function usage() { cat < Date: Wed, 18 Dec 2024 09:24:30 +0000 Subject: [PATCH 3/3] noble --- ...uild-container-jammy.yml => build-container-noble.yml} | 4 ++-- .github/workflows/build-container-reusable.yml | 2 +- Dockerfile | 8 ++++---- README.md | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) rename .github/workflows/{build-container-jammy.yml => build-container-noble.yml} (85%) diff --git a/.github/workflows/build-container-jammy.yml b/.github/workflows/build-container-noble.yml similarity index 85% rename from .github/workflows/build-container-jammy.yml rename to .github/workflows/build-container-noble.yml index d45733e5231..0eaae938691 100644 --- a/.github/workflows/build-container-jammy.yml +++ b/.github/workflows/build-container-noble.yml @@ -1,4 +1,4 @@ -name: Build Jammy Container +name: Build Noble Container on: pull_request: @@ -21,5 +21,5 @@ jobs: build-container: uses: ./.github/workflows/build-container-reusable.yml with: - container-runtime: jammy + container-runtime: noble diff --git a/.github/workflows/build-container-reusable.yml b/.github/workflows/build-container-reusable.yml index 8d3a8dc6f58..1ea161f891a 100644 --- a/.github/workflows/build-container-reusable.yml +++ b/.github/workflows/build-container-reusable.yml @@ -39,7 +39,7 @@ jobs: key: "${{ inputs.container-runtime }}" map: | { - "jammy": { + "noble": { "runtime": "linux-x64" }, "bookworm-slim": { diff --git a/Dockerfile b/Dockerfile index 07083bec185..7d76e2cc427 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # "build" image -ARG CONTAINER_RUNTIME=jammy -FROM mcr.microsoft.com/dotnet/sdk:8.0-jammy AS build +ARG CONTAINER_RUNTIME=noble +FROM mcr.microsoft.com/dotnet/sdk:9.0-noble AS build ARG RUNTIME=linux-x64 WORKDIR /build @@ -25,7 +25,7 @@ RUN find /build/src -maxdepth 1 -type d -name "*.Tests" -print0 | xargs -I{} -0 'dotnet publish --runtime=${RUNTIME} --no-self-contained --configuration Release --output /build/published-tests/`basename $1` $1' - '{}' # "test" image -FROM mcr.microsoft.com/dotnet/sdk:8.0-${CONTAINER_RUNTIME} as test +FROM mcr.microsoft.com/dotnet/sdk:9.0-${CONTAINER_RUNTIME} as test WORKDIR /build COPY --from=build ./build/published-tests ./published-tests COPY --from=build ./build/ci ./ci @@ -50,7 +50,7 @@ RUN dotnet publish --configuration=Release --runtime=${RUNTIME} --self-contained --framework=net9.0 --output /publish EventStore.ClusterNode # "runtime" image -FROM mcr.microsoft.com/dotnet/runtime-deps:8.0-${CONTAINER_RUNTIME} AS runtime +FROM mcr.microsoft.com/dotnet/runtime-deps:9.0-${CONTAINER_RUNTIME} AS runtime ARG RUNTIME=linux-x64 ARG UID=1000 ARG GID=1000 diff --git a/README.md b/README.md index b40a4097160..e2bb0103ae5 100644 --- a/README.md +++ b/README.md @@ -161,9 +161,9 @@ Currently, we support the following configurations: - `CONTAINER_RUNTIME=bookworm-slim` - `RUNTIME=linux-x64` -2. Jammy: +2. Noble: -- `CONTAINER_RUNTIME=Jammy` +- `CONTAINER_RUNTIME=noble` - `RUNTIME=linux-x64` 3. Alpine: