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 9.0.102/8.0.405 #3936

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,8 +31,8 @@ jobs:
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # tag: v4.2.0
with:
dotnet-version: |
8.0.404
9.0.101
8.0.405
9.0.102

- name: Check for NuGet packages cache
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # tag: v4.2.0
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,8 +42,8 @@ jobs:
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # tag: v4.2.0
with:
dotnet-version: |
8.0.404
9.0.101
8.0.405
9.0.102

- name: Check for NuGet packages cache
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # tag: v4.2.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-sdk-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # tag: v4.2.0
with:
dotnet-version: 9.0.101
dotnet-version: 9.0.102

- name: Run VerifySdkVersions
run: ./build.cmd VerifySdkVersions
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ jobs:
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # tag: v4.2.0
with:
dotnet-version: |
8.0.404
9.0.101
8.0.405
9.0.102

- name: Check for NuGet packages cache
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # tag: v4.2.0
Expand Down Expand Up @@ -130,8 +130,8 @@ jobs:
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # tag: v4.2.0
with:
dotnet-version: |
8.0.404
9.0.101
8.0.405
9.0.102

- name: Check for NuGet packages cache
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # tag: v4.2.0
Expand Down Expand Up @@ -169,8 +169,8 @@ jobs:
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # tag: v4.2.0
with:
dotnet-version: |
8.0.404
9.0.101
8.0.405
9.0.102

- name: Check for NuGet packages cache
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # tag: v4.2.0
Expand Down Expand Up @@ -273,8 +273,8 @@ jobs:
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # tag: v4.2.0
with:
dotnet-version: |
8.0.404
9.0.101
8.0.405
9.0.102

- name: Check for NuGet packages cache
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # tag: v4.2.0
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 @@ -26,7 +26,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # tag: v4.2.0
with:
dotnet-version: 9.0.101
dotnet-version: 9.0.102

- 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,8 +13,8 @@ jobs:
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # tag: v4.2.0
with:
dotnet-version: |
8.0.404
9.0.101
8.0.405
9.0.102

- name: Test the PowerShell module instructions from README.md
shell: powershell
Expand Down Expand Up @@ -67,8 +67,8 @@ jobs:
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # tag: v4.2.0
with:
dotnet-version: |
8.0.404
9.0.101
8.0.405
9.0.102

- 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,8 +41,8 @@ jobs:
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # tag: v4.2.0
with:
dotnet-version: |
8.0.404
9.0.101
8.0.405
9.0.102

- 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
6 changes: 3 additions & 3 deletions docker/alpine.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:9.0.101-alpine3.20@sha256:cdc618c61fb14b297986a06ea895efe6eb49e30dfe3b2b6c8b4793e600a5f298
FROM mcr.microsoft.com/dotnet/sdk:9.0.102-alpine3.20@sha256:a9d99ca1f16b123abd916a9e95b4304c3d3e03e86781e24ca565119badd5cad6
RUN apk update \
&& apk upgrade \
&& apk add --no-cache --update \
Expand All @@ -19,9 +19,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 "48e5763854527aca84bf2c9b1542a22ec490e85657725eac8dc18eb0ed809413 dotnet-install.sh" | sha256sum -c \
&& echo "19b0a7890c371201b944bf0f8cdbb6460d053d63ddbea18cfed3e4199769ce17 dotnet-install.sh" | sha256sum -c \
&& chmod +x ./dotnet-install.sh \
&& ./dotnet-install.sh -v 8.0.404 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh -v 8.0.405 --install-dir /usr/share/dotnet --no-path \
&& rm dotnet-install.sh

WORKDIR /project
6 changes: 3 additions & 3 deletions docker/centos-stream9.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ RUN dnf install -y \

RUN curl -sSL https://dot.net/v1/dotnet-install.sh --output dotnet-install.sh \
&& echo "SHA256: $(sha256sum dotnet-install.sh)" \
&& echo "48e5763854527aca84bf2c9b1542a22ec490e85657725eac8dc18eb0ed809413 dotnet-install.sh" | sha256sum -c \
&& echo "19b0a7890c371201b944bf0f8cdbb6460d053d63ddbea18cfed3e4199769ce17 dotnet-install.sh" | sha256sum -c \
&& chmod +x ./dotnet-install.sh \
&& ./dotnet-install.sh -v 9.0.101 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh -v 8.0.404 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh -v 9.0.102 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh -v 8.0.405 --install-dir /usr/share/dotnet --no-path \
&& rm dotnet-install.sh

ENV PATH="$PATH:/usr/share/dotnet"
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:9.0.101-bookworm-slim@sha256:26d070b5f4f32fbf3223f24cd27c5aef94f9074e54270eca2239b833563f6221
FROM mcr.microsoft.com/dotnet/sdk:9.0.102-bookworm-slim@sha256:84fd557bebc64015e731aca1085b92c7619e49bdbe247e57392a43d92276f617

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 "48e5763854527aca84bf2c9b1542a22ec490e85657725eac8dc18eb0ed809413 dotnet-install.sh" | sha256sum -c \
&& echo "19b0a7890c371201b944bf0f8cdbb6460d053d63ddbea18cfed3e4199769ce17 dotnet-install.sh" | sha256sum -c \
&& chmod +x ./dotnet-install.sh \
&& ./dotnet-install.sh -v 8.0.404 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh -v 8.0.405 --install-dir /usr/share/dotnet --no-path \
&& rm dotnet-install.sh

WORKDIR /project
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:9.0.101-bookworm-slim@sha256:26d070b5f4f32fbf3223f24cd27c5aef94f9074e54270eca2239b833563f6221
FROM mcr.microsoft.com/dotnet/sdk:9.0.102-bookworm-slim@sha256:84fd557bebc64015e731aca1085b92c7619e49bdbe247e57392a43d92276f617

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
4 changes: 2 additions & 2 deletions docker/ubuntu1604.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/nul

RUN curl -sSL https://dot.net/v1/dotnet-install.sh --output dotnet-install.sh \
&& echo "SHA256: $(sha256sum dotnet-install.sh)" \
&& echo "48e5763854527aca84bf2c9b1542a22ec490e85657725eac8dc18eb0ed809413 dotnet-install.sh" | sha256sum -c \
&& echo "19b0a7890c371201b944bf0f8cdbb6460d053d63ddbea18cfed3e4199769ce17 dotnet-install.sh" | sha256sum -c \
&& chmod +x ./dotnet-install.sh \
&& ./dotnet-install.sh -v 9.0.101 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh -v 9.0.102 --install-dir /usr/share/dotnet --no-path \
&& rm dotnet-install.sh

WORKDIR /project
Loading