Skip to content

Commit 3c6cf48

Browse files
xiang17Kielek
andauthored
Add .NET 9 in tests projects (#2313)
Co-authored-by: Piotr Kiełkowicz <[email protected]>
1 parent 9ea2d08 commit 3c6cf48

File tree

15 files changed

+671
-17
lines changed

15 files changed

+671
-17
lines changed

.github/workflows/Component.BuildTest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ on:
2222
required: false
2323
type: string
2424
tfm-list:
25-
default: '[ "net462", "net8.0" ]'
25+
default: '[ "net462", "net8.0", "net9.0" ]'
2626
required: false
2727
type: string
2828
test-case-filter:

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ jobs:
197197
with:
198198
project-name: OpenTelemetry.Instrumentation.AspNetCore
199199
code-cov-name: Instrumentation.AspNetCore
200-
tfm-list: '[ "net8.0" ]'
200+
tfm-list: '[ "net8.0", "net9.0" ]'
201201

202202
build-test-instrumentation-aws:
203203
needs: detect-changes
@@ -279,7 +279,7 @@ jobs:
279279
with:
280280
project-name: OpenTelemetry.Instrumentation.EventCounters
281281
code-cov-name: Instrumentation.EventCounters
282-
tfm-list: '[ "net8.0" ]'
282+
tfm-list: '[ "net8.0", "net9.0" ]'
283283

284284
build-test-instrumentation-grpccore:
285285
needs: detect-changes

build/Common.nonprod.props

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@
2929
<MicrosoftExtensionsHostingPkgVer>8.0.1</MicrosoftExtensionsHostingPkgVer>
3030
<MicrosoftNETTestSdkPkgVer>[17.11.1,18.0)</MicrosoftNETTestSdkPkgVer>
3131
<OpenTelemetryExporterInMemoryPkgVer>$(OpenTelemetryCoreLatestVersion)</OpenTelemetryExporterInMemoryPkgVer>
32-
<SupportedNetTargets>net8.0</SupportedNetTargets>
33-
<TargetFrameworksForAotCompatibilityTests>net9.0;net8.0</TargetFrameworksForAotCompatibilityTests>
32+
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
33+
<SupportedNetTargets>net9.0;net8.0</SupportedNetTargets>
34+
<SupportedNetTargetsWithoutNet9>net8.0</SupportedNetTargetsWithoutNet9>
3435
<XUnitRunnerVisualStudioPkgVer>[2.8.2,3.0)</XUnitRunnerVisualStudioPkgVer>
3536
<XUnitPkgVer>[2.9.0,3.0)</XUnitPkgVer>
3637
<WiremockNetPkgVer>[1.6.3,2.0)</WiremockNetPkgVer>

test/OpenTelemetry.AotCompatibility.TestApp/OpenTelemetry.AotCompatibility.TestApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>$(TargetFrameworksForAotCompatibilityTests)</TargetFrameworks>
5+
<TargetFrameworks>$(SupportedNetTargets)</TargetFrameworks>
66
<PublishAot>true</PublishAot>
77
<TrimmerSingleWarn>false</TrimmerSingleWarn>
88
<EventSourceSupport>true</EventSourceSupport>

test/OpenTelemetry.Exporter.Geneva.Benchmarks/OpenTelemetry.Exporter.Geneva.Benchmarks.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<Import Project="$(RepoRoot)\src\OpenTelemetry.Exporter.Geneva\Common.GenevaExporter.props"/>
44

55
<PropertyGroup>
6-
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
76
<TargetFrameworks>$(SupportedNetTargets)</TargetFrameworks>
87
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net48;net472;net471;net47;net462</TargetFrameworks>
98
<OutputType>Exe</OutputType>

test/OpenTelemetry.Exporter.Geneva.Stress/OpenTelemetry.Exporter.Geneva.Stress.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
54
<TargetFrameworks>$(SupportedNetTargets)</TargetFrameworks>
65
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net48;net472;net471;net47;net462</TargetFrameworks>
76
<OutputType>Exe</OutputType>

test/OpenTelemetry.Exporter.Geneva.Tests/OpenTelemetry.Exporter.Geneva.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<Import Project="$(RepoRoot)\src\OpenTelemetry.Exporter.Geneva\Common.GenevaExporter.props" />
44

55
<PropertyGroup>
6-
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
76
<TargetFrameworks>$(SupportedNetTargets)</TargetFrameworks>
87
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net48;net472;net471;net47;net462</TargetFrameworks>
98
<Description>Unit test project for Geneva Exporters for OpenTelemetry.</Description>

test/OpenTelemetry.Instrumentation.AspNetCore.Benchmarks/OpenTelemetry.Instrumentation.AspNetCore.Benchmarks.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
54
<TargetFrameworks>$(SupportedNetTargets)</TargetFrameworks>
65
<OutputType>Exe</OutputType>
76
</PropertyGroup>

test/OpenTelemetry.Instrumentation.AspNetCore.Tests/OpenTelemetry.Instrumentation.AspNetCore.Tests.csproj

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,13 @@
66
</PropertyGroup>
77

88
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'" >
9-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.10" />
10-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.10"/>
9+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.11" />
10+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.11"/>
11+
</ItemGroup>
12+
13+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'" >
14+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="9.0.0" />
15+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0"/>
1116
</ItemGroup>
1217

1318
<ItemGroup>

0 commit comments

Comments
 (0)