Skip to content

[Infra] Update to .NET 11 stable #8066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
martincostello wants to merge 6 commits into
base: main
Choose a base branch
from
+30 −38
Draft

[Infra] Update to .NET 11 stable #8066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
252670d
[Infra] Update to .NET 11 stable
martincostello Oct 29, 2026
358d834
[Infra] Update CHANGELOG
martincostello Oct 29, 2026
09b246a
Merge branch 'main' into dotnet-11-stable
martincostello Oct 29, 2026
280bb37
[Infra] Bump package
martincostello Oct 29, 2026
69bcb5b
Merge branch 'main' into dotnet-11-stable
martincostello Nov 6, 2026
6ebd0eb
Merge branch 'main' into dotnet-11-stable
martincostello Nov 9, 2026
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
2 changes: 1 addition & 1 deletion .oss-scanner/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:11.0.100-rc.3@sha256:3a9175b6c54b2f076817af1360f691c9994447b192faa48a1a1f112a516844c7 AS build
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:11.0.100@sha256:TODO AS build
ARG SOURCE_DATE_EPOCH

COPY . /src
Expand Down
36 changes: 18 additions & 18 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
-->
<ItemGroup>
<!-- Default to latest versions for all TFMs -->
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="[11.0.0-rc.3.26522.148,)" />
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[11.0.0-rc.3.26522.148,)" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[11.0.0-rc.3.26522.148,)" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Abstractions" Version="[11.0.0-rc.3.26522.148,)" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="[11.0.0-rc.3.26522.148,)" />
<PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="[11.0.0-rc.3.26522.148,)" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="[11.0.0,)" />
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[11.0.0,)" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[11.0.0,)" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Abstractions" Version="[11.0.0,)" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="[11.0.0,)" />
<PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="[11.0.0,)" />
</ItemGroup>
<!-- Version overrides for specific netX.0 TFMs -->
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
Expand All @@ -29,12 +29,12 @@
<PackageVersion Update="Microsoft.Extensions.Logging.Configuration" Version="[10.0.0,)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net11.0'">
<PackageVersion Update="Microsoft.Extensions.Configuration" Version="[11.0.0-rc.3.26522.148,)" />
<PackageVersion Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[11.0.0-rc.3.26522.148,)" />
<PackageVersion Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[11.0.0-rc.3.26522.148,)" />
<PackageVersion Update="Microsoft.Extensions.Diagnostics.Abstractions" Version="[11.0.0-rc.3.26522.148,)" />
<PackageVersion Update="Microsoft.Extensions.Hosting.Abstractions" Version="[11.0.0-rc.3.26522.148,)" />
<PackageVersion Update="Microsoft.Extensions.Logging.Configuration" Version="[11.0.0-rc.3.26522.148,)" />
<PackageVersion Update="Microsoft.Extensions.Configuration" Version="[11.0.0,)" />
<PackageVersion Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[11.0.0,)" />
<PackageVersion Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[11.0.0,)" />
<PackageVersion Update="Microsoft.Extensions.Diagnostics.Abstractions" Version="[11.0.0,)" />
<PackageVersion Update="Microsoft.Extensions.Hosting.Abstractions" Version="[11.0.0,)" />
<PackageVersion Update="Microsoft.Extensions.Logging.Configuration" Version="[11.0.0,)" />
</ItemGroup>

<!--
Expand All @@ -43,7 +43,7 @@
See https://github.com/open-telemetry/opentelemetry-dotnet/issues/5973 for more details.
-->
<ItemGroup>
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="[11.0.0-rc.3.26522.148,)" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="[11.0.0,)" />
</ItemGroup>

<!--
Expand Down Expand Up @@ -101,7 +101,7 @@
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="5.6.0" />
<PackageVersion Include="Microsoft.Coyote" Version="1.7.11" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.14" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics" Version="11.0.0-rc.3.26522.148" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics" Version="11.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.14" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.14" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.14" />
Expand Down Expand Up @@ -139,10 +139,10 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net11.0'">
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="11.0.0-rc.3.26522.148" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="11.0.0-rc.3.26522.148" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="11.0.0-rc.3.26522.148" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="11.0.0-rc.3.26522.148" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="11.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="11.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="11.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="11.0.0" />
</ItemGroup>

</Project>
7 changes: 0 additions & 7 deletions build/Tests.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,6 @@
<_TestFrameworkArgument>--framework $(TargetFramework)</_TestFrameworkArgument>
</PropertyGroup>

<!--
HACK Workaround for https://github.com/dotnet/runtime/issues/134491
-->
<PropertyGroup Condition="'$(TargetFramework)' == '' AND '$(OS)' != 'Windows_NT' AND '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'Arm64'">
<_TestMaxParallelTestModulesArgument>--max-parallel-test-modules 1</_TestMaxParallelTestModulesArgument>
</PropertyGroup>

<PropertyGroup Condition="'$(TestFilter)' != ''">
<!--
Ignoring exit code 8 stops dotnet test failing if a filter does not match any tests.
Expand Down
4 changes: 2 additions & 2 deletions examples/MicroserviceExample/WebApi/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG SDK_VERSION=11.0
FROM mcr.microsoft.com/dotnet/sdk:10.0.403@sha256:de4fe90a98845d75910b9769662465c84de1a934665c431279d1382b2bddc02b AS dotnet-sdk-10.0
FROM mcr.microsoft.com/dotnet/sdk:11.0.100-rc.3@sha256:3a9175b6c54b2f076817af1360f691c9994447b192faa48a1a1f112a516844c7 AS dotnet-sdk-11.0
FROM mcr.microsoft.com/dotnet/sdk:11.0.100@sha256:TODO AS dotnet-sdk-11.0

FROM dotnet-sdk-${SDK_VERSION} AS build
ARG PUBLISH_CONFIGURATION=Release
Expand All @@ -10,7 +10,7 @@ COPY . ./
RUN dotnet publish ./examples/MicroserviceExample/WebApi -c "${PUBLISH_CONFIGURATION}" -f "${PUBLISH_FRAMEWORK}" -o /out -p:IntegrationBuild=true

FROM mcr.microsoft.com/dotnet/aspnet:10.0.14@sha256:de0ee358cdd672f7017a003bed21e9ac9ed48a27c922a59b18175b6e82fa7fee AS dotnet-aspnet-10.0
FROM mcr.microsoft.com/dotnet/aspnet:11.0.0-rc.3@sha256:bae0269049d5061ab7f49995cc1acebf54b75471c096c4a1f874e27661d44045 AS dotnet-aspnet-11.0
FROM mcr.microsoft.com/dotnet/aspnet:11.0.0@sha256:TODO AS dotnet-aspnet-11.0

FROM dotnet-aspnet-${SDK_VERSION} AS runtime
WORKDIR /app
Expand Down
4 changes: 2 additions & 2 deletions examples/MicroserviceExample/WorkerService/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG SDK_VERSION=11.0

FROM mcr.microsoft.com/dotnet/sdk:10.0.403@sha256:de4fe90a98845d75910b9769662465c84de1a934665c431279d1382b2bddc02b AS dotnet-sdk-10.0
FROM mcr.microsoft.com/dotnet/sdk:11.0.100-rc.3@sha256:3a9175b6c54b2f076817af1360f691c9994447b192faa48a1a1f112a516844c7 AS dotnet-sdk-11.0
FROM mcr.microsoft.com/dotnet/sdk:11.0.100@sha256:TODO AS dotnet-sdk-11.0

FROM dotnet-sdk-${SDK_VERSION} AS build
ARG PUBLISH_CONFIGURATION=Release
Expand All @@ -11,7 +11,7 @@ COPY . ./
RUN dotnet publish ./examples/MicroserviceExample/WorkerService -c "${PUBLISH_CONFIGURATION}" -f "${PUBLISH_FRAMEWORK}" -o /out -p:IntegrationBuild=true

FROM mcr.microsoft.com/dotnet/aspnet:10.0.14@sha256:de0ee358cdd672f7017a003bed21e9ac9ed48a27c922a59b18175b6e82fa7fee AS dotnet-aspnet-10.0
FROM mcr.microsoft.com/dotnet/aspnet:11.0.0-rc.3@sha256:bae0269049d5061ab7f49995cc1acebf54b75471c096c4a1f874e27661d44045 AS dotnet-aspnet-11.0
FROM mcr.microsoft.com/dotnet/aspnet:11.0.0@sha256:TODO AS dotnet-aspnet-11.0

FROM dotnet-aspnet-${SDK_VERSION} AS runtime
WORKDIR /app
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
".dotnet",
"$host$"
],
"version": "11.0.100-rc.3.26522.148"
"version": "11.0.100"
},
"test": {
"runner": "Microsoft.Testing.Platform"
Expand Down
4 changes: 4 additions & 0 deletions src/OpenTelemetry.Api/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ Notes](../../RELEASENOTES.md).

## Unreleased

* Update `System.Diagnostics.DiagnosticSource` dependency to `11.0.0`
for all target frameworks.
([#8066](https://github.com/open-telemetry/opentelemetry-dotnet/pull/8066))

## 1.21.0-rc.2

Released 2026-Nov-09
Expand Down
5 changes: 0 additions & 5 deletions test/OpenTelemetry.AotCompatibility.TestApp/OpenTelemetry.AotCompatibility.TestApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@
<SelfContained>true</SelfContained>
</PropertyGroup>

<!-- HACK Workaround for https://github.com/dotnet/sdk/issues/56618 -->
<PropertyGroup>
<UseOptimizedPublish>false</UseOptimizedPublish>
</PropertyGroup>

<ItemGroup>
<TrimmerRootAssembly Include="OpenTelemetry.Api.ProviderBuilderExtensions" />
<TrimmerRootAssembly Include="OpenTelemetry.Api" />
Expand Down
2 changes: 1 addition & 1 deletion test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
ARG BUILD_SDK_VERSION=11.0
ARG TEST_SDK_VERSION=11.0
FROM mcr.microsoft.com/dotnet/sdk:10.0.403@sha256:de4fe90a98845d75910b9769662465c84de1a934665c431279d1382b2bddc02b AS dotnet-sdk-10.0
FROM mcr.microsoft.com/dotnet/sdk:11.0.100-rc.3@sha256:3a9175b6c54b2f076817af1360f691c9994447b192faa48a1a1f112a516844c7 AS dotnet-sdk-11.0
FROM mcr.microsoft.com/dotnet/sdk:11.0.100@sha256:TODO AS dotnet-sdk-11.0

FROM dotnet-sdk-${BUILD_SDK_VERSION} AS build
ARG PUBLISH_CONFIGURATION=Release
Expand Down
2 changes: 1 addition & 1 deletion test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARG BUILD_SDK_VERSION=11.0
ARG TEST_SDK_VERSION=11.0

FROM mcr.microsoft.com/dotnet/sdk:10.0.403-azurelinux3.0@sha256:ffd76bb46785445d2d029809009d35b522619b97df88c0abaa05d549db697b43 AS dotnet-sdk-10.0
FROM mcr.microsoft.com/dotnet/sdk:11.0.100-rc.3-azurelinux4.0@sha256:7c9927bfbfe28dd2fd3567885bff2ab81265539e8018fe372f07427e3ede47c3 AS dotnet-sdk-11.0
FROM mcr.microsoft.com/dotnet/sdk:11.0.100-azurelinux4.0@sha256:TODO AS dotnet-sdk-11.0

FROM dotnet-sdk-${BUILD_SDK_VERSION} AS build
ARG PUBLISH_CONFIGURATION=Release
Expand Down
Loading