Fixed issues related to merge conflicts

Author: darrelmiller

src/Microsoft.OpenApi.Hidi/OpenApiService.cs

@@ -71,8 +71,8 @@ CancellationToken cancellationToken
                 {
                     // Default to yaml and OpenApiVersion 3 during csdl to OpenApi conversion
                     openApiFormat = format ?? GetOpenApiFormat(csdl, logger);
-                    openApiVersion = version == null ? OpenApiSpecVersion.OpenApi3_0 : TryParseOpenApiSpecVersion(version);
-                    
+                    openApiVersion = version != null ? TryParseOpenApiSpecVersion(version) : OpenApiSpecVersion.OpenApi3_0;
+
                     stream = await GetStream(csdl, logger, cancellationToken);
                     document = await ConvertCsdlToOpenApi(stream);
                 }
@@ -113,7 +113,7 @@ CancellationToken cancellationToken
                     }
 
                     openApiFormat = format ?? GetOpenApiFormat(openapi, logger);
-                    openApiVersion = version == null ? TryParseOpenApiSpecVersion(version) : result.OpenApiDiagnostic.SpecificationVersion;
+                    openApiVersion = version != null ? TryParseOpenApiSpecVersion(version) : result.OpenApiDiagnostic.SpecificationVersion;
                 }
 
                 Func<string, OperationType?, OpenApiOperation, bool> predicate;
@@ -181,9 +181,10 @@ CancellationToken cancellationToken
             catch (Exception ex)
             {
 #if DEBUG  
-                logger.LogCritical(ex, ex.Message);
+                logger.LogCritical(ex, ex.Message);               
 #else
                 logger.LogCritical(ex.Message);
+                
 #endif
                 return 1;
             }            
@@ -335,12 +336,14 @@ internal static async Task<int> ValidateOpenApiDocument(string openapi, LogLevel
 
                 OpenApiDocument document;
                 logger.LogTrace("Parsing the OpenApi file");
-                document = new OpenApiStreamReader(new OpenApiReaderSettings
+                var result = await new OpenApiStreamReader(new OpenApiReaderSettings
                 {
                     RuleSet = ValidationRuleSet.GetDefaultRuleSet()
                 }
-                ).Read(stream, out var context);
+                ).ReadAsync(stream);
 
+                document = result.OpenApiDocument;
+                var context = result.OpenApiDiagnostic;
                 if (context.Errors.Count != 0)
                 {
                     foreach (var error in context.Errors)
@@ -355,7 +358,7 @@ internal static async Task<int> ValidateOpenApiDocument(string openapi, LogLevel
 
                 logger.LogTrace("Finished walking through the OpenApi document. Generating a statistics report..");
                 logger.LogInformation(statsVisitor.GetStatisticsReport());
-
+                
                 return 0;
             }
             catch(Exception ex)
@@ -385,7 +388,9 @@ private static ILogger ConfigureLoggerInstance(LogLevel loglevel)
 
             var logger = LoggerFactory.Create((builder) => {
                 builder
-                    .AddConsole()
+                    .AddConsole(c => { 
+                        c.LogToStandardErrorThreshold = LogLevel.Error;
+                    })
 #if DEBUG
                     .AddDebug()
 #endif

src/Microsoft.OpenApi.Hidi/Program.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
+using System;
 using System.CommandLine;
 using System.IO;
 using System.Threading;
@@ -11,7 +12,7 @@ namespace Microsoft.OpenApi.Hidi
 {
     static class Program
     {
-        static async Task<int> Main(string[] args)
+        static async Task Main(string[] args)
         {
             var rootCommand = new RootCommand() {
             };
@@ -32,7 +33,7 @@ static async Task<int> Main(string[] args)
             var formatOption = new Option<OpenApiFormat?>("--format", "File format");
             formatOption.AddAlias("-f");
 
-            var logLevelOption = new Option<LogLevel>("--loglevel", () => LogLevel.Warning, "The log level to use when logging messages to the main output.");
+            var logLevelOption = new Option<LogLevel>("--loglevel", () => LogLevel.Information, "The log level to use when logging messages to the main output.");
             logLevelOption.AddAlias("-ll");
 
             var filterByOperationIdsOption = new Option<string>("--filter-by-operationids", "Filters OpenApiDocument by OperationId(s) provided");
@@ -80,7 +81,10 @@ static async Task<int> Main(string[] args)
             rootCommand.Add(validateCommand);
 
             // Parse the incoming args and invoke the handler
-            return await rootCommand.InvokeAsync(args);
+            await rootCommand.InvokeAsync(args);
+
+            //// Wait for logger to write messages to the console before exiting
+            await Task.Delay(10);
         }
     }
 }