When suggesting workloads, only consider available workloads

mhutch · mhutch · commit 11d15c2b97b0 · 2021-07-01T22:46:23.000-04:00
diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadResolver.cs b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadResolver.cs
@@ -437,7 +437,8 @@ public IEnumerable<WorkloadPackId> GetPacksInWorkload(WorkloadId workloadId)
         public ISet<WorkloadInfo> GetWorkloadSuggestionForMissingPacks(IList<WorkloadPackId> packIds)
         {
             var requestedPacks = new HashSet<WorkloadPackId>(packIds);
-            var expandedWorkloads = _workloads.Select(w => (w.Value.workload.Id, new HashSet<WorkloadPackId>(GetPacksInWorkload(w.Value.workload, w.Value.manifest).Select(p => p.packId))));
+            var availableWorkloads = GetAvailableWorkloadDefinitions();
+            var expandedWorkloads = availableWorkloads.Select(w => (w.workload.Id, new HashSet<WorkloadPackId>(GetPacksInWorkload(w.workload, w.manifest).Select(p => p.packId))));
             var finder = new WorkloadSuggestionFinder(GetInstalledPacks(), requestedPacks, expandedWorkloads);
 
             return new HashSet<WorkloadInfo>

Original file line number	Diff line number	Diff line change
`@@ -437,7 +437,8 @@ public IEnumerable<WorkloadPackId> GetPacksInWorkload(WorkloadId workloadId)`
`437`	`437`	`public ISet<WorkloadInfo> GetWorkloadSuggestionForMissingPacks(IList<WorkloadPackId> packIds)`
`438`	`438`	`{`
`439`	`439`	`var requestedPacks = new HashSet<WorkloadPackId>(packIds);`
`440`		`- var expandedWorkloads = _workloads.Select(w => (w.Value.workload.Id, new HashSet<WorkloadPackId>(GetPacksInWorkload(w.Value.workload, w.Value.manifest).Select(p => p.packId))));`
	`440`	`+ var availableWorkloads = GetAvailableWorkloadDefinitions();`
	`441`	`+ var expandedWorkloads = availableWorkloads.Select(w => (w.workload.Id, new HashSet<WorkloadPackId>(GetPacksInWorkload(w.workload, w.manifest).Select(p => p.packId))));`
`441`	`442`	`var finder = new WorkloadSuggestionFinder(GetInstalledPacks(), requestedPacks, expandedWorkloads);`
`442`	`443`
`443`	`444`	`return new HashSet<WorkloadInfo>`