Skip to content
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

Enable .net6.0 build and add net6.0 target #2559

Merged
merged 38 commits into from
Nov 4, 2021
Merged

Enable .net6.0 build and add net6.0 target #2559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
da44deb
add .net6.0 to ci
Nov 2, 2021
7cb7c61
add docker compose for 6.0
Nov 2, 2021
4bb1615
add dotnet 6
Nov 2, 2021
95fe250
add set up step
Nov 2, 2021
ca7481b
add net6.0 to sql client test
Nov 2, 2021
539e1e8
rc sdk version
Nov 2, 2021
aee44ae
revert dotnet set up
Nov 2, 2021
04f9d06
add dotnet install
Nov 2, 2021
cdf0b75
integration
Nov 2, 2021
241302c
rc sdk version
Nov 2, 2021
de1282b
update docker version
Nov 2, 2021
725e7df
Merge branch 'main' into vibankwa/Add-DotNet6-CI
vishweshbankwar Nov 2, 2021
a7d0321
update mcr
Nov 2, 2021
186d7f2
fix otlp docker
Nov 2, 2021
edfd114
add 6.0 to api compat
Nov 2, 2021
59d1e18
update sln
Nov 2, 2021
8968dc2
consistent preprocessor dir
Nov 3, 2021
399c931
add net6.0 to codcov
Nov 3, 2021
19ed125
resolve package conflicts
Nov 3, 2021
ed12ef6
doc fx fix
Nov 3, 2021
89c0b24
revert linux and windows
Nov 3, 2021
a80c37a
minor fix
Nov 3, 2021
4bd2f42
revert
Nov 3, 2021
107e0e2
test with only net6 install
Nov 3, 2021
9c0a502
revert
Nov 3, 2021
cf048c5
add 3.1 and 5 to codcov
Nov 3, 2021
9e0710b
test codcov without install
Nov 3, 2021
eb600f3
revert codecov
Nov 3, 2021
559bca4
revert windows
Nov 3, 2021
7cdf850
add back 3.1 and 5.0
Nov 3, 2021
68b2e46
add comment for specifying docfx version
Nov 3, 2021
86f5658
trying fix to avoid 3.1 and 5.0 install
Nov 4, 2021
1fb2495
fix to avoid installing 3.1 and 5.0
Nov 4, 2021
828f8a3
fail-fast false
Nov 4, 2021
e4b12ec
minor
Nov 4, 2021
1e51043
fix linux-ci formatting
Nov 4, 2021
2381758
try setting env at test step
Nov 4, 2021
80f27e7
fix apicompat, codecov and linux
Nov 4, 2021
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
7 changes: 7 additions & 0 deletions .github/workflows/apicompatibility.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,18 @@ on:
jobs:
build-test:
runs-on: windows-latest
# https://github.com/actions/setup-dotnet/issues/122
env:
CheckAPICompatibility: true
DOTNET_MULTILEVEL_LOOKUP: 1
steps:
- uses: actions/checkout@v2

- uses: actions/setup-dotnet@v1
with:
dotnet-version: '6.0.x'
include-prerelease: true

- name: Install dependencies
run: dotnet restore

Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/code-coverage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,26 @@ on:
jobs:
build-test-report:
runs-on: ${{ matrix.os }}
# https://github.com/actions/setup-dotnet/issues/122

strategy:
fail-fast: false
matrix:
os: [windows-latest]
env:
OS: ${{ matrix.os }}
DOTNET_MULTILEVEL_LOOKUP: 1

steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0 # fetching all

- uses: actions/setup-dotnet@v1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we don't need to install 3.1.x/5.0.x because they are already installed in windows-latest. I always check this:

Remember that windows-latest can change in the future to windows-2022, so, always have that in mind.

with:
dotnet-version: '6.0.x'
include-prerelease: true

- name: Install dependencies
run: dotnet restore

Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/docfx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ jobs:
uses: actions/checkout@v2

- name: install docfx
run: choco install docfx -y
# specifying 2.58.5 version as latest release (2.58.8) has an issue
# https://github.com/dotnet/docfx/issues/7689
run: choco install docfx -y --version=2.58.5
vishweshbankwar marked this conversation as resolved.
Show resolved Hide resolved

- name: run .\build\docfx.cmd
shell: cmd
Expand Down
44 changes: 40 additions & 4 deletions .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,44 +13,80 @@ on:
jobs:
redis-test:
runs-on: ubuntu-latest
# https://github.com/actions/setup-dotnet/issues/122
env:
DOTNET_MULTILEVEL_LOOKUP: 1
strategy:
fail-fast: false
matrix:
version: [netcoreapp3.1,net5.0]
version: [netcoreapp3.1,net5.0,net6.0]
steps:
- uses: actions/checkout@v2

- uses: actions/setup-dotnet@v1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same comment as above, no need for 3.1.x or 5.0.x

with:
dotnet-version: '6.0.x'
include-prerelease: true

- name: Run redis docker-compose.integration
run: docker-compose --file=test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/docker-compose.yml --file=build/docker-compose.${{ matrix.version }}.yml --project-directory=. up --exit-code-from=tests --build

sql-test:
runs-on: ubuntu-latest
# https://github.com/actions/setup-dotnet/issues/122
env:
DOTNET_MULTILEVEL_LOOKUP: 1
strategy:
fail-fast: false
matrix:
version: [netcoreapp3.1,net5.0]
version: [netcoreapp3.1,net5.0,net6.0]
steps:
- uses: actions/checkout@v2

- uses: actions/setup-dotnet@v1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here as well :)

with:
dotnet-version: '6.0.x'
include-prerelease: true

- name: Run sql docker-compose.integration
run: docker-compose --file=test/OpenTelemetry.Instrumentation.SqlClient.Tests/docker-compose.yml --file=build/docker-compose.${{ matrix.version }}.yml --project-directory=. up --exit-code-from=tests --build

w3c-trace-context-test:
runs-on: ubuntu-latest
# https://github.com/actions/setup-dotnet/issues/122
env:
DOTNET_MULTILEVEL_LOOKUP: 1
strategy:
fail-fast: false
matrix:
version: [netcoreapp3.1,net5.0]
version: [netcoreapp3.1,net5.0,net6.0]
steps:
- uses: actions/checkout@v2

- uses: actions/setup-dotnet@v1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here as well

with:
dotnet-version: '6.0.x'
include-prerelease: true

- name: Run W3C Trace Context docker-compose.integration
run: docker-compose --file=test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/docker-compose.yml --file=build/docker-compose.${{ matrix.version }}.yml --project-directory=. up --exit-code-from=tests --build

otlp-exporter-test:
runs-on: ubuntu-latest
# https://github.com/actions/setup-dotnet/issues/122
env:
DOTNET_MULTILEVEL_LOOKUP: 1
strategy:
fail-fast: false
matrix:
version: [netcoreapp3.1,net5.0]
version: [netcoreapp3.1,net5.0,net6.0]
steps:
- uses: actions/checkout@v2

- uses: actions/setup-dotnet@v1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here.
you can check this:
https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-README.md

with:
dotnet-version: '6.0.x'
include-prerelease: true

- name: Run OTLP Exporter docker-compose.integration
run: docker-compose --file=test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/docker-compose.yml --file=build/docker-compose.${{ matrix.version }}.yml --project-directory=. up --exit-code-from=tests --build
20 changes: 19 additions & 1 deletion .github/workflows/linux-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,37 @@ on:
jobs:
build-test:
runs-on: ubuntu-latest
# https://github.com/actions/setup-dotnet/issues/122
env:
DOTNET_MULTILEVEL_LOOKUP: 1

strategy:
matrix:
version: [netcoreapp3.1,net5.0]
version: [netcoreapp3.1,net5.0,net6.0]

steps:
- uses: actions/checkout@v2

- uses: actions/setup-dotnet@v1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here:
https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-README.md

with:
dotnet-version: '3.1.x'

- uses: actions/setup-dotnet@v1
with:
dotnet-version: '5.0.x'

- uses: actions/setup-dotnet@v1
with:
dotnet-version: '6.0.x'
include-prerelease: true

- name: Install dependencies
run: dotnet restore

- name: Build
run: dotnet build --configuration Release --no-restore

- name: Test ${{ matrix.version }}
env:
DOTNET_MULTILEVEL_LOOKUP: 1
run: dotnet test **/bin/**/${{ matrix.version }}/*.Tests.dll --configuration Release --no-build --logger:"console;verbosity=detailed"
10 changes: 9 additions & 1 deletion .github/workflows/windows-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,22 @@ on:
jobs:
build-test:
runs-on: windows-latest
# https://github.com/actions/setup-dotnet/issues/122
env:
DOTNET_MULTILEVEL_LOOKUP: 1

strategy:
matrix:
version: [net461,netcoreapp3.1,net5.0]
version: [net461,netcoreapp3.1,net5.0,net6.0]

steps:
- uses: actions/checkout@v2

- uses: actions/setup-dotnet@v1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

with:
dotnet-version: '6.0.x'
include-prerelease: true

- name: Install dependencies
run: dotnet restore

Expand Down
7 changes: 7 additions & 0 deletions OpenTelemetry.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Exporter.Prom
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs", "src\OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs\OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs.csproj", "{6E1A5FA3-E024-4972-9EDC-11E36C5A0D6F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApp.AspNetCore.6.0", "test\TestApp.AspNetCore.6.0\TestApp.AspNetCore.6.0.csproj", "{0076C657-564F-4787-9FFF-52D9D55166E8}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -460,6 +462,10 @@ Global
{6E1A5FA3-E024-4972-9EDC-11E36C5A0D6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6E1A5FA3-E024-4972-9EDC-11E36C5A0D6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6E1A5FA3-E024-4972-9EDC-11E36C5A0D6F}.Release|Any CPU.Build.0 = Release|Any CPU
{0076C657-564F-4787-9FFF-52D9D55166E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0076C657-564F-4787-9FFF-52D9D55166E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0076C657-564F-4787-9FFF-52D9D55166E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0076C657-564F-4787-9FFF-52D9D55166E8}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -494,6 +500,7 @@ Global
{EA60B549-F712-4ABE-8E44-FCA83B78C06E} = {3277B1C0-BDFE-4460-9B0D-D9A661FB48DB}
{1F9D7748-D099-4E25-97F5-9C969D6FF969} = {3277B1C0-BDFE-4460-9B0D-D9A661FB48DB}
{81234AFA-B4E7-4D0D-AB97-FD559C78EDA2} = {3277B1C0-BDFE-4460-9B0D-D9A661FB48DB}
{0076C657-564F-4787-9FFF-52D9D55166E8} = {77C7929A-2EED-4AA6-8705-B5C443C8AA0F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {55639B5C-0770-4A22-AB56-859604650521}
Expand Down
8 changes: 8 additions & 0 deletions build/docker-compose.net6.0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: '3.7'

services:
tests:
build:
args:
PUBLISH_FRAMEWORK: net6.0
SDK_VERSION: 6.0
2 changes: 1 addition & 1 deletion src/OpenTelemetry.Instrumentation.AspNetCore/AspNetCoreInstrumentationOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public class AspNetCoreInstrumentationOptions
/// </remarks>
public bool RecordException { get; set; }

#if NETSTANDARD2_1 || NETCOREAPP3_1 || NET5_0
#if NETSTANDARD2_1 || NETCOREAPP3_1 || NET5_0_OR_GREATER
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can be only:

#if NETSTANDARD2_1 || NETCOREAPP3_1_OR_GREATER

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The reason why we probably used #if NETSTANDARD2_1 || NETCOREAPP3_1 || NET5_0 in the first place
https://docs.microsoft.com/en-us/dotnet/core/compatibility/sdk/5.0/netcoreapp3_1-preprocessor-symbol-not-defined

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That affects .net 5 SDK, right? So now on NET6 it should work if I undersand?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it looks like it from the .NET 5 and later bullet here

/// <summary>
/// Gets or sets a value indicating whether RPC attributes are added to an Activity when using Grpc.AspNetCore. Default is true.
/// </summary>
Expand Down
6 changes: 5 additions & 1 deletion src/OpenTelemetry.Instrumentation.AspNetCore/OpenTelemetry.Instrumentation.AspNetCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just curious, why was this needed?

Copy link
Member Author

@vishweshbankwar vishweshbankwar Nov 4, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As we are using FrameworkReference, this is needed.
IIRC, if we do not add this, net5.0 targeted instrumentation library will be used for net6.0 app (should still work as we don't have any NET6 framework specific code).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it is needed until we want to use some piece of the .NET 6 API.

If the project is like this...

<TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0</TargetFrameworks>

  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
    <FrameworkReference Include="Microsoft.AspNetCore.App" />
  </ItemGroup>

Users on .NET 6 will still be able to use it.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed - then do we remove 5.0 as well?. I have not tested but I think having only 3.1 will also work for 3.1+ apps then?.
But if we ever use version specific code, we will have to do add it again.
@cijothomas - thoughts?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't use any .NET 6 specific feature today, but Asp.Net core 6.0 has introduced ActivitySource usage. If we want to leverage them, we either need .net6.0 target. or we use reflection to find if user is running Asp.Net Core 6.0 or newer.
(@vishweshbankwar please create a separate issue to discuss this further)

<Description>ASP.NET Core instrumentation for OpenTelemetry .NET</Description>
<PackageTags>$(PackageTags);distributed-tracing;AspNetCore</PackageTags>
<IncludeDiagnosticSourceInstrumentationHelpers>true</IncludeDiagnosticSourceInstrumentationHelpers>
Expand Down Expand Up @@ -34,4 +34,8 @@
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion test/OpenTelemetry.Exporter.Jaeger.Tests/OpenTelemetry.Exporter.Jaeger.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Description>Unit test project for Jaeger Exporter for OpenTelemetry</Description>
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net461</TargetFrameworks>

<IsPackable>false</IsPackable>
Expand Down
6 changes: 3 additions & 3 deletions test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# This should be run from the root of the repo:
# docker build --file test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/Dockerfile

ARG SDK_VERSION=5.0
FROM mcr.microsoft.com/dotnet/sdk:5.0-focal AS build
ARG SDK_VERSION=6.0
FROM mcr.microsoft.com/dotnet/sdk:6.0-focal AS build
ARG PUBLISH_CONFIGURATION=Release
ARG PUBLISH_FRAMEWORK=net5.0
ARG PUBLISH_FRAMEWORK=net6.0
WORKDIR /repo
COPY . ./
WORKDIR "/repo/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests"
Expand Down
2 changes: 1 addition & 1 deletion ...ter.OpenTelemetryProtocol.Tests/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks Condition="$(TARGET_FRAMEWORK) == ''">netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFrameworks Condition="$(TARGET_FRAMEWORK) == ''">netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
<TargetFrameworks Condition="$(TARGET_FRAMEWORK) == '' AND $(OS) == 'Windows_NT'">$(TargetFrameworks);net461</TargetFrameworks>
<TargetFrameworks Condition="$(TARGET_FRAMEWORK) != ''">$(TARGET_FRAMEWORK)</TargetFrameworks>
<IsPackable>false</IsPackable>
Expand Down
4 changes: 4 additions & 0 deletions test/OpenTelemetry.Exporter.Prometheus.Tests/OpenTelemetry.Exporter.Prometheus.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Extensions.Hosting\OpenTelemetry.Extensions.Hosting.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.0-rc.2.21480.10" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.0" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/OpenTelemetry.Exporter.ZPages.Tests/OpenTelemetry.Exporter.ZPages.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net461</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/OpenTelemetry.Exporter.Zipkin.Tests/OpenTelemetry.Exporter.Zipkin.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Description>Unit test project for Zipkin Exporter for OpenTelemetry</Description>
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net461</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/OpenTelemetry.Extensions.Hosting.Tests/OpenTelemetry.Extensions.Hosting.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Description>Unit test project for OpenTelemetry .NET Core hosting library</Description>
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net461</TargetFrameworks>
</PropertyGroup>

Expand Down
7 changes: 6 additions & 1 deletion test/OpenTelemetry.Instrumentation.AspNetCore.Tests/BasicTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,16 @@
using OpenTelemetry.Instrumentation.AspNetCore.Implementation;
using OpenTelemetry.Tests;
using OpenTelemetry.Trace;

#if NETCOREAPP3_1
using TestApp.AspNetCore._3._1;
#else
#endif
#if NET5_0
using TestApp.AspNetCore._5._0;
#endif
#if NET6_0
using TestApp.AspNetCore._6._0;
#endif
using Xunit;

namespace OpenTelemetry.Instrumentation.AspNetCore.Tests
Expand Down
6 changes: 5 additions & 1 deletion test/OpenTelemetry.Instrumentation.AspNetCore.Tests/DependencyInjectionConfigTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,13 @@
using OpenTelemetry.Trace;
#if NETCOREAPP3_1
using TestApp.AspNetCore._3._1;
#else
#endif
#if NET5_0
using TestApp.AspNetCore._5._0;
#endif
#if NET6_0
using TestApp.AspNetCore._6._0;
#endif
using Xunit;

namespace OpenTelemetry.Instrumentation.AspNetCore.Tests
Expand Down
6 changes: 5 additions & 1 deletion ....Instrumentation.AspNetCore.Tests/IncomingRequestsCollectionsIsAccordingToTheSpecTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,13 @@
using OpenTelemetry.Trace;
#if NETCOREAPP3_1
using TestApp.AspNetCore._3._1;
#else
#endif
#if NET5_0
using TestApp.AspNetCore._5._0;
#endif
#if NET6_0
using TestApp.AspNetCore._6._0;
#endif
using Xunit;

namespace OpenTelemetry.Instrumentation.AspNetCore.Tests
Expand Down
Loading