Merge branch 'main' into arm64

# Conflicts: # .github/workflows/build.yml # .github/workflows/ci.yml
open-telemetry · Feb 19, 2024 · f60c1c5 · f60c1c5
2 parents e1338ce + 0b0f728
commit f60c1c5
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 17 deletions.
diff --git a/.github/workflows/build-nuget-packages.yml b/.github/workflows/build-nuget-packages.yml
@@ -31,7 +31,7 @@ jobs:
           dotnet-version: | 
             6.0.419
             7.0.406
-            8.0.200
+            8.0.201
 
       - name: Check for NuGet packages cache
         uses: actions/[email protected]

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -43,8 +43,7 @@ jobs:
           dotnet-version: | 
             6.0.419
             7.0.406
-            8.0.200
-
+            8.0.201
       - 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
@@ -67,8 +67,7 @@ jobs:
           dotnet-version: | 
             6.0.419
             7.0.406
-            8.0.200
-
+            8.0.201
       - name: Check for NuGet packages cache
         uses: actions/[email protected]
         id: nuget-cache
@@ -131,8 +130,7 @@ jobs:
           dotnet-version: | 
             6.0.419
             7.0.406
-            8.0.200
-
+            8.0.201
       - name: Check for NuGet packages cache
         uses: actions/[email protected]
         id: nuget-cache
@@ -170,8 +168,7 @@ jobs:
           dotnet-version: | 
             6.0.419
             7.0.406
-            8.0.200
-
+            8.0.201
       - name: Check for NuGet packages cache
         uses: actions/[email protected]
         id: nuget-cache
@@ -256,8 +253,7 @@ jobs:
           dotnet-version: | 
             6.0.419
             7.0.406
-            8.0.200
-
+            8.0.201
       - 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 8
       uses: actions/[email protected]
       with:
-        dotnet-version: 8.0.200
+        dotnet-version: 8.0.201
 
     - 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
@@ -13,7 +13,7 @@ jobs:
           dotnet-version: | 
             6.0.419
             7.0.406
-            8.0.200
+            8.0.201
       - name: Test the PowerShell module instructions from README.md
         shell: powershell
         run: |
@@ -58,7 +58,7 @@ jobs:
           dotnet-version: | 
             6.0.419
             7.0.406
-            8.0.200
+            8.0.201
       - 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
@@ -32,7 +32,7 @@ jobs:
           dotnet-version: | 
             6.0.419
             7.0.406
-            8.0.200
+            8.0.201
       - 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:8.0.200-alpine3.18
+FROM mcr.microsoft.com/dotnet/sdk:8.0.201-alpine3.18
 RUN apk update \
     && apk upgrade \
     && apk add --no-cache --update \

diff --git a/docker/debian.dockerfile b/docker/debian.dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0.200-bookworm-slim
+FROM mcr.microsoft.com/dotnet/sdk:8.0.201-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 && \
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,7 +31,7 @@ jobs: @@
               dotnet-version: |
 .0.419
 .0.406
-.0.200
+.0.201
           - name: Check for NuGet packages cache
             uses: actions/[email protected]
@@ Expand Down @@