Merge branch 'main' into dependabot/nuget/MongoDB.Driver-2.22.0

open-telemetry · Oct 11, 2023 · 9d95512 · 9d95512
2 parents 142208f + 64dcee8
commit 9d95512
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 23 deletions.
diff --git a/.github/workflows/build-nuget-packages.yml b/.github/workflows/build-nuget-packages.yml
@@ -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]

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -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
@@ -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
@@ -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
@@ -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

diff --git a/.github/workflows/dotnet-format.yml b/.github/workflows/dotnet-format.yml
@@ -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
diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
@@ -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: |
@@ -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

diff --git a/.github/workflows/verify-test.yml b/.github/workflows/verify-test.yml
@@ -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]

diff --git a/docker/alpine.dockerfile b/docker/alpine.dockerfile
@@ -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 \
@@ -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
diff --git a/docker/centos.dockerfile b/docker/centos.dockerfile
@@ -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 /

diff --git a/docker/debian.dockerfile b/docker/debian.dockerfile
@@ -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 && \