Use workload sets by default for all workload operations (#45936)

Forgind · web-flow · commit 9801e2d59b38 · 2025-02-06T15:47:36.000-08:00
diff --git a/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs b/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs
@@ -171,7 +171,7 @@ static InstallStateContents GetCurrentInstallState(SdkFeatureBand sdkFeatureBand
 
         public static bool ShouldUseWorkloadSetMode(SdkFeatureBand sdkFeatureBand, string dotnetDir)
         {
-            return GetCurrentInstallState(sdkFeatureBand, dotnetDir).UseWorkloadSets ?? false;
+            return GetCurrentInstallState(sdkFeatureBand, dotnetDir).ShouldUseWorkloadSets();
         }
 
         protected void UpdateWorkloadManifests(WorkloadHistoryRecorder recorder, ITransactionContext context, DirectoryPath? offlineCache)
diff --git a/src/Cli/dotnet/commands/dotnet-workload/InstallStateContents.cs b/src/Cli/dotnet/commands/dotnet-workload/InstallStateContents.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.ComponentModel;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
@@ -11,6 +12,7 @@ namespace Microsoft.DotNet.Workloads.Workload
     internal class InstallStateContents
     {
         [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+        [EditorBrowsable(EditorBrowsableState.Never)]
         public bool? UseWorkloadSets { get; set; }
 
         [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
@@ -40,6 +42,8 @@ public override string ToString()
         {
             return JsonSerializer.Serialize<InstallStateContents>(this, s_options);
         }
+
+        public bool ShouldUseWorkloadSets() => UseWorkloadSets ?? true;
     }
 }
 
diff --git a/src/Cli/dotnet/commands/dotnet-workload/WorkloadCommandParser.cs b/src/Cli/dotnet/commands/dotnet-workload/WorkloadCommandParser.cs
@@ -53,8 +53,8 @@ internal static void ShowWorkloadsInfo(ParseResult parseResult = null, WorkloadI
 
             void WriteUpdateModeAndAnyError(string indent = "")
             {
-                var useWorkloadSets = InstallStateContents.FromPath(Path.Combine(WorkloadInstallType.GetInstallStateFolder(workloadInfoHelper._currentSdkFeatureBand, workloadInfoHelper.UserLocalPath), "default.json")).UseWorkloadSets;
-                var workloadSetsString = useWorkloadSets == true ? "workload sets" : "loose manifests";
+                var useWorkloadSets = InstallStateContents.FromPath(Path.Combine(WorkloadInstallType.GetInstallStateFolder(workloadInfoHelper._currentSdkFeatureBand, workloadInfoHelper.UserLocalPath), "default.json")).ShouldUseWorkloadSets();
+                var workloadSetsString = useWorkloadSets ? "workload sets" : "loose manifests";
                 reporter.WriteLine(indent + string.Format(CommonStrings.WorkloadManifestInstallationConfiguration, workloadSetsString));
 
                 if (!versionInfo.IsInstalled)
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs
@@ -128,7 +128,7 @@ public static bool ShouldUseWorkloadSetMode(SdkFeatureBand sdkFeatureBand, strin
         {
             string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(sdkFeatureBand, dotnetDir), "default.json");
             var installStateContents = File.Exists(path) ? InstallStateContents.FromString(File.ReadAllText(path)) : new InstallStateContents();
-            return installStateContents.UseWorkloadSets ?? false;
+            return installStateContents.ShouldUseWorkloadSets();
         }
 
         private void WriteUpdatableWorkloadsFile()
diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/WorkloadListCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/list/WorkloadListCommand.cs
@@ -78,7 +78,7 @@ public override int Execute()
                 Reporter.WriteLine();
                 var shouldPrintTable = versionInfo.IsInstalled;
                 var shouldShowWorkloadSetVersion = versionInfo.GlobalJsonPath is not null ||
-                    InstallStateContents.FromPath(Path.Combine(WorkloadInstallType.GetInstallStateFolder(_workloadListHelper._currentSdkFeatureBand, _workloadListHelper.UserLocalPath), "default.json")).UseWorkloadSets == true;
+                    InstallStateContents.FromPath(Path.Combine(WorkloadInstallType.GetInstallStateFolder(_workloadListHelper._currentSdkFeatureBand, _workloadListHelper.UserLocalPath), "default.json")).ShouldUseWorkloadSets();
 
                 if (shouldShowWorkloadSetVersion)
                 {
diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs
@@ -199,7 +199,7 @@ bool TryGetWorkloadSet(string workloadSetVersion, out WorkloadSet? workloadSet)
                 _manifestsFromInstallState = installState.Manifests is null ? null : WorkloadSet.FromDictionaryForJson(installState.Manifests!, _sdkVersionBand);
             }
 
-            if (workloadSet == null && installState.UseWorkloadSets == true && availableWorkloadSets.Any())
+            if (workloadSet == null && installState.ShouldUseWorkloadSets() && availableWorkloadSets.Any())
             {
                 var maxWorkloadSetVersion = availableWorkloadSets.Keys.Aggregate((s1, s2) => VersionCompare(s1, s2) >= 0 ? s1 : s2);
                 workloadSet = availableWorkloadSets[maxWorkloadSetVersion.ToString()];
@@ -278,7 +278,7 @@ public WorkloadVersionInfo GetWorkloadVersion()
                     sb.Append(bytes[b].ToString("x2"));
                 }
 
-                return new WorkloadVersionInfo($"{_sdkVersionBand.ToStringWithoutPrerelease()}-manifests.{sb}", IsInstalled: true, WorkloadSetsEnabledWithoutWorkloadSet: installState.UseWorkloadSets == true);
+                return new WorkloadVersionInfo($"{_sdkVersionBand.ToStringWithoutPrerelease()}-manifests.{sb}", IsInstalled: true, WorkloadSetsEnabledWithoutWorkloadSet: installState.ShouldUseWorkloadSets());
             }
         }
 
diff --git a/test/Microsoft.NET.Sdk.WorkloadManifestReader.Tests/SdkDirectoryWorkloadManifestProviderTests.cs b/test/Microsoft.NET.Sdk.WorkloadManifestReader.Tests/SdkDirectoryWorkloadManifestProviderTests.cs
@@ -738,6 +738,7 @@ public void ItUsesWorkloadManifestFromInstallState()
             CreateMockInstallState("8.0.200",
                 """
                 {
+                    "useWorkloadSets": false,
                     "manifests": {
                         "ios": "11.0.1/8.0.100",
                     }
@@ -776,9 +777,10 @@ public void ItFailsIfManifestFromInstallStateIsNotInstalled()
             var installStatePath = CreateMockInstallState("8.0.200",
                 """
                 {
-                    "manifests": {
+                    "useWorkloadSets": false,
+                     "manifests": {
                         "ios": "12.0.2/8.0.200",
-                    }
+                    },
                 }
                 """);
 
diff --git a/test/dotnet-workload-install.Tests/GivenDotnetWorkloadInstall.cs b/test/dotnet-workload-install.Tests/GivenDotnetWorkloadInstall.cs
@@ -9,6 +9,7 @@
 using Microsoft.DotNet.Cli.NuGetPackageDownloader;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.DotNet.Workloads.Workload;
+using Microsoft.DotNet.Workloads.Workload.Config;
 using Microsoft.DotNet.Workloads.Workload.Install;
 using Microsoft.DotNet.Workloads.Workload.List;
 using Microsoft.Extensions.EnvironmentAbstractions;
@@ -67,7 +68,7 @@ public void GivenWorkloadInstallItCanInstallPacks(bool userLocal, string sdkVers
         {
             var mockWorkloadIds = new WorkloadId[] { new WorkloadId("xamarin-android") };
             var parseResult = Parser.Instance.Parse(new string[] { "dotnet", "workload", "install", "xamarin-android", "--skip-manifest-update" });
-            (_, var installManager, var installer, _, _, _) = GetTestInstallers(parseResult, userLocal, sdkVersion, installedFeatureBand: sdkVersion);
+            (_, var installManager, var installer, _, _, _, _) = GetTestInstallers(parseResult, userLocal, sdkVersion, installedFeatureBand: sdkVersion);
 
             installManager.Execute()
                 .Should().Be(0);
@@ -88,7 +89,7 @@ public void GivenWorkloadInstallItCanRollBackPackInstallation(bool userLocal, st
         {
             var mockWorkloadIds = new WorkloadId[] { new WorkloadId("xamarin-android"), new WorkloadId("xamarin-android-build") };
             var parseResult = Parser.Instance.Parse(new string[] { "dotnet", "workload", "install", "xamarin-android", "xamarin-android-build", "--skip-manifest-update" });
-            (_, var installManager, var installer, var workloadResolver, _, _) = GetTestInstallers(parseResult, userLocal, sdkVersion, failingWorkload: "xamarin-android-build", installedFeatureBand: sdkVersion);
+            (_, var installManager, var installer, var workloadResolver, _, _, _) = GetTestInstallers(parseResult, userLocal, sdkVersion, failingWorkload: "xamarin-android-build", installedFeatureBand: sdkVersion);
 
             var exceptionThrown = Assert.Throws<GracefulException>(() => installManager.Execute());
             exceptionThrown.Message.Should().Contain("Failing workload: xamarin-android-build");
@@ -128,8 +129,9 @@ public void GivenWorkloadInstallOnFailingRollbackItDisplaysTopLevelError()
         public void GivenWorkloadInstallItCanUpdateAdvertisingManifests(bool userLocal, string sdkVersion)
         {
             var parseResult = Parser.Instance.Parse(new string[] { "dotnet", "workload", "install", "xamarin-android" });
-            (_, var installManager, var installer, _, var manifestUpdater, _) = GetTestInstallers(parseResult, userLocal, sdkVersion, installedFeatureBand: sdkVersion);
+            (_, var installManager, var installer, _, var manifestUpdater, _, var resolverFactory) = GetTestInstallers(parseResult, userLocal, sdkVersion, installedFeatureBand: sdkVersion);
 
+            new WorkloadConfigCommand(Parser.Instance.Parse(["dotnet", "workload", "config", "--update-mode", "manifests"]), workloadResolverFactory: resolverFactory).Execute().Should().Be(0);
             installManager.Execute()
                 .Should().Be(0);
 
@@ -216,9 +218,10 @@ public void GivenWorkloadInstallItCanUpdateInstalledManifests(bool userLocal, st
                     {
                         new(new ManifestVersionUpdate(new ManifestId("mock-manifest"), new ManifestVersion("2.0.0"), featureBand.ToString()), null),
                     };
-            (_, var installManager, var installer, _, _, _) =
+            (_, var installManager, var installer, _, _, _, var resolverFactory) =
                 GetTestInstallers(parseResult, userLocal, sdkVersion, manifestUpdates: manifestsToUpdate, installedFeatureBand: sdkVersion);
 
+            new WorkloadConfigCommand(Parser.Instance.Parse(["dotnet", "workload", "config", "--update-mode", "manifests"]), workloadResolverFactory: resolverFactory).Execute().Should().Be(0);
             installManager.Execute()
                 .Should().Be(0);
 
@@ -247,9 +250,10 @@ public void GivenWorkloadInstallFromCacheItInstallsCachedManifest(bool userLocal
             {
                 "dotnet", "workload", "install", "xamarin-android", "--from-cache", cachePath
             });
-            (_, var installManager, var installer, _, _, _) = GetTestInstallers(parseResult, userLocal, sdkVersion,
+            (_, var installManager, var installer, _, _, _, var resolverFactory) = GetTestInstallers(parseResult, userLocal, sdkVersion,
                 tempDirManifestPath: _manifestPath, manifestUpdates: manifestsToUpdate, installedFeatureBand: sdkVersion);
 
+            new WorkloadConfigCommand(Parser.Instance.Parse(["dotnet", "workload", "config", "--update-mode", "manifests"]), workloadResolverFactory: resolverFactory).Execute().Should().Be(0);
             installManager.Execute();
 
             installer.InstalledManifests[0].manifestUpdate.ManifestId.Should().Be(manifestsToUpdate[0].ManifestUpdate.ManifestId);
@@ -267,7 +271,7 @@ public void GivenWorkloadInstallItCanDownloadToOfflineCache(bool userLocal, stri
         {
             var cachePath = Path.Combine(_testAssetsManager.CreateTestDirectory(identifier: AppendForUserLocal("mockCache_", userLocal) + sdkVersion).Path, "mockCachePath");
             var parseResult = Parser.Instance.Parse(new string[] { "dotnet", "workload", "install", "xamarin-android", "--download-to-cache", cachePath });
-            (_, var installManager, _, _, var manifestUpdater, var packageDownloader) = GetTestInstallers(parseResult, userLocal, sdkVersion, tempDirManifestPath: _manifestPath, installedFeatureBand: sdkVersion);
+            (_, var installManager, _, _, var manifestUpdater, var packageDownloader, _) = GetTestInstallers(parseResult, userLocal, sdkVersion, tempDirManifestPath: _manifestPath, installedFeatureBand: sdkVersion);
 
             installManager.Execute();
 
@@ -291,7 +295,7 @@ public void GivenWorkloadInstallItCanInstallFromOfflineCache(bool userLocal, str
             var mockWorkloadIds = new WorkloadId[] { new WorkloadId("xamarin-android") };
             var cachePath = "mockCachePath";
             var parseResult = Parser.Instance.Parse(new string[] { "dotnet", "workload", "install", "xamarin-android", "--from-cache", cachePath });
-            (_, var installManager, var installer, _, _, var nugetDownloader) = GetTestInstallers(parseResult, userLocal, sdkVersion, installedFeatureBand: sdkVersion);
+            (_, var installManager, var installer, _, _, var nugetDownloader, _) = GetTestInstallers(parseResult, userLocal, sdkVersion, installedFeatureBand: sdkVersion);
 
             installManager.Execute();
 
@@ -311,7 +315,7 @@ public void GivenWorkloadInstallItCanInstallFromOfflineCache(bool userLocal, str
         public void GivenWorkloadInstallItPrintsDownloadUrls(bool userLocal, string sdkVersion)
         {
             var parseResult = Parser.Instance.Parse(new string[] { "dotnet", "workload", "install", "xamarin-android", "--print-download-link-only" });
-            (_, var installManager, _, _, _, _) = GetTestInstallers(parseResult, userLocal, sdkVersion, tempDirManifestPath: _manifestPath, installedFeatureBand: sdkVersion);
+            (_, var installManager, _, _, _, _, _) = GetTestInstallers(parseResult, userLocal, sdkVersion, tempDirManifestPath: _manifestPath, installedFeatureBand: sdkVersion);
 
             installManager.Execute();
 
@@ -455,7 +459,7 @@ static void CreateFile(string path)
                 .Should().BeEquivalentTo(new string[] { prev7FormattedFeatureVersion, rc1FormattedFeatureVersion });
         }
 
-        private (string, WorkloadInstallCommand, MockPackWorkloadInstaller, IWorkloadResolver, MockWorkloadManifestUpdater, MockNuGetPackageDownloader) GetTestInstallers(
+        private (string, WorkloadInstallCommand, MockPackWorkloadInstaller, IWorkloadResolver, MockWorkloadManifestUpdater, MockNuGetPackageDownloader, IWorkloadResolverFactory) GetTestInstallers(
                 ParseResult parseResult,
                 bool userLocal,
                 string sdkVersion,
@@ -491,7 +495,7 @@ static void CreateFile(string path)
                 nugetPackageDownloader: nugetDownloader,
                 workloadManifestUpdater: manifestUpdater);
 
-            return (testDirectory, installManager, installer, workloadResolver, manifestUpdater, nugetDownloader);
+            return (testDirectory, installManager, installer, workloadResolver, manifestUpdater, nugetDownloader, workloadResolverFactory);
         }
 
         [Fact]
@@ -627,7 +631,7 @@ public void ShowManifestUpdatesWhenVerbosityIsDetailedOrDiagnostic(string verbos
                     {
                         new(new ManifestVersionUpdate(new ManifestId("mock-manifest"), new ManifestVersion("2.0.0"), sdkFeatureBand), null),
                     };
-            (_, var installManager, _, _, _, _) =
+            (_, var installManager, _, _, _, _, _) =
                 GetTestInstallers(parseResult, true, sdkFeatureBand, manifestUpdates: manifestsToUpdate);
 
             installManager.Execute().Should().Be(0);
diff --git a/test/dotnet-workload-install.Tests/GivenWorkloadManifestUpdater.cs b/test/dotnet-workload-install.Tests/GivenWorkloadManifestUpdater.cs
diff --git a/test/dotnet-workload-list.Tests/GivenDotnetWorkloadList.cs b/test/dotnet-workload-list.Tests/GivenDotnetWorkloadList.cs
diff --git a/test/dotnet-workload-update.Tests/GivenDotnetWorkloadUpdate.cs b/test/dotnet-workload-update.Tests/GivenDotnetWorkloadUpdate.cs

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ static InstallStateContents GetCurrentInstallState(SdkFeatureBand sdkFeatureBand`
`171`	`171`
`172`	`172`	`public static bool ShouldUseWorkloadSetMode(SdkFeatureBand sdkFeatureBand, string dotnetDir)`
`173`	`173`	`{`
`174`		`- return GetCurrentInstallState(sdkFeatureBand, dotnetDir).UseWorkloadSets ?? false;`
	`174`	`+ return GetCurrentInstallState(sdkFeatureBand, dotnetDir).ShouldUseWorkloadSets();`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`protected void UpdateWorkloadManifests(WorkloadHistoryRecorder recorder, ITransactionContext context, DirectoryPath? offlineCache)`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`// Licensed to the .NET Foundation under one or more agreements.`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`
	`4`	`+using System.ComponentModel;`
`4`	`5`	`using System.Text.Json;`
`5`	`6`	`using System.Text.Json.Serialization;`
`6`	`7`
`@@ -11,6 +12,7 @@ namespace Microsoft.DotNet.Workloads.Workload`
`11`	`12`	`internal class InstallStateContents`
`12`	`13`	`{`
`13`	`14`	`[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]`
	`15`	`+ [EditorBrowsable(EditorBrowsableState.Never)]`
`14`	`16`	`public bool? UseWorkloadSets { get; set; }`
`15`	`17`
`16`	`18`	`[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]`
`@@ -40,6 +42,8 @@ public override string ToString()`
`40`	`42`	`{`
`41`	`43`	`return JsonSerializer.Serialize<InstallStateContents>(this, s_options);`
`42`	`44`	`}`
	`45`	`+`
	`46`	`+ public bool ShouldUseWorkloadSets() => UseWorkloadSets ?? true;`
`43`	`47`	`}`
`44`	`48`	`}`
`45`	`49`
Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,8 @@ internal static void ShowWorkloadsInfo(ParseResult parseResult = null, WorkloadI`
`53`	`53`
`54`	`54`	`void WriteUpdateModeAndAnyError(string indent = "")`
`55`	`55`	`{`
`56`		`- var useWorkloadSets = InstallStateContents.FromPath(Path.Combine(WorkloadInstallType.GetInstallStateFolder(workloadInfoHelper._currentSdkFeatureBand, workloadInfoHelper.UserLocalPath), "default.json")).UseWorkloadSets;`
`57`		`- var workloadSetsString = useWorkloadSets == true ? "workload sets" : "loose manifests";`
	`56`	`+ var useWorkloadSets = InstallStateContents.FromPath(Path.Combine(WorkloadInstallType.GetInstallStateFolder(workloadInfoHelper._currentSdkFeatureBand, workloadInfoHelper.UserLocalPath), "default.json")).ShouldUseWorkloadSets();`
	`57`	`+ var workloadSetsString = useWorkloadSets ? "workload sets" : "loose manifests";`
`58`	`58`	`reporter.WriteLine(indent + string.Format(CommonStrings.WorkloadManifestInstallationConfiguration, workloadSetsString));`
`59`	`59`
`60`	`60`	`if (!versionInfo.IsInstalled)`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ public static bool ShouldUseWorkloadSetMode(SdkFeatureBand sdkFeatureBand, strin`
`128`	`128`	`{`
`129`	`129`	`string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(sdkFeatureBand, dotnetDir), "default.json");`
`130`	`130`	`var installStateContents = File.Exists(path) ? InstallStateContents.FromString(File.ReadAllText(path)) : new InstallStateContents();`
`131`		`- return installStateContents.UseWorkloadSets ?? false;`
	`131`	`+ return installStateContents.ShouldUseWorkloadSets();`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`private void WriteUpdatableWorkloadsFile()`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public override int Execute()`
`78`	`78`	`Reporter.WriteLine();`
`79`	`79`	`var shouldPrintTable = versionInfo.IsInstalled;`
`80`	`80`	`var shouldShowWorkloadSetVersion = versionInfo.GlobalJsonPath is not null \|\|`
`81`		`- InstallStateContents.FromPath(Path.Combine(WorkloadInstallType.GetInstallStateFolder(_workloadListHelper._currentSdkFeatureBand, _workloadListHelper.UserLocalPath), "default.json")).UseWorkloadSets == true;`
	`81`	`+ InstallStateContents.FromPath(Path.Combine(WorkloadInstallType.GetInstallStateFolder(_workloadListHelper._currentSdkFeatureBand, _workloadListHelper.UserLocalPath), "default.json")).ShouldUseWorkloadSets();`
`82`	`82`
`83`	`83`	`if (shouldShowWorkloadSetVersion)`
`84`	`84`	`{`
Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ bool TryGetWorkloadSet(string workloadSetVersion, out WorkloadSet? workloadSet)`
`199`	`199`	`_manifestsFromInstallState = installState.Manifests is null ? null : WorkloadSet.FromDictionaryForJson(installState.Manifests!, _sdkVersionBand);`
`200`	`200`	`}`
`201`	`201`
`202`		`- if (workloadSet == null && installState.UseWorkloadSets == true && availableWorkloadSets.Any())`
	`202`	`+ if (workloadSet == null && installState.ShouldUseWorkloadSets() && availableWorkloadSets.Any())`
`203`	`203`	`{`
`204`	`204`	`var maxWorkloadSetVersion = availableWorkloadSets.Keys.Aggregate((s1, s2) => VersionCompare(s1, s2) >= 0 ? s1 : s2);`
`205`	`205`	`workloadSet = availableWorkloadSets[maxWorkloadSetVersion.ToString()];`
`@@ -278,7 +278,7 @@ public WorkloadVersionInfo GetWorkloadVersion()`
`278`	`278`	`sb.Append(bytes[b].ToString("x2"));`
`279`	`279`	`}`
`280`	`280`
`281`		`- return new WorkloadVersionInfo($"{_sdkVersionBand.ToStringWithoutPrerelease()}-manifests.{sb}", IsInstalled: true, WorkloadSetsEnabledWithoutWorkloadSet: installState.UseWorkloadSets == true);`
	`281`	`+ return new WorkloadVersionInfo($"{_sdkVersionBand.ToStringWithoutPrerelease()}-manifests.{sb}", IsInstalled: true, WorkloadSetsEnabledWithoutWorkloadSet: installState.ShouldUseWorkloadSets());`
`282`	`282`	`}`
`283`	`283`	`}`
`284`	`284`
Original file line number	Diff line number	Diff line change
`@@ -738,6 +738,7 @@ public void ItUsesWorkloadManifestFromInstallState()`
`738`	`738`	`CreateMockInstallState("8.0.200",`
`739`	`739`	`"""`
`740`	`740`	`{`
	`741`	`+ "useWorkloadSets": false,`
`741`	`742`	`"manifests": {`
`742`	`743`	`"ios": "11.0.1/8.0.100",`
`743`	`744`	`}`
`@@ -776,9 +777,10 @@ public void ItFailsIfManifestFromInstallStateIsNotInstalled()`
`776`	`777`	`var installStatePath = CreateMockInstallState("8.0.200",`
`777`	`778`	`"""`
`778`	`779`	`{`
`779`		`- "manifests": {`
	`780`	`+ "useWorkloadSets": false,`
	`781`	`+ "manifests": {`
`780`	`782`	`"ios": "12.0.2/8.0.200",`
`781`		`- }`
	`783`	`+ },`
`782`	`784`	`}`
`783`	`785`	`""");`
`784`	`786`