From 952a74c826d2ad47e7d16dae201dc38188df4f45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= Date: Thu, 18 Jan 2024 11:13:46 +0100 Subject: [PATCH] Bump .NET to 8.0.101/7.0.405/6.0.417 (#404) --- .github/workflows/ci.yml | 18 +++++++++--------- .github/workflows/dotnet-format.yml | 2 +- .github/workflows/scripts-test.yml | 4 ++-- docker/alpine.dockerfile | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8ff74fca..cf658d47 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,9 +27,9 @@ jobs: - uses: actions/setup-dotnet@v4.0.0 with: dotnet-version: | - 6.0.417 - 7.0.404 - 8.0.100 + 6.0.418 + 7.0.405 + 8.0.101 - run: ./build.cmd Workflow - run: brew install coreutils if: ${{ runner.os == 'macOS' }} @@ -119,9 +119,9 @@ jobs: - uses: actions/setup-dotnet@v4.0.0 with: dotnet-version: | - 6.0.417 - 7.0.404 - 8.0.100 + 6.0.418 + 7.0.405 + 8.0.101 - run: ./build.cmd NuGetWorkflow - uses: actions/upload-artifact@v4.1.0 with: @@ -144,9 +144,9 @@ jobs: - uses: actions/setup-dotnet@v4.0.0 with: dotnet-version: | - 6.0.417 - 7.0.404 - 8.0.100 + 6.0.418 + 7.0.405 + 8.0.101 - name: Download NuGet Artifacts from build-nuget-package job uses: actions/download-artifact@v4.1.1 with: diff --git a/.github/workflows/dotnet-format.yml b/.github/workflows/dotnet-format.yml index 542ea065..1ad0920e 100644 --- a/.github/workflows/dotnet-format.yml +++ b/.github/workflows/dotnet-format.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v4.1.1 - uses: actions/setup-dotnet@v4.0.0 with: - dotnet-version: 8.0.100 + dotnet-version: 8.0.101 - name: dotnet format run: dotnet format ./Splunk.OpenTelemetry.AutoInstrumentation.sln --no-restore --verify-no-changes diff --git a/.github/workflows/scripts-test.yml b/.github/workflows/scripts-test.yml index def6ffde..83b86762 100644 --- a/.github/workflows/scripts-test.yml +++ b/.github/workflows/scripts-test.yml @@ -10,7 +10,7 @@ jobs: steps: - uses: actions/setup-dotnet@v4.0.0 with: - dotnet-version: 8.0.100 + dotnet-version: 8.0.101 - name: Test the PowerShell module instructions from README.md shell: powershell run: | @@ -52,7 +52,7 @@ jobs: steps: - uses: actions/setup-dotnet@v4.0.0 with: - dotnet-version: 7.0.404 + dotnet-version: 7.0.405 - run: brew install coreutils if: ${{ runner.os == 'macOS' }} - name: Create test directory diff --git a/docker/alpine.dockerfile b/docker/alpine.dockerfile index 5899b3e1..c4eaef07 100644 --- a/docker/alpine.dockerfile +++ b/docker/alpine.dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0.100-alpine3.18 +FROM mcr.microsoft.com/dotnet/sdk:8.0.101-alpine3.18 RUN apk update \ && apk upgrade \ @@ -20,10 +20,10 @@ ENV gRPC_PluginFullPath=/usr/bin/grpc_csharp_plugin # Install older sdks using the install script RUN curl -sSL https://dot.net/v1/dotnet-install.sh --output dotnet-install.sh \ && echo "SHA256: $(sha256sum dotnet-install.sh)" \ - && echo "4f699579f6171f04fb70829ad9cc5958e7db52e6da8da5df2db43ebba76a61d6 dotnet-install.sh" | sha256sum -c \ + && echo "ff2ff47318ffff0af9a6395ca6308b54376fba8c97a3a5eba3e848b0caf17b58 dotnet-install.sh" | sha256sum -c \ && chmod +x ./dotnet-install.sh \ - && ./dotnet-install.sh -v 6.0.417 --install-dir /usr/share/dotnet --no-path \ - && ./dotnet-install.sh -v 7.0.404 --install-dir /usr/share/dotnet --no-path \ + && ./dotnet-install.sh -v 6.0.418 --install-dir /usr/share/dotnet --no-path \ + && ./dotnet-install.sh -v 7.0.405 --install-dir /usr/share/dotnet --no-path \ && rm dotnet-install.sh WORKDIR /project