From 11180a96aa1913151229625f46f7d09a20b9b2c0 Mon Sep 17 00:00:00 2001 From: Florian Bernd Date: Mon, 17 Feb 2025 14:47:14 +0100 Subject: [PATCH] Bump .NET SDK version --- .buildkite/DockerFile | 2 +- .buildkite/pipeline.yml | 2 +- .buildkite/run-repository.ps1 | 2 +- .buildkite/run-repository.sh | 2 +- .buildkite/run-tests.ps1 | 2 +- .ci/DockerFile | 2 +- .ci/make.sh | 2 +- .ci/readme.md | 2 +- .ci/run-repository.ps1 | 2 +- .ci/run-repository.sh | 2 +- .ci/run-tests.ps1 | 2 +- .ci/test-matrix.yml | 2 +- Directory.Build.props | 4 ++++ 13 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.buildkite/DockerFile b/.buildkite/DockerFile index 227524274d..9ccd51b494 100644 --- a/.buildkite/DockerFile +++ b/.buildkite/DockerFile @@ -1,4 +1,4 @@ -ARG DOTNET_VERSION=8.0.400 +ARG DOTNET_VERSION=9.0.100 FROM mcr.microsoft.com/dotnet/sdk:${DOTNET_VERSION} AS elasticsearch-net-build ENV NUGET_SCRATCH="/tmp/NuGetScratch" diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 87f461176d..b702d1737b 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -5,7 +5,7 @@ steps: env: TEST_SUITE: "{{ matrix.suite }}" STACK_VERSION: master-SNAPSHOT - DOTNET_VERSION: 8.0.400 + DOTNET_VERSION: 9.0.100 matrix: setup: suite: diff --git a/.buildkite/run-repository.ps1 b/.buildkite/run-repository.ps1 index 4a290f1c62..774f3684cc 100644 --- a/.buildkite/run-repository.ps1 +++ b/.buildkite/run-repository.ps1 @@ -14,7 +14,7 @@ param( $NODE_NAME, [string] - $DOTNET_VERSION = "8.0.400" + $DOTNET_VERSION = "9.0.100" ) $ESC = [char]27 diff --git a/.buildkite/run-repository.sh b/.buildkite/run-repository.sh index 9c212f484c..d0b1ba8487 100755 --- a/.buildkite/run-repository.sh +++ b/.buildkite/run-repository.sh @@ -9,7 +9,7 @@ script_path=$(dirname $(realpath -s $0)) source $script_path/functions/imports.sh set -euo pipefail -DOTNET_VERSION=${DOTNET_VERSION-8.0.400} +DOTNET_VERSION=${DOTNET_VERSION-9.0.100} ELASTICSEARCH_URL=${ELASTICSEARCH_URL-"$elasticsearch_url"} elasticsearch_container=${elasticsearch_container-} diff --git a/.buildkite/run-tests.ps1 b/.buildkite/run-tests.ps1 index 503edd8df0..3113065ce2 100644 --- a/.buildkite/run-tests.ps1 +++ b/.buildkite/run-tests.ps1 @@ -8,7 +8,7 @@ param ( $TEST_SUITE = "free", [string] - $DOTNET_VERSION = "8.0.400" + $DOTNET_VERSION = "9.0.100" ) $ESC = [char]27 diff --git a/.ci/DockerFile b/.ci/DockerFile index 8c642b9996..5ba098c255 100644 --- a/.ci/DockerFile +++ b/.ci/DockerFile @@ -1,4 +1,4 @@ -ARG DOTNET_VERSION=8.0.400 +ARG DOTNET_VERSION=9.0.100 FROM mcr.microsoft.com/dotnet/sdk:${DOTNET_VERSION} AS elasticsearch-net-build ENV NUGET_SCRATCH="/tmp/NuGetScratch" diff --git a/.ci/make.sh b/.ci/make.sh index 672ad78bd7..ad1dd59e45 100755 --- a/.ci/make.sh +++ b/.ci/make.sh @@ -42,7 +42,7 @@ OUTPUT_DIR="$repo/${output_folder}" REPO_BINDING="${OUTPUT_DIR}:/sln/${output_folder}" mkdir -p "$OUTPUT_DIR" -DOTNET_VERSION=${DOTNET_VERSION-8.0.400} +DOTNET_VERSION=${DOTNET_VERSION-9.0.100} echo -e "\033[34;1mINFO:\033[0m PRODUCT ${product}\033[0m" echo -e "\033[34;1mINFO:\033[0m VERSION ${STACK_VERSION}\033[0m" diff --git a/.ci/readme.md b/.ci/readme.md index fe87c60afd..95bd4f20fc 100644 --- a/.ci/readme.md +++ b/.ci/readme.md @@ -30,7 +30,7 @@ $ STACK_VERSION=8.0.0-SNAPSHOT ./.ci/run-tests |-------------------------|-------------|-------------| | `STACK_VERSION` | `N/A` | The elasticsearch version to target | `TEST_SUITE` | `basic` | `free` or `platinum` sets which test suite to run and which container to run against. | -| `DOTNET_VERSION` | `8.0.400` | The .NET sdk version used to grab the proper container | +| `DOTNET_VERSION` | `9.0.100` | The .NET sdk version used to grab the proper container | If you want to manually spin up elasticsearch for these tests and call the runner afterwards you can use diff --git a/.ci/run-repository.ps1 b/.ci/run-repository.ps1 index e842f7fe21..877995e542 100644 --- a/.ci/run-repository.ps1 +++ b/.ci/run-repository.ps1 @@ -14,7 +14,7 @@ param( $NODE_NAME, [string] - $DOTNET_VERSION = "8.0.400" + $DOTNET_VERSION = "9.0.100" ) $ESC = [char]27 diff --git a/.ci/run-repository.sh b/.ci/run-repository.sh index 0e49cdaf1b..2191e872ea 100755 --- a/.ci/run-repository.sh +++ b/.ci/run-repository.sh @@ -9,7 +9,7 @@ script_path=$(dirname $(realpath -s $0)) source $script_path/functions/imports.sh set -euo pipefail -DOTNET_VERSION=${DOTNET_VERSION-8.0.400} +DOTNET_VERSION=${DOTNET_VERSION-9.0.100} ELASTICSEARCH_URL=${ELASTICSEARCH_URL-"$elasticsearch_url"} elasticsearch_container=${elasticsearch_container-} diff --git a/.ci/run-tests.ps1 b/.ci/run-tests.ps1 index 481ad155db..89b91ebaad 100644 --- a/.ci/run-tests.ps1 +++ b/.ci/run-tests.ps1 @@ -8,7 +8,7 @@ param ( $TEST_SUITE = "free", [string] - $DOTNET_VERSION = "8.0.400" + $DOTNET_VERSION = "9.0.100" ) $ESC = [char]27 diff --git a/.ci/test-matrix.yml b/.ci/test-matrix.yml index 421f57f897..0c4a5a2b9b 100755 --- a/.ci/test-matrix.yml +++ b/.ci/test-matrix.yml @@ -8,6 +8,6 @@ TEST_SUITE: - platinum DOTNET_VERSION: - - 8.0.400 + - 9.0.100 exclude: ~ diff --git a/Directory.Build.props b/Directory.Build.props index 91ddb2e93e..cdc634db8d 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -50,4 +50,8 @@ + + + NU1901;NU1902;NU1903;NU1904 + \ No newline at end of file