Skip to content

AttachVS PR comments fixed #3201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nohwnd merged 2 commits into from
Nov 29, 2021
Merged

AttachVS PR comments fixed #3201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05cf3c9
AttachVS PR comments fixed
nohwnd Nov 29, 2021
a506148
Fix namespace
nohwnd Nov 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 13 additions & 25 deletions src/AttachVS/AttachVs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
using System;
using System.Diagnostics;
using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices.ComTypes;
using System.Threading;

namespace Nohwnd.AttachVS
namespace Microsoft.TestPlatform.AttachVS
{
internal class DebuggerUtility
{
Expand All @@ -24,9 +23,7 @@ internal static bool AttachVSToProcess(int? pid, int? vsPid)
}
var process = Process.GetProcessById(pid.Value);
Trace($"Using pid: {pid} to get parent VS.");
var vs = GetVsFromPid(vsPid != null
? Process.GetProcessById(vsPid.Value)
: Process.GetProcessById(process.Id));
var vs = GetVsFromPid(Process.GetProcessById(vsPid ?? process.Id));

if (vs != null)
{
Expand Down Expand Up @@ -117,6 +114,7 @@ private static bool AttachVs(Process vs, int pid)
object dte, dbg, lps;
runninObjectTable.GetObject(moniker[0], out dte);

// The COM object can be busy, we retry few times, hoping that it won't be busy next time.
for (var i = 0; i < 10; i++)
{
try
Expand All @@ -138,7 +136,7 @@ private static bool AttachVs(Process vs, int pid)
}
catch (COMException ex)
{
Trace($"ComException: Tetrying in 250ms.\n{ex}");
Trace($"ComException: Retrying in 250ms.\n{ex}");
Thread.Sleep(250);
}
}
Expand Down Expand Up @@ -199,24 +197,17 @@ private static bool IsVsOrNull(Process process)
return true;
}

try
var isVs = process.ProcessName.Equals("devenv", StringComparison.InvariantCultureIgnoreCase);
if (isVs)
{
var isVs = process.ProcessName.Equals("devenv", StringComparison.InvariantCultureIgnoreCase);
if (isVs)
{
Trace($"Process {process.ProcessName} ({process.Id}) is VS.");
}
else
{
Trace($"Process {process.ProcessName} ({process.Id}) is not VS.");
}

return isVs;
Trace($"Process {process.ProcessName} ({process.Id}) is VS.");
}
catch
else
{
return true;
Trace($"Process {process.ProcessName} ({process.Id}) is not VS.");
}

return isVs;
}

private static bool IsCorrectParent(Process currentProcess, Process parent)
Expand All @@ -229,12 +220,9 @@ private static bool IsCorrectParent(Process currentProcess, Process parent)
{
return true;
}
else
{
Trace($"Process {parent.ProcessName} ({parent.Id}) is not a valid parent because it started after the current process.");
return false;
}

Trace($"Process {parent.ProcessName} ({parent.Id}) is not a valid parent because it started after the current process.");
return false;
}
catch
{
Expand Down
2 changes: 1 addition & 1 deletion src/AttachVS/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.Linq;

namespace Nohwnd.AttachVS.Console
namespace Microsoft.TestPlatform.AttachVS
{
internal class Program
{
Expand Down