refactor: fix misc analyzer warnings

Author: JamieMagee

.editorconfig

@@ -754,3 +754,7 @@ dotnet_diagnostic.CA1854.severity = suggestion
 
 # JSON002: Probable JSON string detected
 dotnet_diagnostic.JSON002.severity = suggestion
+
+# Workaround for https://github.com/dotnet/roslyn-analyzers/issues/5628
+[Program.cs]
+dotnet_diagnostic.ca1812.severity = none

src/Microsoft.ComponentDetection.Common/Telemetry/TelemetryRelay.cs

@@ -12,12 +12,12 @@ namespace Microsoft.ComponentDetection.Common.Telemetry;
 /// </summary>
 public sealed class TelemetryRelay
 {
+    private IEnumerable<ITelemetryService> telemetryServices;
+
     // For things not populating the telemetry services collection, let's not throw.
     private TelemetryRelay() =>
         this.telemetryServices = Enumerable.Empty<ITelemetryService>();
 
-    private IEnumerable<ITelemetryService> telemetryServices;
-
     /// <summary>
     /// Gets a value indicating whether or not the telemetry relay has been shutdown.
     /// </summary>

src/Microsoft.ComponentDetection.Orchestrator/Exceptions/NoDetectorsFoundException.cs

@@ -23,21 +23,21 @@ namespace Microsoft.ComponentDetection.Orchestrator.Tests.Services;
 [TestCategory("Governance/ComponentDetection")]
 public class BcdeScanExecutionServiceTests
 {
-    private Mock<ILogger> loggerMock;
-    private Mock<IDetectorProcessingService> detectorProcessingServiceMock;
-    private Mock<IEnumerable<IComponentDetector>> detectorsMock;
-    private Mock<IDetectorRestrictionService> detectorRestrictionServiceMock;
-    private Mock<IComponentDetector> componentDetector2Mock;
-    private Mock<IComponentDetector> componentDetector3Mock;
-    private Mock<IComponentDetector> versionedComponentDetector1Mock;
-    private IGraphTranslationService graphTranslationService;
+    private readonly Mock<ILogger> loggerMock;
+    private readonly Mock<IDetectorProcessingService> detectorProcessingServiceMock;
+    private readonly Mock<IEnumerable<IComponentDetector>> detectorsMock;
+    private readonly Mock<IDetectorRestrictionService> detectorRestrictionServiceMock;
+    private readonly Mock<IComponentDetector> componentDetector2Mock;
+    private readonly Mock<IComponentDetector> componentDetector3Mock;
+    private readonly Mock<IComponentDetector> versionedComponentDetector1Mock;
+    private readonly IGraphTranslationService graphTranslationService;
 
-    private DetectedComponent[] detectedComponents;
-    private ContainerDetails sampleContainerDetails;
+    private readonly DetectedComponent[] detectedComponents;
+    private readonly ContainerDetails sampleContainerDetails;
 
-    private BcdeScanExecutionService serviceUnderTest;
+    private readonly BcdeScanExecutionService serviceUnderTest;
 
-    private DirectoryInfo sourceDirectory;
+    private readonly DirectoryInfo sourceDirectory;
 
     public BcdeScanExecutionServiceTests()
     {

test/Microsoft.ComponentDetection.Orchestrator.Tests/Services/BcdeScanExecutionServiceTests.cs

@@ -48,8 +48,8 @@ public DetectorTestUtilityBuilder()
     public DetectorTestUtilityBuilder<T> WithFile(string fileName, string fileContents, IEnumerable<string> searchPatterns = null, string fileLocation = null) =>
         this.WithFile(fileName, fileContents.ToStream(), searchPatterns, fileLocation);
 
-    public DetectorTestUtilityBuilder<T> AddServiceMock<U>(Mock<U> mock)
-        where U : class
+    public DetectorTestUtilityBuilder<T> AddServiceMock<TMock>(Mock<TMock> mock)
+        where TMock : class
     {
         this.serviceCollection.AddSingleton(_ => mock.Object);
         return this;