Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 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
2 changes: 0 additions & 2 deletions src/Shared/HybridDictionary.cs
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,6 @@ private void AddToOrUpdateList(List<KeyValuePair<TKey, TValue>> list, TKey key,
}

list.Add(new KeyValuePair<TKey, TValue>(key, value));
return;
}
else
{
Expand All @@ -694,7 +693,6 @@ private void AddToOrUpdateList(List<KeyValuePair<TKey, TValue>> list, TKey key,
}

_store = newDictionary;
return;
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/Shared/LogMessagePacketBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ internal void WriteToStream(INodePacketTranslator translator)
// Make sure the other side knows what sort of serialization is coming
translator.Translate(ref packetVersion);

bool eventCanSerializeItself = (methodInfo != null) ? true : false;
bool eventCanSerializeItself = methodInfo != null;
translator.Translate(ref eventCanSerializeItself);

if (eventCanSerializeItself)
Expand Down
5 changes: 1 addition & 4 deletions src/XMakeBuildEngine/BackEnd/BuildManager/BuildParameters.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1054,10 +1054,7 @@ private void FindMSBuildExe()
if (path != null && CheckMSBuildExeExistsAt(Path.Combine(path, "MSBuild.exe")))
{
_nodeExeLocation = Path.Combine(path, "MSBuild.exe");
}

// Well, we just can't find it. Maybe they will only build in-proc and won't need it...
return;
}
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is probably worthwile to keep the comment.

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ internal bool CreateNode(TaskHostContext hostContext, INodePacketFactory factory
return false;
}

CommunicationsUtilities.Trace("For a host context of {0}, spawning executable from {1}.", hostContext.ToString(), msbuildLocation ?? "MSBuild.exe");
CommunicationsUtilities.Trace("For a host context of {0}, spawning executable from {1}.", hostContext.ToString(), msbuildLocation);

// Make it here.
NodeContext context = GetNode
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1085,7 +1085,7 @@ public MetadataModifications Clone()
/// </summary>
public bool HasChanges
{
get { return _modifications.Count > 0 || _keepOnlySpecified == true; }
get { return _modifications.Count > 0 || _keepOnlySpecified; }
}

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -520,8 +520,6 @@ private async Task ProcessTargetStack(ITaskBuilder taskBuilder)
break;
}
}

return;
}

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,6 @@ internal async Task ExecuteTarget(ITaskBuilder taskBuilder, BuildRequestEntry re
DataCollection.CommentMarkProfile(8801, endTargetBuild);
}
#endif
return;
}

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ private async Task<WorkUnitResult> ExecuteTask(TaskExecutionMode mode, Lookup lo
// Only create a hash table if there are more than one bucket as this is the only time a property can be overridden
if (buckets.Count > 1)
{
lookupHash = lookupHash ?? new Dictionary<string, string>(MSBuildNameIgnoreCaseComparer.Default);
lookupHash = new Dictionary<string, string>(MSBuildNameIgnoreCaseComparer.Default);
}

WorkUnitResult aggregateResult = new WorkUnitResult();
Expand Down
5 changes: 1 addition & 4 deletions src/XMakeCommandLine/OutOfProcTaskHostNode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -728,9 +728,6 @@ private void OnLinkStatusChanged(INodeEndpoint endpoint, LinkStatus status)

case LinkStatus.Inactive:
break;

default:
break;
}
}

Expand Down Expand Up @@ -893,7 +890,7 @@ private void SetTaskHostEnvironment(IDictionary<string, string> environment)
{
if (_updateEnvironmentAndLog)
{
LogMessageFromResource(MessageImportance.Low, "ModifyingTaskHostEnvironmentVariable", variable, newValue ?? String.Empty, environmentValue ?? String.Empty);
LogMessageFromResource(MessageImportance.Low, "ModifyingTaskHostEnvironmentVariable", variable, newValue, environmentValue ?? String.Empty);
}

updatedEnvironment[variable] = newValue;
Expand Down