diff --git a/package-versions.props b/package-versions.props
index 37c2377bf4..07bbfed960 100644
--- a/package-versions.props
+++ b/package-versions.props
@@ -7,16 +7,17 @@
 
     <!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
     <BenchmarkDotNetVersion>0.13.*</BenchmarkDotNetVersion>
-    <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>
     <SourceLinkVersion>8.0.*</SourceLinkVersion>
     <TestSdkVersion>17.8.*</TestSdkVersion>
-    <XunitVersion>2.5.*</XunitVersion>
+    <XunitVersion>2.6.*</XunitVersion>
+    <XunitVisualStudioVersion>2.5.*</XunitVisualStudioVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
diff --git a/src/JsonApiDotNetCore/Configuration/ServiceDiscoveryFacade.cs b/src/JsonApiDotNetCore/Configuration/ServiceDiscoveryFacade.cs
index 3139930852..615ef244fc 100644
--- a/src/JsonApiDotNetCore/Configuration/ServiceDiscoveryFacade.cs
+++ b/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;
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/CustomFunctions/IsUpperCase/IsUpperCaseFilterParseTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/CustomFunctions/IsUpperCase/IsUpperCaseFilterParseTests.cs
index aca362aed3..ff0f8f6e09 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/CustomFunctions/IsUpperCase/IsUpperCaseFilterParseTests.cs
+++ b/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);
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/CustomFunctions/StringLength/LengthFilterParseTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/CustomFunctions/StringLength/LengthFilterParseTests.cs
index 78352a6ab7..e9f07521ac 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/CustomFunctions/StringLength/LengthFilterParseTests.cs
+++ b/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);
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/CustomFunctions/StringLength/LengthSortParseTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/CustomFunctions/StringLength/LengthSortParseTests.cs
index c28bec8c8a..e7e16196e4 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/CustomFunctions/StringLength/LengthSortParseTests.cs
+++ b/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);
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/CustomFunctions/Sum/SumFilterParseTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/CustomFunctions/Sum/SumFilterParseTests.cs
index c2cc62e279..cc4c3fc7e9 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/CustomFunctions/Sum/SumFilterParseTests.cs
+++ b/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);
diff --git a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/FilterParseTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/FilterParseTests.cs
index 24056cb9a7..9799d7d6ae 100644
--- a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/FilterParseTests.cs
+++ b/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);
diff --git a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/SortParseTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/SortParseTests.cs
index a2a013d535..77c52b3828 100644
--- a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/SortParseTests.cs
+++ b/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);
diff --git a/test/JsonApiDotNetCoreTests/UnitTests/TypeConversion/RuntimeTypeConverterTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/TypeConversion/RuntimeTypeConverterTests.cs
index 4fbe4f3d22..1263912faf 100644
--- a/test/JsonApiDotNetCoreTests/UnitTests/TypeConversion/RuntimeTypeConverterTests.cs
+++ b/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);
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 @@
     <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>