Merge remote-tracking branch 'upstream/vnext' into use-pattern-matching-in-casts

Author: SimonCropp

src/Microsoft.OpenApi.Hidi/Formatters/PowerShellFormatter.cs

@@ -179,7 +179,7 @@ private void AddAdditionalPropertiesToSchema(OpenApiSchema schema)
         {
             if (schema != null && !_schemaLoop.Contains(schema) && "object".Equals(schema.Type, StringComparison.OrdinalIgnoreCase))
             {
-                schema.AdditionalProperties = new OpenApiSchema() { Type = "object" };
+                schema.AdditionalProperties = new OpenApiSchema { Type = "object" };
 
                 /* Because 'additionalProperties' are now being walked,
                  * we need a way to keep track of visited schemas to avoid

src/Microsoft.OpenApi.Hidi/OpenApiService.cs

@@ -186,7 +186,7 @@ private static void WriteOpenApi(HidiOptions options, OpenApiFormat openApiForma
                 using var outputStream = options.Output.Create();
                 using var textWriter = new StreamWriter(outputStream);
 
-                var settings = new OpenApiWriterSettings()
+                var settings = new OpenApiWriterSettings
                 {
                     InlineLocalReferences = options.InlineLocal,
                     InlineExternalReferences = options.InlineExternal
@@ -510,13 +510,15 @@ private static async Task<Stream> GetStream(string input, ILogger logger, Cancel
                         var fileInput = new FileInfo(input);
                         stream = fileInput.OpenRead();
                     }
-                    catch (Exception ex) when (ex is FileNotFoundException ||
-                        ex is PathTooLongException ||
-                        ex is DirectoryNotFoundException ||
-                        ex is IOException ||
-                        ex is UnauthorizedAccessException ||
-                        ex is SecurityException ||
-                        ex is NotSupportedException)
+                    catch (Exception ex) when (
+                        ex is
+                            FileNotFoundException or
+                            PathTooLongException or
+                            DirectoryNotFoundException or
+                            IOException or
+                            UnauthorizedAccessException or
+                            SecurityException or
+                            NotSupportedException)
                     {
                         throw new InvalidOperationException($"Could not open the file at {input}", ex);
                     }
@@ -738,7 +740,7 @@ internal static async Task PluginManifest(HidiOptions options, ILogger logger, C
             WriteOpenApi(options, OpenApiFormat.Json, OpenApiSpecVersion.OpenApi3_0, document, logger);
 
             // Create OpenAIPluginManifest from ApiDependency and OpenAPI document
-            var manifest = new OpenAIPluginManifest()
+            var manifest = new OpenAIPluginManifest
             {
                 NameForHuman = document.Info.Title,
                 DescriptionForHuman = document.Info.Description,

src/Microsoft.OpenApi.Hidi/Program.cs

@@ -22,7 +22,7 @@ static async Task<int> Main(string[] args)
 
         internal static RootCommand CreateRootCommand()
         {
-            var rootCommand = new RootCommand() { };
+            var rootCommand = new RootCommand { };
 
             var commandOptions = new CommandOptions();
 

src/Microsoft.OpenApi.Readers/OpenApiYamlDocumentReader.cs

@@ -133,7 +133,7 @@ public async Task<ReadResult> ReadAsync(YamlDocument input, CancellationToken ca
                 }
             }
 
-            return new ReadResult()
+            return new ReadResult
             {
                 OpenApiDocument = document,
                 OpenApiDiagnostic = diagnostic
@@ -148,7 +148,7 @@ private async Task<OpenApiDiagnostic> LoadExternalRefs(OpenApiDocument document,
             // Load this root document into the workspace
             var streamLoader = new DefaultStreamLoader(_settings.BaseUrl);
             var workspaceLoader = new OpenApiWorkspaceLoader(openApiWorkSpace, _settings.CustomExternalLoader ?? streamLoader, _settings);
-            return await workspaceLoader.LoadAsync(new OpenApiReference() { ExternalResource = "/" }, document, cancellationToken);
+            return await workspaceLoader.LoadAsync(new OpenApiReference { ExternalResource = "/" }, document, cancellationToken);
         }
 
         private void ResolveReferences(OpenApiDiagnostic diagnostic, OpenApiDocument document)

src/Microsoft.OpenApi.Readers/ParseNodes/MapNode.cs

@@ -120,7 +120,7 @@ public override Dictionary<string, T> CreateMapWithReference<T>(
                         // If the component isn't a reference to another component, then point it to itself.
                         if (entry.value.Reference == null)
                         {
-                            entry.value.Reference = new OpenApiReference()
+                            entry.value.Reference = new OpenApiReference
                             {
                                 Type = referenceType,
                                 Id = entry.key
@@ -183,7 +183,7 @@ public override string GetRaw()
         public T GetReferencedObject<T>(ReferenceType referenceType, string referenceId)
             where T : IOpenApiReferenceable, new()
         {
-            return new T()
+            return new T
             {
                 UnresolvedReference = true,
                 Reference = Context.VersionService.ConvertToOpenApiReference(referenceId, referenceType)

src/Microsoft.OpenApi.Readers/ParseNodes/OpenApiAnyConverter.cs

@@ -116,7 +116,7 @@ public static IOpenApiAny GetSpecificOpenApiAny(IOpenApiAny openApiAny, OpenApiS
                 return openApiAny;
             }
 
-            if (value == null || value == "null")
+            if (value is null or "null")
             {
                 return new OpenApiNull();
             }

src/Microsoft.OpenApi.Readers/ParseNodes/ValueNode.cs

@@ -34,7 +34,7 @@ public override string GetScalarValue()
         public override IOpenApiAny CreateAny()
         {
             var value = GetScalarValue();
-            return new OpenApiString(value, this._node.Style == ScalarStyle.SingleQuoted || this._node.Style == ScalarStyle.DoubleQuoted || this._node.Style == ScalarStyle.Literal || this._node.Style == ScalarStyle.Folded);
+            return new OpenApiString(value, this._node.Style is ScalarStyle.SingleQuoted or ScalarStyle.DoubleQuoted or ScalarStyle.Literal or ScalarStyle.Folded);
         }
     }
 }

src/Microsoft.OpenApi.Readers/ParsingContext.cs

@@ -60,7 +60,7 @@ internal OpenApiDocument Parse(YamlDocument yamlDocument)
 
             switch (inputVersion)
             {
-                case string version when version == "2.0":
+                case string and "2.0":
                     VersionService = new OpenApiV2VersionService(Diagnostic);
                     doc = VersionService.LoadDocument(RootNode);
                     this.Diagnostic.SpecificationVersion = OpenApiSpecVersion.OpenApi2_0;

src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs

@@ -220,7 +220,7 @@ private static string BuildUrl(string scheme, string host, string basePath)
                 port = int.Parse(pieces.Last(), CultureInfo.InvariantCulture);
             }
 
-            var uriBuilder = new UriBuilder()
+            var uriBuilder = new UriBuilder
             {
                 Scheme = scheme,
                 Host = host,
@@ -327,10 +327,10 @@ public override void Visit(OpenApiOperation operation)
             if (body != null)
             {
                 operation.Parameters.Remove(body);
-                operation.RequestBody = new OpenApiRequestBody()
+                operation.RequestBody = new OpenApiRequestBody
                 {
                     UnresolvedReference = true,
-                    Reference = new OpenApiReference()
+                    Reference = new OpenApiReference
                     {
                         Id = body.Reference.Id,
                         Type = ReferenceType.RequestBody

src/Microsoft.OpenApi.Readers/V2/OpenApiOperationDeserializer.cs

@@ -221,10 +221,10 @@ private static OpenApiTag LoadTagByReference(
             ParsingContext context,
             string tagName)
         {
-            var tagObject = new OpenApiTag()
+            var tagObject = new OpenApiTag
             {
                 UnresolvedReference = true,
-                Reference = new OpenApiReference() { Id = tagName, Type = ReferenceType.Tag }
+                Reference = new OpenApiReference { Id = tagName, Type = ReferenceType.Tag }
             };
 
             return tagObject;