diff --git a/.github/workflows/build-nuget-packages.yml b/.github/workflows/build-nuget-packages.yml index 88470d5e5a..4ee16eddb3 100644 --- a/.github/workflows/build-nuget-packages.yml +++ b/.github/workflows/build-nuget-packages.yml @@ -33,9 +33,9 @@ jobs: uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # tag: v5.1.0 with: dotnet-version: | - 8.0.416 - 9.0.308 - 10.0.101 + 8.0.417 + 9.0.309 + 10.0.102 - name: Check for NuGet packages cache uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # tag: v5.0.1 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1e59df177c..4b496b2e77 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,9 +36,9 @@ jobs: uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # tag: v5.1.0 with: dotnet-version: | - 8.0.416 - 9.0.308 - 10.0.101 + 8.0.417 + 9.0.309 + 10.0.102 - name: Check for NuGet packages cache uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # tag: v5.0.1 diff --git a/.github/workflows/check-sdk-versions.yml b/.github/workflows/check-sdk-versions.yml index feabca5fbc..ae8765041b 100644 --- a/.github/workflows/check-sdk-versions.yml +++ b/.github/workflows/check-sdk-versions.yml @@ -21,7 +21,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # tag: v5.1.0 with: - dotnet-version: 10.0.101 + dotnet-version: 10.0.102 - name: Run VerifySdkVersions run: ./build.cmd VerifySdkVersions diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 102bbfb8c7..10d6c2dcc2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,9 +71,9 @@ jobs: uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # tag: v5.1.0 with: dotnet-version: | - 8.0.416 - 9.0.308 - 10.0.101 + 8.0.417 + 9.0.309 + 10.0.102 - name: Check for NuGet packages cache uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # tag: v5.0.1 @@ -131,9 +131,9 @@ jobs: uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # tag: v5.1.0 with: dotnet-version: | - 8.0.416 - 9.0.308 - 10.0.101 + 8.0.417 + 9.0.309 + 10.0.102 - name: Check for NuGet packages cache uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # tag: v5.0.1 @@ -175,9 +175,9 @@ jobs: uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # tag: v5.1.0 with: dotnet-version: | - 8.0.416 - 9.0.308 - 10.0.101 + 8.0.417 + 9.0.309 + 10.0.102 - name: Check for NuGet packages cache uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # tag: v5.0.1 @@ -283,9 +283,9 @@ jobs: uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # tag: v5.1.0 with: dotnet-version: | - 8.0.416 - 9.0.308 - 10.0.101 + 8.0.417 + 9.0.309 + 10.0.102 - name: Check for NuGet packages cache uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # tag: v5.0.1 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 94253d0c56..fd8da1635e 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -78,9 +78,9 @@ jobs: uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # tag: v5.1.0 with: dotnet-version: | - 8.0.416 - 9.0.308 - 10.0.101 + 8.0.417 + 9.0.309 + 10.0.102 # If the analyze step fails for one of the languages you are analyzing with # "We were unable to automatically build your code", modify the matrix above diff --git a/.github/workflows/dotnet-format.yml b/.github/workflows/dotnet-format.yml index ffbd5f5144..20fb6c83f0 100644 --- a/.github/workflows/dotnet-format.yml +++ b/.github/workflows/dotnet-format.yml @@ -28,7 +28,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # tag: v5.1.0 with: - dotnet-version: 10.0.101 + dotnet-version: 10.0.102 - name: dotnet format run: dotnet format .\OpenTelemetry.AutoInstrumentation.sln --no-restore --verify-no-changes diff --git a/.github/workflows/release-nextgen-forwarder-packages.yml b/.github/workflows/release-nextgen-forwarder-packages.yml index 99b71a20dd..14bf7dce7f 100644 --- a/.github/workflows/release-nextgen-forwarder-packages.yml +++ b/.github/workflows/release-nextgen-forwarder-packages.yml @@ -32,7 +32,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # tag: v5.1.0 with: - dotnet-version: 9.0.308 + dotnet-version: 9.0.309 - name: Check for NuGet packages cache uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # tag: v5.0.1 diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml index 1ef48966b8..f30be69187 100644 --- a/.github/workflows/release-publish.yml +++ b/.github/workflows/release-publish.yml @@ -16,9 +16,9 @@ jobs: uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # tag: v5.1.0 with: dotnet-version: | - 8.0.416 - 9.0.308 - 10.0.101 + 8.0.417 + 9.0.309 + 10.0.102 - name: Test the PowerShell module instructions from README.md shell: powershell @@ -68,9 +68,9 @@ jobs: uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # tag: v5.1.0 with: dotnet-version: | - 8.0.416 - 9.0.308 - 10.0.101 + 8.0.417 + 9.0.309 + 10.0.102 - name: Install MacOS CoreUtils if: ${{ runner.os == 'macOS' }} diff --git a/.github/workflows/verify-test.yml b/.github/workflows/verify-test.yml index 060deb3db6..c3e550bd39 100644 --- a/.github/workflows/verify-test.yml +++ b/.github/workflows/verify-test.yml @@ -41,9 +41,9 @@ jobs: uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # tag: v5.1.0 with: dotnet-version: | - 8.0.416 - 9.0.308 - 10.0.101 + 8.0.417 + 9.0.309 + 10.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 }} diff --git a/docker/alpine.dockerfile b/docker/alpine.dockerfile index 24cae107a6..2673346f15 100644 --- a/docker/alpine.dockerfile +++ b/docker/alpine.dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:10.0.101-alpine3.22@sha256:0fba99926e4f12405c78f37941312f00c1aadb178bd63616f5d96fc2af5a26a9 +FROM mcr.microsoft.com/dotnet/sdk:10.0.102-alpine3.22@sha256:bd7f021a8293d1a21a51824b76b15e930c6024bd85bc78859c5f249cb07f3a7e RUN apk update \ && apk upgrade \ && apk add --no-cache --update \ @@ -20,8 +20,8 @@ COPY ./scripts/dotnet-install.sh ./dotnet-install.sh # Install older SDKs using the install script RUN chmod +x ./dotnet-install.sh \ - && ./dotnet-install.sh -v 9.0.308 --install-dir /usr/share/dotnet --no-path \ - && ./dotnet-install.sh -v 8.0.416 --install-dir /usr/share/dotnet --no-path \ + && ./dotnet-install.sh -v 9.0.309 --install-dir /usr/share/dotnet --no-path \ + && ./dotnet-install.sh -v 8.0.417 --install-dir /usr/share/dotnet --no-path \ && rm dotnet-install.sh WORKDIR /project diff --git a/docker/centos-stream9.dockerfile b/docker/centos-stream9.dockerfile index 9f16c25b9b..89140de044 100644 --- a/docker/centos-stream9.dockerfile +++ b/docker/centos-stream9.dockerfile @@ -7,9 +7,9 @@ RUN dnf install -y \ COPY ./scripts/dotnet-install.sh ./dotnet-install.sh RUN chmod +x ./dotnet-install.sh \ - && ./dotnet-install.sh -v 10.0.101 --install-dir /usr/share/dotnet --no-path \ - && ./dotnet-install.sh -v 9.0.308 --install-dir /usr/share/dotnet --no-path \ - && ./dotnet-install.sh -v 8.0.416 --install-dir /usr/share/dotnet --no-path \ + && ./dotnet-install.sh -v 10.0.102 --install-dir /usr/share/dotnet --no-path \ + && ./dotnet-install.sh -v 9.0.309 --install-dir /usr/share/dotnet --no-path \ + && ./dotnet-install.sh -v 8.0.417 --install-dir /usr/share/dotnet --no-path \ && rm dotnet-install.sh ENV PATH="$PATH:/usr/share/dotnet" diff --git a/docker/debian-arm64.dockerfile b/docker/debian-arm64.dockerfile index ec1c366876..74a88648d6 100644 --- a/docker/debian-arm64.dockerfile +++ b/docker/debian-arm64.dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:9.0.308-bookworm-slim@sha256:ddc0e6d46a459d1c740dd9e3d2668bc50f24d420274fb751e39cbf75154b9485 +FROM mcr.microsoft.com/dotnet/sdk:9.0.309-bookworm-slim@sha256:c336232f89997e8b03d104edb89253d0e7d7db20779005c0b66da41c0043a9c2 # There is no official base image for .NET SDK 10+ on Debian, so install .NET10 via dotnet-install RUN apt-get update && \ @@ -11,8 +11,8 @@ COPY ./scripts/dotnet-install.sh ./dotnet-install.sh # Install older SDKs using the install script as there are no arm64 SDK packages. RUN chmod +x ./dotnet-install.sh \ - && ./dotnet-install.sh -v 10.0.101 --install-dir /usr/share/dotnet --no-path \ - && ./dotnet-install.sh -v 8.0.416 --install-dir /usr/share/dotnet --no-path \ + && ./dotnet-install.sh -v 10.0.102 --install-dir /usr/share/dotnet --no-path \ + && ./dotnet-install.sh -v 8.0.417 --install-dir /usr/share/dotnet --no-path \ && rm dotnet-install.sh WORKDIR /project diff --git a/docker/debian.dockerfile b/docker/debian.dockerfile index f3285d1569..298e5d96aa 100644 --- a/docker/debian.dockerfile +++ b/docker/debian.dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:9.0.308-bookworm-slim@sha256:ddc0e6d46a459d1c740dd9e3d2668bc50f24d420274fb751e39cbf75154b9485 +FROM mcr.microsoft.com/dotnet/sdk:9.0.309-bookworm-slim@sha256:c336232f89997e8b03d104edb89253d0e7d7db20779005c0b66da41c0043a9c2 # There is no official base image for .NET SDK 10+ on Debian, so install .NET10 via apt-get RUN wget https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -O packages-microsoft-prod.deb && \ diff --git a/docker/ubuntu1604.dockerfile b/docker/ubuntu1604.dockerfile index ec20b584d5..bd616369c2 100644 --- a/docker/ubuntu1604.dockerfile +++ b/docker/ubuntu1604.dockerfile @@ -34,7 +34,7 @@ RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/nul COPY ./scripts/dotnet-install.sh ./dotnet-install.sh RUN chmod +x ./dotnet-install.sh \ - && ./dotnet-install.sh -v 9.0.308 --install-dir /usr/share/dotnet --no-path \ + && ./dotnet-install.sh -v 9.0.309 --install-dir /usr/share/dotnet --no-path \ && rm dotnet-install.sh ENV IsLegacyUbuntu=true diff --git a/examples/demo/Dockerfile b/examples/demo/Dockerfile index 87e0c2907f..6273effdb4 100644 --- a/examples/demo/Dockerfile +++ b/examples/demo/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:10.0.101-noble@sha256:d1823fecac3689a2eb959e02ee3bfe1c2142392808240039097ad70644566190 +FROM mcr.microsoft.com/dotnet/sdk:10.0.102-noble@sha256:d1823fecac3689a2eb959e02ee3bfe1c2142392808240039097ad70644566190 # install OpenTelemetry .NET Automatic Instrumentation ARG OTEL_VERSION=1.13.0 diff --git a/src/OpenTelemetry.AutoInstrumentation/Generated/net8.0/System.Text.RegularExpressions.Generator/System.Text.RegularExpressions.Generator.RegexGenerator/RegexGenerator.g.cs b/src/OpenTelemetry.AutoInstrumentation/Generated/net8.0/System.Text.RegularExpressions.Generator/System.Text.RegularExpressions.Generator.RegexGenerator/RegexGenerator.g.cs index 5bfe46098b..684089e71a 100644 --- a/src/OpenTelemetry.AutoInstrumentation/Generated/net8.0/System.Text.RegularExpressions.Generator/System.Text.RegularExpressions.Generator.RegexGenerator/RegexGenerator.g.cs +++ b/src/OpenTelemetry.AutoInstrumentation/Generated/net8.0/System.Text.RegularExpressions.Generator/System.Text.RegularExpressions.Generator.RegexGenerator/RegexGenerator.g.cs @@ -25,7 +25,7 @@ partial class EnvVarTypeConverter /// ○ Match '}'.
/// /// - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Text.RegularExpressions.Generator", "8.0.13.2707")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Text.RegularExpressions.Generator", "8.0.13.10607")] private static partial global::System.Text.RegularExpressions.Regex GetEnvVarRegex() => global::System.Text.RegularExpressions.Generated.GetEnvVarRegex_0.Instance; } } @@ -43,7 +43,7 @@ namespace System.Text.RegularExpressions.Generated using System.Threading; /// Custom -derived type for the GetEnvVarRegex method. - [GeneratedCodeAttribute("System.Text.RegularExpressions.Generator", "8.0.13.2707")] + [GeneratedCodeAttribute("System.Text.RegularExpressions.Generator", "8.0.13.10607")] file sealed class GetEnvVarRegex_0 : Regex { /// Cached, thread-safe singleton instance. @@ -324,7 +324,7 @@ void UncaptureUntil(int capturePosition) } /// Helper methods used by generated -derived implementations. - [GeneratedCodeAttribute("System.Text.RegularExpressions.Generator", "8.0.13.2707")] + [GeneratedCodeAttribute("System.Text.RegularExpressions.Generator", "8.0.13.10607")] file static class Utilities { /// Default timeout value set in , or if none was set.