From 26322e6385a6122550bb956f176b7b5344622d93 Mon Sep 17 00:00:00 2001
From: Paul Kilgo <paulkilgo@gmail.com>
Date: Sat, 16 Oct 2021 14:46:50 -0700
Subject: [PATCH 1/3] Use pid to determine program if one is not configured for
 local attach

This makes the "program" configuration optional for local attach cases.
The configured program is always preferred if it is defined.
---
 src/OpenDebugAD7/AD7DebugSession.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/OpenDebugAD7/AD7DebugSession.cs b/src/OpenDebugAD7/AD7DebugSession.cs
index f0b08d439..bc393acb3 100644
--- a/src/OpenDebugAD7/AD7DebugSession.cs
+++ b/src/OpenDebugAD7/AD7DebugSession.cs
@@ -1135,6 +1135,10 @@ protected override void HandleAttachRequestAsync(IRequestResponder<AttachArgumen
             SetCommonDebugSettings(responder.Arguments.ConfigurationProperties);
 
             string program = responder.Arguments.ConfigurationProperties.GetValueAsString("program");
+            if (isLocal && program == null)
+            {
+                program = Process.GetProcessById(pid).MainModule.FileName;
+            }
             string executable = null;
             bool success = false;
             try

From 7f729b4bfd2266539fdedd869122dd742ba0d032 Mon Sep 17 00:00:00 2001
From: Paul Kilgo <paulkilgo@gmail.com>
Date: Mon, 1 Nov 2021 20:16:56 -0700
Subject: [PATCH 2/3] Check for null or whitespace for program value

Co-authored-by: Andrew Wang <waan@microsoft.com>
---
 src/OpenDebugAD7/AD7DebugSession.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenDebugAD7/AD7DebugSession.cs b/src/OpenDebugAD7/AD7DebugSession.cs
index bc393acb3..dbe143f0e 100644
--- a/src/OpenDebugAD7/AD7DebugSession.cs
+++ b/src/OpenDebugAD7/AD7DebugSession.cs
@@ -1135,7 +1135,7 @@ protected override void HandleAttachRequestAsync(IRequestResponder<AttachArgumen
             SetCommonDebugSettings(responder.Arguments.ConfigurationProperties);
 
             string program = responder.Arguments.ConfigurationProperties.GetValueAsString("program");
-            if (isLocal && program == null)
+            if (isLocal && string.IsNullOrWhiteSpace(program))
             {
                 program = Process.GetProcessById(pid).MainModule.FileName;
             }

From 5f11efea425369a9f83f028d8847d2bee955d892 Mon Sep 17 00:00:00 2001
From: Paul Kilgo <paulkilgo@gmail.com>
Date: Mon, 1 Nov 2021 20:26:09 -0700
Subject: [PATCH 3/3] Set "program" in ConfigurationProperties if not set by
 user

---
 src/OpenDebugAD7/AD7DebugSession.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/OpenDebugAD7/AD7DebugSession.cs b/src/OpenDebugAD7/AD7DebugSession.cs
index dbe143f0e..b9324be2d 100644
--- a/src/OpenDebugAD7/AD7DebugSession.cs
+++ b/src/OpenDebugAD7/AD7DebugSession.cs
@@ -1138,6 +1138,7 @@ protected override void HandleAttachRequestAsync(IRequestResponder<AttachArgumen
             if (isLocal && string.IsNullOrWhiteSpace(program))
             {
                 program = Process.GetProcessById(pid).MainModule.FileName;
+                responder.Arguments.ConfigurationProperties["program"] = program;
             }
             string executable = null;
             bool success = false;