Skip to content
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
6 changes: 3 additions & 3 deletions .github/workflows/build-nuget-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
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 @@ -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
24 changes: 12 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
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 @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/release-nextgen-forwarder-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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' }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/verify-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
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: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 \
Expand All @@ -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
6 changes: 3 additions & 3 deletions docker/centos-stream9.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
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.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 && \
Expand All @@ -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
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.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 && \
Expand Down
2 changes: 1 addition & 1 deletion docker/ubuntu1604.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/demo/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ partial class EnvVarTypeConverter
/// ○ Match '}'.<br/>
/// </code>
/// </remarks>
[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;
}
}
Expand All @@ -43,7 +43,7 @@ namespace System.Text.RegularExpressions.Generated
using System.Threading;

/// <summary>Custom <see cref="Regex"/>-derived type for the GetEnvVarRegex method.</summary>
[GeneratedCodeAttribute("System.Text.RegularExpressions.Generator", "8.0.13.2707")]
[GeneratedCodeAttribute("System.Text.RegularExpressions.Generator", "8.0.13.10607")]
file sealed class GetEnvVarRegex_0 : Regex
{
/// <summary>Cached, thread-safe singleton instance.</summary>
Expand Down Expand Up @@ -324,7 +324,7 @@ void UncaptureUntil(int capturePosition)
}

/// <summary>Helper methods used by generated <see cref="Regex"/>-derived implementations.</summary>
[GeneratedCodeAttribute("System.Text.RegularExpressions.Generator", "8.0.13.2707")]
[GeneratedCodeAttribute("System.Text.RegularExpressions.Generator", "8.0.13.10607")]
file static class Utilities
{
/// <summary>Default timeout value set in <see cref="AppContext"/>, or <see cref="Regex.InfiniteMatchTimeout"/> if none was set.</summary>
Expand Down
Loading