Skip to content

Commit 4ac479a

Browse files
Merge branch 'vnext' into mk/fix-migrate-to-net6
2 parents 25b7357 + 2937f02 commit 4ac479a

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/Microsoft.OpenApi.Hidi/OpenApiService.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,13 +251,13 @@ private static async Task<Stream> GetStream(string input, ILogger logger)
251251
{
252252
try
253253
{
254-
using var httpClientHandler = new HttpClientHandler()
254+
var httpClientHandler = new HttpClientHandler()
255255
{
256256
SslProtocols = System.Security.Authentication.SslProtocols.Tls12,
257257
};
258258
using var httpClient = new HttpClient(httpClientHandler)
259259
{
260-
DefaultRequestVersion = HttpVersion.Version20
260+
DefaultRequestVersion = HttpVersion.Version20
261261
};
262262
stream = await httpClient.GetStreamAsync(input);
263263
}
@@ -323,7 +323,7 @@ public static Dictionary<string, List<string>> ParseJsonCollectionFile(Stream st
323323
return requestUrls;
324324
}
325325

326-
internal static async void ValidateOpenApiDocument(string openapi, LogLevel loglevel)
326+
internal static async Task ValidateOpenApiDocument(string openapi, LogLevel loglevel)
327327
{
328328
if (string.IsNullOrEmpty(openapi))
329329
{

src/Microsoft.OpenApi/Validations/Rules/OpenApiParameterRules.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ public static class OpenApiParameterRules
103103
new ValidationRule<OpenApiParameter>(
104104
(context, parameter) =>
105105
{
106-
if (parameter.In == ParameterLocation.Path && !context.PathString.Contains("{" + parameter.Name + "}"))
106+
if (parameter.In == ParameterLocation.Path &&
107+
!(context.PathString.Contains("{" + parameter.Name + "}") || context.PathString.Contains("#/components")))
107108
{
108109
context.Enter("in");
109110
context.CreateError(

0 commit comments

Comments
 (0)