Refactor to expose dependencies on NodeContext and avoid NodeContextRepository lookups

src/AzureBlobStorage/MSBuildCacheAzureBlobStoragePlugin.cs

@@ -36,7 +36,6 @@ public sealed class MSBuildCacheAzureBlobStoragePlugin : MSBuildCachePluginBase<
     protected override async Task<ICacheClient> CreateCacheClientAsync(PluginLoggerBase logger, CancellationToken cancellationToken)
     {
         if (Settings == null
-            || NodeContextRepository == null
             || FingerprintFactory == null
             || ContentHasher == null
             || NugetPackageRoot == null)
@@ -94,7 +93,6 @@ protected override async Task<ICacheClient> CreateCacheClientAsync(PluginLoggerB
             ContentHasher,
             Settings.RepoRoot,
             NugetPackageRoot,
-            NodeContextRepository,
             GetFileRealizationMode,
             Settings.MaxConcurrentCacheContentOperations,
             Settings.AsyncCachePublishing,

src/AzurePipelines/MSBuildCacheAzurePipelinesPlugin.cs

@@ -26,7 +26,6 @@ public sealed class MSBuildCacheAzurePipelinesPlugin : MSBuildCachePluginBase
     protected override async Task<ICacheClient> CreateCacheClientAsync(PluginLoggerBase logger, CancellationToken cancellationToken)
     {
         if (Settings == null
-            || NodeContextRepository == null
             || FingerprintFactory == null
             || ContentHasher == null
             || NugetPackageRoot == null)
@@ -58,7 +57,6 @@ protected override async Task<ICacheClient> CreateCacheClientAsync(PluginLoggerB
             Settings.CacheUniverse,
             Settings.RepoRoot,
             NugetPackageRoot,
-            NodeContextRepository,
             GetFileRealizationMode,
             Settings.MaxConcurrentCacheContentOperations,
             Settings.RemoteCacheIsReadOnly,

src/AzurePipelines/PipelineCachingCacheClient.cs

@@ -101,13 +101,12 @@ public PipelineCachingCacheClient(
         string universe,
         string repoRoot,
         string nugetPackageRoot,
-        INodeContextRepository nodeContextRepository,
         Func<string, FileRealizationMode> getFileRealizationMode,
         int maxConcurrentCacheContentOperations,
         bool remoteCacheIsReadOnly,
         bool enableAsyncPublishing,
         bool enableAsyncMaterialization)
-        : base(rootContext, fingerprintFactory, hasher, repoRoot, nugetPackageRoot, nodeContextRepository, getFileRealizationMode, localCache, localCAS, maxConcurrentCacheContentOperations, enableAsyncPublishing, enableAsyncMaterialization)
+        : base(rootContext, fingerprintFactory, hasher, repoRoot, nugetPackageRoot, getFileRealizationMode, localCache, localCAS, maxConcurrentCacheContentOperations, enableAsyncPublishing, enableAsyncMaterialization)
     {
         _remoteCacheIsReadOnly = remoteCacheIsReadOnly;
         _universe = $"pccc-{(int)hasher.Info.HashType}-{InternalSeed}-" + (string.IsNullOrEmpty(universe) ? "DEFAULT" : universe);

src/Common/Caching/CacheClient.cs

@@ -20,7 +20,6 @@
 using BuildXL.Cache.ContentStore.UtilitiesCore;
 using BuildXL.Cache.MemoizationStore.Interfaces.Caches;
 using BuildXL.Cache.MemoizationStore.Interfaces.Sessions;
-using Microsoft.Build.Graph;
 using Microsoft.CopyOnWrite;
 using Microsoft.MSBuildCache.Fingerprinting;
 using Microsoft.MSBuildCache.Hashing;
@@ -40,7 +39,6 @@ public abstract class CacheClient : ICacheClient
     private readonly ICopyOnWriteFilesystem _copyOnWriteFilesystem = CopyOnWriteFilesystemFactory.GetInstance();
     private readonly IContentHasher _hasher;
     private readonly IFingerprintFactory _fingerprintFactory;
-    private readonly INodeContextRepository _nodeContextRepository;
     private readonly bool _enableAsyncMaterialization;
     private readonly ICache _localCache;
     private readonly string _nugetPackageRoot;
@@ -52,7 +50,6 @@ protected CacheClient(
         IContentHasher hasher,
         string repoRoot,
         string nugetPackageRoot,
-        INodeContextRepository nodeContextRepository,
         Func<string, FileRealizationMode> getFileRealizationMode,
         ICache localCache,
         IContentSession localCas,
@@ -66,7 +63,6 @@ protected CacheClient(
         EmptySelector = new(hasher.Info.EmptyHash, EmptySelectorOutput);
         RepoRoot = repoRoot;
         _nugetPackageRoot = nugetPackageRoot;
-        _nodeContextRepository = nodeContextRepository;
         _localCache = localCache;
         LocalCacheSession = localCas;
         EnableAsyncPublishing = enableAsyncPublishing;
@@ -356,10 +352,9 @@ await AddNodeAsync(
         // On cache miss ensure all dependencies are materialized before returning to MSBuild so that MSBuild's execution will actually work.
         if (_enableAsyncMaterialization && result.NodeBuildResult == null)
         {
-            foreach (ProjectGraphNode dependencyNode in nodeContext.Node.ProjectReferences)
+            foreach (NodeContext dependency in nodeContext.Dependencies)
             {
-                if (_nodeContextRepository.TryGetNodeContext(dependencyNode.ProjectInstance, out NodeContext? dependency)
-                    && _materializationTasks.TryGetValue(dependency, out Task? dependencyMaterializationTask))
+                if (_materializationTasks.TryGetValue(dependency, out Task? dependencyMaterializationTask))
                 {
                     await dependencyMaterializationTask;
                 }

src/Common/Caching/CasCacheClient.cs

@@ -48,12 +48,11 @@ public CasCacheClient(
         IContentHasher hasher,
         string repoRoot,
         string nugetPackageRoot,
-        INodeContextRepository nodeContextRepository,
         Func<string, FileRealizationMode> getFileRealizationMode,
         int maxConcurrentCacheContentOperations,
         bool enableAsyncPublishing,
         bool enableAsyncMaterialization)
-        : base(rootContext, fingerprintFactory, hasher, repoRoot, nugetPackageRoot, nodeContextRepository, getFileRealizationMode, localCache, localCacheSession, maxConcurrentCacheContentOperations, enableAsyncPublishing, enableAsyncMaterialization)
+        : base(rootContext, fingerprintFactory, hasher, repoRoot, nugetPackageRoot, getFileRealizationMode, localCache, localCacheSession, maxConcurrentCacheContentOperations, enableAsyncPublishing, enableAsyncMaterialization)
     {
         ICacheSession cacheSession;
         if (remoteCache == null)

src/Common/Fingerprinting/FingerprintFactory.cs

@@ -11,7 +11,6 @@
 using BuildXL.Cache.ContentStore.Hashing;
 using BuildXL.Cache.ContentStore.Interfaces.Extensions;
 using DotNet.Globbing;
-using Microsoft.Build.Graph;
 using Microsoft.MSBuildCache.Hashing;
 
 namespace Microsoft.MSBuildCache.Fingerprinting;
@@ -31,26 +30,20 @@ public sealed class FingerprintFactory : IFingerprintFactory
     private readonly ConcurrentDictionary<string, byte[]> _stringHashCache = new(StringComparer.OrdinalIgnoreCase);
     private readonly IContentHasher _contentHasher;
     private readonly IInputHasher _inputHasher;
-    private readonly INodeContextRepository _nodeContextRepository;
     private readonly List<FingerprintEntry> _pluginSettingsFingerprintEntries;
     private readonly PluginSettings _pluginSettings;
     private readonly PathNormalizer _pathNormalizer;
-    private readonly string _repoRoot;
 
     public FingerprintFactory(
         IContentHasher contentHasher,
         IInputHasher inputHasher,
-        INodeContextRepository nodeRepository,
         PluginSettings pluginSettings,
-        PathNormalizer pathNormalizer,
-        string repoRoot)
+        PathNormalizer pathNormalizer)
     {
         _contentHasher = contentHasher;
         _inputHasher = inputHasher;
-        _nodeContextRepository = nodeRepository;
         _pluginSettings = pluginSettings;
         _pathNormalizer = pathNormalizer;
-        _repoRoot = repoRoot;
 
         _pluginSettingsFingerprintEntries = new List<FingerprintEntry>()
         {
@@ -100,14 +93,14 @@ void AddSettingToFingerprint(IReadOnlyCollection<Glob>? patterns, string setting
                 entries.Add(CreateFingerprintEntry($"Targets: {targetList}"));
 
                 // If the VC toolchain changes, the node should rebuild.
-                string vcToolsVersion = nodeContext.Node.ProjectInstance.GetPropertyValue("VCToolsVersion");
+                string vcToolsVersion = nodeContext.ProjectInstance.GetPropertyValue("VCToolsVersion");
                 if (!string.IsNullOrEmpty(vcToolsVersion))
                 {
                     entries.Add(CreateFingerprintEntry($"VCToolsVersion: {vcToolsVersion}"));
                 }
 
                 // If the .NET SDK changes, the node should rebuild.
-                string dotnetSdkVersion = nodeContext.Node.ProjectInstance.GetPropertyValue("NETCoreSdkVersion");
+                string dotnetSdkVersion = nodeContext.ProjectInstance.GetPropertyValue("NETCoreSdkVersion");
                 if (!string.IsNullOrEmpty(dotnetSdkVersion))
                 {
                     entries.Add(CreateFingerprintEntry($"DotnetSdkVersion: {dotnetSdkVersion}"));
@@ -118,18 +111,8 @@ void AddSettingToFingerprint(IReadOnlyCollection<Glob>? patterns, string setting
 
                 // Gather dependencies. Dependencies are sorted for a consistent hash ordering.
                 SortedDictionary<string, NodeContext> dependencies = new(StringComparer.Ordinal);
-                foreach (ProjectGraphNode dependencyNode in nodeContext.Node.ProjectReferences)
+                foreach (NodeContext dependency in nodeContext.Dependencies)
                 {
-                    if (!_nodeContextRepository.TryGetNodeContext(dependencyNode.ProjectInstance, out NodeContext? dependency))
-                    {
-                        if (!dependencyNode.ProjectInstance.FullPath.IsUnderDirectory(_repoRoot))
-                        {
-                            continue;
-                        }
-
-                        return null;
-                    }
-
                     if (dependency.BuildResult == null)
                     {
                         // The dependency has not been built, or at least not successfully