Merge branch 'master' into merge-master-into-openapi

Author: bkoelman

package-versions.props

@@ -9,20 +9,21 @@
     <!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
     <BenchmarkDotNetVersion>0.13.*</BenchmarkDotNetVersion>
     <BlushingPenguinVersion>1.0.*</BlushingPenguinVersion>
-    <BogusVersion>34.0.*</BogusVersion>
+    <BogusVersion>35.2.*</BogusVersion>
     <CodeAnalysisVersion>4.8.*</CodeAnalysisVersion>
     <CoverletVersion>6.0.*</CoverletVersion>
     <DapperVersion>2.1.*</DapperVersion>
     <FluentAssertionsVersion>6.12.*</FluentAssertionsVersion>
     <GitHubActionsTestLoggerVersion>2.3.*</GitHubActionsTestLoggerVersion>
-    <InheritDocVersion>1.4.*</InheritDocVersion>
+    <InheritDocVersion>2.0.*</InheritDocVersion>
     <MicrosoftApiClientVersion>8.0.*</MicrosoftApiClientVersion>
     <NSwagApiClientVersion>13.20.*</NSwagApiClientVersion>
     <NewtonsoftJsonVersion>13.0.*</NewtonsoftJsonVersion>
     <SourceLinkVersion>8.0.*</SourceLinkVersion>
     <SwashbuckleVersion>6.5.*</SwashbuckleVersion>
     <TestSdkVersion>17.8.*</TestSdkVersion>
-    <XunitVersion>2.5.*</XunitVersion>
+    <XunitVersion>2.6.*</XunitVersion>
+    <XunitVisualStudioVersion>2.5.*</XunitVisualStudioVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">

src/JsonApiDotNetCore/Configuration/ServiceDiscoveryFacade.cs

@@ -1,10 +1,12 @@
 using System.Reflection;
+using JetBrains.Annotations;
 
 namespace JsonApiDotNetCore.Configuration;
 
 /// <summary>
 /// Provides auto-discovery by scanning assemblies for resources and related injectables.
 /// </summary>
+[PublicAPI]
 public sealed class ServiceDiscoveryFacade
 {
     private readonly ResourceDescriptorAssemblyCache _assemblyCache;

test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/CustomFunctions/IsUpperCase/IsUpperCaseFilterParseTests.cs

@@ -66,7 +66,7 @@ public void Reader_Read_Fails(string parameterName, string parameterValue, strin
     [InlineData("filter", "has(posts,isUpperCase(author.userName))", null)]
     [InlineData("filter", "or(isUpperCase(title),isUpperCase(platformName))", null)]
     [InlineData("filter[posts]", "isUpperCase(author.userName)", "posts")]
-    public void Reader_Read_Succeeds(string parameterName, string parameterValue, string scopeExpected)
+    public void Reader_Read_Succeeds(string parameterName, string parameterValue, string? scopeExpected)
     {
         // Act
         _reader.Read(parameterName, parameterValue);

test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/CustomFunctions/StringLength/LengthFilterParseTests.cs

@@ -66,7 +66,7 @@ public void Reader_Read_Fails(string parameterName, string parameterValue, strin
     [InlineData("filter", "has(posts,lessThan(length(author.userName),'1'))", null)]
     [InlineData("filter", "or(equals(length(title),'1'),equals(length(platformName),'1'))", null)]
     [InlineData("filter[posts]", "equals(length(author.userName),'1')", "posts")]
-    public void Reader_Read_Succeeds(string parameterName, string parameterValue, string scopeExpected)
+    public void Reader_Read_Succeeds(string parameterName, string parameterValue, string? scopeExpected)
     {
         // Act
         _reader.Read(parameterName, parameterValue);

test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/CustomFunctions/StringLength/LengthSortParseTests.cs

@@ -62,7 +62,7 @@ public void Reader_Read_Fails(string parameterName, string parameterValue, strin
     [InlineData("sort", "length(title),-length(platformName)", null)]
     [InlineData("sort", "length(owner.userName)", null)]
     [InlineData("sort[posts]", "length(author.userName)", "posts")]
-    public void Reader_Read_Succeeds(string parameterName, string parameterValue, string scopeExpected)
+    public void Reader_Read_Succeeds(string parameterName, string parameterValue, string? scopeExpected)
     {
         // Act
         _reader.Read(parameterName, parameterValue);

test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/CustomFunctions/Sum/SumFilterParseTests.cs

@@ -71,7 +71,7 @@ public void Reader_Read_Fails(string parameterName, string parameterValue, strin
     [InlineData("filter", "has(posts,greaterThan(sum(comments,numStars),'5'))", null)]
     [InlineData("filter[posts]", "equals(sum(comments,numStars),'11')", "posts")]
     [InlineData("filter[posts]", "equals(sum(labels,count(posts)),'8')", "posts")]
-    public void Reader_Read_Succeeds(string parameterName, string parameterValue, string scopeExpected)
+    public void Reader_Read_Succeeds(string parameterName, string parameterValue, string? scopeExpected)
     {
         // Act
         _reader.Read(parameterName, parameterValue);

test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/FilterParseTests.cs

@@ -202,7 +202,7 @@ public void Reader_Read_ParameterValue_Fails(string parameterName, string parame
     [InlineData("filter", "isType(owner.person,men,equals(hasBeard,'true'))", null)]
     [InlineData("filter[posts.contributors]", "isType(,women)", "posts.contributors")]
     [InlineData("filter[posts.contributors]", "isType(,women,equals(maidenName,'Austen'))", "posts.contributors")]
-    public void Reader_Read_Succeeds(string parameterName, string parameterValue, string scopeExpected)
+    public void Reader_Read_Succeeds(string parameterName, string parameterValue, string? scopeExpected)
     {
         // Act
         _reader.Read(parameterName, parameterValue);

test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/SortParseTests.cs

@@ -152,7 +152,7 @@ public void Reader_Read_ParameterValue_Fails(string parameterName, string parame
     [InlineData("sort[posts.contributors]", "count(wife.husband.drinkingBuddies)", "posts.contributors")]
     [InlineData("sort[posts.contributors]", "wife.age", "posts.contributors")]
     [InlineData("sort[posts.contributors]", "count(father.friends)", "posts.contributors")]
-    public void Reader_Read_Succeeds(string parameterName, string parameterValue, string scopeExpected)
+    public void Reader_Read_Succeeds(string parameterName, string parameterValue, string? scopeExpected)
     {
         // Act
         _reader.Read(parameterName, parameterValue);

test/JsonApiDotNetCoreTests/UnitTests/TypeConversion/RuntimeTypeConverterTests.cs

@@ -141,7 +141,7 @@ public void Returns_same_instance_for_interface()
     [InlineData(typeof(IFace), null)]
     [InlineData(typeof(BaseType), null)]
     [InlineData(typeof(DerivedType), null)]
-    public void Returns_default_value_for_empty_string(Type type, object expectedValue)
+    public void Returns_default_value_for_empty_string(Type type, object? expectedValue)
     {
         // Act
         object? result = RuntimeTypeConverter.ConvertType(string.Empty, type);

test/TestBuildingBlocks/TestBuildingBlocks.csproj

@@ -20,6 +20,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EntityFrameworkCoreVersion)" />
     <PackageReference Include="xunit" Version="$(XunitVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" PrivateAssets="All" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVisualStudioVersion)" PrivateAssets="All" />
   </ItemGroup>
 </Project>