Post-merge fixes and package updates

json-api-dotnet · Dec 24, 2024 · df14313 · df14313
1 parent f69cc54
commit df14313
Show file tree

Hide file tree

Showing 87 changed files with 267 additions and 1,304 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -31,7 +31,7 @@
       "rollForward": false
     },
     "microsoft.openapi.kiota": {
-      "version": "1.19.1",
+      "version": "1.21.0",
       "commands": [
         "kiota"
       ],

diff --git a/package-versions.props b/package-versions.props
@@ -4,11 +4,10 @@
     <CodeAnalysisFrozenVersion>4.1.0</CodeAnalysisFrozenVersion>
     <DemystifierFrozenVersion>0.4.1</DemystifierFrozenVersion>
     <HumanizerFrozenVersion>2.14.1</HumanizerFrozenVersion>
-    <SwashbuckleFrozenVersion>6.8.1</SwashbuckleFrozenVersion>
+    <SwashbuckleFrozenVersion>7.2.0</SwashbuckleFrozenVersion>
     <NewtonsoftJsonFrozenVersion>13.0.3</NewtonsoftJsonFrozenVersion>
 
     <!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
-    <ApiDescriptionServerVersion>8.0.*</ApiDescriptionServerVersion>
     <BenchmarkDotNetVersion>0.14.*</BenchmarkDotNetVersion>
     <BlushingPenguinVersion>1.0.*</BlushingPenguinVersion>
     <BogusVersion>35.6.*</BogusVersion>
@@ -19,11 +18,12 @@
     <GitHubActionsTestLoggerVersion>2.4.*</GitHubActionsTestLoggerVersion>
     <InheritDocVersion>2.0.*</InheritDocVersion>
     <KiotaVersion>1.*</KiotaVersion>
-    <MicrosoftApiClientVersion>8.0.*</MicrosoftApiClientVersion>
-    <NSwagApiClientVersion>14.1.*</NSwagApiClientVersion>
+    <MicrosoftApiClientVersion>9.0.*</MicrosoftApiClientVersion>
+    <MicrosoftApiServerVersion>9.0.*</MicrosoftApiServerVersion>
+    <NSwagApiClientVersion>14.2.*</NSwagApiClientVersion>
     <NewtonsoftJsonVersion>13.0.*</NewtonsoftJsonVersion>
     <SourceLinkVersion>8.0.*</SourceLinkVersion>
-    <SwashbuckleVersion>6.*-*</SwashbuckleVersion>
+    <SwashbuckleVersion>7.*-*</SwashbuckleVersion>
     <SystemTextJsonVersion>9.0.*</SystemTextJsonVersion>
     <TestSdkVersion>17.12.*</TestSdkVersion>
     <XunitVersion>2.9.*</XunitVersion>

diff --git a/src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj b/src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj
@@ -16,7 +16,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EntityFrameworkCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.ApiDescription.Server" Version="$(ApiDescriptionServerVersion)" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Extensions.ApiDescription.Server" Version="$(MicrosoftApiServerVersion)" PrivateAssets="all" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EntityFrameworkCoreVersion)" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="$(SwashbuckleVersion)" />
   </ItemGroup>

diff --git a/src/Examples/OpenApiKiotaClientExample/OpenApiKiotaClientExample.csproj b/src/Examples/OpenApiKiotaClientExample/OpenApiKiotaClientExample.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Worker">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <Import Project="..\..\..\package-versions.props" />
@@ -20,6 +20,10 @@
     <PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="$(KiotaVersion)" />
   </ItemGroup>
 
+  <Target Name="KiotaRestoreTool" BeforeTargets="ExcludeKiotaGeneratedCode" Condition="$(DesignTimeBuild) != true And $(BuildingProject) == true">
+    <Exec Command="dotnet tool restore" />
+  </Target>
+
   <Target Name="ExcludeKiotaGeneratedCode" BeforeTargets="BeforeCompile;CoreCompile" Condition="$(DesignTimeBuild) != true And $(BuildingProject) == true">
     <ItemGroup>
       <Compile Remove="**\GeneratedCode\**\*.cs" />

diff --git a/src/Examples/OpenApiNSwagClientExample/OpenApiNSwagClientExample.csproj b/src/Examples/OpenApiNSwagClientExample/OpenApiNSwagClientExample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Worker">
   <PropertyGroup>
     <!-- TargetFrameworks does not work, see https://github.com/domaindrivendev/Swashbuckle.AspNetCore/issues/2706 -->
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <Import Project="..\..\..\package-versions.props" />

diff --git a/src/JsonApiDotNetCore.OpenApi.Client.Kiota/JsonApiDotNetCore.OpenApi.Client.Kiota.csproj b/src/JsonApiDotNetCore.OpenApi.Client.Kiota/JsonApiDotNetCore.OpenApi.Client.Kiota.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <OpenApiGenerateDocuments>false</OpenApiGenerateDocuments>

diff --git a/src/JsonApiDotNetCore.OpenApi.Client.NSwag/ApiResponse.cs b/src/JsonApiDotNetCore.OpenApi.Client.NSwag/ApiResponse.cs
@@ -12,7 +12,7 @@ public class ApiResponse(int statusCode, IReadOnlyDictionary<string, IEnumerable
     public static async Task<TResponse?> TranslateAsync<TResponse>(Func<Task<TResponse>> operation)
         where TResponse : class
     {
-        ArgumentGuard.NotNull(operation);
+        ArgumentNullException.ThrowIfNull(operation);
 
         try
         {
@@ -27,7 +27,7 @@ public class ApiResponse(int statusCode, IReadOnlyDictionary<string, IEnumerable
 
     public static async Task TranslateAsync(Func<Task> operation)
     {
-        ArgumentGuard.NotNull(operation);
+        ArgumentNullException.ThrowIfNull(operation);
 
         try
         {
@@ -42,7 +42,7 @@ public static async Task TranslateAsync(Func<Task> operation)
     public static async Task<ApiResponse<TResult?>> TranslateAsync<TResult>(Func<Task<ApiResponse<TResult>>> operation)
         where TResult : class
     {
-        ArgumentGuard.NotNull(operation);
+        ArgumentNullException.ThrowIfNull(operation);
 
         try
         {
@@ -57,7 +57,7 @@ public static async Task TranslateAsync(Func<Task> operation)
 
     public static async Task<ApiResponse> TranslateAsync(Func<Task<ApiResponse>> operation)
     {
-        ArgumentGuard.NotNull(operation);
+        ArgumentNullException.ThrowIfNull(operation);
 
         try
         {

diff --git a/src/JsonApiDotNetCore.OpenApi.Client.NSwag/ArgumentGuard.cs b/src/JsonApiDotNetCore.OpenApi.Client.NSwag/ArgumentGuard.cs
diff --git a/src/JsonApiDotNetCore.OpenApi.Client.NSwag/JsonApiClient.cs b/src/JsonApiDotNetCore.OpenApi.Client.NSwag/JsonApiClient.cs
@@ -17,7 +17,7 @@ public abstract class JsonApiClient : IJsonApiClient
     /// </summary>
     protected void SetSerializerSettingsForJsonApi(JsonSerializerSettings settings)
     {
-        ArgumentGuard.NotNull(settings);
+        ArgumentNullException.ThrowIfNull(settings);
 
         settings.Converters.Add(_documentJsonConverter);
     }
@@ -27,8 +27,8 @@ public IDisposable WithPartialAttributeSerialization<TRequestDocument, TAttribut
         params Expression<Func<TAttributesObject, object?>>[] alwaysIncludedAttributeSelectors)
         where TRequestDocument : class
     {
-        ArgumentGuard.NotNull(requestDocument);
-        ArgumentGuard.NotNull(alwaysIncludedAttributeSelectors);
+        ArgumentNullException.ThrowIfNull(requestDocument);
+        ArgumentNullException.ThrowIfNull(alwaysIncludedAttributeSelectors);
 
         HashSet<string> attributeNames = [];
 
@@ -79,8 +79,8 @@ private sealed class DocumentRegistrationScope : IDisposable
 
         public DocumentRegistrationScope(DocumentJsonConverter documentJsonConverter, object document)
         {
-            ArgumentGuard.NotNull(documentJsonConverter);
-            ArgumentGuard.NotNull(document);
+            ArgumentNullException.ThrowIfNull(documentJsonConverter);
+            ArgumentNullException.ThrowIfNull(document);
 
             _documentJsonConverter = documentJsonConverter;
             _document = document;
@@ -102,8 +102,8 @@ private sealed class AlwaysIncludedAttributes
 
         public AlwaysIncludedAttributes(HashSet<string> propertyNames, Type attributesObjectType)
         {
-            ArgumentGuard.NotNull(propertyNames);
-            ArgumentGuard.NotNull(attributesObjectType);
+            ArgumentNullException.ThrowIfNull(propertyNames);
+            ArgumentNullException.ThrowIfNull(attributesObjectType);
 
             _propertyNames = propertyNames;
             _attributesObjectType = attributesObjectType;
@@ -162,7 +162,7 @@ public void UnRegisterDocument(object document)
 
         public override bool CanConvert(Type objectType)
         {
-            ArgumentGuard.NotNull(objectType);
+            ArgumentNullException.ThrowIfNull(objectType);
 
             if (_isSerializing)
             {
@@ -180,8 +180,8 @@ public override object ReadJson(JsonReader reader, Type objectType, object? exis
 
         public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
         {
-            ArgumentGuard.NotNull(writer);
-            ArgumentGuard.NotNull(serializer);
+            ArgumentNullException.ThrowIfNull(writer);
+            ArgumentNullException.ThrowIfNull(serializer);
 
             if (value != null)
             {
@@ -216,14 +216,14 @@ private sealed class AttributesJsonConverter : JsonConverter
 
         public AttributesJsonConverter(AlwaysIncludedAttributes alwaysIncludedAttributes)
         {
-            ArgumentGuard.NotNull(alwaysIncludedAttributes);
+            ArgumentNullException.ThrowIfNull(alwaysIncludedAttributes);
 
             _alwaysIncludedAttributes = alwaysIncludedAttributes;
         }
 
         public override bool CanConvert(Type objectType)
         {
-            ArgumentGuard.NotNull(objectType);
+            ArgumentNullException.ThrowIfNull(objectType);
 
             if (_isSerializing)
             {
@@ -241,8 +241,8 @@ public override object ReadJson(JsonReader reader, Type objectType, object? exis
 
         public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
         {
-            ArgumentGuard.NotNull(writer);
-            ArgumentGuard.NotNull(serializer);
+            ArgumentNullException.ThrowIfNull(writer);
+            ArgumentNullException.ThrowIfNull(serializer);
 
             if (value != null)
             {
@@ -322,7 +322,7 @@ private sealed class JsonApiAttributeContractResolver : DefaultContractResolver
 
         public JsonApiAttributeContractResolver(AlwaysIncludedAttributes alwaysIncludedAttributes)
         {
-            ArgumentGuard.NotNull(alwaysIncludedAttributes);
+            ArgumentNullException.ThrowIfNull(alwaysIncludedAttributes);
 
             _alwaysIncludedAttributes = alwaysIncludedAttributes;
         }

diff --git a/src/JsonApiDotNetCore.OpenApi.Client.NSwag/JsonApiDotNetCore.OpenApi.Client.NSwag.csproj b/src/JsonApiDotNetCore.OpenApi.Client.NSwag/JsonApiDotNetCore.OpenApi.Client.NSwag.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <OpenApiGenerateDocuments>false</OpenApiGenerateDocuments>

diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ActionDescriptorExtensions.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ActionDescriptorExtensions.cs
@@ -10,22 +10,22 @@ internal static class ActionDescriptorExtensions
 {
     public static MethodInfo GetActionMethod(this ActionDescriptor descriptor)
     {
-        ArgumentGuard.NotNull(descriptor);
+        ArgumentNullException.ThrowIfNull(descriptor);
 
         return ((ControllerActionDescriptor)descriptor).MethodInfo;
     }
 
     public static TFilterMetaData? GetFilterMetadata<TFilterMetaData>(this ActionDescriptor descriptor)
         where TFilterMetaData : IFilterMetadata
     {
-        ArgumentGuard.NotNull(descriptor);
+        ArgumentNullException.ThrowIfNull(descriptor);
 
         return descriptor.FilterDescriptors.Select(filterDescriptor => filterDescriptor.Filter).OfType<TFilterMetaData>().FirstOrDefault();
     }
 
     public static ControllerParameterDescriptor? GetBodyParameterDescriptor(this ActionDescriptor descriptor)
     {
-        ArgumentGuard.NotNull(descriptor);
+        ArgumentNullException.ThrowIfNull(descriptor);
 
         return (ControllerParameterDescriptor?)descriptor.Parameters.FirstOrDefault(parameterDescriptor =>
             parameterDescriptor.BindingInfo?.BindingSource == BindingSource.Body);

diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ConfigureMvcOptions.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ConfigureMvcOptions.cs
@@ -14,9 +14,9 @@ internal sealed class ConfigureMvcOptions : IConfigureOptions<MvcOptions>
     public ConfigureMvcOptions(IJsonApiRoutingConvention jsonApiRoutingConvention, OpenApiEndpointConvention openApiEndpointConvention,
         JsonApiRequestFormatMetadataProvider jsonApiRequestFormatMetadataProvider)
     {
-        ArgumentGuard.NotNull(jsonApiRoutingConvention);
-        ArgumentGuard.NotNull(openApiEndpointConvention);
-        ArgumentGuard.NotNull(jsonApiRequestFormatMetadataProvider);
+        ArgumentNullException.ThrowIfNull(jsonApiRoutingConvention);
+        ArgumentNullException.ThrowIfNull(openApiEndpointConvention);
+        ArgumentNullException.ThrowIfNull(jsonApiRequestFormatMetadataProvider);
 
         _jsonApiRoutingConvention = jsonApiRoutingConvention;
         _openApiEndpointConvention = openApiEndpointConvention;

diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ConfigureSwaggerGenOptions.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ConfigureSwaggerGenOptions.cs
@@ -32,10 +32,10 @@ internal sealed class ConfigureSwaggerGenOptions : IConfigureOptions<SwaggerGenO
     public ConfigureSwaggerGenOptions(OpenApiOperationIdSelector operationIdSelector, JsonApiSchemaIdSelector schemaIdSelector,
         IControllerResourceMapping controllerResourceMapping, IResourceGraph resourceGraph)
     {
-        ArgumentGuard.NotNull(operationIdSelector);
-        ArgumentGuard.NotNull(schemaIdSelector);
-        ArgumentGuard.NotNull(controllerResourceMapping);
-        ArgumentGuard.NotNull(resourceGraph);
+        ArgumentNullException.ThrowIfNull(operationIdSelector);
+        ArgumentNullException.ThrowIfNull(schemaIdSelector);
+        ArgumentNullException.ThrowIfNull(controllerResourceMapping);
+        ArgumentNullException.ThrowIfNull(resourceGraph);
 
         _operationIdSelector = operationIdSelector;
         _schemaIdSelector = schemaIdSelector;

diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/IncludeDependencyScanner.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/IncludeDependencyScanner.cs
@@ -10,7 +10,7 @@ internal sealed class IncludeDependencyScanner
     /// </summary>
     public IReadOnlySet<ResourceType> GetReachableRelatedTypes(ResourceType resourceType)
     {
-        ArgumentGuard.NotNull(resourceType);
+        ArgumentNullException.ThrowIfNull(resourceType);
 
         HashSet<ResourceType> resourceTypesFound = [];
         AddTypesFromRelationships(resourceType.Relationships, resourceTypesFound);

diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiActionDescriptorCollectionProvider.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiActionDescriptorCollectionProvider.cs
@@ -32,8 +32,8 @@ internal sealed class JsonApiActionDescriptorCollectionProvider : IActionDescrip
     public JsonApiActionDescriptorCollectionProvider(IActionDescriptorCollectionProvider defaultProvider,
         JsonApiEndpointMetadataProvider jsonApiEndpointMetadataProvider)
     {
-        ArgumentGuard.NotNull(defaultProvider);
-        ArgumentGuard.NotNull(jsonApiEndpointMetadataProvider);
+        ArgumentNullException.ThrowIfNull(defaultProvider);
+        ArgumentNullException.ThrowIfNull(jsonApiEndpointMetadataProvider);
 
         _defaultProvider = defaultProvider;
         _jsonApiEndpointMetadataProvider = jsonApiEndpointMetadataProvider;

diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiDotNetCore.OpenApi.Swashbuckle.csproj b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiDotNetCore.OpenApi.Swashbuckle.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <OpenApiGenerateDocuments>false</OpenApiGenerateDocuments>

diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/EndpointResolver.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/EndpointResolver.cs
@@ -15,7 +15,7 @@ private EndpointResolver()
 
     public JsonApiEndpoints GetEndpoint(MethodInfo controllerAction)
     {
-        ArgumentGuard.NotNull(controllerAction);
+        ArgumentNullException.ThrowIfNull(controllerAction);
 
         if (!IsJsonApiController(controllerAction))
         {

diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/JsonApiEndpointMetadataProvider.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/JsonApiEndpointMetadataProvider.cs
@@ -18,16 +18,16 @@ internal sealed class JsonApiEndpointMetadataProvider
 
     public JsonApiEndpointMetadataProvider(IControllerResourceMapping controllerResourceMapping, NonPrimaryDocumentTypeFactory nonPrimaryDocumentTypeFactory)
     {
-        ArgumentGuard.NotNull(controllerResourceMapping);
-        ArgumentGuard.NotNull(nonPrimaryDocumentTypeFactory);
+        ArgumentNullException.ThrowIfNull(controllerResourceMapping);
+        ArgumentNullException.ThrowIfNull(nonPrimaryDocumentTypeFactory);
 
         _controllerResourceMapping = controllerResourceMapping;
         _nonPrimaryDocumentTypeFactory = nonPrimaryDocumentTypeFactory;
     }
 
     public JsonApiEndpointMetadataContainer Get(MethodInfo controllerAction)
     {
-        ArgumentGuard.NotNull(controllerAction);
+        ArgumentNullException.ThrowIfNull(controllerAction);
 
         if (EndpointResolver.Instance.IsAtomicOperationsController(controllerAction))
         {