Skip to content

Commit 5084054

Browse files
authored
[repo] Some cleanup after dropping support for .NET 6 (open-telemetry#2187)
Co-authored-by: joegoldman2 <[email protected]>
1 parent b424269 commit 5084054

File tree

8 files changed

+8
-18
lines changed

8 files changed

+8
-18
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ body:
7979
- type: input
8080
attributes:
8181
label: Runtime Version
82-
description: What .NET runtime version did you use? (e.g. `net462`, `net48`, `netcoreapp3.1`, `net6.0` etc. You can find this information from the `*.csproj` file)
82+
description: What .NET runtime version did you use? (e.g. `net462`, `net48`, `net8.0` etc. You can find this information from the `*.csproj` file)
8383
validations:
8484
required: true
8585

.github/workflows/Component.BuildTest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ on:
1818
required: false
1919
type: string
2020
tfm-list:
21-
default: '[ "net462", "net6.0", "net8.0" ]'
21+
default: '[ "net462", "net8.0" ]'
2222
required: false
2323
type: string
2424

.github/workflows/ci-Exporter.OneCollector-Integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
3030
matrix:
3131
os: [ windows-latest, ubuntu-latest ]
32-
version: [ net462, net6.0, net8.0 ]
32+
version: [ net462, net8.0 ]
3333
exclude:
3434
- os: ubuntu-latest
3535
version: net462

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ jobs:
196196
with:
197197
project-name: OpenTelemetry.Instrumentation.AspNetCore
198198
code-cov-name: Instrumentation.AspNetCore
199-
tfm-list: '[ "net6.0", "net8.0" ]'
199+
tfm-list: '[ "net8.0" ]'
200200

201201
build-test-instrumentation-aws:
202202
needs: detect-changes
@@ -219,7 +219,7 @@ jobs:
219219
with:
220220
project-name: Component[OpenTelemetry.Instrumentation.AWSLambda]
221221
code-cov-name: Instrumentation.AWSLambda
222-
tfm-list: '[ "net6.0", "net8.0" ]'
222+
tfm-list: '[ "net8.0" ]'
223223

224224
build-test-instrumentation-cassandra:
225225
needs: detect-changes
@@ -285,7 +285,7 @@ jobs:
285285
with:
286286
project-name: OpenTelemetry.Instrumentation.EventCounters
287287
code-cov-name: Instrumentation.EventCounters
288-
tfm-list: '[ "net6.0", "net8.0" ]'
288+
tfm-list: '[ "net8.0" ]'
289289

290290
build-test-instrumentation-grpccore:
291291
needs: detect-changes

build/docker-compose.net6.0.yml

Lines changed: 0 additions & 9 deletions
This file was deleted.

opentelemetry-dotnet-contrib.sln

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{824BD1DE
5555
build\Common.props = build\Common.props
5656
build\Common.targets = build\Common.targets
5757
build\debug.snk = build\debug.snk
58-
build\docker-compose.net6.0.yml = build\docker-compose.net6.0.yml
5958
build\docker-compose.net8.0.yml = build\docker-compose.net8.0.yml
6059
build\opentelemetry-icon-color.png = build\opentelemetry-icon-color.png
6160
build\OpenTelemetryContrib.prod.ruleset = build\OpenTelemetryContrib.prod.ruleset

test/OpenTelemetry.Exporter.Geneva.Tests/LogSerializationTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class LogSerializationTests
1515
{
1616
/*
1717
Run from the current directory:
18-
dotnet test -f net6.0 --filter FullyQualifiedName~LogSerializationTests -l "console;verbosity=detailed"
18+
dotnet test -f net8.0 --filter FullyQualifiedName~LogSerializationTests -l "console;verbosity=detailed"
1919
*/
2020
private readonly ITestOutputHelper output;
2121

test/OpenTelemetry.Exporter.InfluxDB.Tests/OpenTelemetry.Exporter.InfluxDB.Tests.csproj

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

1010
<ItemGroup>
11-
<PackageReference Include="System.Net.Http" Version="$(SystemNetHttp)" Condition="'$(TargetFramework)' != 'net6.0' AND '$(TargetFramework)' != 'net8.0'" />
11+
<PackageReference Include="System.Net.Http" Version="$(SystemNetHttp)" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

0 commit comments

Comments
 (0)