diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 049aead328..20b1c6a40f 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "jetbrains.resharper.globaltools": { - "version": "2024.1.6", + "version": "2024.2.5", "commands": [ "jb" ], diff --git a/Directory.Build.props b/Directory.Build.props index b06480623f..6c68a15073 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -53,7 +53,7 @@ - + diff --git a/JsonApiDotNetCore.sln.DotSettings b/JsonApiDotNetCore.sln.DotSettings index f861fcbedb..2a09eac0dc 100644 --- a/JsonApiDotNetCore.sln.DotSettings +++ b/JsonApiDotNetCore.sln.DotSettings @@ -81,6 +81,7 @@ JsonApiDotNetCore.ArgumentGuard.NotNull($EXPR$); SUGGESTION SUGGESTION WARNING + DO_NOT_SHOW WARNING WARNING WARNING @@ -99,6 +100,7 @@ JsonApiDotNetCore.ArgumentGuard.NotNull($EXPR$); WARNING True SUGGESTION + False <?xml version="1.0" encoding="utf-16"?><Profile name="JADNC Full Cleanup"><XMLReformatCode>True</XMLReformatCode><CSCodeStyleAttributes ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="True" ArrangeBraces="True" ArrangeAttributes="True" ArrangeArgumentsStyle="True" ArrangeCodeBodyStyle="True" ArrangeVarStyle="True" ArrangeTrailingCommas="True" ArrangeObjectCreation="True" ArrangeDefaultValue="True" ArrangeNamespaces="True" ArrangeNullCheckingPattern="True" /><CssAlphabetizeProperties>True</CssAlphabetizeProperties><JsInsertSemicolon>True</JsInsertSemicolon><FormatAttributeQuoteDescriptor>True</FormatAttributeQuoteDescriptor><CorrectVariableKindsDescriptor>True</CorrectVariableKindsDescriptor><VariablesToInnerScopesDescriptor>True</VariablesToInnerScopesDescriptor><StringToTemplatesDescriptor>True</StringToTemplatesDescriptor><JsReformatCode>True</JsReformatCode><JsFormatDocComments>True</JsFormatDocComments><RemoveRedundantQualifiersTs>True</RemoveRedundantQualifiersTs><OptimizeImportsTs>True</OptimizeImportsTs><OptimizeReferenceCommentsTs>True</OptimizeReferenceCommentsTs><PublicModifierStyleTs>True</PublicModifierStyleTs><ExplicitAnyTs>True</ExplicitAnyTs><TypeAnnotationStyleTs>True</TypeAnnotationStyleTs><RelativePathStyleTs>True</RelativePathStyleTs><AsInsteadOfCastTs>True</AsInsteadOfCastTs><HtmlReformatCode>True</HtmlReformatCode><AspOptimizeRegisterDirectives>True</AspOptimizeRegisterDirectives><RemoveCodeRedundancies>True</RemoveCodeRedundancies><CSUseAutoProperty>True</CSUseAutoProperty><CSMakeFieldReadonly>True</CSMakeFieldReadonly><CSMakeAutoPropertyGetOnly>True</CSMakeAutoPropertyGetOnly><CSArrangeQualifiers>True</CSArrangeQualifiers><CSFixBuiltinTypeReferences>True</CSFixBuiltinTypeReferences><CssReformatCode>True</CssReformatCode><CSOptimizeUsings><OptimizeUsings>True</OptimizeUsings></CSOptimizeUsings><CSShortenReferences>True</CSShortenReferences><CSReformatCode>True</CSReformatCode><CSharpFormatDocComments>True</CSharpFormatDocComments><CSReorderTypeMembers>True</CSReorderTypeMembers><XAMLCollapseEmptyTags>False</XAMLCollapseEmptyTags><CSReformatInactiveBranches>True</CSReformatInactiveBranches></Profile> JADNC Full Cleanup Required @@ -596,6 +598,7 @@ JsonApiDotNetCore.ArgumentGuard.NotNull($EXPR$); True True True + True True True True diff --git a/WarningSeverities.DotSettings b/WarningSeverities.DotSettings index 060df315df..5b64971520 100644 --- a/WarningSeverities.DotSettings +++ b/WarningSeverities.DotSettings @@ -1,4 +1,5 @@  + WARNING WARNING WARNING WARNING @@ -197,7 +198,6 @@ WARNING WARNING WARNING - WARNING WARNING WARNING WARNING diff --git a/package-versions.props b/package-versions.props index 47408ebe40..ed9b06b1aa 100644 --- a/package-versions.props +++ b/package-versions.props @@ -6,17 +6,18 @@ 2.14.1 - 0.13.* - 35.5.* - 4.10.* + 0.14.* + 35.6.* + 4.11.* 6.0.* 2.1.* 6.12.* - 2.3.* + 2.4.* 2.0.* 8.0.* - 17.10.* - 2.8.* + 17.11.* + 2.9.* + 2.8.* diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterOperatorTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterOperatorTests.cs index 30a6aca67c..222ce40af4 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterOperatorTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterOperatorTests.cs @@ -819,7 +819,7 @@ public async Task Can_filter_on_has_with_nested_condition() // Arrange List resources = [ - new FilterableResource + new() { Children = new List { @@ -829,7 +829,7 @@ public async Task Can_filter_on_has_with_nested_condition() } } }, - new FilterableResource + new() { Children = new List { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/ResourceInheritanceWriteTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/ResourceInheritanceWriteTests.cs index 1524b92ed7..a5cffa039a 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/ResourceInheritanceWriteTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/ResourceInheritanceWriteTests.cs @@ -1704,7 +1704,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext => }); tandemStore.AssertLeftType(); - tandemStore.AssertRightTypes([]); + tandemStore.AssertRightTypes(); } [Fact] diff --git a/test/JsonApiDotNetCoreTests/UnitTests/Serialization/InputConversionTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/Serialization/InputConversionTests.cs index 1c0ab48c22..37307b1ab5 100644 --- a/test/JsonApiDotNetCoreTests/UnitTests/Serialization/InputConversionTests.cs +++ b/test/JsonApiDotNetCoreTests/UnitTests/Serialization/InputConversionTests.cs @@ -60,11 +60,11 @@ public void Converts_various_data_types_with_values() List complexObjectList = [ - new ComplexObject + new() { Value = "One" }, - new ComplexObject + new() { Value = "Two" } diff --git a/test/NoEntityFrameworkTests/NullSafeExpressionRewriterTests.cs b/test/NoEntityFrameworkTests/NullSafeExpressionRewriterTests.cs index 0258877f49..23250ddb1c 100644 --- a/test/NoEntityFrameworkTests/NullSafeExpressionRewriterTests.cs +++ b/test/NoEntityFrameworkTests/NullSafeExpressionRewriterTests.cs @@ -20,11 +20,11 @@ public void Can_rewrite_where_clause_with_constant_comparison() List dataSource = [ - new TestResource + new() { Id = generator.GetNext() }, - new TestResource + new() { Id = generator.GetNext(), Parent = new TestResource @@ -59,11 +59,11 @@ public void Can_rewrite_where_clause_with_member_comparison() List dataSource = [ - new TestResource + new() { Id = generator.GetNext() }, - new TestResource + new() { Id = generator.GetNext(), Parent = new TestResource @@ -71,7 +71,7 @@ public void Can_rewrite_where_clause_with_member_comparison() Id = generator.GetNext() } }, - new TestResource + new() { Id = generator.GetNext(), Parent = new TestResource @@ -86,7 +86,7 @@ public void Can_rewrite_where_clause_with_member_comparison() } } }, - new TestResource + new() { Id = generator.GetNext(), Parent = new TestResource @@ -132,11 +132,11 @@ public void Can_rewrite_where_clause_with_not_comparison() List dataSource = [ - new TestResource + new() { Id = generator.GetNext() }, - new TestResource + new() { Id = generator.GetNext(), Parent = new TestResource @@ -170,11 +170,11 @@ public void Can_rewrite_where_clause_with_any_comparison() List dataSource = [ - new TestResource + new() { Id = generator.GetNext() }, - new TestResource + new() { Id = generator.GetNext(), Parent = new TestResource @@ -182,7 +182,7 @@ public void Can_rewrite_where_clause_with_any_comparison() Id = generator.GetNext() } }, - new TestResource + new() { Id = generator.GetNext(), Parent = new TestResource @@ -230,11 +230,11 @@ public void Can_rewrite_where_clause_with_conditional_any_comparison() List dataSource = [ - new TestResource + new() { Id = generator.GetNext() }, - new TestResource + new() { Id = generator.GetNext(), Parent = new TestResource @@ -242,7 +242,7 @@ public void Can_rewrite_where_clause_with_conditional_any_comparison() Id = generator.GetNext() } }, - new TestResource + new() { Id = generator.GetNext(), Children = @@ -289,12 +289,12 @@ public void Can_rewrite_where_clause_with_nested_conditional_any_comparison() List dataSource = [ - new TestResource + new() { Id = generator.GetNext(), Children = null! }, - new TestResource + new() { Id = generator.GetNext(), Children = @@ -312,7 +312,7 @@ public void Can_rewrite_where_clause_with_nested_conditional_any_comparison() } } }, - new TestResource + new() { Id = generator.GetNext(), Children = @@ -365,11 +365,11 @@ public void Can_rewrite_where_clause_with_count_comparison() List dataSource = [ - new TestResource + new() { Id = generator.GetNext() }, - new TestResource + new() { Id = generator.GetNext(), Parent = new TestResource @@ -378,7 +378,7 @@ public void Can_rewrite_where_clause_with_count_comparison() }, Children = null! }, - new TestResource + new() { Id = generator.GetNext(), Parent = new TestResource @@ -437,11 +437,11 @@ public void Can_rewrite_order_by_clause_with_long() List dataSource = [ - new TestResource + new() { Id = generator.GetNext() }, - new TestResource + new() { Id = generator.GetNext(), Parent = new TestResource @@ -449,7 +449,7 @@ public void Can_rewrite_order_by_clause_with_long() Id = generator.GetNext() } }, - new TestResource + new() { Id = generator.GetNext(), Parent = new TestResource @@ -484,11 +484,11 @@ public void Can_rewrite_order_by_clause_with_IntPtr() List dataSource = [ - new TestResource + new() { Id = generator.GetNext() }, - new TestResource + new() { Id = generator.GetNext(), Parent = new TestResource @@ -496,7 +496,7 @@ public void Can_rewrite_order_by_clause_with_IntPtr() Id = generator.GetNext() } }, - new TestResource + new() { Id = generator.GetNext(), Parent = new TestResource @@ -533,11 +533,11 @@ public void Can_rewrite_order_by_clause_with_nullable_int() List dataSource = [ - new TestResource + new() { Id = generator.GetNext() }, - new TestResource + new() { Id = generator.GetNext(), Parent = new TestResource @@ -545,7 +545,7 @@ public void Can_rewrite_order_by_clause_with_nullable_int() Id = generator.GetNext() } }, - new TestResource + new() { Id = generator.GetNext(), Parent = new TestResource @@ -581,11 +581,11 @@ public void Can_rewrite_order_by_clause_with_enum() List dataSource = [ - new TestResource + new() { Id = generator.GetNext() }, - new TestResource + new() { Id = generator.GetNext(), Parent = new TestResource @@ -593,7 +593,7 @@ public void Can_rewrite_order_by_clause_with_enum() Id = generator.GetNext() } }, - new TestResource + new() { Id = generator.GetNext(), Parent = new TestResource @@ -629,11 +629,11 @@ public void Can_rewrite_order_by_clause_with_string() List dataSource = [ - new TestResource + new() { Id = generator.GetNext() }, - new TestResource + new() { Id = generator.GetNext(), Parent = new TestResource @@ -641,7 +641,7 @@ public void Can_rewrite_order_by_clause_with_string() Id = generator.GetNext() } }, - new TestResource + new() { Id = generator.GetNext(), Parent = new TestResource @@ -677,11 +677,11 @@ public void Can_rewrite_order_by_clause_with_count() List dataSource = [ - new TestResource + new() { Id = generator.GetNext() }, - new TestResource + new() { Id = generator.GetNext(), Parent = new TestResource @@ -689,7 +689,7 @@ public void Can_rewrite_order_by_clause_with_count() Id = generator.GetNext() } }, - new TestResource + new() { Id = generator.GetNext(), Parent = new TestResource @@ -698,7 +698,7 @@ public void Can_rewrite_order_by_clause_with_count() }, Children = null! }, - new TestResource + new() { Id = generator.GetNext(), Parent = new TestResource @@ -746,11 +746,11 @@ public void Can_rewrite_nested_descending_order_by_clauses() List dataSource = [ - new TestResource + new() { Id = generator.GetNext() }, - new TestResource + new() { Id = generator.GetNext(), Parent = new TestResource @@ -760,7 +760,7 @@ public void Can_rewrite_nested_descending_order_by_clauses() Number = 1 } }, - new TestResource + new() { Id = generator.GetNext(), Parent = new TestResource @@ -770,7 +770,7 @@ public void Can_rewrite_nested_descending_order_by_clauses() Number = 10 } }, - new TestResource + new() { Id = generator.GetNext(), Parent = new TestResource @@ -780,7 +780,7 @@ public void Can_rewrite_nested_descending_order_by_clauses() Number = 1 } }, - new TestResource + new() { Id = generator.GetNext(), Parent = new TestResource diff --git a/test/TestBuildingBlocks/TestBuildingBlocks.csproj b/test/TestBuildingBlocks/TestBuildingBlocks.csproj index ae6cf32ff6..40e10eb297 100644 --- a/test/TestBuildingBlocks/TestBuildingBlocks.csproj +++ b/test/TestBuildingBlocks/TestBuildingBlocks.csproj @@ -19,6 +19,6 @@ - + diff --git a/tests.runsettings b/tests.runsettings index db83eb983e..14974e19f3 100644 --- a/tests.runsettings +++ b/tests.runsettings @@ -1,5 +1,9 @@ + + aggressive + true + true