Skip to content

[Infra] Update to .NET 10 GA #6667

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

Merged
merged 13 commits into from
Nov 12, 2025
Merged

[Infra] Update to .NET 10 GA #6667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4157ad4
[Infra] Update to .NET 10 GA
martincostello Nov 5, 2025
f35cd2e
Fix SDK install
martincostello Nov 11, 2025
82a802f
Update container digests
martincostello Nov 11, 2025
5d71472
[Infra] Fix tests
martincostello Nov 11, 2025
9ad16c9
Merge branch 'main' into dotnet-10-ga
martincostello Nov 11, 2025
2d1016c
[Infra] Update CHANGELOGs
martincostello Nov 11, 2025
7b6fee1
[Api] Update CHANGELOG
martincostello Nov 12, 2025
8831916
Merge branch 'main' into dotnet-10-ga
martincostello Nov 12, 2025
f851eca
[Infra] Bump Microsoft.AspNetCore.TestHost
martincostello Nov 12, 2025
b010d11
Merge branch 'main' into dotnet-10-ga
martincostello Nov 12, 2025
37d6990
PR feedback - bump dependencies for .NET Framework/.NET Standard
Kielek Nov 12, 2025
16e5878
PR feedback - cleanup API changelog, there is no other dependency exc…
Kielek Nov 12, 2025
aa0ded5
PR feedback - update changelogs
Kielek Nov 12, 2025
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
32 changes: 16 additions & 16 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
-->
<ItemGroup>
<!-- Default to latest versions for all TFMs -->
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[9.0.0,)" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Abstractions" Version="[9.0.0,)" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="[9.0.0,)" />
<PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="[9.0.0,)" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[10.0.0,)" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Abstractions" Version="[10.0.0,)" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="[10.0.0,)" />
<PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="[10.0.0,)" />
</ItemGroup>
<!-- Version overrides for specific netX.0 TFMs -->
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
Expand All @@ -31,10 +31,10 @@
<PackageVersion Update="Microsoft.Extensions.Logging.Configuration" Version="[9.0.0,)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<PackageVersion Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[10.0.0-rc.2.25502.107,)" />
<PackageVersion Update="Microsoft.Extensions.Diagnostics.Abstractions" Version="[10.0.0-rc.2.25502.107,)" />
<PackageVersion Update="Microsoft.Extensions.Hosting.Abstractions" Version="[10.0.0-rc.2.25502.107,)" />
<PackageVersion Update="Microsoft.Extensions.Logging.Configuration" Version="[10.0.0-rc.2.25502.107,)" />
<PackageVersion Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[10.0.0,)" />
<PackageVersion Update="Microsoft.Extensions.Diagnostics.Abstractions" Version="[10.0.0,)" />
<PackageVersion Update="Microsoft.Extensions.Hosting.Abstractions" Version="[10.0.0,)" />
<PackageVersion Update="Microsoft.Extensions.Logging.Configuration" Version="[10.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="[10.0.0-rc.2.25502.107,)" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="[10.0.0,)" />
</ItemGroup>

<!--
Expand Down Expand Up @@ -102,10 +102,10 @@
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="4.14.0" />
<PackageVersion Include="Microsoft.Coyote" Version="1.7.11" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Telemetry.Abstractions" Version="9.10.0" />
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
Expand All @@ -124,15 +124,15 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.21" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.22" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="9.0.10" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="9.0.11" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="10.0.0" />
</ItemGroup>

</Project>
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,7 +1,7 @@
ARG SDK_VERSION=9.0
FROM mcr.microsoft.com/dotnet/sdk:8.0.416@sha256:a87db299d259cec53210df406cd5e51f900a0c6d938fe56d5f392629c0505d75 AS dotnet-sdk-8.0
FROM mcr.microsoft.com/dotnet/sdk:9.0.307@sha256:1ea5b7f2154cbd1e20a336cb56957dba30a7ce30ef5c1c032a37c42801594713 AS dotnet-sdk-9.0
FROM mcr.microsoft.com/dotnet/sdk:10.0.100-rc.2@sha256:ed46c853a4f100ba7aab2394e9fb9f9b8989e93346b04632dbce11e5da7623d8 AS dotnet-sdk-10.0
FROM mcr.microsoft.com/dotnet/sdk:10.0.100@sha256:c7445f141c04f1a6b454181bd098dcfa606c61ba0bd213d0a702489e5bd4cd71 AS dotnet-sdk-10.0

FROM dotnet-sdk-${SDK_VERSION} AS build
ARG PUBLISH_CONFIGURATION=Release
Expand All @@ -12,7 +12,7 @@ RUN dotnet publish ./examples/MicroserviceExample/WebApi -c "${PUBLISH_CONFIGURA

FROM mcr.microsoft.com/dotnet/aspnet:8.0.22@sha256:e9684fdc74056bda84e8f5918c7211cac837a979a26b8a56c4e424f1ab94c80b AS dotnet-aspnet-8.0
FROM mcr.microsoft.com/dotnet/aspnet:9.0.11@sha256:1b8d328201297fd5ca40dc1a0788aa9e813f58279c3410fe82dce6744c36d03f AS dotnet-aspnet-9.0
FROM mcr.microsoft.com/dotnet/aspnet:10.0.0-rc.2@sha256:5b201bc57156a9f70d58a86112dc7a8217cf3a885740a8fe914b0782ee09647e AS dotnet-aspnet-10.0
FROM mcr.microsoft.com/dotnet/aspnet:10.0.0@sha256:7c4246c1c384319346d45b3e24a10a21d5b6fc9b36a04790e1588148ff8055b0 AS dotnet-aspnet-10.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
Expand Up @@ -2,7 +2,7 @@ ARG SDK_VERSION=10.0

FROM mcr.microsoft.com/dotnet/sdk:8.0.416@sha256:a87db299d259cec53210df406cd5e51f900a0c6d938fe56d5f392629c0505d75 AS dotnet-sdk-8.0
FROM mcr.microsoft.com/dotnet/sdk:9.0.307@sha256:1ea5b7f2154cbd1e20a336cb56957dba30a7ce30ef5c1c032a37c42801594713 AS dotnet-sdk-9.0
FROM mcr.microsoft.com/dotnet/sdk:10.0.100-rc.2@sha256:ed46c853a4f100ba7aab2394e9fb9f9b8989e93346b04632dbce11e5da7623d8 AS dotnet-sdk-10.0
FROM mcr.microsoft.com/dotnet/sdk:10.0.100@sha256:c7445f141c04f1a6b454181bd098dcfa606c61ba0bd213d0a702489e5bd4cd71 AS dotnet-sdk-10.0

FROM dotnet-sdk-${SDK_VERSION} AS build
ARG PUBLISH_CONFIGURATION=Release
Expand All @@ -13,7 +13,7 @@ RUN dotnet publish ./examples/MicroserviceExample/WorkerService -c "${PUBLISH_CO

FROM mcr.microsoft.com/dotnet/aspnet:8.0.22@sha256:e9684fdc74056bda84e8f5918c7211cac837a979a26b8a56c4e424f1ab94c80b AS dotnet-aspnet-8.0
FROM mcr.microsoft.com/dotnet/aspnet:9.0.11@sha256:1b8d328201297fd5ca40dc1a0788aa9e813f58279c3410fe82dce6744c36d03f AS dotnet-aspnet-9.0
FROM mcr.microsoft.com/dotnet/aspnet:10.0.0-rc.2@sha256:5b201bc57156a9f70d58a86112dc7a8217cf3a885740a8fe914b0782ee09647e AS dotnet-aspnet-10.0
FROM mcr.microsoft.com/dotnet/aspnet:10.0.0@sha256:7c4246c1c384319346d45b3e24a10a21d5b6fc9b36a04790e1588148ff8055b0 AS dotnet-aspnet-10.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 @@ -2,6 +2,6 @@
"sdk": {
"rollForward": "latestMajor",
"allowPrerelease": false,
"version": "10.0.100-rc.2.25502.107"
"version": "10.0.100"
}
}
7 changes: 7 additions & 0 deletions src/OpenTelemetry.Api.ProviderBuilderExtensions/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@ Notes](../../RELEASENOTES.md).
section](../../README.md#digital-signing) for updated verification instructions.
([#6623](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6623))

* Update to stable versions for .NET 10.0 NuGet packages.
([#6667](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6667))

* Update `Microsoft.Extensions.*` dependencies to `10.0.0` for .NET Framework
and .NET Standard.
([#6667](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6667))

## 1.14.0-rc.1

Released 2025-Oct-21
Expand Down
6 changes: 5 additions & 1 deletion src/OpenTelemetry.Api/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,18 @@ Notes](../../RELEASENOTES.md).
section](../../README.md#digital-signing) for updated verification instructions.
([#6623](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6623))

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

## 1.14.0-rc.1

Released 2025-Oct-21

* Add support for .NET 10.0.
([#6307](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6307))

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

Expand Down
7 changes: 7 additions & 0 deletions src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ Notes](../../RELEASENOTES.md).
section](../../README.md#digital-signing) for updated verification instructions.
([#6623](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6623))

* Update to stable versions for .NET 10.0 NuGet packages.
([#6667](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6667))

* Update `Microsoft.Extensions.*` dependencies to `10.0.0` for .NET Framework
and .NET Standard.
([#6667](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6667))

## 1.14.0-rc.1

Released 2025-Oct-21
Expand Down
7 changes: 7 additions & 0 deletions src/OpenTelemetry/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ Notes](../../RELEASENOTES.md).
section](../../README.md#digital-signing) for updated verification instructions.
([#6623](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6623))

* Update to stable versions for .NET 10.0 NuGet packages.
([#6667](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6667))

* Update `Microsoft.Extensions.*` dependencies to `10.0.0` for .NET Framework
and .NET Standard.
([#6667](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6667))

## 1.14.0-rc.1

Released 2025-Oct-21
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 @@ -6,7 +6,7 @@ ARG BUILD_SDK_VERSION=10.0
ARG TEST_SDK_VERSION=10.0
FROM mcr.microsoft.com/dotnet/sdk:8.0.416@sha256:a87db299d259cec53210df406cd5e51f900a0c6d938fe56d5f392629c0505d75 AS dotnet-sdk-8.0
FROM mcr.microsoft.com/dotnet/sdk:9.0.307@sha256:1ea5b7f2154cbd1e20a336cb56957dba30a7ce30ef5c1c032a37c42801594713 AS dotnet-sdk-9.0
FROM mcr.microsoft.com/dotnet/sdk:10.0.100-rc.2@sha256:ed46c853a4f100ba7aab2394e9fb9f9b8989e93346b04632dbce11e5da7623d8 AS dotnet-sdk-10.0
FROM mcr.microsoft.com/dotnet/sdk:10.0.100@sha256:c7445f141c04f1a6b454181bd098dcfa606c61ba0bd213d0a702489e5bd4cd71 AS dotnet-sdk-10.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 @@ -13,7 +13,7 @@ RUN git clone --branch level-1 https://github.com/w3c/trace-context.git

FROM mcr.microsoft.com/dotnet/sdk:8.0.416@sha256:a87db299d259cec53210df406cd5e51f900a0c6d938fe56d5f392629c0505d75 AS dotnet-sdk-8.0
FROM mcr.microsoft.com/dotnet/sdk:9.0.307@sha256:1ea5b7f2154cbd1e20a336cb56957dba30a7ce30ef5c1c032a37c42801594713 AS dotnet-sdk-9.0
FROM mcr.microsoft.com/dotnet/sdk:10.0.100-rc.2@sha256:ed46c853a4f100ba7aab2394e9fb9f9b8989e93346b04632dbce11e5da7623d8 AS dotnet-sdk-10.0
FROM mcr.microsoft.com/dotnet/sdk:10.0.100@sha256:c7445f141c04f1a6b454181bd098dcfa606c61ba0bd213d0a702489e5bd4cd71 AS dotnet-sdk-10.0

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

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" VersionOverride="10.0.0-rc.2.25502.107" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" VersionOverride="10.0.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" />
</ItemGroup>

Expand Down
Loading