Skip to content

fix: updates openapi.net to a non-vulnerable version #887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Vincent Biret (baywet) merged 1 commit into from
Oct 9, 2026
Merged

fix: updates openapi.net to a non-vulnerable version #887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.OData.Edm" Version="8.3.0" />
<PackageReference Include="Microsoft.OpenApi" Version="2.0.0" />
<PackageReference Include="Microsoft.OpenApi" Version="2.12.2" />
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.14.15">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
18 changes: 17 additions & 1 deletion test/Microsoft.OpenAPI.OData.Reader.Tests/Generator/OpenApiSchemaGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,9 @@ public async Task CreateStructuredTypePropertiesSchemaWithCustomAttributeReturns
""$ref"": ""#/components/schemas/microsoft.graph.userInsightsSettings""
},
{
""enum"": [
null
],
""nullable"": true
}
],
Expand All @@ -403,6 +406,9 @@ public async Task CreateStructuredTypePropertiesSchemaWithCustomAttributeReturns
""$ref"": ""#/components/schemas/microsoft.graph.contactMergeSuggestions""
},
{
""enum"": [
null
],
""nullable"": true
}
],
Expand All @@ -415,6 +421,9 @@ public async Task CreateStructuredTypePropertiesSchemaWithCustomAttributeReturns
""$ref"": ""#/components/schemas/microsoft.graph.regionalAndLanguageSettings""
},
{
""enum"": [
null
],
""nullable"": true
}
],
Expand All @@ -427,6 +436,9 @@ public async Task CreateStructuredTypePropertiesSchemaWithCustomAttributeReturns
""$ref"": ""#/components/schemas/microsoft.graph.shiftPreferences""
},
{
""enum"": [
null
],
""nullable"": true
}
],
Expand Down Expand Up @@ -907,7 +919,8 @@ public async Task CreatePropertySchemaForNullableEnumPropertyReturnSchema(OpenAp
string json = await schema.SerializeAsJsonAsync(specVersion);
_output.WriteLine(json);

var expected = JsonNode.Parse(specVersion switch {
var expected = JsonNode.Parse(specVersion switch
{
OpenApiSpecVersion.OpenApi2_0 =>
"""
{
Expand All @@ -922,6 +935,9 @@ public async Task CreatePropertySchemaForNullableEnumPropertyReturnSchema(OpenAp
"$ref": "#/components/schemas/DefaultNs.Color"
},
{
"enum": [
null
],
"nullable": true
}
],
Expand Down
39 changes: 39 additions & 0 deletions test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5016,6 +5016,9 @@
"$ref": "#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Document.Document"
},
{
"enum": [
null
],
"nullable": true
}
],
Expand Down Expand Up @@ -5364,6 +5367,9 @@
"$ref": "#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Library.Library"
},
{
"enum": [
null
],
"nullable": true
}
],
Expand All @@ -5375,6 +5381,9 @@
"$ref": "#/components/schemas/Siterra.Documents.BusinessLogic.Entities.DocumentFile.DocumentFile"
},
{
"enum": [
null
],
"nullable": true
}
],
Expand All @@ -5386,6 +5395,9 @@
"$ref": "#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Document.Document"
},
{
"enum": [
null
],
"nullable": true
}
],
Expand Down Expand Up @@ -5535,6 +5547,9 @@
"$ref": "#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Document.Document"
},
{
"enum": [
null
],
"nullable": true
}
],
Expand Down Expand Up @@ -5605,6 +5620,9 @@
"$ref": "#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Document.Document"
},
{
"enum": [
null
],
"nullable": true
}
],
Expand All @@ -5616,6 +5634,9 @@
"$ref": "#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Tags.Tag"
},
{
"enum": [
null
],
"nullable": true
}
],
Expand Down Expand Up @@ -5864,6 +5885,9 @@
"$ref": "#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Library.Library"
},
{
"enum": [
null
],
"nullable": true
}
],
Expand All @@ -5875,6 +5899,9 @@
"$ref": "#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Library.LibraryType"
},
{
"enum": [
null
],
"nullable": true
}
],
Expand All @@ -5886,6 +5913,9 @@
"$ref": "#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Library.Library"
},
{
"enum": [
null
],
"nullable": true
}
],
Expand Down Expand Up @@ -6064,6 +6094,9 @@
"$ref": "#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Library.LibraryType"
},
{
"enum": [
null
],
"nullable": true
}
],
Expand All @@ -6075,6 +6108,9 @@
"$ref": "#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Library.LibraryType"
},
{
"enum": [
null
],
"nullable": true
}
],
Expand Down Expand Up @@ -6590,6 +6626,9 @@
"$ref": "#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Document.Document"
},
{
"enum": [
null
],
"nullable": true
}
],
Expand Down
52 changes: 39 additions & 13 deletions test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3528,7 +3528,9 @@ components:
Document:
anyOf:
- $ref: '#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Document.Document'
- nullable: true
- enum:
- null
nullable: true
x-ms-navigationProperty: true
example:
Id: 0
Expand Down Expand Up @@ -3805,17 +3807,23 @@ components:
Library:
anyOf:
- $ref: '#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Library.Library'
- nullable: true
- enum:
- null
nullable: true
x-ms-navigationProperty: true
LastRevisionFile:
anyOf:
- $ref: '#/components/schemas/Siterra.Documents.BusinessLogic.Entities.DocumentFile.DocumentFile'
- nullable: true
- enum:
- null
nullable: true
x-ms-navigationProperty: true
SourceDocument:
anyOf:
- $ref: '#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Document.Document'
- nullable: true
- enum:
- null
nullable: true
x-ms-navigationProperty: true
SourceDocumentChildren:
type: array
Expand Down Expand Up @@ -3928,7 +3936,9 @@ components:
Document:
anyOf:
- $ref: '#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Document.Document'
- nullable: true
- enum:
- null
nullable: true
x-ms-navigationProperty: true
example:
ClassInstance: 0
Expand Down Expand Up @@ -3981,12 +3991,16 @@ components:
Document:
anyOf:
- $ref: '#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Document.Document'
- nullable: true
- enum:
- null
nullable: true
x-ms-navigationProperty: true
Tag:
anyOf:
- $ref: '#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Tags.Tag'
- nullable: true
- enum:
- null
nullable: true
x-ms-navigationProperty: true
example:
DocumentId: 0
Expand Down Expand Up @@ -4186,17 +4200,23 @@ components:
LibraryParent:
anyOf:
- $ref: '#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Library.Library'
- nullable: true
- enum:
- null
nullable: true
x-ms-navigationProperty: true
Type:
anyOf:
- $ref: '#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Library.LibraryType'
- nullable: true
- enum:
- null
nullable: true
x-ms-navigationProperty: true
SourceFolder:
anyOf:
- $ref: '#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Library.Library'
- nullable: true
- enum:
- null
nullable: true
x-ms-navigationProperty: true
Documents:
type: array
Expand Down Expand Up @@ -4333,12 +4353,16 @@ components:
MasterLibraryType:
anyOf:
- $ref: '#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Library.LibraryType'
- nullable: true
- enum:
- null
nullable: true
x-ms-navigationProperty: true
ParentLibraryTypes:
anyOf:
- $ref: '#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Library.LibraryType'
- nullable: true
- enum:
- null
nullable: true
x-ms-navigationProperty: true
MasterLibraryTypeChildren:
type: array
Expand Down Expand Up @@ -4725,7 +4749,9 @@ components:
Document:
anyOf:
- $ref: '#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Document.Document'
- nullable: true
- enum:
- null
nullable: true
x-ms-navigationProperty: true
example:
Id: 0
Expand Down
Loading
Loading