Release build was broken because of an #if DEBUG for System.Diagnostics

Author: andyleejordan

src/PowerShellEditorServices.Hosting/Commands/StartEditorServicesCommand.cs

@@ -10,10 +10,10 @@
 using SMA = System.Management.Automation;
 using System.Management.Automation.Runspaces;
 using Microsoft.PowerShell.EditorServices.Hosting;
+using System.Diagnostics;
 using System.Globalization;
 
 #if DEBUG
-using System.Diagnostics;
 using System.Threading;
 using Debugger = System.Diagnostics.Debugger;
 #endif
@@ -23,7 +23,6 @@ namespace Microsoft.PowerShell.EditorServices.Commands
     /// <summary>
     /// The Start-EditorServices command, the conventional entrypoint for PowerShell Editor Services.
     /// </summary>
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1819:Properties should not return arrays", Justification = "Cmdlet parameters can be arrays")]
     [Cmdlet(VerbsLifecycle.Start, "EditorServices", DefaultParameterSetName = "NamedPipe")]
     public sealed class StartEditorServicesCommand : PSCmdlet
     {
@@ -204,7 +203,7 @@ protected override void BeginProcessing()
             {
                 // NOTE: Ignore the suggestion to use Environment.ProcessId as it doesn't work for
                 // .NET 4.6.2 (for Windows PowerShell), and this won't be caught in CI.
-                Console.WriteLine($"Waiting for debugger to attach, PID: {Process.GetCurrentProcess().Id}");
+                Console.WriteLine($"Waiting for debugger to attach, PID: {s_currentPID}");
                 while (!Debugger.IsAttached)
                 {
                     Thread.Sleep(1000);

src/PowerShellEditorServices/Hosting/EditorServicesServerFactory.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using System;
+using System.Diagnostics;
 using System.IO;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -13,7 +14,6 @@
 using Microsoft.PowerShell.EditorServices.Services.Extension;
 
 #if DEBUG
-using System.Diagnostics;
 using Serilog.Debugging;
 #endif
 

src/PowerShellEditorServices/Services/DebugAdapter/Handlers/LaunchAndAttachHandler.cs

@@ -87,7 +87,7 @@ internal record PsesAttachRequestArguments : AttachRequestArguments
 
     internal class LaunchAndAttachHandler : ILaunchHandler<PsesLaunchRequestArguments>, IAttachHandler<PsesAttachRequestArguments>, IOnDebugAdapterServerStarted
     {
-        private static readonly int currentProcessId = System.Diagnostics.Process.GetCurrentProcess().Id;
+        private static readonly int s_currentPID = System.Diagnostics.Process.GetCurrentProcess().Id;
         private static readonly Version s_minVersionForCustomPipeName = new(6, 2);
         private readonly ILogger<LaunchAndAttachHandler> _logger;
         private readonly BreakpointService _breakpointService;
@@ -275,7 +275,7 @@ void RunspaceChangedHandler(object s, RunspaceChangedEventArgs _)
 
             if (processIdIsSet)
             {
-                if (request.ProcessId == currentProcessId)
+                if (request.ProcessId == s_currentPID)
                 {
                     throw new RpcErrorException(0, null, $"Attaching to the Extension Terminal is not supported!");
                 }

src/PowerShellEditorServices/Services/PowerShell/Handlers/PSHostProcessAndRunspaceHandlers.cs

@@ -19,7 +19,7 @@ internal class PSHostProcessAndRunspaceHandlers : IGetPSHostProcessesHandler, IG
         private readonly ILogger<PSHostProcessAndRunspaceHandlers> _logger;
         private readonly IInternalPowerShellExecutionService _executionService;
         private readonly IRunspaceContext _runspaceContext;
-        private static readonly int currentProcessId = System.Diagnostics.Process.GetCurrentProcess().Id;
+        private static readonly int s_currentPID = System.Diagnostics.Process.GetCurrentProcess().Id;
 
         public PSHostProcessAndRunspaceHandlers(
             ILoggerFactory factory,
@@ -50,7 +50,7 @@ public async Task<PSHostProcessResponse[]> Handle(GetPSHostProcessesParams reque
 
                 // NOTE: We do not currently support attaching to ourself in this manner, so we
                 // exclude our process. When we maybe eventually do, we should name it.
-                if (response.ProcessId == currentProcessId)
+                if (response.ProcessId == s_currentPID)
                 {
                     continue;
                 }
@@ -63,7 +63,7 @@ public async Task<PSHostProcessResponse[]> Handle(GetPSHostProcessesParams reque
 
         public async Task<RunspaceResponse[]> Handle(GetRunspaceParams request, CancellationToken cancellationToken)
         {
-            if (request.ProcessId == currentProcessId)
+            if (request.ProcessId == s_currentPID)
             {
                 throw new RpcErrorException(0, null, $"Attaching to the Extension Terminal is not supported!");
             }