From 7e03bcad42841e39a83876365a61b06af1afdb1e Mon Sep 17 00:00:00 2001 From: Richard Werkman Date: Fri, 14 Feb 2025 11:14:34 +0100 Subject: [PATCH] Fix sonar issues --- src/Stryker.Core/Stryker.Core/StrykerRunner.cs | 13 ------------- .../Buildalyzer/IAnalyzerResultExtensions.cs | 4 ++-- .../CrossPlatformAssemblyResolver.cs | 9 ++++----- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/src/Stryker.Core/Stryker.Core/StrykerRunner.cs b/src/Stryker.Core/Stryker.Core/StrykerRunner.cs index 5d5933e75..3b42054cd 100644 --- a/src/Stryker.Core/Stryker.Core/StrykerRunner.cs +++ b/src/Stryker.Core/Stryker.Core/StrykerRunner.cs @@ -196,17 +196,4 @@ private IReadOnlyProjectComponent AddRootFolderIfMultiProject(IEnumerable GetSourceGenerators(this IAnalyzerRe catch (Exception e) { logger?.LogWarning(e, - $"Analyzer/Generator assembly {analyzer} could not be loaded. {Environment.NewLine}" + - "Generated source code may be missing."); + @"Analyzer/Generator assembly {analyzer} could not be loaded. +Generated source code may be missing.", analyzer); } } diff --git a/src/Stryker.Utilities/EmbeddedResources/CrossPlatformAssemblyResolver.cs b/src/Stryker.Utilities/EmbeddedResources/CrossPlatformAssemblyResolver.cs index c11fcab3d..e76ba591d 100644 --- a/src/Stryker.Utilities/EmbeddedResources/CrossPlatformAssemblyResolver.cs +++ b/src/Stryker.Utilities/EmbeddedResources/CrossPlatformAssemblyResolver.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.IO; +using System.Linq; using System.Text; using Mono.Cecil; @@ -155,12 +156,10 @@ private static Dictionary CreateTrustedPlatformAssemblyMap() return result; } - foreach (var path in paths.Split(Path.PathSeparator)) + foreach (var path in paths.Split(Path.PathSeparator) + .Where(path => string.Equals(Path.GetExtension(path), ".dll", StringComparison.OrdinalIgnoreCase))) { - if (string.Equals(Path.GetExtension(path), ".dll", StringComparison.OrdinalIgnoreCase)) - { - result[Path.GetFileNameWithoutExtension(path)] = path; - } + result[Path.GetFileNameWithoutExtension(path)] = path; } return result;