Skip to content

fix MergeWith option #1601

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 7 commits into from
Feb 14, 2024
Merged

fix MergeWith option #1601

merged 7 commits into from
Feb 14, 2024

Conversation

@Bertk
Copy link
Collaborator

@Bertk Bertk commented Jan 23, 2024 •
edited by daveMueller
Loading

  • adds JsonSerializerOptions for JsonSerializer.Deserialize (Replace Newtonsoft.Json package with System.Text.Json #1513)
  • removes src/coverlet.collector/Resources/Resources.resx
  • updates nuget package versions for coverlet.core.csproj
  • add tests in coverlet.core.tests/Coverage/CoverageTests.cs
  • add message for invalid mergeWith parameter
    LogInformation($"MergeWith: file '{_parameters.MergeWith}' does not exist.");

closes #1583
closes #1587

@Bertk Bertk mentioned this pull request Jan 25, 2024
Closed
@Bertk Bertk force-pushed the MergeWithErrors branch 2 times, most recently from f631c55 to 5d40f5c Compare January 29, 2024 16:47
@Bertk Bertk changed the title add MergeWith ArgumentException (file does not exist) add MergeWith log message "file does not exist" Jan 31, 2024
@Bertk Bertk requested a review from daveMueller January 31, 2024 09:12
@Bertk Bertk self-assigned this Jan 31, 2024
@Bertk Bertk marked this pull request as ready for review January 31, 2024 09:12
@Bertk Bertk changed the title add MergeWith log message "file does not exist" fix MergeWith (update dependencies for net7.0/net8.0 target frameworks) Feb 1, 2024
@Bertk Bertk mentioned this pull request Feb 1, 2024
Closed
@pinkfloydx33
Copy link

pinkfloydx33 commented Feb 5, 2024

Is there any chance this will be reviewed soon? We'd really like to start using the nightly build again and this is the blocker

@Bertk Bertk added the blocking-users Issue is blocking some users label Feb 5, 2024
@Bertk
Copy link
Collaborator Author

Bertk commented Feb 5, 2024

@daveMueller @MarcoRossignoli Please review this PR.

daveMueller
daveMueller reviewed Feb 5, 2024
View reviewed changes
@Bertk Bertk mentioned this pull request Feb 7, 2024
Closed
@Bertk Bertk removed the blocking-users Issue is blocking some users label Feb 8, 2024
@Bertk Bertk marked this pull request as draft February 9, 2024 16:09
@Bertk Bertk marked this pull request as ready for review February 10, 2024 15:00
@Bertk Bertk changed the title fix MergeWith (update dependencies for net7.0/net8.0 target frameworks) fix MergeWith option Feb 11, 2024
daveMueller
daveMueller reviewed Feb 11, 2024
View reviewed changes
daveMueller
daveMueller reviewed Feb 11, 2024
View reviewed changes
@daveMueller
Merge branch 'upstream/master' into MergeWithErrors
9a4dbef 
# Conflicts:
#	test/coverlet.integration.tests/coverlet.integration.tests.csproj
@daveMueller
Copy link
Collaborator

daveMueller commented Feb 14, 2024

LGTM 👍

@daveMueller daveMueller merged commit 16eda38 into coverlet-coverage:master Feb 14, 2024
@Bertk Bertk deleted the MergeWithErrors branch February 14, 2024 07:37
@drdamour drdamour mentioned this pull request Feb 21, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@daveMueller daveMueller daveMueller approved these changes

+1 more reviewer

@pinkfloydx33 pinkfloydx33 pinkfloydx33 left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@Bertk Bertk

Labels

None yet

Projects

None yet

Milestone

No milestone

3 participants

@Bertk @pinkfloydx33 @daveMueller