From ca66c27cf645e9e34bd0d2365d0fe8628740ff63 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Wed, 10 Jul 2024 19:09:55 -0400 Subject: [PATCH] Workaround --- .../SdkDirectoryWorkloadManifestProvider.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs index 22a7c18d3b47..2aca0c68dbd5 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs @@ -123,6 +123,7 @@ public void RefreshWorkloadManifests() _installStateFilePath = null; _useManifestsFromInstallState = true; var availableWorkloadSets = GetAvailableWorkloadSets(_sdkVersionBand); + var workloadSets80100 = GetAvailableWorkloadSets(new SdkFeatureBand("8.0.100")); bool TryGetWorkloadSet(string workloadSetVersion, out WorkloadSet? workloadSet) { @@ -142,6 +143,13 @@ bool TryGetWorkloadSet(string workloadSetVersion, out WorkloadSet? workloadSet) } } + // The baseline workload sets were merged with a fixed 8.0.100 feature band. That means they will always be here + // regardless of where they would otherwise belong. This is a workaround for that. + if (workloadSets80100.TryGetValue(workloadSetVersion, out workloadSet)) + { + return true; + } + workloadSet = null; return false; }