From bf098a195459c9f5b2fb14b690d478a88b512266 Mon Sep 17 00:00:00 2001 From: Pavel Koneski Date: Sun, 10 Dec 2023 12:28:22 -0800 Subject: [PATCH 1/2] Avoid ToLoverInvariant in string comparisons (CA1862) --- Src/Microsoft.Dynamic/DebugOptions.cs | 2 +- Src/Microsoft.Dynamic/Generation/AssemblyGen.cs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Src/Microsoft.Dynamic/DebugOptions.cs b/Src/Microsoft.Dynamic/DebugOptions.cs index a0c8b32c..9fee3467 100644 --- a/Src/Microsoft.Dynamic/DebugOptions.cs +++ b/Src/Microsoft.Dynamic/DebugOptions.cs @@ -19,7 +19,7 @@ internal static class DebugOptions { private static bool ReadOption(string name) { string envVar = ReadString(name); - return envVar != null && envVar.ToLowerInvariant() == "true"; + return "true".Equals(envVar, StringComparison.InvariantCultureIgnoreCase); } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "name")] diff --git a/Src/Microsoft.Dynamic/Generation/AssemblyGen.cs b/Src/Microsoft.Dynamic/Generation/AssemblyGen.cs index 694fe6f1..cc2b17d8 100644 --- a/Src/Microsoft.Dynamic/Generation/AssemblyGen.cs +++ b/Src/Microsoft.Dynamic/Generation/AssemblyGen.cs @@ -283,7 +283,8 @@ private static void CopyDirectory(string to, string from) { string toFile = Path.Combine(to, fi.Name); FileInfo toInfo = new FileInfo(toFile); - if (fi.Extension.ToLowerInvariant() == ".dll" || fi.Extension.ToLowerInvariant() == ".exe") { + if (fi.Extension.Equals(".dll", StringComparison.InvariantCultureIgnoreCase) + || fi.Extension.Equals(".exe", StringComparison.InvariantCultureIgnoreCase)) { if (!File.Exists(toFile) || toInfo.CreationTime != fi.CreationTime) { try { File.Copy(filename, toFile, true); From 5c67e6440a13309d032086fc5a86007f8fc0e511 Mon Sep 17 00:00:00 2001 From: Pavel Koneski Date: Sun, 10 Dec 2023 20:02:53 -0800 Subject: [PATCH 2/2] Use OdrinalIgnoreCase iso InvariantCultureIgnoreCase --- Src/Microsoft.Dynamic/DebugOptions.cs | 2 +- Src/Microsoft.Dynamic/Generation/AssemblyGen.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Src/Microsoft.Dynamic/DebugOptions.cs b/Src/Microsoft.Dynamic/DebugOptions.cs index 9fee3467..bbfda4d6 100644 --- a/Src/Microsoft.Dynamic/DebugOptions.cs +++ b/Src/Microsoft.Dynamic/DebugOptions.cs @@ -19,7 +19,7 @@ internal static class DebugOptions { private static bool ReadOption(string name) { string envVar = ReadString(name); - return "true".Equals(envVar, StringComparison.InvariantCultureIgnoreCase); + return "true".Equals(envVar, StringComparison.OrdinalIgnoreCase); } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "name")] diff --git a/Src/Microsoft.Dynamic/Generation/AssemblyGen.cs b/Src/Microsoft.Dynamic/Generation/AssemblyGen.cs index cc2b17d8..1055f3b6 100644 --- a/Src/Microsoft.Dynamic/Generation/AssemblyGen.cs +++ b/Src/Microsoft.Dynamic/Generation/AssemblyGen.cs @@ -283,8 +283,8 @@ private static void CopyDirectory(string to, string from) { string toFile = Path.Combine(to, fi.Name); FileInfo toInfo = new FileInfo(toFile); - if (fi.Extension.Equals(".dll", StringComparison.InvariantCultureIgnoreCase) - || fi.Extension.Equals(".exe", StringComparison.InvariantCultureIgnoreCase)) { + if (fi.Extension.Equals(".dll", StringComparison.OrdinalIgnoreCase) + || fi.Extension.Equals(".exe", StringComparison.OrdinalIgnoreCase)) { if (!File.Exists(toFile) || toInfo.CreationTime != fi.CreationTime) { try { File.Copy(filename, toFile, true);