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
4 changes: 2 additions & 2 deletions .github/workflows/build-nuget-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ jobs:
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # tag: v5.0.0
with:
dotnet-version: |
8.0.413
9.0.304
8.0.414
9.0.305

- name: Check for NuGet packages cache
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # tag: v4.2.4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ jobs:
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # tag: v5.0.0
with:
dotnet-version: |
8.0.413
9.0.304
8.0.414
9.0.305

- name: Check for NuGet packages cache
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # tag: v4.2.4
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@d4c94342e560b34958eacfc5d055d21461ed1c5d # tag: v5.0.0
with:
dotnet-version: 9.0.304
dotnet-version: 9.0.305

- name: Run VerifySdkVersions
run: ./build.cmd VerifySdkVersions
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ jobs:
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # tag: v5.0.0
with:
dotnet-version: |
8.0.413
9.0.304
8.0.414
9.0.305

- name: Check for NuGet packages cache
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # tag: v4.2.4
Expand Down Expand Up @@ -130,8 +130,8 @@ jobs:
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # tag: v5.0.0
with:
dotnet-version: |
8.0.413
9.0.304
8.0.414
9.0.305

- name: Check for NuGet packages cache
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # tag: v4.2.4
Expand Down Expand Up @@ -173,8 +173,8 @@ jobs:
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # tag: v5.0.0
with:
dotnet-version: |
8.0.413
9.0.304
8.0.414
9.0.305

- name: Check for NuGet packages cache
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # tag: v4.2.4
Expand Down Expand Up @@ -280,8 +280,8 @@ jobs:
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # tag: v5.0.0
with:
dotnet-version: |
8.0.413
9.0.304
8.0.414
9.0.305

- name: Check for NuGet packages cache
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # tag: v4.2.4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ jobs:
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
with:
dotnet-version: |
8.0.413
9.0.304
8.0.414
9.0.305

# 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@d4c94342e560b34958eacfc5d055d21461ed1c5d # tag: v5.0.0
with:
dotnet-version: 9.0.304
dotnet-version: 9.0.305

- 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@d4c94342e560b34958eacfc5d055d21461ed1c5d # tag: v5.0.0
with:
dotnet-version: 9.0.304
dotnet-version: 9.0.305

- name: Check for NuGet packages cache
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # tag: v4.2.4
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # tag: v5.0.0
with:
dotnet-version: |
8.0.413
9.0.304
8.0.414
9.0.305

- name: Test the PowerShell module instructions from README.md
shell: powershell
Expand Down Expand Up @@ -67,8 +67,8 @@ jobs:
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # tag: v5.0.0
with:
dotnet-version: |
8.0.413
9.0.304
8.0.414
9.0.305

- name: Install MacOS CoreUtils
if: ${{ runner.os == 'macOS' }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/verify-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ jobs:
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # tag: v5.0.0
with:
dotnet-version: |
8.0.413
9.0.304
8.0.414
9.0.305

- 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
4 changes: 2 additions & 2 deletions docker/alpine.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:9.0.304-alpine3.21@sha256:430bd56f4348f9dd400331f0d71403554ec83ae1700a7dcfe1e1519c9fd12174
FROM mcr.microsoft.com/dotnet/sdk:9.0.305-alpine3.21@sha256:f47429a125e38d83f5231a78dde18106cb447d541f7ffdc5b8af4d227a323d95
RUN apk update \
&& apk upgrade \
&& apk add --no-cache --update \
Expand All @@ -20,7 +20,7 @@ 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 8.0.413 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh -v 8.0.414 --install-dir /usr/share/dotnet --no-path \
&& rm dotnet-install.sh

WORKDIR /project
4 changes: 2 additions & 2 deletions docker/centos-stream9.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ RUN dnf install -y \
COPY ./scripts/dotnet-install.sh ./dotnet-install.sh

RUN chmod +x ./dotnet-install.sh \
&& ./dotnet-install.sh -v 9.0.304 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh -v 8.0.413 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh -v 9.0.305 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh -v 8.0.414 --install-dir /usr/share/dotnet --no-path \
&& rm dotnet-install.sh

ENV PATH="$PATH:/usr/share/dotnet"
Expand Down
4 changes: 2 additions & 2 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.304-bookworm-slim@sha256:ae000be75dac94fc40e00f0eee903289e985995cc06dac3937469254ce5b60b6
FROM mcr.microsoft.com/dotnet/sdk:9.0.305-bookworm-slim@sha256:bb42ae2c058609d1746baf24fe6864ecab0686711dfca1f4b7a99e367ab17162

RUN apt-get update && \
apt-get install -y \
Expand All @@ -10,7 +10,7 @@ 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 8.0.413 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh -v 8.0.414 --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.304-bookworm-slim@sha256:ae000be75dac94fc40e00f0eee903289e985995cc06dac3937469254ce5b60b6
FROM mcr.microsoft.com/dotnet/sdk:9.0.305-bookworm-slim@sha256:bb42ae2c058609d1746baf24fe6864ecab0686711dfca1f4b7a99e367ab17162

RUN wget https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -O packages-microsoft-prod.deb && \
dpkg -i 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.304 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh -v 9.0.305 --install-dir /usr/share/dotnet --no-path \
&& rm dotnet-install.sh

WORKDIR /project
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:8.0.413-jammy@sha256:05594d347192d12cc8c7137493b45f9e5390aa12654cf2c45b028960b2808571
FROM mcr.microsoft.com/dotnet/sdk:8.0.414-jammy@sha256:b6142e9f2ba1d33700791de1b5946dd3f75d65198ca73be99aca966ee37896f1

# install OpenTelemetry .NET Automatic Instrumentation
ARG OTEL_VERSION=1.12.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.12.36514")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Text.RegularExpressions.Generator", "8.0.12.41914")]
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.12.36514")]
[GeneratedCodeAttribute("System.Text.RegularExpressions.Generator", "8.0.12.41914")]
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.12.36514")]
[GeneratedCodeAttribute("System.Text.RegularExpressions.Generator", "8.0.12.41914")]
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