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

Appearance settings

Commit b301827

Browse filesBrowse files
baywetCopilot
andcommitted
fix(library): remove unshipped schema extension fallback
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent ec04a7f commit b301827
Copy full SHA for b301827

4 files changed

+2-30Lines changed: 2 additions & 30 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎src/Microsoft.OpenApi/Models/OpenApiConstants.cs‎

Copy file name to clipboardExpand all lines: src/Microsoft.OpenApi/Models/OpenApiConstants.cs
-5Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,6 @@ public static class OpenApiConstants
135135
/// </summary>
136136
public const string UnevaluatedPropertiesExtension = "x-jsonschema-unevaluatedProperties";
137137

138-
/// <summary>
139-
/// Legacy extension: x-oai-unevaluatedProperties
140-
/// </summary>
141-
public const string LegacyUnevaluatedPropertiesExtension = "x-oai-unevaluatedProperties";
142-
143138
/// <summary>
144139
/// Field: Version
145140
/// </summary>
Collapse file

‎src/Microsoft.OpenApi/Models/OpenApiSchema.cs‎

Copy file name to clipboardExpand all lines: src/Microsoft.OpenApi/Models/OpenApiSchema.cs
+2-6Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -599,22 +599,18 @@ private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version
599599
// Skip when type is explicitly set to a non-object type (array, string, number, integer, boolean, null).
600600
if (!Type.HasValue || (Type.Value & JsonSchemaType.Object) != 0)
601601
{
602-
var unevaluatedPropertiesExtensionName = version == OpenApiSpecVersion.OpenApi3_0
603-
? OpenApiConstants.UnevaluatedPropertiesExtension
604-
: OpenApiConstants.LegacyUnevaluatedPropertiesExtension;
605-
606602
// Write UnevaluatedPropertiesSchema as extension if present
607603
if (UnevaluatedPropertiesSchema is not null)
608604
{
609605
writer.WriteOptionalObject(
610-
unevaluatedPropertiesExtensionName,
606+
OpenApiConstants.UnevaluatedPropertiesExtension,
611607
UnevaluatedPropertiesSchema,
612608
callback);
613609
}
614610
// Write boolean false as extension if explicitly set to false
615611
else if (!UnevaluatedProperties)
616612
{
617-
writer.WritePropertyName(unevaluatedPropertiesExtensionName);
613+
writer.WritePropertyName(OpenApiConstants.UnevaluatedPropertiesExtension);
618614
writer.WriteValue(false);
619615
}
620616
}
Collapse file

‎src/Microsoft.OpenApi/PublicAPI.Unshipped.txt‎

Copy file name to clipboardExpand all lines: src/Microsoft.OpenApi/PublicAPI.Unshipped.txt
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ const Microsoft.OpenApi.OpenApiConstants.Else = "else" -> string!
1313
const Microsoft.OpenApi.OpenApiConstants.ElseExtension = "x-jsonschema-else" -> string!
1414
const Microsoft.OpenApi.OpenApiConstants.If = "if" -> string!
1515
const Microsoft.OpenApi.OpenApiConstants.IfExtension = "x-jsonschema-if" -> string!
16-
const Microsoft.OpenApi.OpenApiConstants.LegacyUnevaluatedPropertiesExtension = "x-oai-unevaluatedProperties" -> string!
1716
const Microsoft.OpenApi.OpenApiConstants.PropertyNames = "propertyNames" -> string!
1817
const Microsoft.OpenApi.OpenApiConstants.PropertyNamesExtension = "x-jsonschema-propertyNames" -> string!
1918
const Microsoft.OpenApi.OpenApiConstants.Then = "then" -> string!
Collapse file

‎src/Microsoft.OpenApi/Reader/V3/OpenApiSchemaDeserializer.cs‎

Copy file name to clipboardExpand all lines: src/Microsoft.OpenApi/Reader/V3/OpenApiSchemaDeserializer.cs
-18Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -300,24 +300,6 @@ internal static partial class OpenApiV3Deserializer
300300
}
301301
}
302302
},
303-
{
304-
OpenApiConstants.LegacyUnevaluatedPropertiesExtension,
305-
(o, n, t, c) =>
306-
{
307-
if (n is JsonValue)
308-
{
309-
var value = n.GetScalarValue();
310-
if (value is not null)
311-
{
312-
o.UnevaluatedProperties = bool.Parse(value);
313-
}
314-
}
315-
else
316-
{
317-
o.UnevaluatedPropertiesSchema = LoadSchema(n, t, c);
318-
}
319-
}
320-
},
321303
{
322304
OpenApiConstants.AnchorExtension,
323305
(o, n, _, _) => o.Anchor = n.GetScalarValue()

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.