Skip to content

[Infra] Update to .NET 10 GA #3403

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 17 commits into from
Nov 13, 2025
Merged

[Infra] Update to .NET 10 GA #3403

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
ab996bd
[Infra] Update to .NET 10 GA
martincostello Nov 5, 2025
d59d552
[Infra] Remove workaround
martincostello Nov 5, 2025
f28d00a
[Infra] Revert roll-forward policy
martincostello Nov 6, 2025
d54b450
Fix SDK install
martincostello Nov 11, 2025
339dbac
Update container digests
martincostello Nov 11, 2025
1e55f37
Merge branch 'main' into dotnet-10-ga
martincostello Nov 12, 2025
23d8cff
[Infra] Update OpenTelemetryCoreLatestVersion
martincostello Nov 12, 2025
817c4d5
Update OpenTelemetryCoreUnstableLatestVersion
martincostello Nov 12, 2025
f70212e
[Infra] Update package versions
martincostello Nov 12, 2025
bf55290
[Infra] Fix tests
martincostello Nov 12, 2025
b91b13e
[OneCollector] Fix AoT compatibility
martincostello Nov 12, 2025
acc5d4a
[OneCollector] Fix tests
martincostello Nov 12, 2025
56ffac7
[OneCollector] Simplify condition
martincostello Nov 12, 2025
342ee33
[Infra] Update CHANGELOGs
martincostello Nov 12, 2025
f48b49d
[Infra] Update CHANGELOGs
martincostello Nov 12, 2025
a4af320
[Infra] Fix duplicate entries
martincostello Nov 12, 2025
509f1a6
Update CHANGELOGs for projects using OpenTelemetryCoreLatestVersion.
otelbot[bot] Nov 13, 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
4 changes: 0 additions & 4 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,4 @@
<ArtifactsPath>$([System.IO.Path]::Combine('$(MSBuildThisFileDirectory)', 'artifacts'))</ArtifactsPath>
<UseArtifactsOutput>true</UseArtifactsOutput>
</PropertyGroup>
<!-- HACK Workaround for https://github.com/dotnet/sdk/issues/51265 -->
<PropertyGroup>
<RestoreEnablePackagePruning>false</RestoreEnablePackagePruning>
</PropertyGroup>
</Project>
14 changes: 7 additions & 7 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
-->
<ItemGroup Label="Production .NET packages">
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="4.14.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="[10.0.0-rc.2.25502.107,)" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="[10.0.0-rc.2.25502.107,)" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="[10.0.0,)" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="[10.0.0,)" />
<PackageVersion Include="Microsoft.Owin" Version="[4.2.2,)" />
<PackageVersion Include="Microsoft.Win32.Registry" Version="[5.0.0,)" />
<PackageVersion Include="System.Drawing.Common" Version="[4.7.2,)" />
Expand All @@ -69,8 +69,8 @@
<PackageVersion Update="Microsoft.Extensions.Options" Version="[9.0.0,)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<PackageVersion Update="Microsoft.Extensions.Configuration" Version="[10.0.0-rc.2.25502.107,)" />
<PackageVersion Update="Microsoft.Extensions.Options" Version="[10.0.0-rc.2.25502.107,)" />
<PackageVersion Update="Microsoft.Extensions.Configuration" Version="[10.0.0,)" />
<PackageVersion Update="Microsoft.Extensions.Options" Version="[10.0.0,)" />
</ItemGroup>

<ItemGroup Label="Production other packages">
Expand Down Expand Up @@ -151,9 +151,9 @@
<PackageVersion Update="Microsoft.AspNetCore.SignalR.Client" Version="9.0.10" />
</ItemGroup>
<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" Label="Non-production packages, such as for examples and tests, for .NET 10">
<PackageVersion Update="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Update="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Update="Microsoft.AspNetCore.SignalR.Client" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Update="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="10.0.0" />
<PackageVersion Update="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0" />
<PackageVersion Update="Microsoft.AspNetCore.SignalR.Client" Version="10.0.0" />
</ItemGroup>

</Project>
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"
}
}
3 changes: 1 addition & 2 deletions src/OpenTelemetry.Instrumentation.AspNetCore/OpenTelemetry.Instrumentation.AspNetCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
</ItemGroup>

<ItemGroup>
<!-- TODO Revert version override for .NET 10 GA -->
<PackageReference Include="OpenTelemetry.Api.ProviderBuilderExtensions" VersionOverride="[$(OpenTelemetryCoreLatestPrereleaseVersion),2.0)" />
<PackageReference Include="OpenTelemetry.Api.ProviderBuilderExtensions" />
</ItemGroup>

<ItemGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier(`$(TargetFramework)`))' == '.NETStandard'">
Expand Down
3 changes: 1 addition & 2 deletions src/OpenTelemetry.Instrumentation.Http/OpenTelemetry.Instrumentation.Http.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@
<Reference Include="System.Net.Http" Condition="'$([MSBuild]::GetTargetFrameworkIdentifier(`$(TargetFramework)`))' == '.NETFramework'" />
<PackageReference Include="Microsoft.Extensions.Configuration" />
<PackageReference Include="Microsoft.Extensions.Options" />
<!-- TODO Revert version override for .NET 10 GA -->
<PackageReference Include="OpenTelemetry.Api.ProviderBuilderExtensions" VersionOverride="[$(OpenTelemetryCoreLatestPrereleaseVersion),2.0)" />
<PackageReference Include="OpenTelemetry.Api.ProviderBuilderExtensions" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion test/OpenTelemetry.Instrumentation.Cassandra.Tests/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ARG TEST_SDK_VERSION=10.0

FROM mcr.microsoft.com/dotnet/sdk:8.0.415@sha256:4632e98dc703311ca09d0c37170fe70ad4ba334bd88a841c78cbcc9d29994b2c AS dotnet-sdk-8.0
FROM mcr.microsoft.com/dotnet/sdk:9.0.306@sha256:81f6d622fe21ed9d31375167f62a3538ff4d6835f9d5e6da9c2defa8a84b7687 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:ed46c853a4f100ba7aab2394e9fb9f9b8989e93346b04632dbce11e5da7623d8 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.ConfluentKafka.Tests/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ARG TEST_SDK_VERSION=10.0

FROM mcr.microsoft.com/dotnet/sdk:8.0.415@sha256:4632e98dc703311ca09d0c37170fe70ad4ba334bd88a841c78cbcc9d29994b2c AS dotnet-sdk-8.0
FROM mcr.microsoft.com/dotnet/sdk:9.0.306@sha256:81f6d622fe21ed9d31375167f62a3538ff4d6835f9d5e6da9c2defa8a84b7687 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:ed46c853a4f100ba7aab2394e9fb9f9b8989e93346b04632dbce11e5da7623d8 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.StackExchangeRedis.Tests/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ARG TEST_SDK_VERSION=10.0

FROM mcr.microsoft.com/dotnet/sdk:8.0.415@sha256:4632e98dc703311ca09d0c37170fe70ad4ba334bd88a841c78cbcc9d29994b2c AS dotnet-sdk-8.0
FROM mcr.microsoft.com/dotnet/sdk:9.0.306@sha256:81f6d622fe21ed9d31375167f62a3538ff4d6835f9d5e6da9c2defa8a84b7687 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:ed46c853a4f100ba7aab2394e9fb9f9b8989e93346b04632dbce11e5da7623d8 AS dotnet-sdk-10.0

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