Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Next Next commit
Upgrade to .NET 10 SDK
- Updated nearly all projects to target .NET 10. An exception is the `Example.AutoInstrumentation` project which remains .NET 9, until we update to the latest upstream version which supports .NET 10.
- Moved to centralized package management.
- Replaced `Elastic.OpenTelemetry.sln` with `Elastic.OpenTelemetry.slnx`.
- Removed the `End_To_End` test suite and related infrastructure, simplifying test execution logic.
- Enhanced disposal logic in logging components.
- Updated tests to cover .NET 10.
  • Loading branch information
stevejgordon committed Nov 25, 2025
commit 2687e39dccbdb4eef67c0fb06137969bef0056c4
3 changes: 3 additions & 0 deletions .aspire/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"appHostPath": "../examples/AppHost/AppHost.csproj"
}
3 changes: 2 additions & 1 deletion .github/.github.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<IsPackable>False</IsPackable>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: ./.github/workflows/bootstrap

- name: Test
run: ./build.sh test --test-suite=skip-e2e
run: ./build.sh test

- run: ./build.sh release -c
name: Release
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ NOTE: This document is a work in progress.

Ensure you have the following components installed:

- .NET 9 SDK
- .NET 10 SDK
- To build and run the NativeAoT tests you will require the prequisites listed at https://learn.microsoft.com/en-gb/dotnet/core/deploying/native-aot/?tabs=windows%2Cnet8#prerequisites, specifically the C++ components optionally installed with Visual Studio.
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MinVer" Version="5.0.0" PrivateAssets="all" />
<PackageReference Include="MinVer" PrivateAssets="all" />
</ItemGroup>
</Project>
59 changes: 59 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<!-- OpenTelemetry -->
<PackageVersion Include="OpenTelemetry" Version="1.12.0" />
<PackageVersion Include="OpenTelemetry.AutoInstrumentation" Version="1.12.0" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
<PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.12.0" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.12.0" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.12.0-beta.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Process" Version="1.12.0-beta.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.12.0-beta.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.12.0-beta.1" />
<PackageVersion Include="OpenTelemetry.Resources.Host" Version="1.12.0-beta.1" />
<PackageVersion Include="OpenTelemetry.Resources.ProcessRuntime" Version="1.12.0-beta.1" />

<!-- Microsoft Extensions -->
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.2" Condition="'$(TargetFramework)' == 'net8.0' OR '$(TargetFramework)' == 'net9.0'" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.0.0" />

<!-- General -->
<PackageVersion Include="ConfigureAwaitChecker.Analyzer" Version="5.0.0.1" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageVersion Include="MinVer" Version="6.0.0" />
<PackageVersion Include="NetEscapades.EnumGenerators" Version="1.0.0-beta16" />
<PackageVersion Include="Polyfill" Version="9.3.0" />

<!-- Build -->
<PackageVersion Include="Argu" Version="6.2.5" />
<PackageVersion Include="Bullseye" Version="6.0.0" />
<PackageVersion Include="Octokit" Version="13.0.1" />
<PackageVersion Include="Proc.Fs" Version="0.11.0" />
<PackageVersion Include="Fake.Tools.Git" Version="5.23.1" />

<!-- Testing -->
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageVersion Include="JunitXml.TestLogger" Version="7.0.2" />
<PackageVersion Include="Nullean.VsTest.Pretty.TestLogger" Version="0.10.0" />
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
<PackageVersion Include="Testcontainers" Version="4.9.0" />
<PackageVersion Include="GitHubActionsTestLogger" Version="3.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.22" Condition="'$(TargetFramework)' == 'net8.0'" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.11" Condition="'$(TargetFramework)' == 'net9.0'" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />

<!-- Examples -->
<PackageVersion Include="Aspire.Hosting.AppHost" Version="13.0.0" />
</ItemGroup>
</Project>
169 changes: 0 additions & 169 deletions Elastic.OpenTelemetry.sln

This file was deleted.

Loading