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 #3698

Merged
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
4 changes: 2 additions & 2 deletions .github/workflows/build-nuget-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ jobs:
uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # tag: v4.0.1
with:
dotnet-version: |
6.0.425
6.0.427
7.0.410
8.0.402
8.0.403

- name: Check for NuGet packages cache
uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # tag: v4.1.1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ jobs:
uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # tag: v4.0.1
with:
dotnet-version: |
6.0.425
6.0.427
7.0.410
8.0.402
8.0.403

- name: Check for NuGet packages cache
uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # tag: v4.1.1
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ jobs:
uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # tag: v4.0.1
with:
dotnet-version: |
6.0.425
6.0.427
7.0.410
8.0.402
8.0.403

- name: Check for NuGet packages cache
uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # tag: v4.1.1
Expand Down Expand Up @@ -131,9 +131,9 @@ jobs:
uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # tag: v4.0.1
with:
dotnet-version: |
6.0.425
6.0.427
7.0.410
8.0.402
8.0.403

- name: Check for NuGet packages cache
uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # tag: v4.1.1
Expand Down Expand Up @@ -171,9 +171,9 @@ jobs:
uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # tag: v4.0.1
with:
dotnet-version: |
6.0.425
6.0.427
7.0.410
8.0.402
8.0.403

- name: Check for NuGet packages cache
uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # tag: v4.1.1
Expand Down Expand Up @@ -280,9 +280,9 @@ jobs:
uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # tag: v4.0.1
with:
dotnet-version: |
6.0.425
6.0.427
7.0.410
8.0.402
8.0.403

- name: Check for NuGet packages cache
uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # tag: v4.1.1
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 @@ -25,7 +25,7 @@ jobs:
- name: Setup .NET 8
uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # tag: v4.0.1
with:
dotnet-version: 8.0.402
dotnet-version: 8.0.403

- name: dotnet format
run: dotnet format .\OpenTelemetry.AutoInstrumentation.sln --no-restore --verify-no-changes
8 changes: 4 additions & 4 deletions .github/workflows/release-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:
uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # tag: v4.0.1
with:
dotnet-version: |
6.0.425
6.0.427
7.0.410
8.0.402
8.0.403

- name: Test the PowerShell module instructions from README.md
shell: powershell
Expand Down Expand Up @@ -68,9 +68,9 @@ jobs:
uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # tag: v4.0.1
with:
dotnet-version: |
6.0.425
6.0.427
7.0.410
8.0.402
8.0.403

- name: Install MacOS CoreUtils
if: ${{ runner.os == 'macOS' }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/verify-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ jobs:
uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # tag: v4.0.1
with:
dotnet-version: |
6.0.425
6.0.427
7.0.410
8.0.402
8.0.403

- name: Run BuildTracer and ManagedTests
run: ./build.cmd BuildTracer ManagedTests --containers ${{ matrix.containers }} --test-project "${{ github.event.inputs.testProject }}" --test-name '"${{ github.event.inputs.testName }}"' --test-count ${{ github.event.inputs.count }}
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h

### Changed

- Musl-based (Alpine) libraries are compiled on Alpine v3.20.

#### Dependency updates

- .NET Framework only, following packages updated
Expand Down
18 changes: 9 additions & 9 deletions docker/alpine.dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
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 @@ -21,7 +21,7 @@ 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 \
&& 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
2 changes: 1 addition & 1 deletion docker/centos.dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ghcr.io/open-telemetry/opentelemetry-dotnet-instrumentation-centos7-build-image:main

RUN rpm -Uvh https://packages.microsoft.com/config/centos/7/packages-microsoft-prod.rpm
RUN yum -y install dotnet-sdk-6.0-6.0.425-1 dotnet-sdk-7.0-7.0.410-1
RUN yum -y install dotnet-sdk-6.0-6.0.427-1 dotnet-sdk-7.0-7.0.410-1

ENV IsCentos=true
WORKDIR /project
Expand Down
4 changes: 2 additions & 2 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 @@ -11,7 +11,7 @@ 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 \
&& 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
2 changes: 1 addition & 1 deletion docker/debian.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 wget https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -O packages-microsoft-prod.deb && \
dpkg -i packages-microsoft-prod.deb && \
Expand Down
Loading