Updates to reflect other changes to vnext

Author: darrelmiller

src/Microsoft.OpenApi.Readers/OpenApiYamlDocumentReader.cs

@@ -38,7 +38,7 @@ public OpenApiYamlDocumentReader(OpenApiReaderSettings settings = null)
         public OpenApiDocument Read(YamlDocument input, out OpenApiDiagnostic diagnostic)
         {
             diagnostic = new OpenApiDiagnostic();
-            var context = new ParsingContext
+            var context = new ParsingContext(diagnostic)
             {
                 ExtensionParsers = _settings.ExtensionParsers,
                 BaseUrl = _settings.BaseUrl
@@ -48,7 +48,7 @@ public OpenApiDocument Read(YamlDocument input, out OpenApiDiagnostic diagnostic
             try
             {
                 // Parse the OpenAPI Document
-                document = context.Parse(input, diagnostic);
+                document = context.Parse(input);
 
                 // Resolve References if requested
                 switch (_settings.ReferenceResolution)
@@ -95,7 +95,7 @@ public OpenApiDocument Read(YamlDocument input, out OpenApiDiagnostic diagnostic
         public T ReadFragment<T>(YamlDocument input, OpenApiSpecVersion version, out OpenApiDiagnostic diagnostic) where T : IOpenApiElement
         {
             diagnostic = new OpenApiDiagnostic();
-            var context = new ParsingContext
+            var context = new ParsingContext(diagnostic)
             {
                 ExtensionParsers = _settings.ExtensionParsers
             };
@@ -104,7 +104,7 @@ public T ReadFragment<T>(YamlDocument input, OpenApiSpecVersion version, out Ope
             try
             {
                 // Parse the OpenAPI element
-                element = context.ParseFragment<T>(input, version, diagnostic);
+                element = context.ParseFragment<T>(input, version);
             }
             catch (OpenApiException ex)
             {

test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSecuritySchemeTests.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.IO;
+using System.Linq;
 using FluentAssertions;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Readers.ParseNodes;
@@ -47,7 +48,7 @@ public void ParseApiKeySecuritySchemeShouldSucceed()
         {
             using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "apiKeySecurityScheme.yaml")))
             {
-                var document = OpenApiStreamReader.LoadYamlDocument(stream);
+                var document = LoadYamlDocument(stream);
                 var diagnostic = new OpenApiDiagnostic();
                 var context = new ParsingContext(diagnostic);
 
@@ -72,7 +73,7 @@ public void ParseOAuth2ImplicitSecuritySchemeShouldSucceed()
         {
             using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "oauth2ImplicitSecurityScheme.yaml")))
             {
-                var document = OpenApiStreamReader.LoadYamlDocument(stream);
+                var document = LoadYamlDocument(stream);
                 var diagnostic = new OpenApiDiagnostic();
                 var context = new ParsingContext(diagnostic);
 
@@ -107,7 +108,7 @@ public void ParseOAuth2PasswordSecuritySchemeShouldSucceed()
         {
             using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "oauth2PasswordSecurityScheme.yaml")))
             {
-                var document = OpenApiStreamReader.LoadYamlDocument(stream);
+                var document = LoadYamlDocument(stream);
                 var diagnostic = new OpenApiDiagnostic();
                 var context = new ParsingContext(diagnostic);
 
@@ -142,7 +143,7 @@ public void ParseOAuth2ApplicationSecuritySchemeShouldSucceed()
         {
             using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "oauth2ApplicationSecurityScheme.yaml")))
             {
-                var document = OpenApiStreamReader.LoadYamlDocument(stream);
+                var document = LoadYamlDocument(stream);
                 var diagnostic = new OpenApiDiagnostic();
                 var context = new ParsingContext(diagnostic);