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

Jump to bottom

Enable code coverage for security tests #1699

Merged
merged 4 commits into from
Sep 2, 2021
Merged

Enable code coverage for security tests #1699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e9f4b6a
Enable code coverage for security tests
kevingosse Aug 25, 2021
4eb0d1e
Enable aspnetcore5 tests
kevingosse Aug 25, 2021
5ec3b19
Try fixing RabbitMQ coverage
kevingosse Aug 25, 2021
46cd324
Replace CopyLocal with Private
kevingosse Sep 1, 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
5 changes: 4 additions & 1 deletion test/Datadog.Trace.Security.IntegrationTests/AspNetCore5.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc.
// </copyright>

#if NETCOREAPP3_0_OR_GREATER
// The conditions looks weird, but it seems like _OR_GREATER is not supported yet in all environments
// We can trim all the additional conditions when this is fixed
#if NETCOREAPP3_0_OR_GREATER || NETCOREAPP3_0 || NETCOREAPP3_1 || NET50

using System;
using System.Collections.Generic;
using System.Linq;
Expand Down
5 changes: 5 additions & 0 deletions test/Datadog.Trace.Security.IntegrationTests/Datadog.Trace.Security.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@
<ProjectReference Include="..\Datadog.Trace.TestHelpers\Datadog.Trace.TestHelpers.csproj" />
<PackageReference Include="libsqreen" Version="1.1.2.3" GeneratePathProperty="true" />

<PackageReference Include="coverlet.collector" Version="3.0.4-preview.32">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions test/test-applications/integrations/Samples.RabbitMQ/Samples.RabbitMQ.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<ApiVersion Condition="'$(ApiVersion)' == ''">6.2.1</ApiVersion>
<DefineConstants Condition="$(ApiVersion) >= 6.0.0">$(DefineConstants);RABBITMQ_6_0</DefineConstants>
<DefineConstants Condition="$(ApiVersion) &gt;= 6.0.0">$(DefineConstants);RABBITMQ_6_0</DefineConstants>

<!-- override to remove net452 -->
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1;net5.0</TargetFrameworks>
Expand All @@ -13,7 +13,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\..\src\Datadog.Trace\Datadog.Trace.csproj" />
<ProjectReference Include="..\..\..\..\src\Datadog.Trace\Datadog.Trace.csproj" Private="false" />
</ItemGroup>

<ItemGroup>
Expand Down