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.

Sign up for GitHub

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 7.0.402/6.0.415 #3000

Merged
merged 2 commits into from
Oct 11, 2023
Merged

Bump .NET SDK to 7.0.402/6.0.415 #3000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c039418
Bump dotnet/sdk from 7.0.401-alpine3.18 to 7.0.402-alpine3.18 in /docker
dependabot[bot] Oct 11, 2023
fe28a85
Bump other places
Kielek Oct 11, 2023
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ jobs:
- uses: actions/[email protected]
with:
dotnet-version: |
6.0.414
7.0.401
6.0.415
7.0.402

- name: Check for NuGet packages cache
uses: actions/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ jobs:
- uses: actions/[email protected]
with:
dotnet-version: |
6.0.414
7.0.401
6.0.415
7.0.402
- name: Check for NuGet packages cache
uses: actions/[email protected]
id: nuget-cache
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ jobs:
- uses: actions/[email protected]
with:
dotnet-version: |
6.0.414
7.0.401
6.0.415
7.0.402
- name: Check for NuGet packages cache
uses: actions/[email protected]
id: nuget-cache
Expand Down Expand Up @@ -94,8 +94,8 @@ jobs:
- uses: actions/[email protected]
with:
dotnet-version: |
6.0.414
7.0.401
6.0.415
7.0.402
- name: Check for NuGet packages cache
uses: actions/[email protected]
id: nuget-cache
Expand Down Expand Up @@ -125,8 +125,8 @@ jobs:
- uses: actions/[email protected]
with:
dotnet-version: |
6.0.414
7.0.401
6.0.415
7.0.402
- name: Check for NuGet packages cache
uses: actions/[email protected]
id: nuget-cache
Expand Down Expand Up @@ -199,8 +199,8 @@ jobs:
- uses: actions/[email protected]
with:
dotnet-version: |
6.0.414
7.0.401
6.0.415
7.0.402
- name: Check for NuGet packages cache
uses: actions/[email protected]
id: nuget-cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dotnet-format.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Setup .NET 7.0
uses: actions/[email protected]
with:
dotnet-version: 7.0.401
dotnet-version: 7.0.402

- 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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
- uses: actions/[email protected]
with:
dotnet-version: |
6.0.414
7.0.401
6.0.415
7.0.402
- name: Test the PowerShell module instructions from README.md
shell: powershell
run: |
Expand Down Expand Up @@ -55,8 +55,8 @@ jobs:
- uses: actions/[email protected]
with:
dotnet-version: |
6.0.414
7.0.401
6.0.415
7.0.402
- run: brew install coreutils
if: ${{ runner.os == 'macOS' }}
- name: Create test directory
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/verify-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ jobs:
- uses: actions/[email protected]
with:
dotnet-version: |
6.0.414
7.0.401
6.0.415
7.0.402
- 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 }}
- name: Upload logs
uses: actions/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions docker/alpine.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:7.0.401-alpine3.18
FROM mcr.microsoft.com/dotnet/sdk:7.0.402-alpine3.18

RUN apk update \
&& apk upgrade \
Expand All @@ -22,7 +22,7 @@ RUN curl -sSL https://dot.net/v1/dotnet-install.sh --output dotnet-install.sh \
&& echo "SHA256: $(sha256sum dotnet-install.sh)" \
&& echo "a07fe1945b0e619797125f08762195227e7a76218deeabea0f88d3a0c0588964 dotnet-install.sh" | sha256sum -c \
&& chmod +x ./dotnet-install.sh \
&& ./dotnet-install.sh -v 6.0.414 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh -v 6.0.415 --install-dir /usr/share/dotnet --no-path \
&& rm dotnet-install.sh

WORKDIR /project
2 changes: 1 addition & 1 deletion docker/centos.dockerfile
View file
Open in desktop
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.414-1 dotnet-sdk-7.0-7.0.401-1
RUN yum -y install dotnet-sdk-6.0-6.0.415-1 dotnet-sdk-7.0-7.0.402-1

WORKDIR /project
COPY ./docker-entrypoint.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/debian.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:7.0.401-bullseye-slim
FROM mcr.microsoft.com/dotnet/sdk:7.0.402-bullseye-slim

RUN wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb && \
dpkg -i packages-microsoft-prod.deb && \
Expand Down
Loading