Skip to content

Update TargetFrameworks #8052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .buildkite/DockerFile
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/run-repository.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ param(
$NODE_NAME,

[string]
$DOTNET_VERSION = "6.0.403"
$DOTNET_VERSION = "8.0.100"
)

$ESC = [char]27
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/run-repository.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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-}

Expand Down
2 changes: 1 addition & 1 deletion .buildkite/run-tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ param (
$TEST_SUITE = "free",

[string]
$DOTNET_VERSION = "6.0.403"
$DOTNET_VERSION = "8.0.100"
)

$ESC = [char]27
Expand Down
5 changes: 4 additions & 1 deletion .ci/DockerFile
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions .ci/make.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .ci/run-repository.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ param(
$NODE_NAME,

[string]
$DOTNET_VERSION = "6.0.403"
$DOTNET_VERSION = "8.0.100"
)

$ESC = [char]27
Expand Down
2 changes: 1 addition & 1 deletion .ci/run-repository.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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-}

Expand Down
2 changes: 1 addition & 1 deletion .ci/run-tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ param (
$TEST_SUITE = "free",

[string]
$DOTNET_VERSION = "6.0.403"
$DOTNET_VERSION = "8.0.100"
)

$ESC = [char]27
Expand Down
2 changes: 1 addition & 1 deletion .ci/test-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ TEST_SUITE:
- platinum

DOTNET_VERSION:
- 6.0.403
- 8.0.100

exclude: ~
4 changes: 2 additions & 2 deletions .github/workflows/integration-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/make-bump.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/make-release-notes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/stale-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unified-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
2 changes: 1 addition & 1 deletion build/scripts/Benchmarking.fs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/scripts/Documentation.fs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/scripts/packages.lock.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"dependencies": {
"net6.0": {
"net8.0": {
"Bullseye": {
"type": "Direct",
"requested": "[3.3.0, )",
Expand Down
2 changes: 1 addition & 1 deletion build/scripts/scripts.fsproj
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "6.0.403",
"version": "8.0.100",
"rollForward": "minor",
"allowPrerelease": false
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
Loading