Update TargetFrameworks (#8052)

gpetrou · flobernd · commit 18fbbe2c9eb0 · 2024-03-25T10:35:00.000+01:00
diff --git a/.buildkite/DockerFile b/.buildkite/DockerFile
@@ -1,6 +1,8 @@
-ARG DOTNET_VERSION=6.0.403
+ARG DOTNET_VERSION=8.0.100
 FROM mcr.microsoft.com/dotnet/sdk:${DOTNET_VERSION} AS elasticsearch-net-build
 
+ENV NUGET_SCRATCH="/tmp/NuGetScratch"
+
 ARG USER_ID
 ARG GROUP_ID
 
@@ -42,6 +44,7 @@ RUN chown -R $GROUP_ID:$USER_ID /tmp/NuGetScratch
 COPY . .
 
 # making sure enough git info is available inside the container
+RUN git config --global --add safe.directory '*'
 RUN git rev-parse HEAD .
 
 # USER user
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -5,7 +5,7 @@ steps:
     env:
       TEST_SUITE: "{{ matrix.suite }}"
       STACK_VERSION: master-SNAPSHOT
-      DOTNET_VERSION: 6.0.403
+      DOTNET_VERSION: 8.0.100
     matrix:
       setup:
         suite:
diff --git a/.buildkite/run-repository.ps1 b/.buildkite/run-repository.ps1
@@ -14,7 +14,7 @@ param(
     $NODE_NAME,
 
     [string]
-    $DOTNET_VERSION = "6.0.403"
+    $DOTNET_VERSION = "8.0.100"
 )
 
 $ESC = [char]27
diff --git 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-6.0.403}
+DOTNET_VERSION=${DOTNET_VERSION-8.0.100}
 ELASTICSEARCH_URL=${ELASTICSEARCH_URL-"$elasticsearch_url"}
 elasticsearch_container=${elasticsearch_container-}
 
diff --git a/.buildkite/run-tests.ps1 b/.buildkite/run-tests.ps1
@@ -8,7 +8,7 @@ param (
     $TEST_SUITE = "free",
 
     [string]
-    $DOTNET_VERSION = "6.0.403"
+    $DOTNET_VERSION = "8.0.100"
 )
 
 $ESC = [char]27
diff --git a/.ci/DockerFile b/.ci/DockerFile
@@ -1,6 +1,8 @@
-ARG DOTNET_VERSION=6.0.403
+ARG DOTNET_VERSION=8.0.100
 FROM mcr.microsoft.com/dotnet/sdk:${DOTNET_VERSION} AS elasticsearch-net-build
 
+ENV NUGET_SCRATCH="/tmp/NuGetScratch"
+
 ARG USER_ID
 ARG GROUP_ID
 
@@ -42,6 +44,7 @@ RUN chown -R $GROUP_ID:$USER_ID /tmp/NuGetScratch
 COPY . .
 
 # making sure enough git info is available inside the container
+RUN git config --global --add safe.directory '*'
 RUN git rev-parse HEAD .
 
 # USER user
diff --git 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-6.0.403}
+DOTNET_VERSION=${DOTNET_VERSION-8.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"
@@ -121,7 +121,8 @@ echo -e "\033[34;1mINFO: building $product container\033[0m"
 
 docker build --file .ci/DockerFile --tag ${product} \
   --build-arg USER_ID="$(id -u)" \
-  --build-arg GROUP_ID="$(id -g)" .
+  --build-arg GROUP_ID="$(id -g)" \
+  --build-arg DOTNET_VERSION="$DOTNET_VERSION" .
 
 # ------------------------------------------------------- #
 # Run the Container
diff --git 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`        | `6.0.403`   | The .NET sdk version used to grab the proper container |
+| `DOTNET_VERSION`        | `8.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
@@ -14,7 +14,7 @@ param(
     $NODE_NAME,
     
     [string]
-    $DOTNET_VERSION = "6.0.403"
+    $DOTNET_VERSION = "8.0.100"
 )
 
 $ESC = [char]27
diff --git 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-6.0.403}
+DOTNET_VERSION=${DOTNET_VERSION-8.0.100}
 ELASTICSEARCH_URL=${ELASTICSEARCH_URL-"$elasticsearch_url"}
 elasticsearch_container=${elasticsearch_container-}
 
diff --git a/.ci/run-tests.ps1 b/.ci/run-tests.ps1
@@ -8,7 +8,7 @@ param (
     $TEST_SUITE = "free",
 
     [string]
-    $DOTNET_VERSION = "6.0.403"
+    $DOTNET_VERSION = "8.0.100"
 )
 
 $ESC = [char]27
diff --git a/.ci/test-matrix.yml b/.ci/test-matrix.yml
@@ -8,6 +8,6 @@ TEST_SUITE:
   - platinum
 
 DOTNET_VERSION:
-  - 6.0.403
+  - 8.0.100
 
 exclude: ~
diff --git a/.github/workflows/integration-jobs.yml b/.github/workflows/integration-jobs.yml
@@ -38,9 +38,9 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - uses: actions/setup-dotnet@v3
+      - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '6.0.403'
+          dotnet-version: '8.0.100'
       - uses: actions/cache@v3
         with:
           path: ~/.nuget/packages
diff --git a/.github/workflows/make-bump.yml b/.github/workflows/make-bump.yml
@@ -33,9 +33,9 @@ jobs:
             Updates ${{ github.event.inputs.branch }} to version ${{ github.event.inputs.version }}. 
           labels: "infra,code-gen"
       # Add version and backport labels automatically
-      - uses: actions/setup-dotnet@v3
+      - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '6.0.403'
+          dotnet-version: '8.0.100'
       - name: Install dotnet-script
         run: dotnet tool install release-notes --tool-path dotnet-tool
 
diff --git a/.github/workflows/make-release-notes.yml b/.github/workflows/make-release-notes.yml
@@ -49,9 +49,9 @@ jobs:
         with:
           ref: "${{ matrix.branch }}"
           
-      - uses: actions/setup-dotnet@v3
+      - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '6.0.403'
+          dotnet-version: '8.0.100'
       - name: Install dotnet-script
         run: dotnet tool install release-notes --tool-path dotnet-tool
 
diff --git a/.github/workflows/stale-jobs.yml b/.github/workflows/stale-jobs.yml
@@ -22,9 +22,9 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - uses: actions/setup-dotnet@v3
+      - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '6.0.403'
+          dotnet-version: '8.0.100'
       - uses: actions/cache@v3
         with:
           path: ~/.nuget/packages
diff --git a/.github/workflows/test-jobs.yml b/.github/workflows/test-jobs.yml
@@ -21,9 +21,9 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - uses: actions/setup-dotnet@v3
+      - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '6.0.403'
+          dotnet-version: '8.0.100'
       - uses: actions/cache@v3
         with:
           path: ~/.nuget/packages
@@ -51,9 +51,9 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - uses: actions/setup-dotnet@v3
+      - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '6.0.403'
+          dotnet-version: '8.0.100'
       - uses: actions/cache@v3
         with:
           path: ~/.nuget/packages
diff --git a/.github/workflows/unified-release.yml b/.github/workflows/unified-release.yml
@@ -26,9 +26,9 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - uses: actions/setup-dotnet@v3
+      - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '6.0.403'
+          dotnet-version: '8.0.100'
             
       - run: "./.ci/make.sh assemble ${{ matrix.stack_version }}"
         name: Assemble ${{ matrix.stack_version }}
diff --git a/build/scripts/Benchmarking.fs b/build/scripts/Benchmarking.fs
@@ -18,7 +18,7 @@ module Benchmarker =
         let password = match args.CommandArguments with | Benchmark b -> b.Password | _ -> None
         let runInteractive = not args.NonInteractive
         let credentials  = (username, password)
-        let runCommandPrefix = "run -f net5.0 -c Release"
+        let runCommandPrefix = "run -f net8.0 -c Release"
         let runCommand =
             match (runInteractive, url, credentials) with
             | (false, Some url, (Some username, Some password)) -> sprintf "%s -- --all \"%s\" \"%s\" \"%s\"" runCommandPrefix url username password
diff --git a/build/scripts/Documentation.fs b/build/scripts/Documentation.fs
@@ -13,7 +13,7 @@ module Documentation =
 
     exception DocGenError of string 
     let Generate args = 
-        let path = Paths.InplaceBuildOutput "DocGenerator" "net5.0"
+        let path = Paths.InplaceBuildOutput "DocGenerator" "net8.0"
         let generator = sprintf "%s.dll" "DocGenerator"
         
         printfn "==> %s" path
diff --git a/build/scripts/packages.lock.json b/build/scripts/packages.lock.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "dependencies": {
-    "net6.0": {
+    "net8.0": {
       "Bullseye": {
         "type": "Direct",
         "requested": "[3.3.0, )",
diff --git a/build/scripts/scripts.fsproj b/build/scripts/scripts.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <!-- Type Providers are restored using net461, fine for netcoreapp2.2 so we kill the warning -->
     <NoWarn>$(NoWarn);NU1701</NoWarn>
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.403",
+    "version": "8.0.100",
     "rollForward": "minor",
     "allowPrerelease": false
   },
diff --git a/src/Elastic.Clients.Elasticsearch.JsonNetSerializer/Elastic.Clients.Elasticsearch.JsonNetSerializer.csproj b/src/Elastic.Clients.Elasticsearch.JsonNetSerializer/Elastic.Clients.Elasticsearch.JsonNetSerializer.csproj
@@ -10,7 +10,7 @@
   <PropertyGroup>
     <IsPackable>true</IsPackable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <TargetFrameworks>netstandard2.0;net461;netstandard2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net462;netstandard2.1;net6.0;net8.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
diff --git a/src/Elastic.Clients.Elasticsearch.JsonNetSerializer/packages.lock.json b/src/Elastic.Clients.Elasticsearch.JsonNetSerializer/packages.lock.json
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/Elastic.Clients.Elasticsearch.Serverless.csproj b/src/Elastic.Clients.Elasticsearch.Serverless/Elastic.Clients.Elasticsearch.Serverless.csproj
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/packages.lock.json b/src/Elastic.Clients.Elasticsearch.Serverless/packages.lock.json
diff --git a/src/Elastic.Clients.Elasticsearch/Elastic.Clients.Elasticsearch.csproj b/src/Elastic.Clients.Elasticsearch/Elastic.Clients.Elasticsearch.csproj
diff --git a/src/Elastic.Clients.Elasticsearch/packages.lock.json b/src/Elastic.Clients.Elasticsearch/packages.lock.json
diff --git a/tests/Tests.ClusterLauncher/Tests.ClusterLauncher.csproj b/tests/Tests.ClusterLauncher/Tests.ClusterLauncher.csproj
diff --git a/tests/Tests.ClusterLauncher/packages.lock.json b/tests/Tests.ClusterLauncher/packages.lock.json
diff --git a/tests/Tests/Tests.csproj b/tests/Tests/Tests.csproj
diff --git a/tests/Tests/packages.lock.json b/tests/Tests/packages.lock.json

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ param(`
`14`	`14`	`$NODE_NAME,`
`15`	`15`
`16`	`16`	`[string]`
`17`		`- $DOTNET_VERSION = "6.0.403"`
	`17`	`+ $DOTNET_VERSION = "8.0.100"`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`$ESC = [char]27`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ param (`
`8`	`8`	`$TEST_SUITE = "free",`
`9`	`9`
`10`	`10`	`[string]`
`11`		`- $DOTNET_VERSION = "6.0.403"`
	`11`	`+ $DOTNET_VERSION = "8.0.100"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`$ESC = [char]27`