Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit e81be61

Browse files
committed
Update to .NET 10 Preview 6
1 parent d461fed commit e81be61

32 files changed

+67
-164
lines changed

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<PropertyGroup>
1919
<!-- .NET 10 Preview -->
2020
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
21-
<NoWarn>$(NoWarn);NU1903;NU5104;NU1608</NoWarn>
21+
<NoWarn>$(NoWarn);CA1873;NU1903;NU5104;NU1608</NoWarn>
2222
</PropertyGroup>
2323

2424
<PropertyGroup>

‎package-versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@
3434
<PropertyGroup Condition="'$(TargetFramework)' == 'net10.0'">
3535
<!-- Published dependencies (only update on major version change) -->
3636
<EntityFrameworkCoreFrozenVersion>10.0.*-*</EntityFrameworkCoreFrozenVersion>
37-
<SwashbuckleFrozenVersion>9.0.0-pr.3283.*</SwashbuckleFrozenVersion>
37+
<SwashbuckleFrozenVersion>10.0.0-pr.3283.*</SwashbuckleFrozenVersion>
3838

3939
<!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
4040
<AspNetCoreVersion>10.0.*-*</AspNetCoreVersion>
41-
<SwashbuckleVersion>9.0.0-pr.3283.*</SwashbuckleVersion>
42-
<MicrosoftOpenApiVersion>2.0.0-preview.21</MicrosoftOpenApiVersion>
41+
<SwashbuckleVersion>10.0.0-pr.3283.*</SwashbuckleVersion>
42+
<MicrosoftOpenApiVersion>2.0.*</MicrosoftOpenApiVersion>
4343
<MicrosoftApiServerVersion>10.0.*-*</MicrosoftApiServerVersion>
4444
<EntityFrameworkCoreVersion>10.0.*-*</EntityFrameworkCoreVersion>
4545
<EntityFrameworkCorePomeloVersion>9.0.*-*</EntityFrameworkCorePomeloVersion>

‎src/Examples/JsonApiDotNetCoreExample/SetOpenApiServerAtBuildTimeFilter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using JetBrains.Annotations;
2-
using Microsoft.OpenApi.Models;
2+
using Microsoft.OpenApi;
33
using Swashbuckle.AspNetCore.SwaggerGen;
44

55
namespace JsonApiDotNetCoreExample;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ public void Configure(SwaggerGenOptions options)
7474
options.DocumentFilter<StringEnumOrderingFilter>();
7575
options.DocumentFilter<SetSchemaTypeToObjectDocumentFilter>();
7676
options.DocumentFilter<UnusedComponentSchemaCleaner>();
77-
options.DocumentFilter<SortSchemasFilter>();
7877
options.DocumentFilter<RemoveTagsFilter>();
7978
}
8079

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Microsoft.OpenApi.Models;
1+
using Microsoft.OpenApi;
22

33
namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
44

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using Microsoft.OpenApi.Models;
2-
using Microsoft.OpenApi.Models.Interfaces;
1+
using Microsoft.OpenApi;
32

43
namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
54

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using JetBrains.Annotations;
2-
using Microsoft.OpenApi.Models;
2+
using Microsoft.OpenApi;
33
using Swashbuckle.AspNetCore.SwaggerGen;
44

55
namespace JsonApiDotNetCore.OpenApi.Swashbuckle;

‎src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/AtomicOperationCodeSchemaGenerator.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
using JsonApiDotNetCore.Serialization.Objects;
2-
using Microsoft.OpenApi.Models;
3-
using Microsoft.OpenApi.Models.Interfaces;
4-
using Microsoft.OpenApi.Models.References;
2+
using Microsoft.OpenApi;
53
using Swashbuckle.AspNetCore.SwaggerGen;
64

75
namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators.Components;

‎src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/DataContainerSchemaGenerator.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
using JsonApiDotNetCore.Configuration;
33
using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
44
using JsonApiDotNetCore.OpenApi.Swashbuckle.SwaggerComponents;
5-
using Microsoft.OpenApi.Models.Interfaces;
6-
using Microsoft.OpenApi.Models.References;
5+
using Microsoft.OpenApi;
76
using Swashbuckle.AspNetCore.SwaggerGen;
87

98
namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators.Components;

‎src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/DataSchemaGenerator.cs

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@
77
using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
88
using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
99
using JsonApiDotNetCore.OpenApi.Swashbuckle.SwaggerComponents;
10-
using Microsoft.OpenApi.Extensions;
11-
using Microsoft.OpenApi.Interfaces;
12-
using Microsoft.OpenApi.Models;
13-
using Microsoft.OpenApi.Models.Interfaces;
14-
using Microsoft.OpenApi.Models.References;
10+
using Microsoft.OpenApi;
1511
using Swashbuckle.AspNetCore.SwaggerGen;
1612

1713
namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators.Components;
@@ -226,7 +222,7 @@ public OpenApiSchemaReference GenerateSchemaForCommonData(Type commonDataSchemaT
226222
var fullSchema = new OpenApiSchema
227223
{
228224
Type = JsonSchemaType.Object,
229-
Required = [JsonApiPropertyName.Type],
225+
Required = newSortedSet<string>([JsonApiPropertyName.Type]),
230226
Properties = new Dictionary<string, IOpenApiSchema>
231227
{
232228
[JsonApiPropertyName.Type] = referenceSchemaForResourceType.WrapInExtendedSchema(),
@@ -236,9 +232,9 @@ public OpenApiSchemaReference GenerateSchemaForCommonData(Type commonDataSchemaT
236232
Discriminator = new OpenApiDiscriminator
237233
{
238234
PropertyName = JsonApiPropertyName.Type,
239-
Mapping = new Dictionary<string, OpenApiSchemaReference>(StringComparer.Ordinal)
235+
Mapping = new SortedDictionary<string, OpenApiSchemaReference>(StringComparer.Ordinal)
240236
},
241-
Extensions = new Dictionary<string, IOpenApiExtension>
237+
Extensions = new SortedDictionary<string, IOpenApiExtension>
242238
{
243239
["x-abstract"] = new JsonNodeExtension(true)
244240
}
@@ -302,8 +298,8 @@ private void AdaptResourceIdentity(OpenApiSchema fullSchema, ResourceSchemaType
302298

303299
bool hasAtomicOperationsEndpoint = _generationCacheSchemaGenerator.HasAtomicOperationsEndpoint(schemaRepository);
304300

305-
Dictionary<string, IOpenApiSchema> fullSchemaProperties = fullSchema.Properties!;
306-
HashSet<string> fullSchemaRequired = fullSchema.Required!;
301+
IDictionary<string, IOpenApiSchema> fullSchemaProperties = fullSchema.Properties!;
302+
ISet<string> fullSchemaRequired = fullSchema.Required!;
307303

308304
if (!hasAtomicOperationsEndpoint)
309305
{
@@ -461,7 +457,7 @@ private OpenApiSchemaReference GenerateSchemaForCommonFields(Type commonFieldsSc
461457
var fullSchema = new OpenApiSchema
462458
{
463459
Type = JsonSchemaType.Object,
464-
Required = [OpenApiMediaTypeExtension.FullyQualifiedOpenApiDiscriminatorPropertyName],
460+
Required = newSortedSet<string>([OpenApiMediaTypeExtension.FullyQualifiedOpenApiDiscriminatorPropertyName]),
465461
Properties = new Dictionary<string, IOpenApiSchema>
466462
{
467463
[OpenApiMediaTypeExtension.FullyQualifiedOpenApiDiscriminatorPropertyName] = referenceSchemaForResourceType.WrapInExtendedSchema()
@@ -470,9 +466,9 @@ private OpenApiSchemaReference GenerateSchemaForCommonFields(Type commonFieldsSc
470466
Discriminator = new OpenApiDiscriminator
471467
{
472468
PropertyName = OpenApiMediaTypeExtension.FullyQualifiedOpenApiDiscriminatorPropertyName,
473-
Mapping = new Dictionary<string, OpenApiSchemaReference>(StringComparer.Ordinal)
469+
Mapping = new SortedDictionary<string, OpenApiSchemaReference>(StringComparer.Ordinal)
474470
},
475-
Extensions = new Dictionary<string, IOpenApiExtension>
471+
Extensions = new SortedDictionary<string, IOpenApiExtension>
476472
{
477473
["x-abstract"] = new JsonNodeExtension(true)
478474
}
@@ -504,17 +500,17 @@ private void MapInDiscriminator(ResourceSchemaType resourceSchemaType, bool forR
504500
inlineSchemaForBase.Discriminator ??= new OpenApiDiscriminator
505501
{
506502
PropertyName = discriminatorPropertyName,
507-
Mapping = new Dictionary<string, OpenApiSchemaReference>(StringComparer.Ordinal)
503+
Mapping = new SortedDictionary<string, OpenApiSchemaReference>(StringComparer.Ordinal)
508504
};
509505

510506
if (RepeatDiscriminatorInResponseDerivedTypes && !forRequestSchema)
511507
{
512-
inlineSchemaForBase.Required ??= [];
508+
inlineSchemaForBase.Required ??= newSortedSet<string>();
513509
inlineSchemaForBase.Required.Add(discriminatorPropertyName);
514510
}
515511

516512
string publicName = resourceSchemaType.ResourceType.PublicName;
517-
inlineSchemaForBase.Discriminator.Mapping ??= [];
513+
inlineSchemaForBase.Discriminator.Mapping ??= newSortedDictionary<string,OpenApiSchemaReference>();
518514

519515
if (inlineSchemaForBase.Discriminator.Mapping.TryAdd(publicName, referenceSchemaForDerived) && baseResourceType == null)
520516
{

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /