Skip to content

Commit 82a738f

Browse files
Forgindgithub-actions
authored andcommitted
Also prio workload sets if requested
1 parent e88bb43 commit 82a738f

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ bool TryGetWorkloadSet(string workloadSetVersion, out WorkloadSet? workloadSet)
198198
{
199199
var maxWorkloadSetVersion = availableWorkloadSets.Keys.Aggregate((s1, s2) => VersionCompare(s1, s2) >= 0 ? s1 : s2);
200200
_workloadSet = availableWorkloadSets[maxWorkloadSetVersion.ToString()];
201+
_useManifestsFromInstallState = false;
201202
}
202203
}
203204

test/Microsoft.NET.Sdk.WorkloadManifestReader.Tests/SdkDirectoryWorkloadManifestProviderTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public void ItShouldPrioritizeInstallStateOverWorkloadSetUnlessSpecified(bool pr
6161
var sdkDirectoryWorkloadManifestProvider
6262
= new SdkDirectoryWorkloadManifestProvider(sdkRootPath: _fakeDotnetRootDirectory, sdkVersion: "8.0.400", userProfileDir: null, globalJsonPath: null);
6363

64-
sdkDirectoryWorkloadManifestProvider.GetManifests().Single().Should().NotBeNull();
64+
sdkDirectoryWorkloadManifestProvider.GetManifests().Single().ManifestVersion.Should().Be(preferWorkloadSet ? "11.0.2" : "11.0.6");
6565

6666
Directory.Delete(Path.Combine(_manifestRoot, "8.0.400"), recursive: true);
6767
}

0 commit comments

Comments
 (0)