From e9f4b6a9776fa415cb6fc513f60a08ed7221cf18 Mon Sep 17 00:00:00 2001
From: Kevin Gosse <krix33@gmail.com>
Date: Wed, 25 Aug 2021 12:06:26 +0200
Subject: [PATCH 1/4] Enable code coverage for security tests

---
 .../Datadog.Trace.Security.IntegrationTests.csproj           | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/Datadog.Trace.Security.IntegrationTests/Datadog.Trace.Security.IntegrationTests.csproj b/test/Datadog.Trace.Security.IntegrationTests/Datadog.Trace.Security.IntegrationTests.csproj
index 4f4a2c82d1a1..2aa6d437002f 100644
--- a/test/Datadog.Trace.Security.IntegrationTests/Datadog.Trace.Security.IntegrationTests.csproj
+++ b/test/Datadog.Trace.Security.IntegrationTests/Datadog.Trace.Security.IntegrationTests.csproj
@@ -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>
 

From 4eb0d1e7e0b5a523442c45428ba827e1bdfffa67 Mon Sep 17 00:00:00 2001
From: Kevin Gosse <krix33@gmail.com>
Date: Wed, 25 Aug 2021 17:10:16 +0200
Subject: [PATCH 2/4] Enable aspnetcore5 tests

---
 test/Datadog.Trace.Security.IntegrationTests/AspNetCore5.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/Datadog.Trace.Security.IntegrationTests/AspNetCore5.cs b/test/Datadog.Trace.Security.IntegrationTests/AspNetCore5.cs
index 2703904739ad..f69500f3b271 100644
--- a/test/Datadog.Trace.Security.IntegrationTests/AspNetCore5.cs
+++ b/test/Datadog.Trace.Security.IntegrationTests/AspNetCore5.cs
@@ -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;

From 5ec3b19b46bc73998799b2c133d684df49447a17 Mon Sep 17 00:00:00 2001
From: Kevin Gosse <krix33@gmail.com>
Date: Wed, 25 Aug 2021 17:31:14 +0200
Subject: [PATCH 3/4] Try fixing RabbitMQ coverage

---
 .../integrations/Samples.RabbitMQ/Samples.RabbitMQ.csproj   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/test-applications/integrations/Samples.RabbitMQ/Samples.RabbitMQ.csproj b/test/test-applications/integrations/Samples.RabbitMQ/Samples.RabbitMQ.csproj
index 50d278487dc0..80e3178e67be 100644
--- a/test/test-applications/integrations/Samples.RabbitMQ/Samples.RabbitMQ.csproj
+++ b/test/test-applications/integrations/Samples.RabbitMQ/Samples.RabbitMQ.csproj
@@ -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>
@@ -13,7 +13,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Datadog.Trace\Datadog.Trace.csproj" />
+    <ProjectReference Include="..\..\..\..\src\Datadog.Trace\Datadog.Trace.csproj">
+      <CopyLocal>False</CopyLocal>
+    </ProjectReference>
   </ItemGroup>
 
   <ItemGroup>

From 46cd32467997b207a7e130f965427c6086013cab Mon Sep 17 00:00:00 2001
From: Kevin Gosse <krix33@gmail.com>
Date: Wed, 1 Sep 2021 16:11:13 +0200
Subject: [PATCH 4/4] Replace CopyLocal with Private

---
 .../integrations/Samples.RabbitMQ/Samples.RabbitMQ.csproj     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/test/test-applications/integrations/Samples.RabbitMQ/Samples.RabbitMQ.csproj b/test/test-applications/integrations/Samples.RabbitMQ/Samples.RabbitMQ.csproj
index 80e3178e67be..3818fc7db5d6 100644
--- a/test/test-applications/integrations/Samples.RabbitMQ/Samples.RabbitMQ.csproj
+++ b/test/test-applications/integrations/Samples.RabbitMQ/Samples.RabbitMQ.csproj
@@ -13,9 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Datadog.Trace\Datadog.Trace.csproj">
-      <CopyLocal>False</CopyLocal>
-    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\src\Datadog.Trace\Datadog.Trace.csproj" Private="false" />
   </ItemGroup>
 
   <ItemGroup>