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
9 changes: 2 additions & 7 deletions src/Tasks/AssemblyDependency/ReferenceTable.cs
Original file line number Diff line number Diff line change
Expand Up @@ -741,13 +741,8 @@ out string redistName
/// </summary>
private static void TryConvertToAssemblyName(string itemSpec, string fusionName, ref AssemblyNameExtension assemblyName)
{
// FusionName is used if available.
string finalName = fusionName;
if (string.IsNullOrEmpty(finalName))
{
// Otherwise, its itemSpec.
finalName = itemSpec;
}
// FusionName is used if available; otherwise use itemspec.
string finalName = string.IsNullOrEmpty(fusionName) ? itemSpec : fusionName;

bool pathRooted = false;
try
Expand Down
9 changes: 2 additions & 7 deletions src/Tasks/SystemState.cs
Original file line number Diff line number Diff line change
Expand Up @@ -366,15 +366,10 @@ private FileState ComputeFileStateFromCachesAndDisk(string path)
// If the process-wide cache contains an up-to-date FileState, always use it
if (isProcessFileStateUpToDate)
{
// If a FileState already exists in this instance cache due to deserialization, remove it;
// another instance has taken responsibility for serialization, and keeping this would
// result in multiple instances serializing the same data to disk
if (isCachedInInstance)
if (!isInstanceFileStateUpToDate)
{
instanceLocalFileStateCache.Remove(path);
isDirty = true;
instanceLocalFileStateCache[path] = cachedProcessFileState;
}

return cachedProcessFileState;
}
// If the process-wide FileState is missing or out-of-date, this instance owns serialization;
Copy link
Member

Choose a reason for hiding this comment

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

nit: Is this comment still valid?

Expand Down