提交 2f1c8961 编写于 作者: J Jared Parsons

Remove work around for double writes

The previous change corrects the last of the double writes.  Can now
remove the work around.

closes #15163
上级 c8cdf49d
......@@ -94,11 +94,6 @@ private void ProcessCopyingFileFrom(string text, string prefix, string infix)
var source = text.Substring(prefixLength, split - prefixLength);
var destination = text.Substring(split + toLength, text.Length - 2 - split - toLength);
if (IgnoreDestinationTemporarily(destination))
{
return;
}
List<string> list;
if (!_copyMap.TryGetValue(destination, out list))
{
......@@ -108,41 +103,5 @@ private void ProcessCopyingFileFrom(string text, string prefix, string infix)
list.Add(source);
}
/// <summary>
/// Presently our build has a series of bad double writes. Until we have completely fixed these
/// scenarios we will suppress the error.
///
/// https://github.com/dotnet/roslyn/issues/15163
/// </summary>
private static bool IgnoreDestinationTemporarily(string destinationPath)
{
var fileName = Path.GetFileName(destinationPath);
var parentDirName = Path.GetFileName(Path.GetDirectoryName(destinationPath));
if (FilePathComparer.Equals(parentDirName, "VisualStudioTest.Next"))
{
return
FilePathComparer.Equals(fileName, "Microsoft.VisualStudio.CoreUtility.dll") ||
FilePathComparer.Equals(fileName, "Microsoft.VisualStudio.Language.Intellisense.dll") ||
FilePathComparer.Equals(fileName, "Microsoft.VisualStudio.Text.Data.dll") ||
FilePathComparer.Equals(fileName, "Microsoft.VisualStudio.Text.Logic.dll") ||
FilePathComparer.Equals(fileName, "Microsoft.VisualStudio.Text.UI.dll") ||
FilePathComparer.Equals(fileName, "Microsoft.VisualStudio.Text.UI.Wpf.dll");
}
if (FilePathComparer.Equals(parentDirName, "VisualStudioSetup.Next"))
{
return
FilePathComparer.Equals(fileName, "Microsoft.VisualStudio.CoreUtility.dll") ||
FilePathComparer.Equals(fileName, "Microsoft.VisualStudio.Shell.15.0.dll") ||
FilePathComparer.Equals(fileName, "Microsoft.VisualStudio.Shell.Framework.dll") ||
FilePathComparer.Equals(fileName, "Microsoft.VisualStudio.Text.Data.dll") ||
FilePathComparer.Equals(fileName, "Microsoft.VisualStudio.Text.Logic.dll") ||
FilePathComparer.Equals(fileName, "Microsoft.VisualStudio.Text.UI.dll") ||
FilePathComparer.Equals(fileName, "Microsoft.VisualStudio.Text.UI.Wpf.dll");
}
return false;
}
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册