Skip to content

Commit a89d4cb

Browse files
Support .NET 10 (#6307)
1 parent 8115626 commit a89d4cb

File tree

32 files changed

+106
-50
lines changed

32 files changed

+106
-50
lines changed

.github/workflows/Component.BuildTest.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ on:
2424
required: false
2525
type: string
2626
tfm-list:
27-
default: '[ "net462", "net8.0", "net9.0" ]'
27+
default: '[ "net462", "net8.0", "net9.0", "net10.0" ]'
2828
required: false
2929
type: string
3030

@@ -45,9 +45,9 @@ jobs:
4545
- os: ubuntu-22.04-arm
4646
version: net462
4747
- os: ubuntu-22.04-arm
48-
version: net8.0
48+
version: net10.0
4949
- os: windows-11-arm
50-
version: net8.0
50+
version: net10.0
5151

5252
runs-on: ${{ matrix.os }}
5353
timeout-minutes: 30
@@ -64,6 +64,7 @@ jobs:
6464
with:
6565
dotnet-version: |
6666
8.0.x
67+
9.0.x
6768
6869
- name: Setup .NET
6970
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ jobs:
121121
strategy:
122122
fail-fast: false
123123
matrix:
124-
version: [ net8.0, net9.0 ]
124+
version: [ net8.0, net9.0, net10.0 ]
125125
steps:
126126
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
127127
- name: Run OTLP Exporter docker compose
@@ -139,7 +139,7 @@ jobs:
139139
strategy:
140140
fail-fast: false
141141
matrix:
142-
version: [ net8.0, net9.0 ]
142+
version: [ net8.0, net9.0, net10.0 ]
143143
steps:
144144
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
145145
- name: Run W3C Trace Context docker compose

.github/workflows/concurrency-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
1616
matrix:
1717
os: [ windows-latest, ubuntu-22.04 ]
18-
version: [ net8.0 ]
18+
version: [ net8.0, net10.0 ]
1919
project: [ OpenTelemetry.Tests, OpenTelemetry.Api.Tests ]
2020

2121
runs-on: ${{ matrix.os }}

.github/workflows/verifyaotcompat.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
1616
matrix:
1717
os: [ ubuntu-22.04, windows-latest ]
18-
version: [ net8.0, net9.0 ]
18+
version: [ net8.0, net9.0, net10.0 ]
1919

2020
runs-on: ${{ matrix.os }}
2121
steps:

Directory.Packages.props

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,20 @@
3030
<PackageVersion Update="Microsoft.Extensions.Hosting.Abstractions" Version="[9.0.0,)" />
3131
<PackageVersion Update="Microsoft.Extensions.Logging.Configuration" Version="[9.0.0,)" />
3232
</ItemGroup>
33+
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
34+
<PackageVersion Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[10.0.0-rc.1.25451.107,)" />
35+
<PackageVersion Update="Microsoft.Extensions.Diagnostics.Abstractions" Version="[10.0.0-rc.1.25451.107,)" />
36+
<PackageVersion Update="Microsoft.Extensions.Hosting.Abstractions" Version="[10.0.0-rc.1.25451.107,)" />
37+
<PackageVersion Update="Microsoft.Extensions.Logging.Configuration" Version="[10.0.0-rc.1.25451.107,)" />
38+
</ItemGroup>
3339

3440
<!--
3541
System.Diagnostics.DiagnosticSource is exempted from the requirement to match the major version of
3642
the runtime so that new APIs and/or semantic conventions are available to all versions of .NET.
3743
See https://github.com/open-telemetry/opentelemetry-dotnet/issues/5973 for more details.
3844
-->
3945
<ItemGroup>
40-
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="[9.0.0,)" />
46+
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="[10.0.0-rc.1.25451.107,)" />
4147
</ItemGroup>
4248

4349
<!--
@@ -96,10 +102,10 @@
96102
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
97103
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="4.14.0" />
98104
<PackageVersion Include="Microsoft.Coyote" Version="1.7.11" />
99-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9" />
100-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.9" />
101-
<PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.9" />
102-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.9" />
105+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.1.25451.107" />
106+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.0-rc.1.25451.107" />
107+
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.0-rc.1.25451.107" />
108+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0-rc.1.25451.107" />
103109
<PackageVersion Include="Microsoft.Extensions.Telemetry.Abstractions" Version="9.9.0" />
104110
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
105111
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
@@ -126,4 +132,8 @@
126132
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="9.0.9" />
127133
</ItemGroup>
128134

135+
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
136+
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="10.0.0-rc.1.25451.107" />
137+
</ItemGroup>
138+
129139
</Project>

OpenTelemetry.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7CB2F02E
3535
build\docfx.cmd = build\docfx.cmd
3636
build\docker-compose.net8.0.yml = build\docker-compose.net8.0.yml
3737
build\docker-compose.net9.0.yml = build\docker-compose.net9.0.yml
38+
build\docker-compose.net10.0.yml = build\docker-compose.net10.0.yml
3839
build\GlobalAttrExclusions.txt = build\GlobalAttrExclusions.txt
3940
build\opentelemetry-icon-color.png = build\opentelemetry-icon-color.png
4041
build\OpenTelemetry.prod.loose.ruleset = build\OpenTelemetry.prod.loose.ruleset

build/Common.nonprod.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<PropertyGroup>
11-
<DefaultTargetFrameworkForExampleApps>net9.0</DefaultTargetFrameworkForExampleApps>
11+
<DefaultTargetFrameworkForExampleApps>net10.0</DefaultTargetFrameworkForExampleApps>
1212
</PropertyGroup>
1313

1414
<PropertyGroup Condition="$(MSBuildProjectName.EndsWith('.Tests'))">

build/Common.props

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,19 @@
3030
<NetFrameworkSupportedVersions>net481;net48;net472;net471;net47;net462</NetFrameworkSupportedVersions>
3131

3232
<!-- production TFMs -->
33-
<TargetFrameworksForLibraries>net9.0;net8.0;netstandard2.0;$(NetFrameworkMinimumSupportedVersion)</TargetFrameworksForLibraries>
34-
<TargetFrameworksForLibrariesExtended>net9.0;net8.0;netstandard2.1;netstandard2.0;$(NetFrameworkMinimumSupportedVersion)</TargetFrameworksForLibrariesExtended>
35-
<TargetFrameworksForPrometheusAspNetCore>net9.0;net8.0</TargetFrameworksForPrometheusAspNetCore>
36-
<TargetFrameworksRequiringSystemTextJsonDirectReference>net8.0;netstandard2.1;netstandard2.0;$(NetFrameworkMinimumSupportedVersion)</TargetFrameworksRequiringSystemTextJsonDirectReference>
33+
<TargetFrameworksForLibraries>net10.0;net9.0;net8.0;netstandard2.0;$(NetFrameworkMinimumSupportedVersion)</TargetFrameworksForLibraries>
34+
<TargetFrameworksForLibrariesExtended>net10.0;net9.0;net8.0;netstandard2.1;netstandard2.0;$(NetFrameworkMinimumSupportedVersion)</TargetFrameworksForLibrariesExtended>
35+
<TargetFrameworksForPrometheusAspNetCore>net10.0;net9.0;net8.0</TargetFrameworksForPrometheusAspNetCore>
36+
<TargetFrameworksRequiringSystemTextJsonDirectReference>netstandard2.1;netstandard2.0;$(NetFrameworkMinimumSupportedVersion)</TargetFrameworksRequiringSystemTextJsonDirectReference>
3737

3838
<!-- non-production TFMs -->
39-
<TargetFrameworksForAspNetCoreTests>net9.0;net8.0</TargetFrameworksForAspNetCoreTests>
40-
<TargetFrameworksForAotCompatibilityTests>net9.0;net8.0</TargetFrameworksForAotCompatibilityTests>
41-
<TargetFrameworksForDocs>net9.0;net8.0</TargetFrameworksForDocs>
39+
<TargetFrameworksForAspNetCoreTests>net10.0;net9.0;net8.0</TargetFrameworksForAspNetCoreTests>
40+
<TargetFrameworksForAotCompatibilityTests>net10.0;net9.0;net8.0</TargetFrameworksForAotCompatibilityTests>
41+
<TargetFrameworksForDocs>net10.0;net9.0;net8.0</TargetFrameworksForDocs>
4242
<TargetFrameworksForDocs Condition="$(OS) == 'Windows_NT' And '$(UsingMicrosoftNETSdkWeb)' != 'True'">
4343
$(TargetFrameworksForDocs);$(NetFrameworkSupportedVersions)
4444
</TargetFrameworksForDocs>
45-
<TargetFrameworksForTests>net9.0;net8.0</TargetFrameworksForTests>
45+
<TargetFrameworksForTests>net10.0;net9.0;net8.0</TargetFrameworksForTests>
4646
<TargetFrameworksForTests Condition="$(OS) == 'Windows_NT'">
4747
$(TargetFrameworksForTests);$(NetFrameworkMinimumSupportedVersion)
4848
</TargetFrameworksForTests>

build/docker-compose.net10.0.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
services:
2+
tests:
3+
build:
4+
args:
5+
PUBLISH_FRAMEWORK: net10.0
6+
TEST_SDK_VERSION: "10.0"
7+
BUILD_SDK_VERSION: "10.0"

build/docker-compose.net8.0.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ services:
44
args:
55
PUBLISH_FRAMEWORK: net8.0
66
TEST_SDK_VERSION: "8.0"
7-
BUILD_SDK_VERSION: "9.0"
7+
BUILD_SDK_VERSION: "10.0"

0 commit comments

Comments
 (0)