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.

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

Add option for additional assembly probe dirs #253

Merged
merged 10 commits into from
Nov 28, 2018

Conversation

ViktorHofer
Copy link
Contributor

@ViktorHofer ViktorHofer commented Nov 26, 2018

Adds an optional argument to probe for additional assemblies at a different location than the test assembly's directory. This is needed for corefx but should also be useful for advanced scenarios in regular .NET apps.

cc @tonerdo

@ViktorHofer ViktorHofer force-pushed the ProbePath branch 2 times, most recently from ae4cbdc to e973b79 Compare November 26, 2018 16:35
@codecov
Copy link

codecov bot commented Nov 26, 2018

Codecov Report

Merging #253 into master will increase coverage by 0.14%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #253      +/-   ##
==========================================
+ Coverage   95.29%   95.43%   +0.14%     
==========================================
  Files          16       16              
  Lines        1699     1752      +53     
==========================================
+ Hits         1619     1672      +53     
  Misses         80       80
Impacted Files Coverage Δ
src/coverlet.core/Helpers/InstrumentationHelper.cs 98.73% <100%> (+0.26%) ⬆️
src/coverlet.core/Coverage.cs 99.52% <100%> (+0.02%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1a28fcd...d4450ac. Read the comment docs.

@tonerdo
Copy link
Collaborator

tonerdo commented Nov 26, 2018

@ViktorHofer I believe #213 already addresses this?

@ViktorHofer
Copy link
Contributor Author

You are absolutely right, I missed that PR. I think both PRs present individual benefits. I will incorporate my changes into @jherby2k's PR.

@ViktorHofer
Copy link
Contributor Author

@tonerdo I force pushed @jherby2k and my changes into this PR as I couldn't update his base PR. This includes all the changes. Can you please take a look?

{
document.Value.Branches.Remove(branchToRemove.Key);
}
// for MoveNext() compiler autogenerated method we need to patch false positive (IAsyncStateMachine for instance)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

These are white-space only changes that are wrong in upstream.

@jherby2k
Copy link
Contributor

Can you just add ViktorHofer@3c480c7 to this? I'm so over my head with this complex PR stuff.

@ViktorHofer
Copy link
Contributor Author

That is already part of the changes or am I missing something?

@jherby2k
Copy link
Contributor

jherby2k commented Nov 27, 2018 via email

@tonerdo
Copy link
Collaborator

tonerdo commented Nov 27, 2018

@jherby2k no worries, your contributions are already included in this PR. I'll do one final sweeping review, your contribution is greatly appreciated

@ViktorHofer
Copy link
Contributor Author

ViktorHofer commented Nov 27, 2018

@jherby2k your commits are cherry-picked into this PR, you are still the author of the commits and 50% of the work is yours. If I crossed a line please tell me, we usually work this way in our team, therefore I wasn't aware that I could be insensitive.

I’m not looking at coverlet any more at this point. if this ever makes it into a release, cool.

Because of the way this PR moved forward or because you don't need it anymore?

@tonerdo thanks a lot 👍

@jherby2k
Copy link
Contributor

jherby2k commented Nov 27, 2018 via email

@ViktorHofer
Copy link
Contributor Author

Ok got it. Hope it'll get better soon :)

Copy link
Collaborator

@tonerdo tonerdo left a comment

Choose a reason for hiding this comment

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

A couple of comments and this should be ready to go

src/coverlet.console/Program.cs Outdated Show resolved Hide resolved
src/coverlet.core/Helpers/InstrumentationHelper.cs Outdated Show resolved Hide resolved
src/coverlet.core/Helpers/InstrumentationHelper.cs Outdated Show resolved Hide resolved
src/coverlet.core/Helpers/InstrumentationHelper.cs Outdated Show resolved Hide resolved
src/coverlet.core/Helpers/InstrumentationHelper.cs Outdated Show resolved Hide resolved
src/coverlet.msbuild.tasks/InstrumentationTask.cs Outdated Show resolved Hide resolved
src/coverlet.msbuild/coverlet.msbuild.props Outdated Show resolved Hide resolved
src/coverlet.core/Helpers/InstrumentationHelper.cs Outdated Show resolved Hide resolved
src/coverlet.core/Coverage.cs Outdated Show resolved Hide resolved
@ViktorHofer
Copy link
Contributor Author

@tonerdo Thanks for the through feedback. I addressed all your comments. Hope we can get this into master now.

Additionally I have an ask: Can we please publish a new version to either an internal feed (myget) or nuget (preferably nuget) after this is in? Thanks a lot!

@tonerdo
Copy link
Collaborator

tonerdo commented Nov 28, 2018

Sure @ViktorHofer, will merge and publish once I get an answer to my little nit above and the CI passes

@ViktorHofer
Copy link
Contributor Author

ViktorHofer commented Nov 28, 2018

@tonerdo it seems CI failed. Can you re-run CI?

@ViktorHofer
Copy link
Contributor Author

Also I see that your appveyor script still uses VS 2015 instances. I suggest updating to 2017 or "even better", consider using Azure DevOps.

@tonerdo
Copy link
Collaborator

tonerdo commented Nov 28, 2018

consider using Azure DevOps

Hehehe, shameless plug 😄

@tonerdo tonerdo merged commit a3c76ed into coverlet-coverage:master Nov 28, 2018
@tonerdo
Copy link
Collaborator

tonerdo commented Nov 28, 2018

@ViktorHofer there's a new release with these changes

@ViktorHofer ViktorHofer deleted the ProbePath branch November 28, 2018 19:47
@ViktorHofer
Copy link
Contributor Author

Amazing, thanks 😊

@jherby2k
Copy link
Contributor

jherby2k commented Nov 28, 2018 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants