From f93223c0e4ef5c7867f7d5cbe9a3ed383806b99c Mon Sep 17 00:00:00 2001
From: Kevin Gosse <krix33@gmail.com>
Date: Tue, 15 Jun 2021 17:41:53 +0200
Subject: [PATCH] Cleanup

---
 .azure-pipelines/ultimate-pipeline.yml                      | 6 +-----
 build/_build/Build.Steps.cs                                 | 6 +++---
 build/docker/Datadog.Trace.ClrProfiler.IntegrationTests.sh  | 6 +++---
 .../Datadog.Trace.OpenTracing.Tests.csproj                  | 1 -
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/.azure-pipelines/ultimate-pipeline.yml b/.azure-pipelines/ultimate-pipeline.yml
index 6d6134604fbd..34817357cdba 100644
--- a/.azure-pipelines/ultimate-pipeline.yml
+++ b/.azure-pipelines/ultimate-pipeline.yml
@@ -844,11 +844,7 @@ stages:
         inputs:
           patterns: '**/coverage.cobertura.xml'
           path: $(Build.SourcesDirectory)/cover
-    
-      - task: CmdLine@2
-        inputs:
-          script: 'tree $(Build.SourcesDirectory) /F /A'     
-    
+
       - task: reportgenerator@4
         inputs:
           reports: '$(Build.SourcesDirectory)\cover\**\coverage.cobertura.xml'
diff --git a/build/_build/Build.Steps.cs b/build/_build/Build.Steps.cs
index 8f3fce350490..47b67185b64f 100644
--- a/build/_build/Build.Steps.cs
+++ b/build/_build/Build.Steps.cs
@@ -562,8 +562,8 @@ partial class Build
 
     Target CompileDependencyLibs => _ => _
         .Unlisted()
-        .DependsOn(Restore)
-        .DependsOn(CompileManagedSrc)
+        .After(Restore)
+        .After(CompileManagedSrc)
         .Executes(() =>
         {
             // Always AnyCPU
@@ -756,7 +756,7 @@ _ when projectPath.ToString().Contains("Samples.OracleMDA") => false,
                 DotNetTest(config => config
                     .SetConfiguration(BuildConfiguration)
                     .SetTargetPlatform(Platform)
-                                    .EnableNoRestore()
+                    .EnableNoRestore()
                     .EnableNoBuild()
                     .When(!string.IsNullOrEmpty(Filter), c => c.SetFilter(Filter))
                     .When(CodeCoverage, ConfigureCodeCoverage)
diff --git a/build/docker/Datadog.Trace.ClrProfiler.IntegrationTests.sh b/build/docker/Datadog.Trace.ClrProfiler.IntegrationTests.sh
index 3d349e4c4670..97fa7e887381 100755
--- a/build/docker/Datadog.Trace.ClrProfiler.IntegrationTests.sh
+++ b/build/docker/Datadog.Trace.ClrProfiler.IntegrationTests.sh
@@ -23,9 +23,9 @@ cleanup() {
 
 trap cleanup SIGINT SIGTERM EXIT
 
-dotnet vstest test/Datadog.Trace.IntegrationTests/bin/$buildConfiguration/$publishTargetFramework/publish/Datadog.Trace.IntegrationTests.dll --logger:trx --ResultsDirectory:test/Datadog.Trace.IntegrationTests/results --collect:"XPlat Code Coverage" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=cobertura DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Exclude=[*]Datadog.Trace.Vendors.*
+dotnet vstest test/Datadog.Trace.IntegrationTests/bin/$buildConfiguration/$publishTargetFramework/publish/Datadog.Trace.IntegrationTests.dll --logger:trx --ResultsDirectory:test/Datadog.Trace.IntegrationTests/results
 
-dotnet vstest test/Datadog.Trace.OpenTracing.IntegrationTests/bin/$buildConfiguration/$publishTargetFramework/publish/Datadog.Trace.OpenTracing.IntegrationTests.dll --logger:trx --ResultsDirectory:test/Datadog.Trace.OpenTracing.IntegrationTests/results --collect:"XPlat Code Coverage" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=cobertura DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Exclude=[*]Datadog.Trace.Vendors.*
+dotnet vstest test/Datadog.Trace.OpenTracing.IntegrationTests/bin/$buildConfiguration/$publishTargetFramework/publish/Datadog.Trace.OpenTracing.IntegrationTests.dll --logger:trx --ResultsDirectory:test/Datadog.Trace.OpenTracing.IntegrationTests/results
 
 wait-for-it servicestackredis:6379 -- \
 wait-for-it stackexchangeredis:6379 -- \
@@ -36,4 +36,4 @@ wait-for-it mongo:27017 -- \
 wait-for-it postgres:5432 -- \
 wait-for-it -t 60 kafka-zookeeper:2181 -- \
 wait-for-it -t 60 kafka-broker:9092 -- \
-dotnet vstest test/Datadog.Trace.ClrProfiler.IntegrationTests/bin/$buildConfiguration/$publishTargetFramework/publish/Datadog.Trace.ClrProfiler.IntegrationTests.dll --logger:trx --ResultsDirectory:test/Datadog.Trace.ClrProfiler.IntegrationTests/results --TestCaseFilter:Category!=LinuxUnsupported --collect:"XPlat Code Coverage" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=cobertura DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Exclude=[*]Datadog.Trace.Vendors.*
+dotnet vstest test/Datadog.Trace.ClrProfiler.IntegrationTests/bin/$buildConfiguration/$publishTargetFramework/publish/Datadog.Trace.ClrProfiler.IntegrationTests.dll --logger:trx --ResultsDirectory:test/Datadog.Trace.ClrProfiler.IntegrationTests/results --TestCaseFilter:Category!=LinuxUnsupported
diff --git a/test/Datadog.Trace.OpenTracing.Tests/Datadog.Trace.OpenTracing.Tests.csproj b/test/Datadog.Trace.OpenTracing.Tests/Datadog.Trace.OpenTracing.Tests.csproj
index 54c1c547e439..3bda276b409d 100644
--- a/test/Datadog.Trace.OpenTracing.Tests/Datadog.Trace.OpenTracing.Tests.csproj
+++ b/test/Datadog.Trace.OpenTracing.Tests/Datadog.Trace.OpenTracing.Tests.csproj
@@ -4,7 +4,6 @@
     <ProjectReference Include="..\..\src\Datadog.Trace.OpenTracing\Datadog.Trace.OpenTracing.csproj" />
     <ProjectReference Include="..\..\src\Datadog.Trace\Datadog.Trace.csproj" />
     <ProjectReference Include="..\Datadog.Trace.TestHelpers\Datadog.Trace.TestHelpers.csproj" />
-
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">