simplify process code

src/Platform/Microsoft.Testing.Extensions.HangDump/HangDumpProcessLifetimeHandler.cs

@@ -381,9 +381,7 @@ private async Task TakeDumpAsync()
 #endif
 
         NotifyCrashDumpServiceIfEnabled();
-        using IProcess process = _processHandler.GetProcessById(_testHostProcessInformation.PID);
-        process.Kill();
-        await process.WaitForExitAsync();
+        await _processHandler.KillAsync(_testHostProcessInformation.PID);
         _dumpFileTaken = finalDumpFileName;
     }
 

src/Platform/Microsoft.Testing.Platform/Builder/TestApplication.cs

@@ -134,8 +134,7 @@
         await logger.LogInformationAsync("Logging mode: " + (syncWrite ? "synchronous" : "asynchronous"));
         await logger.LogInformationAsync($"Logging level: {loggerLevel}");
         await logger.LogInformationAsync($"CreateBuilderAsync entry time: {createBuilderEntryTime}");
-        using IProcess currentProcess = processHandler.GetCurrentProcess();
-        await logger.LogInformationAsync($"PID: {currentProcess.Id}");
+        await logger.LogInformationAsync($"PID: {processHandler.GetCurrentProcessId()}");
 
 #if NETCOREAPP
         string runtimeInformation = $"{RuntimeInformation.RuntimeIdentifier} - {RuntimeInformation.FrameworkDescription}";
@@ -245,8 +244,8 @@
 
         if (environment.GetEnvironmentVariable(EnvironmentVariableConstants.TESTINGPLATFORM_WAIT_ATTACH_DEBUGGER) == "1")
         {
-            IProcess currentProcess = systemProcess.GetCurrentProcess();
-            console.WriteLine($"Waiting for debugger to attach... Process Id: {currentProcess.Id}, Name: {currentProcess.Name}");
+            var process = systemProcess.GetCurrentProcessInfo();
+            console.WriteLine($"Waiting for debugger to attach... Process Id: {process.Id}, Name: {process.Name}");
 
             while (!Debugger.IsAttached)
             {

src/Platform/Microsoft.Testing.Platform/Helpers/System/IProcess.cs

@@ -10,31 +10,14 @@ internal interface IProcess : IDisposable
     /// <inheritdoc cref="System.Diagnostics.Process.Id" />
     int Id { get; }
 
-    /// <inheritdoc cref="System.Diagnostics.Process.ProcessName" />
-    string Name { get; }
-
     /// <inheritdoc cref="System.Diagnostics.Process.ExitCode" />
     int ExitCode { get; }
 
     /// <inheritdoc cref="System.Diagnostics.Process.HasExited" />
     bool HasExited { get; }
 
-#if NETCOREAPP
-    /// <inheritdoc cref="System.Diagnostics.Process.MainModule" />
-    IMainModule? MainModule { get; }
-#else
-    /// <inheritdoc cref="System.Diagnostics.Process.MainModule" />
-    IMainModule MainModule { get; }
-#endif
-
     /// <summary>
     /// Instructs the Process component to wait for the associated process to exit, or for the cancellationToken to be canceled.
     /// </summary>
     Task WaitForExitAsync();
-
-    /// <inheritdoc cref="System.Diagnostics.Process.WaitForExit()" />
-    void WaitForExit();
-
-    /// <inheritdoc cref="System.Diagnostics.Process.Kill()" />
-    void Kill();
 }

src/Platform/Microsoft.Testing.Platform/Helpers/System/IProcessHandler.cs

@@ -5,9 +5,13 @@ namespace Microsoft.Testing.Platform.Helpers;
 
 internal interface IProcessHandler
 {
-    IProcess GetProcessById(int pid);
+    Task KillAsync(int id);
 
-    IProcess GetCurrentProcess();
+    int GetCurrentProcessId();
+
+    (int Id, string Name) GetCurrentProcessInfo();
+
+    string? GetCurrentProcessFileName();
 
     IProcess Start(ProcessStartInfo startInfo);
 }

src/Platform/Microsoft.Testing.Platform/Helpers/System/SystemProcess.cs

@@ -20,37 +20,14 @@ public SystemProcess(Process process)
 
     public int Id => _process.Id;
 
-    public string Name => _process.ProcessName;
-
     public int ExitCode => _process.ExitCode;
 
-#if NETCOREAPP
-    public IMainModule? MainModule
-        => _process.MainModule is null
-            ? null
-            : (IMainModule)new SystemMainModule(_process.MainModule);
-#else
-    public IMainModule MainModule
-        => new SystemMainModule(_process.MainModule);
-#endif
-
     private void OnProcessExited(object? sender, EventArgs e)
         => Exited?.Invoke(sender, e);
 
-    public void WaitForExit()
-        => _process.WaitForExit();
-
     public Task WaitForExitAsync()
         => _process.WaitForExitAsync();
 
-#if NETCOREAPP
-    public void Kill()
-        => _process.Kill(true);
-#else
-    public void Kill()
-        => _process.Kill();
-#endif
-
     public void Dispose() => _process.Dispose();
 #pragma warning restore CA1416
 }

src/Platform/Microsoft.Testing.Platform/Helpers/System/SystemProcessHandler.cs

@@ -8,10 +8,30 @@
 [SuppressMessage("ApiDesign", "RS0030:Do not use banned APIs", Justification = "This is the Process wrapper.")]
 internal sealed class SystemProcessHandler : IProcessHandler
 {
-#pragma warning disable CA1416 // Validate platform compatibility
-    public IProcess GetCurrentProcess() => new SystemProcess(Process.GetCurrentProcess());
+    public async Task KillAsync(int id)
+    {
+        using var process = Process.GetProcessById(id);
+        process.Kill();
+        await process.WaitForExitAsync();
+    }
+
+    public int GetCurrentProcessId()
+    {
+        using var process = Process.GetCurrentProcess();
+        return process.Id;
+    }
 
-    public IProcess GetProcessById(int pid) => new SystemProcess(Process.GetProcessById(pid));
+    public (int Id, string Name) GetCurrentProcessInfo()
+    {
+        using var process = Process.GetCurrentProcess();
+        return (process.Id, process.ProcessName);
+    }
+
+    public string? GetCurrentProcessFileName()
+    {
+        using var process = Process.GetCurrentProcess();
+        return process.MainModule?.FileName;
+    }
 
     public IProcess Start(ProcessStartInfo startInfo)
     {

src/Platform/Microsoft.Testing.Platform/Hosts/ServerTestHost.cs

@@ -406,7 +406,7 @@ private async Task<object> HandleRequestCoreAsync(RequestMessage message, RpcInv
 
                     INamedFeatureCapability? namedFeatureCapability = ServiceProvider.GetTestFrameworkCapabilities().GetCapability<INamedFeatureCapability>();
                     return new InitializeResponseArgs(
-                        ProcessId: ServiceProvider.GetProcessHandler().GetCurrentProcess().Id,
+                        ProcessId: ServiceProvider.GetProcessHandler().GetCurrentProcessId(),
                         ServerInfo: new ServerInfo("test-anywhere", Version: ProtocolVersion),
                         Capabilities: new ServerCapabilities(
                             new ServerTestingCapabilities(

src/Platform/Microsoft.Testing.Platform/Hosts/TestHostBuilder.cs

@@ -563,9 +563,8 @@ await LogTestHostCreatedAsync(
         await logger.LogDebugAsync($"Connected to named pipe '{pipeName}'");
 
         // Send the PID
-        using IProcess currentProcess = processHandler.GetCurrentProcess();
         await client.RequestReplyAsync<TestHostProcessPIDRequest, VoidResponse>(
-            new TestHostProcessPIDRequest(currentProcess.Id),
+            new TestHostProcessPIDRequest(processHandler.GetCurrentProcessId()),
             testApplicationCancellationTokenSource.CancellationToken);
         return client;
     }

src/Platform/Microsoft.Testing.Platform/Hosts/TestHostControllersTestHost.cs

@@ -76,8 +76,7 @@ protected override async Task<int> InternalRunAsync()
         IConfiguration configuration = ServiceProvider.GetConfiguration();
         try
         {
-            using IProcess currentProcess = process.GetCurrentProcess();
-            int currentPID = currentProcess.Id;
+            int currentPID = process.GetCurrentProcessId();
             string processIdString = currentPID.ToString(CultureInfo.InvariantCulture);
 
             ExecutableInfo executableInfo = testApplicationModuleInfo.GetCurrentExecutableInfo();

src/Platform/Microsoft.Testing.Platform/ServerMode/DotnetTest/DotnetTestConnection.cs

@@ -95,7 +95,7 @@ public async Task<bool> IsCompatibleProtocolAsync(string hostType)
         string supportedProtocolVersions = ProtocolConstants.Version;
         HandshakeMessage handshakeMessage = new(new Dictionary<byte, string>()
         {
-            { HandshakeMessagePropertyNames.PID, _processHandler.GetCurrentProcess().Id.ToString(CultureInfo.InvariantCulture) },
+            { HandshakeMessagePropertyNames.PID, _processHandler.GetCurrentProcessId().ToString(CultureInfo.InvariantCulture) },
             { HandshakeMessagePropertyNames.Architecture, RuntimeInformation.ProcessArchitecture.ToString() },
             { HandshakeMessagePropertyNames.Framework, RuntimeInformation.FrameworkDescription },
             { HandshakeMessagePropertyNames.OS, RuntimeInformation.OSDescription },

src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/PassiveNode.cs

@@ -62,7 +62,7 @@ public async Task<bool> ConnectAsync()
 
         var requestMessage = (RequestMessage)message;
         var responseObject = new InitializeResponseArgs(
-                        ProcessId: _processHandler.GetCurrentProcess().Id,
+                        ProcessId: _processHandler.GetCurrentProcessId(),
                         ServerInfo: new ServerInfo("test-anywhere", Version: ServerTestHost.ProtocolVersion),
                         Capabilities: new ServerCapabilities(
                             new ServerTestingCapabilities(

src/Platform/Microsoft.Testing.Platform/Services/CurrentTestApplicationModuleInfo.cs

@@ -94,8 +94,7 @@
     }
 #else
     {
-        using IProcess currentProcess = process.GetCurrentProcess();
-        return currentProcess.MainModule.FileName;
+        return process.GetCurrentProcessFileName();
     }
 #endif