Skip to content

Commit 6c0b9fa

Browse files
authored
Merge branch 'vnext' into feature/add-path-signature-unique-validation
2 parents 6bf85c5 + cb3c26b commit 6c0b9fa

File tree

4 files changed

+1608
-34
lines changed

4 files changed

+1608
-34
lines changed

src/Microsoft.OpenApi/Services/OpenApiWalker.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -733,6 +733,11 @@ internal void Walk(OpenApiEncoding encoding)
733733
}
734734

735735
_visitor.Visit(encoding);
736+
737+
if (encoding.Headers != null)
738+
{
739+
Walk(encoding.Headers);
740+
}
736741
Walk(encoding as IOpenApiExtensible);
737742
}
738743

@@ -788,6 +793,11 @@ internal void Walk(OpenApiSchema schema, bool isComponent = false)
788793
});
789794
}
790795

796+
if (schema.AdditionalProperties != null)
797+
{
798+
Walk("additionalProperties", () => Walk(schema.AdditionalProperties));
799+
}
800+
791801
Walk(OpenApiConstants.ExternalDocs, () => Walk(schema.ExternalDocs));
792802

793803
Walk(schema as IOpenApiExtensible);
Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,37 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFrameworks>net46;net461</TargetFrameworks>
4-
<Authors></Authors>
5-
<Company>Microsoft</Company>
6-
<Product>Microsoft.OpenApi.Tests</Product>
7-
<PackageId>Microsoft.OpenApi.Tests</PackageId>
8-
<Description>Tests for Microsoft.OpenApi</Description>
9-
<AssemblyName>Microsoft.OpenApi.Tests</AssemblyName>
10-
<RootNamespace>Microsoft.OpenApi.Tests</RootNamespace>
11-
<SignAssembly>true</SignAssembly>
12-
<OutputType>Library</OutputType>
13-
<AssemblyOriginatorKeyFile>..\..\src\Microsoft.OpenApi.snk</AssemblyOriginatorKeyFile>
14-
</PropertyGroup>
2+
<PropertyGroup>
3+
<TargetFrameworks>net46;net461</TargetFrameworks>
4+
<Authors></Authors>
5+
<Company>Microsoft</Company>
6+
<Product>Microsoft.OpenApi.Tests</Product>
7+
<PackageId>Microsoft.OpenApi.Tests</PackageId>
8+
<Description>Tests for Microsoft.OpenApi</Description>
9+
<AssemblyName>Microsoft.OpenApi.Tests</AssemblyName>
10+
<RootNamespace>Microsoft.OpenApi.Tests</RootNamespace>
11+
<SignAssembly>true</SignAssembly>
12+
<OutputType>Library</OutputType>
13+
<AssemblyOriginatorKeyFile>..\..\src\Microsoft.OpenApi.snk</AssemblyOriginatorKeyFile>
14+
</PropertyGroup>
1515

16-
<ItemGroup>
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
18-
<PackageReference Include="FluentAssertions" Version="5.10.0">
19-
</PackageReference>
20-
<PackageReference Include="Newtonsoft.Json" Version="12.0.3">
21-
</PackageReference>
22-
<PackageReference Include="SharpYaml" Version="1.6.5">
23-
</PackageReference>
24-
<PackageReference Include="xunit" Version="2.4.1">
25-
</PackageReference>
26-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
27-
<PrivateAssets>all</PrivateAssets>
28-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
29-
</PackageReference>
30-
</ItemGroup>
16+
<ItemGroup>
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
18+
<PackageReference Include="FluentAssertions" Version="5.10.0" />
19+
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
20+
<PackageReference Include="SharpYaml" Version="1.6.5" />
21+
<PackageReference Include="xunit" Version="2.4.1" />
22+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
23+
<PrivateAssets>all</PrivateAssets>
24+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
25+
</PackageReference>
26+
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
27+
<PackageReference Include="PublicApiGenerator" Version="9.3.0" />
28+
</ItemGroup>
3129

32-
<ItemGroup>
33-
<ProjectReference Include="..\..\src\Microsoft.OpenApi\Microsoft.OpenApi.csproj" />
34-
</ItemGroup>
30+
<ItemGroup>
31+
<ProjectReference Include="..\..\src\Microsoft.OpenApi\Microsoft.OpenApi.csproj" />
32+
</ItemGroup>
3533

36-
<ItemGroup>
37-
<Reference Include="Microsoft.CSharp" />
38-
</ItemGroup>
34+
<ItemGroup>
35+
<None Update="PublicApi\PublicApi.approved.txt" CopyToOutputDirectory="Always" />
36+
</ItemGroup>
3937
</Project>

0 commit comments

Comments
 (0)