From 7c8ebbf12529c0d5f52242449411446ddb491c5c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Jul 2025 18:36:54 +0000 Subject: [PATCH 1/3] Update dotnet monorepo | datasource | package | from | to | | -------------- | ---------------- | ------- | ------- | | nuget | System.Text.Json | 8.0.5 | 8.0.6 | | dotnet-version | dotnet-sdk | 8.0.411 | 8.0.412 | Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- global.json | 2 +- .../Grafana.OpenTelemetry.Base.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 552ef8d0..aff0add0 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { "rollForward": "latestFeature", - "version": "8.0.411", + "version": "8.0.412", "allowPrerelease": false } } diff --git a/src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj b/src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj index 371106fc..b78d8ec7 100644 --- a/src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj +++ b/src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj @@ -10,7 +10,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From ebe2c1936814a22e9ba53281c61a59a738a1c93f Mon Sep 17 00:00:00 2001 From: Martin Costello Date: Thu, 10 Jul 2025 08:22:52 +0100 Subject: [PATCH 2/3] Update Dockerfile Update to latest SDK and runtime. --- examples/net8.0/aspnetcore/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/net8.0/aspnetcore/Dockerfile b/examples/net8.0/aspnetcore/Dockerfile index c6599329..01adadfb 100644 --- a/examples/net8.0/aspnetcore/Dockerfile +++ b/examples/net8.0/aspnetcore/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0.411@sha256:e6a5a8d884609907fa8d468b927df765967f6b22f890ce92bd3ae614ca4ae87e AS build +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0.412@sha256:e6748a3b3d8cea753f643cacac0e577d8c409285b3924232db1354693bdbd3d7 AS build ARG TARGETARCH ARG CONFIGURATION="Release" ARG DOTNET_PUBLISH_ARGS="" @@ -11,7 +11,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN --mount=type=cache,id=nuget,target=/root/.nuget/packages \ dotnet publish "examples/net8.0/aspnetcore/aspnetcore.csproj" --arch "${TARGETARCH}" --configuration "${CONFIGURATION}" --output /app ${DOTNET_PUBLISH_ARGS} -FROM mcr.microsoft.com/dotnet/aspnet:8.0.17-noble-chiseled-extra@sha256:db790153de8350a1809b62aa495364372df4c9b551e9606a1bd857908299e2b9 AS final +FROM mcr.microsoft.com/dotnet/aspnet:8.0.18-noble-chiseled-extra@sha256:1f0890132c50c55879371a16261ef1a53d01c9bf14f9104f266eb91bb885e5d0 AS final WORKDIR /app EXPOSE 8080 From 1d14a36e510e24e26c13e859294754024ae0ebb0 Mon Sep 17 00:00:00 2001 From: Martin Costello Date: Thu, 10 Jul 2025 08:34:27 +0100 Subject: [PATCH 3/3] Apply suggestions from code review Fix incorrect digest. --- examples/net8.0/aspnetcore/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/net8.0/aspnetcore/Dockerfile b/examples/net8.0/aspnetcore/Dockerfile index 01adadfb..7a1d2b3b 100644 --- a/examples/net8.0/aspnetcore/Dockerfile +++ b/examples/net8.0/aspnetcore/Dockerfile @@ -11,7 +11,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN --mount=type=cache,id=nuget,target=/root/.nuget/packages \ dotnet publish "examples/net8.0/aspnetcore/aspnetcore.csproj" --arch "${TARGETARCH}" --configuration "${CONFIGURATION}" --output /app ${DOTNET_PUBLISH_ARGS} -FROM mcr.microsoft.com/dotnet/aspnet:8.0.18-noble-chiseled-extra@sha256:1f0890132c50c55879371a16261ef1a53d01c9bf14f9104f266eb91bb885e5d0 AS final +FROM mcr.microsoft.com/dotnet/aspnet:8.0.18-noble-chiseled-extra@sha256:479b9a3f71f169960d909f599f1b0da82af99bbd6b1179216923eb730217db0d AS final WORKDIR /app EXPOSE 8080