Skip to content

Commit df14313

Browse files
bkoelmanbkoelman
committed
Post-merge fixes and package updates
1 parent f69cc54 commit df14313

File tree

87 files changed

+267
-1304
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+267
-1304
lines changed

‎.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"rollForward": false
3232
},
3333
"microsoft.openapi.kiota": {
34-
"version": "1.19.1",
34+
"version": "1.21.0",
3535
"commands": [
3636
"kiota"
3737
],

‎package-versions.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
<CodeAnalysisFrozenVersion>4.1.0</CodeAnalysisFrozenVersion>
55
<DemystifierFrozenVersion>0.4.1</DemystifierFrozenVersion>
66
<HumanizerFrozenVersion>2.14.1</HumanizerFrozenVersion>
7-
<SwashbuckleFrozenVersion>6.8.1</SwashbuckleFrozenVersion>
7+
<SwashbuckleFrozenVersion>7.2.0</SwashbuckleFrozenVersion>
88
<NewtonsoftJsonFrozenVersion>13.0.3</NewtonsoftJsonFrozenVersion>
99

1010
<!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
11-
<ApiDescriptionServerVersion>8.0.*</ApiDescriptionServerVersion>
1211
<BenchmarkDotNetVersion>0.14.*</BenchmarkDotNetVersion>
1312
<BlushingPenguinVersion>1.0.*</BlushingPenguinVersion>
1413
<BogusVersion>35.6.*</BogusVersion>
@@ -19,11 +18,12 @@
1918
<GitHubActionsTestLoggerVersion>2.4.*</GitHubActionsTestLoggerVersion>
2019
<InheritDocVersion>2.0.*</InheritDocVersion>
2120
<KiotaVersion>1.*</KiotaVersion>
22-
<MicrosoftApiClientVersion>8.0.*</MicrosoftApiClientVersion>
23-
<NSwagApiClientVersion>14.1.*</NSwagApiClientVersion>
21+
<MicrosoftApiClientVersion>9.0.*</MicrosoftApiClientVersion>
22+
<MicrosoftApiServerVersion>9.0.*</MicrosoftApiServerVersion>
23+
<NSwagApiClientVersion>14.2.*</NSwagApiClientVersion>
2424
<NewtonsoftJsonVersion>13.0.*</NewtonsoftJsonVersion>
2525
<SourceLinkVersion>8.0.*</SourceLinkVersion>
26-
<SwashbuckleVersion>6.*-*</SwashbuckleVersion>
26+
<SwashbuckleVersion>7.*-*</SwashbuckleVersion>
2727
<SystemTextJsonVersion>9.0.*</SystemTextJsonVersion>
2828
<TestSdkVersion>17.12.*</TestSdkVersion>
2929
<XunitVersion>2.9.*</XunitVersion>

‎src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<ItemGroup>
1818
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EntityFrameworkCoreVersion)" />
19-
<PackageReference Include="Microsoft.Extensions.ApiDescription.Server" Version="$(ApiDescriptionServerVersion)" PrivateAssets="all" />
19+
<PackageReference Include="Microsoft.Extensions.ApiDescription.Server" Version="$(MicrosoftApiServerVersion)" PrivateAssets="all" />
2020
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EntityFrameworkCoreVersion)" />
2121
<PackageReference Include="Swashbuckle.AspNetCore" Version="$(SwashbuckleVersion)" />
2222
</ItemGroup>

‎src/Examples/OpenApiKiotaClientExample/OpenApiKiotaClientExample.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Worker">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
</PropertyGroup>
55

66
<Import Project="..\..\..\package-versions.props" />
@@ -20,6 +20,10 @@
2020
<PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="$(KiotaVersion)" />
2121
</ItemGroup>
2222

23+
<Target Name="KiotaRestoreTool" BeforeTargets="ExcludeKiotaGeneratedCode" Condition="$(DesignTimeBuild) != true And $(BuildingProject) == true">
24+
<Exec Command="dotnet tool restore" />
25+
</Target>
26+
2327
<Target Name="ExcludeKiotaGeneratedCode" BeforeTargets="BeforeCompile;CoreCompile" Condition="$(DesignTimeBuild) != true And $(BuildingProject) == true">
2428
<ItemGroup>
2529
<Compile Remove="**\GeneratedCode\**\*.cs" />

‎src/Examples/OpenApiNSwagClientExample/OpenApiNSwagClientExample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Worker">
22
<PropertyGroup>
33
<!-- TargetFrameworks does not work, see https://github.com/domaindrivendev/Swashbuckle.AspNetCore/issues/2706 -->
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
</PropertyGroup>
66

77
<Import Project="..\..\..\package-versions.props" />

‎src/JsonApiDotNetCore.OpenApi.Client.Kiota/JsonApiDotNetCore.OpenApi.Client.Kiota.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0;net6.0</TargetFrameworks>
3+
<TargetFrameworks>net8.0</TargetFrameworks>
44
<IsPackable>true</IsPackable>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<OpenApiGenerateDocuments>false</OpenApiGenerateDocuments>

‎src/JsonApiDotNetCore.OpenApi.Client.NSwag/ApiResponse.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class ApiResponse(int statusCode, IReadOnlyDictionary<string, IEnumerable
1212
public static async Task<TResponse?> TranslateAsync<TResponse>(Func<Task<TResponse>> operation)
1313
where TResponse : class
1414
{
15-
ArgumentGuard.NotNull(operation);
15+
ArgumentNullException.ThrowIfNull(operation);
1616

1717
try
1818
{
@@ -27,7 +27,7 @@ public class ApiResponse(int statusCode, IReadOnlyDictionary<string, IEnumerable
2727

2828
public static async Task TranslateAsync(Func<Task> operation)
2929
{
30-
ArgumentGuard.NotNull(operation);
30+
ArgumentNullException.ThrowIfNull(operation);
3131

3232
try
3333
{
@@ -42,7 +42,7 @@ public static async Task TranslateAsync(Func<Task> operation)
4242
public static async Task<ApiResponse<TResult?>> TranslateAsync<TResult>(Func<Task<ApiResponse<TResult>>> operation)
4343
where TResult : class
4444
{
45-
ArgumentGuard.NotNull(operation);
45+
ArgumentNullException.ThrowIfNull(operation);
4646

4747
try
4848
{
@@ -57,7 +57,7 @@ public static async Task TranslateAsync(Func<Task> operation)
5757

5858
public static async Task<ApiResponse> TranslateAsync(Func<Task<ApiResponse>> operation)
5959
{
60-
ArgumentGuard.NotNull(operation);
60+
ArgumentNullException.ThrowIfNull(operation);
6161

6262
try
6363
{

‎src/JsonApiDotNetCore.OpenApi.Client.NSwag/ArgumentGuard.cs

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎src/JsonApiDotNetCore.OpenApi.Client.NSwag/JsonApiClient.cs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public abstract class JsonApiClient : IJsonApiClient
1717
/// </summary>
1818
protected void SetSerializerSettingsForJsonApi(JsonSerializerSettings settings)
1919
{
20-
ArgumentGuard.NotNull(settings);
20+
ArgumentNullException.ThrowIfNull(settings);
2121

2222
settings.Converters.Add(_documentJsonConverter);
2323
}
@@ -27,8 +27,8 @@ public IDisposable WithPartialAttributeSerialization<TRequestDocument, TAttribut
2727
params Expression<Func<TAttributesObject, object?>>[] alwaysIncludedAttributeSelectors)
2828
where TRequestDocument : class
2929
{
30-
ArgumentGuard.NotNull(requestDocument);
31-
ArgumentGuard.NotNull(alwaysIncludedAttributeSelectors);
30+
ArgumentNullException.ThrowIfNull(requestDocument);
31+
ArgumentNullException.ThrowIfNull(alwaysIncludedAttributeSelectors);
3232

3333
HashSet<string> attributeNames = [];
3434

@@ -79,8 +79,8 @@ private sealed class DocumentRegistrationScope : IDisposable
7979

8080
public DocumentRegistrationScope(DocumentJsonConverter documentJsonConverter, object document)
8181
{
82-
ArgumentGuard.NotNull(documentJsonConverter);
83-
ArgumentGuard.NotNull(document);
82+
ArgumentNullException.ThrowIfNull(documentJsonConverter);
83+
ArgumentNullException.ThrowIfNull(document);
8484

8585
_documentJsonConverter = documentJsonConverter;
8686
_document = document;
@@ -102,8 +102,8 @@ private sealed class AlwaysIncludedAttributes
102102

103103
public AlwaysIncludedAttributes(HashSet<string> propertyNames, Type attributesObjectType)
104104
{
105-
ArgumentGuard.NotNull(propertyNames);
106-
ArgumentGuard.NotNull(attributesObjectType);
105+
ArgumentNullException.ThrowIfNull(propertyNames);
106+
ArgumentNullException.ThrowIfNull(attributesObjectType);
107107

108108
_propertyNames = propertyNames;
109109
_attributesObjectType = attributesObjectType;
@@ -162,7 +162,7 @@ public void UnRegisterDocument(object document)
162162

163163
public override bool CanConvert(Type objectType)
164164
{
165-
ArgumentGuard.NotNull(objectType);
165+
ArgumentNullException.ThrowIfNull(objectType);
166166

167167
if (_isSerializing)
168168
{
@@ -180,8 +180,8 @@ public override object ReadJson(JsonReader reader, Type objectType, object? exis
180180

181181
public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
182182
{
183-
ArgumentGuard.NotNull(writer);
184-
ArgumentGuard.NotNull(serializer);
183+
ArgumentNullException.ThrowIfNull(writer);
184+
ArgumentNullException.ThrowIfNull(serializer);
185185

186186
if (value != null)
187187
{
@@ -216,14 +216,14 @@ private sealed class AttributesJsonConverter : JsonConverter
216216

217217
public AttributesJsonConverter(AlwaysIncludedAttributes alwaysIncludedAttributes)
218218
{
219-
ArgumentGuard.NotNull(alwaysIncludedAttributes);
219+
ArgumentNullException.ThrowIfNull(alwaysIncludedAttributes);
220220

221221
_alwaysIncludedAttributes = alwaysIncludedAttributes;
222222
}
223223

224224
public override bool CanConvert(Type objectType)
225225
{
226-
ArgumentGuard.NotNull(objectType);
226+
ArgumentNullException.ThrowIfNull(objectType);
227227

228228
if (_isSerializing)
229229
{
@@ -241,8 +241,8 @@ public override object ReadJson(JsonReader reader, Type objectType, object? exis
241241

242242
public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
243243
{
244-
ArgumentGuard.NotNull(writer);
245-
ArgumentGuard.NotNull(serializer);
244+
ArgumentNullException.ThrowIfNull(writer);
245+
ArgumentNullException.ThrowIfNull(serializer);
246246

247247
if (value != null)
248248
{
@@ -322,7 +322,7 @@ private sealed class JsonApiAttributeContractResolver : DefaultContractResolver
322322

323323
public JsonApiAttributeContractResolver(AlwaysIncludedAttributes alwaysIncludedAttributes)
324324
{
325-
ArgumentGuard.NotNull(alwaysIncludedAttributes);
325+
ArgumentNullException.ThrowIfNull(alwaysIncludedAttributes);
326326

327327
_alwaysIncludedAttributes = alwaysIncludedAttributes;
328328
}

‎src/JsonApiDotNetCore.OpenApi.Client.NSwag/JsonApiDotNetCore.OpenApi.Client.NSwag.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0;net6.0</TargetFrameworks>
3+
<TargetFrameworks>net8.0</TargetFrameworks>
44
<IsPackable>true</IsPackable>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<OpenApiGenerateDocuments>false</OpenApiGenerateDocuments>

‎src/JsonApiDotNetCore.OpenApi.Swashbuckle/ActionDescriptorExtensions.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@ internal static class ActionDescriptorExtensions
1010
{
1111
public static MethodInfo GetActionMethod(this ActionDescriptor descriptor)
1212
{
13-
ArgumentGuard.NotNull(descriptor);
13+
ArgumentNullException.ThrowIfNull(descriptor);
1414

1515
return ((ControllerActionDescriptor)descriptor).MethodInfo;
1616
}
1717

1818
public static TFilterMetaData? GetFilterMetadata<TFilterMetaData>(this ActionDescriptor descriptor)
1919
where TFilterMetaData : IFilterMetadata
2020
{
21-
ArgumentGuard.NotNull(descriptor);
21+
ArgumentNullException.ThrowIfNull(descriptor);
2222

2323
return descriptor.FilterDescriptors.Select(filterDescriptor => filterDescriptor.Filter).OfType<TFilterMetaData>().FirstOrDefault();
2424
}
2525

2626
public static ControllerParameterDescriptor? GetBodyParameterDescriptor(this ActionDescriptor descriptor)
2727
{
28-
ArgumentGuard.NotNull(descriptor);
28+
ArgumentNullException.ThrowIfNull(descriptor);
2929

3030
return (ControllerParameterDescriptor?)descriptor.Parameters.FirstOrDefault(parameterDescriptor =>
3131
parameterDescriptor.BindingInfo?.BindingSource == BindingSource.Body);

‎src/JsonApiDotNetCore.OpenApi.Swashbuckle/ConfigureMvcOptions.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ internal sealed class ConfigureMvcOptions : IConfigureOptions<MvcOptions>
1414
public ConfigureMvcOptions(IJsonApiRoutingConvention jsonApiRoutingConvention, OpenApiEndpointConvention openApiEndpointConvention,
1515
JsonApiRequestFormatMetadataProvider jsonApiRequestFormatMetadataProvider)
1616
{
17-
ArgumentGuard.NotNull(jsonApiRoutingConvention);
18-
ArgumentGuard.NotNull(openApiEndpointConvention);
19-
ArgumentGuard.NotNull(jsonApiRequestFormatMetadataProvider);
17+
ArgumentNullException.ThrowIfNull(jsonApiRoutingConvention);
18+
ArgumentNullException.ThrowIfNull(openApiEndpointConvention);
19+
ArgumentNullException.ThrowIfNull(jsonApiRequestFormatMetadataProvider);
2020

2121
_jsonApiRoutingConvention = jsonApiRoutingConvention;
2222
_openApiEndpointConvention = openApiEndpointConvention;

‎src/JsonApiDotNetCore.OpenApi.Swashbuckle/ConfigureSwaggerGenOptions.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ internal sealed class ConfigureSwaggerGenOptions : IConfigureOptions<SwaggerGenO
3232
public ConfigureSwaggerGenOptions(OpenApiOperationIdSelector operationIdSelector, JsonApiSchemaIdSelector schemaIdSelector,
3333
IControllerResourceMapping controllerResourceMapping, IResourceGraph resourceGraph)
3434
{
35-
ArgumentGuard.NotNull(operationIdSelector);
36-
ArgumentGuard.NotNull(schemaIdSelector);
37-
ArgumentGuard.NotNull(controllerResourceMapping);
38-
ArgumentGuard.NotNull(resourceGraph);
35+
ArgumentNullException.ThrowIfNull(operationIdSelector);
36+
ArgumentNullException.ThrowIfNull(schemaIdSelector);
37+
ArgumentNullException.ThrowIfNull(controllerResourceMapping);
38+
ArgumentNullException.ThrowIfNull(resourceGraph);
3939

4040
_operationIdSelector = operationIdSelector;
4141
_schemaIdSelector = schemaIdSelector;

‎src/JsonApiDotNetCore.OpenApi.Swashbuckle/IncludeDependencyScanner.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ internal sealed class IncludeDependencyScanner
1010
/// </summary>
1111
public IReadOnlySet<ResourceType> GetReachableRelatedTypes(ResourceType resourceType)
1212
{
13-
ArgumentGuard.NotNull(resourceType);
13+
ArgumentNullException.ThrowIfNull(resourceType);
1414

1515
HashSet<ResourceType> resourceTypesFound = [];
1616
AddTypesFromRelationships(resourceType.Relationships, resourceTypesFound);

‎src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiActionDescriptorCollectionProvider.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ internal sealed class JsonApiActionDescriptorCollectionProvider : IActionDescrip
3232
public JsonApiActionDescriptorCollectionProvider(IActionDescriptorCollectionProvider defaultProvider,
3333
JsonApiEndpointMetadataProvider jsonApiEndpointMetadataProvider)
3434
{
35-
ArgumentGuard.NotNull(defaultProvider);
36-
ArgumentGuard.NotNull(jsonApiEndpointMetadataProvider);
35+
ArgumentNullException.ThrowIfNull(defaultProvider);
36+
ArgumentNullException.ThrowIfNull(jsonApiEndpointMetadataProvider);
3737

3838
_defaultProvider = defaultProvider;
3939
_jsonApiEndpointMetadataProvider = jsonApiEndpointMetadataProvider;

‎src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiDotNetCore.OpenApi.Swashbuckle.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0;net6.0</TargetFrameworks>
3+
<TargetFrameworks>net8.0</TargetFrameworks>
44
<IsPackable>true</IsPackable>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<OpenApiGenerateDocuments>false</OpenApiGenerateDocuments>

‎src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/EndpointResolver.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ private EndpointResolver()
1515

1616
public JsonApiEndpoints GetEndpoint(MethodInfo controllerAction)
1717
{
18-
ArgumentGuard.NotNull(controllerAction);
18+
ArgumentNullException.ThrowIfNull(controllerAction);
1919

2020
if (!IsJsonApiController(controllerAction))
2121
{

‎src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/JsonApiEndpointMetadataProvider.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ internal sealed class JsonApiEndpointMetadataProvider
1818

1919
public JsonApiEndpointMetadataProvider(IControllerResourceMapping controllerResourceMapping, NonPrimaryDocumentTypeFactory nonPrimaryDocumentTypeFactory)
2020
{
21-
ArgumentGuard.NotNull(controllerResourceMapping);
22-
ArgumentGuard.NotNull(nonPrimaryDocumentTypeFactory);
21+
ArgumentNullException.ThrowIfNull(controllerResourceMapping);
22+
ArgumentNullException.ThrowIfNull(nonPrimaryDocumentTypeFactory);
2323

2424
_controllerResourceMapping = controllerResourceMapping;
2525
_nonPrimaryDocumentTypeFactory = nonPrimaryDocumentTypeFactory;
2626
}
2727

2828
public JsonApiEndpointMetadataContainer Get(MethodInfo controllerAction)
2929
{
30-
ArgumentGuard.NotNull(controllerAction);
30+
ArgumentNullException.ThrowIfNull(controllerAction);
3131

3232
if (EndpointResolver.Instance.IsAtomicOperationsController(controllerAction))
3333
{

0 commit comments

Comments
 (0)