Skip to content

Commit d66780b

Browse files
committed
Fix bad merge
1 parent c948f12 commit d66780b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ bool TryGetWorkloadSet(string workloadSetVersion, out WorkloadSet? workloadSet)
198198
_manifestsFromInstallState = installState.Manifests is null ? null : WorkloadSet.FromDictionaryForJson(installState.Manifests!, _sdkVersionBand);
199199
}
200200

201-
if (_workloadSet == null && installState.UseWorkloadSets == true && availableWorkloadSets.Any())
201+
if (workloadSet == null && installState.UseWorkloadSets == true && availableWorkloadSets.Any())
202202
{
203203
var maxWorkloadSetVersion = availableWorkloadSets.Keys.Aggregate((s1, s2) => VersionCompare(s1, s2) >= 0 ? s1 : s2);
204204
workloadSet = availableWorkloadSets[maxWorkloadSetVersion.ToString()];

0 commit comments

Comments
 (0)