Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -635,8 +635,7 @@ internal static int CountActiveNodesWithMode(NodeMode nodeMode)

private static (string expectedProcessName, IList<Process> nodeProcesses) GetPossibleRunningNodes(NodeMode? expectedNodeMode)
{
string msbuildLocation = Constants.MSBuildExecutableName;
var expectedProcessName = Path.GetFileNameWithoutExtension(CurrentHost.GetCurrentHost() ?? msbuildLocation);
var expectedProcessName = Constants.MSBuildAppName;

Process[] processes;
try
Expand All @@ -651,7 +650,6 @@ private static (string expectedProcessName, IList<Process> nodeProcesses) GetPos
if (expectedNodeMode.HasValue && ChangeWaves.AreFeaturesEnabled(ChangeWaves.Wave18_5))
{
List<Process> filteredProcesses = [];
bool isDotnetProcess = expectedProcessName.Equals(Path.GetFileNameWithoutExtension(Constants.DotnetProcessName), StringComparison.OrdinalIgnoreCase);

foreach (var process in processes)
{
Expand All @@ -668,11 +666,6 @@ private static (string expectedProcessName, IList<Process> nodeProcesses) GetPos
continue;
}

if (isDotnetProcess && !commandLine.Contains("MSBuild.dll", StringComparison.OrdinalIgnoreCase))
{
continue;
}

NodeMode? processNodeMode = NodeModeHelper.ExtractFromCommandLine(commandLine);
if (processNodeMode.HasValue && processNodeMode.Value == expectedNodeMode.Value)
{
Expand Down