From 05512ec0035bfab31ab4a75592c21e0a227b9487 Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Tue, 3 Oct 2023 21:10:55 +1100 Subject: [PATCH 1/3] use char overloads where possible --- src/Microsoft.OpenApi.Hidi/Formatters/PowerShellFormatter.cs | 4 ++-- .../V2/OpenApiDocumentDeserializer.cs | 2 +- test/Microsoft.OpenApi.SmokeTests/ApiGurus.cs | 2 +- test/Microsoft.OpenApi.SmokeTests/GraphTests.cs | 2 +- test/Microsoft.OpenApi.Tests/StringExtensions.cs | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Microsoft.OpenApi.Hidi/Formatters/PowerShellFormatter.cs b/src/Microsoft.OpenApi.Hidi/Formatters/PowerShellFormatter.cs index 4db55a05e..45fac0270 100644 --- a/src/Microsoft.OpenApi.Hidi/Formatters/PowerShellFormatter.cs +++ b/src/Microsoft.OpenApi.Hidi/Formatters/PowerShellFormatter.cs @@ -133,7 +133,7 @@ private static string SingularizeAndDeduplicateOperationId(IList operati singularizedSegments.Add(segment); } - return string.Join(".", singularizedSegments); + return string.Join('.', singularizedSegments); } private static string RemoveHashSuffix(string operationId) @@ -153,7 +153,7 @@ private static string RemoveKeyTypeSegment(string operationId, IList ResolveFunctionParameters(IList parameters) diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs index 806c96877..dc51992cc 100644 --- a/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs @@ -213,7 +213,7 @@ private static string BuildUrl(string scheme, string host, string basePath) int? port = null; - if (!String.IsNullOrEmpty(host) && host.Contains(":")) + if (!String.IsNullOrEmpty(host) && host.Contains(':')) { var pieces = host.Split(':'); host = pieces.First(); diff --git a/test/Microsoft.OpenApi.SmokeTests/ApiGurus.cs b/test/Microsoft.OpenApi.SmokeTests/ApiGurus.cs index 55a32ff71..2e2b622a8 100644 --- a/test/Microsoft.OpenApi.SmokeTests/ApiGurus.cs +++ b/test/Microsoft.OpenApi.SmokeTests/ApiGurus.cs @@ -93,7 +93,7 @@ public async Task EnsureThatICouldParse(string url) if (diagnostic.Errors.Count > 0) { _output.WriteLine($"Errors parsing {url}"); - _output.WriteLine(String.Join("\n", diagnostic.Errors)); + _output.WriteLine(String.Join('\n', diagnostic.Errors)); // Assert.True(false); // Uncomment to identify descriptions with errors. } diff --git a/test/Microsoft.OpenApi.SmokeTests/GraphTests.cs b/test/Microsoft.OpenApi.SmokeTests/GraphTests.cs index 1aa84662d..24a3a5498 100644 --- a/test/Microsoft.OpenApi.SmokeTests/GraphTests.cs +++ b/test/Microsoft.OpenApi.SmokeTests/GraphTests.cs @@ -43,7 +43,7 @@ public GraphTests(ITestOutputHelper output) if (diagnostic.Errors.Count > 0) { _output.WriteLine($"Errors parsing"); - _output.WriteLine(String.Join("\n", diagnostic.Errors)); + _output.WriteLine(String.Join('\n', diagnostic.Errors)); // Assert.True(false); // Uncomment to identify descriptions with errors. } diff --git a/test/Microsoft.OpenApi.Tests/StringExtensions.cs b/test/Microsoft.OpenApi.Tests/StringExtensions.cs index 5b01c97ac..dfbec23bc 100644 --- a/test/Microsoft.OpenApi.Tests/StringExtensions.cs +++ b/test/Microsoft.OpenApi.Tests/StringExtensions.cs @@ -17,7 +17,7 @@ public static class StringExtensions public static string MakeLineBreaksEnvironmentNeutral(this string input) { return input.Replace("\r\n", "\n") - .Replace("\r", "\n") + .Replace('\r', '\n') .Replace("\n", Environment.NewLine); } } From f3c9141c73c5ca5ec884ed7ab18e09a3d06da05c Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Tue, 3 Oct 2023 08:28:06 -0400 Subject: [PATCH 2/3] Update src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs --- src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs index dc51992cc..93e0f4ce7 100644 --- a/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs @@ -213,7 +213,7 @@ private static string BuildUrl(string scheme, string host, string basePath) int? port = null; - if (!String.IsNullOrEmpty(host) && host.Contains(':')) + if (!String.IsNullOrEmpty(host) && host.Contains(':', StringComparison.OrdinalIgnoreCase)) { var pieces = host.Split(':'); host = pieces.First(); From 47e83949db56b1668138921df8d515784fb9508b Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Tue, 3 Oct 2023 08:45:41 -0400 Subject: [PATCH 3/3] Update src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs --- .../V2/OpenApiDocumentDeserializer.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs index 93e0f4ce7..f6754dd54 100644 --- a/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs @@ -213,7 +213,11 @@ private static string BuildUrl(string scheme, string host, string basePath) int? port = null; +#if NETSTANDARD2_1_OR_GREATER if (!String.IsNullOrEmpty(host) && host.Contains(':', StringComparison.OrdinalIgnoreCase)) +#else + if (!String.IsNullOrEmpty(host) && host.Contains(':')) +#endif { var pieces = host.Split(':'); host = pieces.First();