Skip to content
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

Bump .NET SDK to 8.0.403/6.0.427 #564

Merged
merged 2 commits into from
Oct 24, 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
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ jobs:
- uses: actions/[email protected]
with:
dotnet-version: |
6.0.425
6.0.427
7.0.410
8.0.402
8.0.403
- run: ./build.cmd Workflow
- run: brew install coreutils
if: ${{ runner.os == 'macOS' }}
Expand Down Expand Up @@ -132,9 +132,9 @@ jobs:
- uses: actions/[email protected]
with:
dotnet-version: |
6.0.425
6.0.427
7.0.410
8.0.402
8.0.403
- run: ./build.cmd NuGetWorkflow
- uses: actions/[email protected]
with:
Expand All @@ -157,9 +157,9 @@ jobs:
- uses: actions/[email protected]
with:
dotnet-version: |
6.0.425
6.0.427
7.0.410
8.0.402
8.0.403
- name: Download NuGet Artifacts from build-nuget-package job
uses: actions/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dotnet-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: actions/[email protected]
- uses: actions/[email protected]
with:
dotnet-version: 8.0.402
dotnet-version: 8.0.403

- name: dotnet format
run: dotnet format ./Splunk.OpenTelemetry.AutoInstrumentation.sln --no-restore --verify-no-changes
2 changes: 1 addition & 1 deletion .github/workflows/scripts-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
steps:
- uses: actions/[email protected]
with:
dotnet-version: 8.0.402
dotnet-version: 8.0.403
- name: Test the PowerShell module instructions from README.md
shell: powershell
run: |
Expand Down
20 changes: 10 additions & 10 deletions docker/alpine-arm64.dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
FROM mcr.microsoft.com/dotnet/sdk:8.0.402-alpine3.19
FROM mcr.microsoft.com/dotnet/sdk:8.0.403-alpine3.20

RUN apk update \
&& apk upgrade \
&& apk add --no-cache --update \
clang=17.0.5-r0 \
cmake=3.27.8-r0 \
clang=17.0.6-r1 \
cmake=3.29.3-r0 \
make=4.4.1-r2 \
bash=5.2.21-r0 \
bash=5.2.26-r0 \
alpine-sdk=1.0-r1 \
protobuf=24.4-r0 \
protobuf-dev=24.4-r0 \
grpc=1.59.3-r0 \
grpc-plugins=1.59.3-r0
protobuf=24.4-r1 \
protobuf-dev=24.4-r1 \
grpc=1.62.1-r0 \
grpc-plugins=1.62.1-r0

ENV IsAlpine=true
ENV PROTOBUF_PROTOC=/usr/bin/protoc
Expand All @@ -20,9 +20,9 @@ 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 "8b33761700040a9cd7f835f181a7c350b866e42425540c3a1894cc7919b275e3 dotnet-install.sh" | sha256sum -c \
&& echo "de4957e41252191427a8ba0866f640b9f19c98fad62305919de41bd332e9c820 dotnet-install.sh" | sha256sum -c \
&& chmod +x ./dotnet-install.sh \
&& ./dotnet-install.sh -v 6.0.425 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh -v 6.0.427 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh -v 7.0.410 --install-dir /usr/share/dotnet --no-path \
&& rm dotnet-install.sh

Expand Down
20 changes: 10 additions & 10 deletions docker/alpine-x64.dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
FROM mcr.microsoft.com/dotnet/sdk:8.0.402-alpine3.19
FROM mcr.microsoft.com/dotnet/sdk:8.0.403-alpine3.20

RUN apk update \
&& apk upgrade \
&& apk add --no-cache --update \
clang=17.0.5-r0 \
cmake=3.27.8-r0 \
clang=17.0.6-r1 \
cmake=3.29.3-r0 \
make=4.4.1-r2 \
bash=5.2.21-r0 \
bash=5.2.26-r0 \
alpine-sdk=1.0-r1 \
protobuf=24.4-r0 \
protobuf-dev=24.4-r0 \
grpc=1.59.3-r0 \
grpc-plugins=1.59.3-r0
protobuf=24.4-r1 \
protobuf-dev=24.4-r1 \
grpc=1.62.1-r0 \
grpc-plugins=1.62.1-r0

ENV IsAlpine=true
ENV PROTOBUF_PROTOC=/usr/bin/protoc
Expand All @@ -20,9 +20,9 @@ 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 "8b33761700040a9cd7f835f181a7c350b866e42425540c3a1894cc7919b275e3 dotnet-install.sh" | sha256sum -c \
&& echo "de4957e41252191427a8ba0866f640b9f19c98fad62305919de41bd332e9c820 dotnet-install.sh" | sha256sum -c \
&& chmod +x ./dotnet-install.sh \
&& ./dotnet-install.sh -v 6.0.425 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh -v 6.0.427 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh -v 7.0.410 --install-dir /usr/share/dotnet --no-path \
&& rm dotnet-install.sh

Expand Down
6 changes: 3 additions & 3 deletions docker/debian-arm64.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:8.0.402-bookworm-slim
FROM mcr.microsoft.com/dotnet/sdk:8.0.403-bookworm-slim

RUN apt-get update && \
apt-get install -y \
Expand All @@ -9,9 +9,9 @@ RUN apt-get update && \
# Install older sdks using the install script as there are no arm64 SDK packages.
RUN curl -sSL https://dot.net/v1/dotnet-install.sh --output dotnet-install.sh \
&& echo "SHA256: $(sha256sum dotnet-install.sh)" \
&& echo "8b33761700040a9cd7f835f181a7c350b866e42425540c3a1894cc7919b275e3 dotnet-install.sh" | sha256sum -c \
&& echo "de4957e41252191427a8ba0866f640b9f19c98fad62305919de41bd332e9c820 dotnet-install.sh" | sha256sum -c \
&& chmod +x ./dotnet-install.sh \
&& ./dotnet-install.sh -v 6.0.425 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh -v 6.0.427 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh -v 7.0.410 --install-dir /usr/share/dotnet --no-path \
&& rm dotnet-install.sh

Expand Down
Loading