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

Upmerge from v7 #3028

Merged
merged 2 commits into from
Feb 20, 2025
Merged

Upmerge from v7 #3028

merged 2 commits into from
Feb 20, 2025

Conversation

jnyrup
Copy link
Member

@jnyrup jnyrup commented Feb 20, 2025

The resolved merge conflict was due to 3205e04 moving CompleteWithinAsync from AsyncFunctionAssertions from NonGenericAsyncFunctionAssertions

IMPORTANT

  • If the PR touches the public API, the changes have been approved in a separate issue with the "api-approved" label.
  • The code complies with the Coding Guidelines for C#.
  • The changes are covered by unit tests which follow the Arrange-Act-Assert syntax and the naming conventions such as is used in these tests.
  • If the PR adds a feature or fixes a bug, please update the release notes with a functional description that explains what the change means to consumers of this library, which are published on the website.
  • If the PR changes the public API the changes needs to be included by running AcceptApiChanges.ps1 or AcceptApiChanges.sh.
  • If the PR affects the documentation, please include your changes in this pull request so the documentation will appear on the website.
    • Please also run ./build.sh --target spellcheck or .\build.ps1 --target spellcheck before pushing and check the good outcome

Sorry, something went wrong.

dennisdoomen and others added 2 commits February 11, 2025 08:56

Unverified

The signing certificate or its chain could not be verified.
…sk as an exception.

Verified

This commit was signed with the committer’s verified signature.
jdolitsky Josh Dolitsky
Copy link

Qodana for .NET

It seems all right 👌

No new problems were found according to the checks applied

💡 Qodana analysis was run in the pull request mode: only the changed files were checked
☁️ View the detailed Qodana report

Contact Qodana team

Contact us at qodana-support@jetbrains.com

@coveralls
Copy link

Pull Request Test Coverage Report for Build 13440170649

Details

  • 5 of 5 (100.0%) changed or added relevant lines in 3 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage remained the same at 97.422%

Totals Coverage Status
Change from base Build 13393442044: 0.0%
Covered Lines: 12314
Relevant Lines: 12498

💛 - Coveralls

@dennisdoomen dennisdoomen merged commit 255d397 into fluentassertions:main Feb 20, 2025
8 checks passed
@jnyrup jnyrup deleted the upmerge branch February 20, 2025 17:57
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.

None yet

3 participants