use integration test directory for profiler lib

Author: colin-higgins

test/Datadog.Trace.ClrProfiler.IntegrationTests/Datadog.Trace.ClrProfiler.IntegrationTests.csproj

@@ -7,12 +7,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="..\..\integrations.json" Link="integrations.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\src\Datadog.Trace.ClrProfiler.Native\bin\**"
-             CopyToOutputDirectory="PreserveNewest"
-             CopyToPublishDirectory="PreserveNewest" />
+    <None Include="..\..\src\Datadog.Trace.ClrProfiler.Native\bin\$(Configuration)\$(Platform)\**"
+             CopyToOutputDirectory="Always"
+             CopyToPublishDirectory="Always"
+             Link="profiler-lib\%(RecursiveDir)\%(Filename)%(Extension)" />
+    <Content Include="..\..\integrations.json"
+             CopyToOutputDirectory="Always"
+             CopyToPublishDirectory="Always"
+             Link="profiler-lib\integrations.json" />
   </ItemGroup>
 
   <ItemGroup>

test/Datadog.Trace.TestHelpers/EnvironmentHelper.cs

@@ -239,9 +239,9 @@ public string GetProfilerPath()
 
                 if (!File.Exists(_profilerFileLocation))
                 {
-                    // Let's try the project directory, as dotnet publish ignores the Copy attributes we currently use
+                    // Let's try the executing directory, as dotnet publish ignores the Copy attributes we currently use
                     _profilerFileLocation = Path.Combine(
-                        GetProfilerProjectDirectory(),
+                        ExecutingAssembly.Location,
                         fileName);
                 }
 
@@ -305,16 +305,5 @@ public string GetTargetFramework()
 
             return $"net{_major}{_minor}{_patch ?? string.Empty}";
         }
-
-        private static string GetProfilerProjectDirectory()
-        {
-            return Path.Combine(
-                GetSolutionDirectory(),
-                "src",
-                "Datadog.Trace.ClrProfiler.Native",
-                "bin",
-                GetBuildConfiguration(),
-                GetPlatform());
-        }
     }
 }