feat: change code to conform to coding-rules after update to dotnet 8

Per Kops · Per Kops · commit e7d31bc13cda · 2024-03-27T15:18:51.000+01:00
diff --git a/src/Atc.CodingRules.AnalyzerProviders/Providers/MicrosoftCodeAnalysisNetAnalyzersProvider.cs b/src/Atc.CodingRules.AnalyzerProviders/Providers/MicrosoftCodeAnalysisNetAnalyzersProvider.cs
@@ -58,7 +58,7 @@ protected override async Task ReCollect(
             var sa = aHrefNode.InnerText.Split(":");
             if (sa.Length != 2)
             {
-                sa = aHrefNode.InnerText.Split(new[] { ' ' }, 2);
+                sa = aHrefNode.InnerText.Split([' '], 2);
                 if (sa.Length != 2)
                 {
                     continue;
diff --git a/src/Atc.CodingRules.Updater.CLI/Extensions/CommandAppExtensions.cs b/src/Atc.CodingRules.Updater.CLI/Extensions/CommandAppExtensions.cs
@@ -21,35 +21,33 @@ public static void ConfigureCommands(this CommandApp<RootCommand> app)
     private static void ConfigureRunCommand(IConfigurator config)
         => config.AddCommand<RunCommand>(NameCommandConstants.Run)
             .WithDescription("Update the project folder with ATC coding rules and configurations")
-            .WithExample(new[] { ".", CreateEquivalentToRun(8) })
-            .WithExample(new[] { NameCommandConstants.Run, ".", CreateEquivalentToRun(4), })
-            .WithExample(new[] { NameCommandConstants.Run, CreateArgumentProjectPathWithDot(), CreateEquivalentToRun(1) })
-            .WithExample(new[] { NameCommandConstants.Run, CreateArgumentProjectPathWithTestFolder() })
+            .WithExample([".", CreateEquivalentToRun(8)])
+            .WithExample([NameCommandConstants.Run, ".", CreateEquivalentToRun(4)])
+            .WithExample([NameCommandConstants.Run, CreateArgumentProjectPathWithDot(), CreateEquivalentToRun(1)])
+            .WithExample([NameCommandConstants.Run, CreateArgumentProjectPathWithTestFolder()])
             .WithExample(
-                new[]
-                {
-                    NameCommandConstants.Run,
-                    CreateArgumentProjectPathWithTestFolder(),
-                    CreateArgumentProjectTarget(SupportedProjectTargetType.DotNetCore),
-                    ArgumentCommandConstants.LongUseTemporarySuppressions,
-                    ArgumentCommandConstants.LongOrganizationName, "MyCompany",
-                    ArgumentCommandConstants.LongRepositoryName, "MyRepo",
-                    CommandConstants.ArgumentShortVerbose,
-                });
+            [
+                NameCommandConstants.Run,
+                CreateArgumentProjectPathWithTestFolder(),
+                CreateArgumentProjectTarget(SupportedProjectTargetType.DotNetCore),
+                ArgumentCommandConstants.LongUseTemporarySuppressions,
+                ArgumentCommandConstants.LongOrganizationName, "MyCompany",
+                ArgumentCommandConstants.LongRepositoryName, "MyRepo",
+                CommandConstants.ArgumentShortVerbose
+            ]);
 
     private static void ConfigureSanityCheckCommand(IConfigurator config)
         => config.AddCommand<SanityCheckCommand>(NameCommandConstants.SanityCheck)
             .WithDescription("Sanity check the project files")
-            .WithExample(new[] { NameCommandConstants.SanityCheck, ".", CreateEquivalentToSanityCheck(8) })
-            .WithExample(new[] { NameCommandConstants.SanityCheck, CreateArgumentProjectPathWithTestFolder() })
+            .WithExample([NameCommandConstants.SanityCheck, ".", CreateEquivalentToSanityCheck(8)])
+            .WithExample([NameCommandConstants.SanityCheck, CreateArgumentProjectPathWithTestFolder()])
             .WithExample(
-                new[]
-                {
-                    NameCommandConstants.SanityCheck,
+            [
+                NameCommandConstants.SanityCheck,
                     CreateArgumentProjectPathWithTestFolder(),
                     CreateArgumentProjectTarget(SupportedProjectTargetType.DotNetCore),
-                    CommandConstants.ArgumentShortVerbose,
-                });
+                    CommandConstants.ArgumentShortVerbose
+            ]);
 
     private static Action<IConfigurator<CommandSettings>> ConfigureOptionsFileCommands()
         => node =>
@@ -59,15 +57,15 @@ private static Action<IConfigurator<CommandSettings>> ConfigureOptionsFileComman
             node
                 .AddCommand<OptionsFileCreateCommand>(CommandConstants.NameOptionsFileCreate)
                 .WithDescription("Create default options file 'atc-coding-rules-updater.json' if it doesn't exist")
-                .WithExample(new[] { CreateArgumentCommandsOptionsFileWithCreate(), ".", CreateEquivalentToOptionsFileCreate(6), })
-                .WithExample(new[] { CreateArgumentCommandsOptionsFileWithCreate(), CreateArgumentProjectPathWithDot(), CreateEquivalentToOptionsFileCreate(3), })
-                .WithExample(new[] { CreateArgumentCommandsOptionsFileWithCreate(), CreateArgumentProjectPathWithTestFolder(), });
+                .WithExample([CreateArgumentCommandsOptionsFileWithCreate(), ".", CreateEquivalentToOptionsFileCreate(6)])
+                .WithExample([CreateArgumentCommandsOptionsFileWithCreate(), CreateArgumentProjectPathWithDot(), CreateEquivalentToOptionsFileCreate(3)])
+                .WithExample([CreateArgumentCommandsOptionsFileWithCreate(), CreateArgumentProjectPathWithTestFolder()]);
 
             node
                 .AddCommand<OptionsFileValidateCommand>(CommandConstants.NameOptionsFileValidate)
                 .WithDescription("Validate the options file 'atc-coding-rules-updater.json'")
-                .WithExample(new[] { CreateArgumentCommandsOptionsFileWithValidate(), ".", CreateEquivalentToOptionsFileValidate(4), })
-                .WithExample(new[] { CreateArgumentCommandsOptionsFileWithValidate(), CreateArgumentProjectPathWithTestFolder() });
+                .WithExample([CreateArgumentCommandsOptionsFileWithValidate(), ".", CreateEquivalentToOptionsFileValidate(4)])
+                .WithExample([CreateArgumentCommandsOptionsFileWithValidate(), CreateArgumentProjectPathWithTestFolder()]);
         };
 
     private static Action<IConfigurator<CommandSettings>> ConfigureAnalyzerProvidersCommands()
@@ -78,22 +76,21 @@ private static Action<IConfigurator<CommandSettings>> ConfigureAnalyzerProviders
             node
                 .AddCommand<AnalyzerProvidersCollectCommand>(NameCommandConstants.AnalyzerProvidersCollect)
                 .WithDescription("Collect base rules metadata from all Analyzer providers")
-                .WithExample(new[] { CreateArgumentCommandsAnalyzerProvidersWithCollect(), ".", CreateEquivalentToAnalyzerProvidersCollect(6), })
-                .WithExample(new[] { CreateArgumentCommandsAnalyzerProvidersWithCollect(), CreateArgumentProjectPathWithDot(), CreateEquivalentToAnalyzerProvidersCollect(3) })
-                .WithExample(new[] { CreateArgumentCommandsAnalyzerProvidersWithCollect(), CreateArgumentProjectPathWithTestFolder() })
+                .WithExample([CreateArgumentCommandsAnalyzerProvidersWithCollect(), ".", CreateEquivalentToAnalyzerProvidersCollect(6)])
+                .WithExample([CreateArgumentCommandsAnalyzerProvidersWithCollect(), CreateArgumentProjectPathWithDot(), CreateEquivalentToAnalyzerProvidersCollect(3)])
+                .WithExample([CreateArgumentCommandsAnalyzerProvidersWithCollect(), CreateArgumentProjectPathWithTestFolder()])
                 .WithExample(
-                    new[]
-                    {
-                        CreateArgumentCommandsAnalyzerProvidersWithCollect(),
-                        CreateArgumentProjectPathWithTestFolder(),
-                        CreateArgumentFetchMode(ProviderCollectingMode.ReCollect),
-                        CommandConstants.ArgumentShortVerbose,
-                    });
+                [
+                    CreateArgumentCommandsAnalyzerProvidersWithCollect(),
+                    CreateArgumentProjectPathWithTestFolder(),
+                    CreateArgumentFetchMode(ProviderCollectingMode.ReCollect),
+                    CommandConstants.ArgumentShortVerbose
+                ]);
 
             node
                 .AddCommand<AnalyzerProvidersCacheCleanupCommand>(NameCommandConstants.AnalyzerProvidersCleanupCache)
                 .WithDescription("Cleanup cache from Analyzer providers")
-                .WithExample(new[] { CreateArgumentCommandsAnalyzerProvidersWithCleanupCache() });
+                .WithExample([CreateArgumentCommandsAnalyzerProvidersWithCleanupCache()]);
         };
 
     private static string CreateArgumentProjectPathWithDot()
diff --git a/src/Atc.CodingRules.Updater.CLI/Models/Options/OptionsMappings.cs b/src/Atc.CodingRules.Updater.CLI/Models/Options/OptionsMappings.cs
@@ -62,7 +62,7 @@ private static bool TryResolvePathIfNeeded(
         var di = new DirectoryInfo(orgPath);
         if (di.FullName.Contains("Atc.CodingRules.Updater.CLI", StringComparison.Ordinal))
         {
-            if (orgPath.IndexOfAny(new[] { '.', '/', '\\' }) == -1)
+            if (orgPath.IndexOfAny(['.', '/', '\\']) == -1)
             {
                 newPath = Path.Combine(projectPath.FullName, orgPath);
                 return true;
@@ -75,15 +75,15 @@ private static bool TryResolvePathIfNeeded(
                 return true;
             }
 
-            if (orgPath.IndexOfAny(new[] { '/', '\\' }) != -1)
+            if (orgPath.IndexOfAny(['/', '\\']) != -1)
             {
                 var s = orgPath.Replace("/", "\\", StringComparison.Ordinal);
                 newPath = Path.Combine(projectPath.FullName, s);
                 return true;
             }
         }
 
-        if (orgPath.StartsWith("\\", StringComparison.Ordinal))
+        if (orgPath.StartsWith('\\'))
         {
             var s = orgPath.Substring(1).Replace("/", "\\", StringComparison.Ordinal);
             newPath = Path.Combine(projectPath.FullName, s);
diff --git a/src/Atc.CodingRules.Updater.CLI/ProjectHelper.cs b/src/Atc.CodingRules.Updater.CLI/ProjectHelper.cs
@@ -204,7 +204,7 @@ private static async Task HandleTemporarySuppressions(
             var errorTypes = buildResult
                 .Where(x => x.Key.StartsWith("MSB", StringComparison.Ordinal))
                 .Select(x => x.Key)
-                .OrderBy(x => x)
+                .OrderBy(x => x, StringComparer.Ordinal)
                 .ToList();
 
             logger.LogWarning($"     MSB-errors ({string.Join(',', errorTypes)}) was found, please correct them manually first and try again.");
@@ -214,7 +214,7 @@ private static async Task HandleTemporarySuppressions(
             var errorTypes = buildResult
                 .Where(x => x.Key.StartsWith("NU", StringComparison.Ordinal))
                 .Select(x => x.Key)
-                .OrderBy(x => x)
+                .OrderBy(x => x, StringComparer.Ordinal)
                 .ToList();
 
             logger.LogWarning($"     NU-errors ({string.Join(',', errorTypes)}) was found, please correct them manually first and try again.");
@@ -288,14 +288,10 @@ private static async Task<bool> BuildAndCollectErrorsAgainAndUpdateFile(
             hasFoundNewErrors = buildResultNextRun.Count > 0;
             foreach (var (key, value) in buildResultNextRun)
             {
-                if (buildResult.ContainsKey(key))
+                if (!buildResult.TryAdd(key, value))
                 {
                     buildResult[key] += value;
                 }
-                else
-                {
-                    buildResult.Add(key, value);
-                }
             }
         }
         catch (DataException ex)
@@ -332,7 +328,7 @@ private static void DeleteSuppressionsFileInTempPath(
         }
     }
 
-    private static Task CreateSuppressionsFileInTempPath(
+    private static async Task CreateSuppressionsFileInTempPath(
         ILogger logger,
         DirectoryInfo temporarySuppressionsPath,
         bool temporarySuppressionAsExcel,
@@ -371,15 +367,14 @@ private static Task CreateSuppressionsFileInTempPath(
             worksheet.View.FreezePanes(2, 1);
 
             logger.LogDebug($"{EmojisConstants.FileUpdated}   {temporarySuppressionsFile} updated");
-
-            return excelPackage.SaveAsAsync(new FileInfo(temporarySuppressionsFile));
+            await excelPackage.SaveAsAsync(new FileInfo(temporarySuppressionsFile));
         }
 
         var suppressionsText = CreateSuppressionsText(suppressionLinesPrAnalyzer);
 
         logger.LogDebug($"{EmojisConstants.FileUpdated}   {temporarySuppressionsFile} updated");
 
-        return Helpers.FileHelper.WriteAllTextAsync(new FileInfo(temporarySuppressionsFile), suppressionsText);
+        await Helpers.FileHelper.WriteAllTextAsync(new FileInfo(temporarySuppressionsFile), suppressionsText);
     }
 
     private static int AddSuppressionLinesToWorksheet(
@@ -476,7 +471,7 @@ private static List<Tuple<string, List<string>>> GetSuppressionLines(
         var groupedSuppressionLines = suppressionLines
             .GroupBy(x => x.Item1, StringComparer.Ordinal)
             .Select(group => new { AnalyzerName = group.Key, Values = group.Select(x => x.Item2).ToList() })
-            .OrderBy(x => x.AnalyzerName)
+            .OrderBy(x => x.AnalyzerName, StringComparer.Ordinal)
             .ToList();
 
         return groupedSuppressionLines.Select(x => Tuple.Create(x.AnalyzerName, x.Values)).ToList();
@@ -488,7 +483,7 @@ private static void HandleSuppressionLinesForKnownAnalyzerRules(
         ICollection<Tuple<string, string>> suppressionLines,
         ICollection<string> handledCodes)
     {
-        foreach (var (code, count) in buildResult.OrderBy(x => x.Key))
+        foreach (var (code, count) in buildResult.OrderBy(x => x.Key, StringComparer.Ordinal))
         {
             foreach (var analyzerProvider in analyzerProviderBaseRules)
             {
@@ -511,7 +506,7 @@ private static void HandleSuppressionLinesForUnknownAnalyzerRules(
         ICollection<Tuple<string, string>> suppressionLines,
         ICollection<string> handledCodes)
     {
-        foreach (var (code, count) in buildResult.OrderBy(x => x.Key))
+        foreach (var (code, count) in buildResult.OrderBy(x => x.Key, StringComparer.Ordinal))
         {
             if (handledCodes.Contains(code, StringComparer.Ordinal))
             {
diff --git a/src/Atc.CodingRules.Updater/DirectoryBuildPropsHelper.cs b/src/Atc.CodingRules.Updater/DirectoryBuildPropsHelper.cs
@@ -99,7 +99,7 @@ public static bool HasFileInsertPlaceholderElement(
 
         var fileContent = FileHelper.ReadAllText(file);
         var searchText = $"<{elementName}><!-- {elementValue} --></{elementName}>";
-        return fileContent.IndexOf(searchText, StringComparison.Ordinal) != -1;
+        return fileContent.Contains(searchText, StringComparison.Ordinal);
     }
 
     public static void UpdateFileInsertPlaceholderElement(
@@ -119,7 +119,7 @@ public static void UpdateFileInsertPlaceholderElement(
 
         var fileContent = FileHelper.ReadAllText(file);
         var searchText = $"<{elementName}><!-- {elementValue} --></{elementName}>";
-        if (fileContent.IndexOf(searchText, StringComparison.Ordinal) != -1)
+        if (fileContent.Contains(searchText, StringComparison.Ordinal))
         {
             fileContent = fileContent.Replace(
                 searchText,
diff --git a/src/Atc.CodingRules.Updater/FileHelper.cs b/src/Atc.CodingRules.Updater/FileHelper.cs
@@ -31,7 +31,7 @@ public static Collection<FileInfo> SearchAllForElement(
                 searchText = $"<{elementName}>{elementValue}</{elementName}>";
             }
 
-            if (fileContent.IndexOf(searchText, stringComparison) != -1)
+            if (fileContent.Contains(searchText, stringComparison))
             {
                 result.Add(new FileInfo(file));
             }
diff --git a/src/Atc.CodingRules.Updater/ProjectSanityCheckHelper.cs b/src/Atc.CodingRules.Updater/ProjectSanityCheckHelper.cs
@@ -14,12 +14,12 @@ public static void CheckFiles(
         switch (projectTarget)
         {
             case SupportedProjectTargetType.DotNet5:
-                HasEnableNetAnalyzers(throwIf, logger, projectPath, projectTarget);
+                HasEnableNetAnalyzers(throwIf, logger, projectPath, projectTarget); // TODO: XXX
                 break;
             case SupportedProjectTargetType.DotNet6:
             case SupportedProjectTargetType.DotNet7:
             case SupportedProjectTargetType.DotNet8:
-                HasTargetFrameworkAndImplicitUsings(throwIf, logger, projectPath, "netcoreapp3.1");
+                HasTargetFrameworkAndImplicitUsings(throwIf, logger, projectPath, "netcoreapp3.1"); // TODO: XXX
                 break;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ protected override async Task ReCollect(`
`58`	`58`	`var sa = aHrefNode.InnerText.Split(":");`
`59`	`59`	`if (sa.Length != 2)`
`60`	`60`	`{`
`61`		`- sa = aHrefNode.InnerText.Split(new[] { ' ' }, 2);`
	`61`	`+ sa = aHrefNode.InnerText.Split([' '], 2);`
`62`	`62`	`if (sa.Length != 2)`
`63`	`63`	`{`
`64`	`64`	`continue;`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ private static bool TryResolvePathIfNeeded(`
`62`	`62`	`var di = new DirectoryInfo(orgPath);`
`63`	`63`	`if (di.FullName.Contains("Atc.CodingRules.Updater.CLI", StringComparison.Ordinal))`
`64`	`64`	`{`
`65`		`- if (orgPath.IndexOfAny(new[] { '.', '/', '\\' }) == -1)`
	`65`	`+ if (orgPath.IndexOfAny(['.', '/', '\\']) == -1)`
`66`	`66`	`{`
`67`	`67`	`newPath = Path.Combine(projectPath.FullName, orgPath);`
`68`	`68`	`return true;`
`@@ -75,15 +75,15 @@ private static bool TryResolvePathIfNeeded(`
`75`	`75`	`return true;`
`76`	`76`	`}`
`77`	`77`
`78`		`- if (orgPath.IndexOfAny(new[] { '/', '\\' }) != -1)`
	`78`	`+ if (orgPath.IndexOfAny(['/', '\\']) != -1)`
`79`	`79`	`{`
`80`	`80`	`var s = orgPath.Replace("/", "\\", StringComparison.Ordinal);`
`81`	`81`	`newPath = Path.Combine(projectPath.FullName, s);`
`82`	`82`	`return true;`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
`86`		`- if (orgPath.StartsWith("\\", StringComparison.Ordinal))`
	`86`	`+ if (orgPath.StartsWith('\\'))`
`87`	`87`	`{`
`88`	`88`	`var s = orgPath.Substring(1).Replace("/", "\\", StringComparison.Ordinal);`
`89`	`89`	`newPath = Path.Combine(projectPath.FullName, s);`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ private static async Task HandleTemporarySuppressions(`
`204`	`204`	`var errorTypes = buildResult`
`205`	`205`	`.Where(x => x.Key.StartsWith("MSB", StringComparison.Ordinal))`
`206`	`206`	`.Select(x => x.Key)`
`207`		`- .OrderBy(x => x)`
	`207`	`+ .OrderBy(x => x, StringComparer.Ordinal)`
`208`	`208`	`.ToList();`
`209`	`209`
`210`	`210`	`logger.LogWarning($" MSB-errors ({string.Join(',', errorTypes)}) was found, please correct them manually first and try again.");`
`@@ -214,7 +214,7 @@ private static async Task HandleTemporarySuppressions(`
`214`	`214`	`var errorTypes = buildResult`
`215`	`215`	`.Where(x => x.Key.StartsWith("NU", StringComparison.Ordinal))`
`216`	`216`	`.Select(x => x.Key)`
`217`		`- .OrderBy(x => x)`
	`217`	`+ .OrderBy(x => x, StringComparer.Ordinal)`
`218`	`218`	`.ToList();`
`219`	`219`
`220`	`220`	`logger.LogWarning($" NU-errors ({string.Join(',', errorTypes)}) was found, please correct them manually first and try again.");`
`@@ -288,14 +288,10 @@ private static async Task<bool> BuildAndCollectErrorsAgainAndUpdateFile(`
`288`	`288`	`hasFoundNewErrors = buildResultNextRun.Count > 0;`
`289`	`289`	`foreach (var (key, value) in buildResultNextRun)`
`290`	`290`	`{`
`291`		`- if (buildResult.ContainsKey(key))`
	`291`	`+ if (!buildResult.TryAdd(key, value))`
`292`	`292`	`{`
`293`	`293`	`buildResult[key] += value;`
`294`	`294`	`}`
`295`		`- else`
`296`		`- {`
`297`		`- buildResult.Add(key, value);`
`298`		`- }`
`299`	`295`	`}`
`300`	`296`	`}`
`301`	`297`	`catch (DataException ex)`
`@@ -332,7 +328,7 @@ private static void DeleteSuppressionsFileInTempPath(`
`332`	`328`	`}`
`333`	`329`	`}`
`334`	`330`
`335`		`- private static Task CreateSuppressionsFileInTempPath(`
	`331`	`+ private static async Task CreateSuppressionsFileInTempPath(`
`336`	`332`	`ILogger logger,`
`337`	`333`	`DirectoryInfo temporarySuppressionsPath,`
`338`	`334`	`bool temporarySuppressionAsExcel,`
`@@ -371,15 +367,14 @@ private static Task CreateSuppressionsFileInTempPath(`
`371`	`367`	`worksheet.View.FreezePanes(2, 1);`
`372`	`368`
`373`	`369`	`logger.LogDebug($"{EmojisConstants.FileUpdated} {temporarySuppressionsFile} updated");`
`374`		`-`
`375`		`- return excelPackage.SaveAsAsync(new FileInfo(temporarySuppressionsFile));`
	`370`	`+ await excelPackage.SaveAsAsync(new FileInfo(temporarySuppressionsFile));`
`376`	`371`	`}`
`377`	`372`
`378`	`373`	`var suppressionsText = CreateSuppressionsText(suppressionLinesPrAnalyzer);`
`379`	`374`
`380`	`375`	`logger.LogDebug($"{EmojisConstants.FileUpdated} {temporarySuppressionsFile} updated");`
`381`	`376`
`382`		`- return Helpers.FileHelper.WriteAllTextAsync(new FileInfo(temporarySuppressionsFile), suppressionsText);`
	`377`	`+ await Helpers.FileHelper.WriteAllTextAsync(new FileInfo(temporarySuppressionsFile), suppressionsText);`
`383`	`378`	`}`
`384`	`379`
`385`	`380`	`private static int AddSuppressionLinesToWorksheet(`
`@@ -476,7 +471,7 @@ private static List<Tuple<string, List<string>>> GetSuppressionLines(`
`476`	`471`	`var groupedSuppressionLines = suppressionLines`
`477`	`472`	`.GroupBy(x => x.Item1, StringComparer.Ordinal)`
`478`	`473`	`.Select(group => new { AnalyzerName = group.Key, Values = group.Select(x => x.Item2).ToList() })`
`479`		`- .OrderBy(x => x.AnalyzerName)`
	`474`	`+ .OrderBy(x => x.AnalyzerName, StringComparer.Ordinal)`
`480`	`475`	`.ToList();`
`481`	`476`
`482`	`477`	`return groupedSuppressionLines.Select(x => Tuple.Create(x.AnalyzerName, x.Values)).ToList();`
`@@ -488,7 +483,7 @@ private static void HandleSuppressionLinesForKnownAnalyzerRules(`
`488`	`483`	`ICollection<Tuple<string, string>> suppressionLines,`
`489`	`484`	`ICollection<string> handledCodes)`
`490`	`485`	`{`
`491`		`- foreach (var (code, count) in buildResult.OrderBy(x => x.Key))`
	`486`	`+ foreach (var (code, count) in buildResult.OrderBy(x => x.Key, StringComparer.Ordinal))`
`492`	`487`	`{`
`493`	`488`	`foreach (var analyzerProvider in analyzerProviderBaseRules)`
`494`	`489`	`{`
`@@ -511,7 +506,7 @@ private static void HandleSuppressionLinesForUnknownAnalyzerRules(`
`511`	`506`	`ICollection<Tuple<string, string>> suppressionLines,`
`512`	`507`	`ICollection<string> handledCodes)`
`513`	`508`	`{`
`514`		`- foreach (var (code, count) in buildResult.OrderBy(x => x.Key))`
	`509`	`+ foreach (var (code, count) in buildResult.OrderBy(x => x.Key, StringComparer.Ordinal))`
`515`	`510`	`{`
`516`	`511`	`if (handledCodes.Contains(code, StringComparer.Ordinal))`
`517`	`512`	`{`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public static bool HasFileInsertPlaceholderElement(`
`99`	`99`
`100`	`100`	`var fileContent = FileHelper.ReadAllText(file);`
`101`	`101`	`var searchText = $"<{elementName}><!-- {elementValue} --></{elementName}>";`
`102`		`- return fileContent.IndexOf(searchText, StringComparison.Ordinal) != -1;`
	`102`	`+ return fileContent.Contains(searchText, StringComparison.Ordinal);`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`public static void UpdateFileInsertPlaceholderElement(`
`@@ -119,7 +119,7 @@ public static void UpdateFileInsertPlaceholderElement(`
`119`	`119`
`120`	`120`	`var fileContent = FileHelper.ReadAllText(file);`
`121`	`121`	`var searchText = $"<{elementName}><!-- {elementValue} --></{elementName}>";`
`122`		`- if (fileContent.IndexOf(searchText, StringComparison.Ordinal) != -1)`
	`122`	`+ if (fileContent.Contains(searchText, StringComparison.Ordinal))`
`123`	`123`	`{`
`124`	`124`	`fileContent = fileContent.Replace(`
`125`	`125`	`searchText,`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public static Collection<FileInfo> SearchAllForElement(`
`31`	`31`	`searchText = $"<{elementName}>{elementValue}</{elementName}>";`
`32`	`32`	`}`
`33`	`33`
`34`		`- if (fileContent.IndexOf(searchText, stringComparison) != -1)`
	`34`	`+ if (fileContent.Contains(searchText, stringComparison))`
`35`	`35`	`{`
`36`	`36`	`result.Add(new FileInfo(file));`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,12 @@ public static void CheckFiles(`
`14`	`14`	`switch (projectTarget)`
`15`	`15`	`{`
`16`	`16`	`case SupportedProjectTargetType.DotNet5:`
`17`		`- HasEnableNetAnalyzers(throwIf, logger, projectPath, projectTarget);`
	`17`	`+ HasEnableNetAnalyzers(throwIf, logger, projectPath, projectTarget); // TODO: XXX`
`18`	`18`	`break;`
`19`	`19`	`case SupportedProjectTargetType.DotNet6:`
`20`	`20`	`case SupportedProjectTargetType.DotNet7:`
`21`	`21`	`case SupportedProjectTargetType.DotNet8:`
`22`		`- HasTargetFrameworkAndImplicitUsings(throwIf, logger, projectPath, "netcoreapp3.1");`
	`22`	`+ HasTargetFrameworkAndImplicitUsings(throwIf, logger, projectPath, "netcoreapp3.1"); // TODO: XXX`
`23`	`23`	`break;`
`24`	`24`	`}`
`25`	`25`	`}`