chore: resolve bad merge

Author: JamieMagee

src/Microsoft.ComponentDetection.Detectors/pnpm/PnpmComponentDetector.cs

@@ -7,8 +7,6 @@ namespace Microsoft.ComponentDetection.Detectors.Pnpm;
 using Microsoft.ComponentDetection.Contracts.Internal;
 using Microsoft.ComponentDetection.Contracts.TypedComponent;
 
-namespace Microsoft.ComponentDetection.Detectors.Pnpm;
-
 public class PnpmComponentDetector : FileComponentDetector
 {
     public PnpmComponentDetector(

test/Microsoft.ComponentDetection.Detectors.Tests/MvnCliDetectorTests.cs

@@ -28,7 +28,7 @@ public MvnCliDetectorTests()
     [TestMethod]
     public async Task IfMavenIsNotAvailableThenExitDetectorGracefullyAsync()
     {
-        this.mavenCommandServiceMock.Setup(x => x.MavenCLIExists())
+        this.mavenCommandServiceMock.Setup(x => x.MavenCLIExistsAsync())
             .ReturnsAsync(false);
 
         var (detectorResult, componentRecorder) = await this.DetectorTestUtility
@@ -63,7 +63,7 @@ public async Task MavenAvailableHappyPathAsync()
     [TestMethod]
     public async Task MavenCli_FileObservableIsNotPresent_DetectionShouldNotFailAsync()
     {
-        this.mavenCommandServiceMock.Setup(x => x.MavenCLIExists())
+        this.mavenCommandServiceMock.Setup(x => x.MavenCLIExistsAsync())
             .ReturnsAsync(true);
 
         Func<Task> action = async () => await this.DetectorTestUtility.ExecuteDetectorAsync();
@@ -189,7 +189,7 @@ private void MvnCliHappyPath(string content)
 
         this.mavenCommandServiceMock.Setup(x => x.BcdeMvnDependencyFileName)
             .Returns(bcdeMvnFileName);
-        this.mavenCommandServiceMock.Setup(x => x.MavenCLIExists())
+        this.mavenCommandServiceMock.Setup(x => x.MavenCLIExistsAsync())
             .ReturnsAsync(true);
         this.DetectorTestUtility.WithFile("pom.xml", content)
             .WithFile("pom.xml", content, searchPatterns: new[] { bcdeMvnFileName });

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

@@ -145,7 +145,7 @@ public async Task ProcessDetectorsAsync_HappyPathReturns_DependencyGraphAsync()
     }
 
     [TestMethod]
-    public async Task ProcessDetectorsAsync_AdditionalTelemetryDetailsAreReturned()
+    public async Task ProcessDetectorsAsync_AdditionalTelemetryDetailsAreReturnedAsync()
     {
         this.detectorsToUse = new[]
         {
@@ -165,7 +165,7 @@ public async Task ProcessDetectorsAsync_AdditionalTelemetryDetailsAreReturned()
     }
 
     [TestMethod]
-    public async Task ProcessDetectorsAsync_ExperimentalDetectorsDoNotReturnComponents()
+    public async Task ProcessDetectorsAsync_ExperimentalDetectorsDoNotReturnComponentsAsync()
     {
         this.detectorsToUse = new[]
         {
@@ -202,7 +202,7 @@ public async Task ProcessDetectorsAsync_ExperimentalDetectorsDoNotReturnComponen
     }
 
     [TestMethod]
-    public async Task ProcessDetectorsAsync_ExperimentalDetectorsDoNormalStuffIfExplicitlyEnabled()
+    public async Task ProcessDetectorsAsync_ExperimentalDetectorsDoNormalStuffIfExplicitlyEnabledAsync()
     {
         this.detectorsToUse = new[]
         {
@@ -230,7 +230,7 @@ public async Task ProcessDetectorsAsync_ExperimentalDetectorsDoNormalStuffIfExpl
     }
 
     [TestMethod]
-    public async Task ProcessDetectorsAsync_ExperimentalDetectorsThrowingDoesntKillDetection()
+    public async Task ProcessDetectorsAsync_ExperimentalDetectorsThrowingDoesntKillDetectionAsync()
     {
         this.detectorsToUse = new[]
         {
@@ -425,7 +425,7 @@ await this.serviceUnderTest.ProcessDetectorsAsync(
     }
 
     [TestMethod]
-    public async Task ProcessDetectorsAsync_CapturesTelemetry()
+    public async Task ProcessDetectorsAsync_CapturesTelemetryAsync()
     {
         var args = DefaultArgs;
 
@@ -454,7 +454,7 @@ public async Task ProcessDetectorsAsync_CapturesTelemetry()
     }
 
     [TestMethod]
-    public async Task ProcessDetectorsAsync_ExecutesMixedCommandAndFileDetectors()
+    public async Task ProcessDetectorsAsync_ExecutesMixedCommandAndFileDetectorsAsync()
     {
         this.detectorsToUse = new[]
         {