Skip to content

Colin/better build order#349

Merged
colin-higgins merged 5 commits intodevelopfrom
colin/better-build-order
May 14, 2019
Merged

Colin/better build order#349
colin-higgins merged 5 commits intodevelopfrom
colin/better-build-order

Conversation

@colin-higgins
Copy link
Member

Move c++ projects to top of solution to have them build before samples.
Replace inconsistent OutputRoot variable.
Only copy relevant profiler subdirectory.

@colin-higgins colin-higgins requested a review from a team as a code owner May 14, 2019 19:19

<ItemGroup>
<Content Include="..\..\src\Datadog.Trace.ClrProfiler.Native\bin\**"
<None Include="..\..\src\Datadog.Trace.ClrProfiler.Native\bin\$(Configuration)\\$(Platform)\\**"
Copy link
Member

@lucaspimentel lucaspimentel May 14, 2019

Choose a reason for hiding this comment

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

You can probably change the end here to **\*.dll so it only copies the dll files. Similarly for test/Datadog.Trace.ClrProfiler.IntegrationTests/Datadog.Trace.ClrProfiler.IntegrationTests.csproj.

Copy link
Member Author

Choose a reason for hiding this comment

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

what about *.so?

Copy link
Member

Choose a reason for hiding this comment

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

The samples (and any profiled app) only need Datadog.Trace.ClrProfiler.Native.dll.

Copy link
Member

@lucaspimentel lucaspimentel May 14, 2019

Choose a reason for hiding this comment

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

Never mind me. I got mixed up with native code in Linux. Manged code still builds into a dll file even on Linux.

@colin-higgins colin-higgins self-assigned this May 14, 2019
@colin-higgins colin-higgins added area:builds project files, build scripts, pipelines, versioning, releases, packages area:test-apps apps used to test integrations labels May 14, 2019
@colin-higgins colin-higgins added this to the 1.2.0 milestone May 14, 2019
@colin-higgins colin-higgins added the status:work-in-progress Actively worked on. If this is a PR, no review needed yet. WIP. label May 14, 2019
@colin-higgins colin-higgins removed the status:work-in-progress Actively worked on. If this is a PR, no review needed yet. WIP. label May 14, 2019
@colin-higgins colin-higgins merged commit 9a8e89f into develop May 14, 2019
@colin-higgins colin-higgins deleted the colin/better-build-order branch May 14, 2019 20:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:builds project files, build scripts, pipelines, versioning, releases, packages area:test-apps apps used to test integrations

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants