Imported Upstream version 5.14.0.103

Former-commit-id: 486bd2a74e710211687006431be86dd9c935761f
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-05-25 08:39:07 +00:00
parent c30f196079
commit c34b058d3e
50 changed files with 281 additions and 138 deletions

View File

@ -12,6 +12,7 @@ namespace Microsoft.NET.Build.Tasks
internal class LockFileCache
{
private IBuildEngine4 _buildEngine;
private static string s_taskObjectPrefix = null;
public LockFileCache(IBuildEngine4 buildEngine)
{
@ -45,7 +46,11 @@ namespace Microsoft.NET.Build.Tasks
private static string GetTaskObjectKey(string lockFilePath)
{
return $"{nameof(LockFileCache)}:{lockFilePath}";
if (s_taskObjectPrefix == null)
{
s_taskObjectPrefix = typeof(LockFile).AssemblyQualifiedName;
}
return $"{s_taskObjectPrefix}:{lockFilePath}";
}
private LockFile LoadLockFile(string path)