Skip to content

Commit

Permalink
upmerge master to develop
Browse files Browse the repository at this point in the history
  • Loading branch information
jnyrup committed Feb 11, 2023
2 parents 97cf195 + faca1e9 commit 6d038f0
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docs/_pages/data.md
Expand Up @@ -187,7 +187,7 @@ Matching the rows of `DataTable`s by their primary key values:

```csharp
var expected = GetExpectedDataTable();
var actual = GetActualDataTable(0;
var actual = GetActualDataTable();

actual.Should().BeEquivalentTo(expected, options => options.UsingRowMatchMode(RowMatchMode.PrimaryKey));
```
2 changes: 1 addition & 1 deletion docs/_pages/releases.md
Expand Up @@ -34,7 +34,7 @@ sidebar:
* Changed `BeEquivalentTo` to treat record structs like records, thus comparing them by member by default - [#2009](https://github.com/fluentassertions/fluentassertions/pull/2009)

### Fixes
* `PropertyInfoSelector.ThatArePublicOrInternal` now takes the setter into account when determining if a property is `public` or `internal` - [#2082] (https://github.com/fluentassertions/fluentassertions/pull/2082)
* `PropertyInfoSelector.ThatArePublicOrInternal` now takes the setter into account when determining if a property is `public` or `internal` - [#2082](https://github.com/fluentassertions/fluentassertions/pull/2082)
* Quering properties on classes, e.g. `typeof(MyClass).Properties()`, now also includes static properties - [#2054](https://github.com/fluentassertions/fluentassertions/pull/2054)
* Nested AssertionScopes now print the inner scope reportables - [#2044](https://github.com/fluentassertions/fluentassertions/pull/2044)
* Throw `ArgumentException` instead of `ArgumentNullException` when a required `string` argument is empty - [#2023](https://github.com/fluentassertions/fluentassertions/pull/2023)
Expand Down
1 change: 1 addition & 0 deletions docs/_sass/minimal-mistakes/_buttons.scss
Expand Up @@ -46,6 +46,7 @@
(patreon, rgb(250, 118, 100)),
(github, rgb(217, 85, 169)),
(google-plus, $google-plus-color),
(mastodon, #595aff),
(linkedin, $linkedin-color);

@each $buttoncolor, $color in $buttoncolors {
Expand Down
7 changes: 4 additions & 3 deletions docs/index.html
Expand Up @@ -6,8 +6,8 @@
overlay_color: "#373737"
overlay_filter: "0.7"
overlay_image: "/assets/images/fluent_assertions_large_horizontal.svg"
cta_label: "6.8.0 is out - the most powerful version we've ever released!"
cta_url: "https://fluentassertions.com/releases/#670"
cta_label: "Hello 2023! Here's Fluent Assertions 6.9!"
cta_url: "https://fluentassertions.com/releases/#680"
caption: "Logo by [**IUserName**](https://github.com/IUsername) and icons by [**Zlatko Najdenovski**](https://www.flaticon.com/authors/zlatko-najdenovski) from [Flaticon](https://www.flaticon.com/)
"
excerpt: '_"There''s a life before Fluent Assertions, and there''s a life after it"_ - [Meisam Alifallahi](https://www.linkedin.com/in/meisam-alifallahi/)
Expand All @@ -21,7 +21,8 @@
intro:
- excerpt: '
[<i class="fab fa-twitter"></i> @ddoomen](https://twitter.com/ddoomen){: .btn .btn--twitter}
[<i class="fab fa-twitter"></i> @jnyrup](https://twitter.com/jnyrup){: .btn .btn--twitter}
[<i class="fab fa-mastodon"/> @ddoomen](https://mastodon.social/@ddoomen){: .btn .btn--mastodon}
[<i class="fab fa-twitter"></i> @jnyrup](https://twitter.com/jnyrup){: .btn .btn--twitter}<br/>
[<i class="fab fa-github"></i> Github Sponsors](https://github.com/sponsors/fluentassertions){: .btn .btn--github}
[<i class="fab fa-patreon"></i> Patreon](https://www.patreon.com/bePatron?u=9250052&redirect_uri=http%3A%2F%2Ffluentassertions.com%2F&utm_medium=widget){: .btn .btn--patreon}
[<i class="fab fa-paypal"></i> Tip Us](https://paypal.me/fluentassertions){: .btn .btn--paypal}
Expand Down

0 comments on commit 6d038f0

Please sign in to comment.