Fix some cases of pinning / unpinning workload version in global install state

Author: dsplaisted

src/Cli/dotnet/commands/InstallingWorkloadCommand.cs

@@ -165,7 +165,7 @@ protected void UpdateWorkloadManifests(ITransactionContext context, DirectoryPat
             }
 
             string resolvedWorkloadSetVersion = _workloadSetVersionFromGlobalJson ??_workloadSetVersionFromCommandLine;
-            if (string.IsNullOrWhiteSpace(resolvedWorkloadSetVersion) && !UseRollback /* TODO && !specifiedWorkloadManifestsInInstallState */)
+            if (string.IsNullOrWhiteSpace(resolvedWorkloadSetVersion) && !UseRollback)
             {
                 _workloadManifestUpdater.UpdateAdvertisingManifestsAsync(_includePreviews, updateUsingWorkloadSets, offlineCache).Wait();
                 if (updateUsingWorkloadSets)
@@ -207,15 +207,17 @@ protected void UpdateWorkloadManifests(ITransactionContext context, DirectoryPat
                         {
                             _workloadInstaller.SaveInstallStateManifestVersions(_sdkFeatureBand, GetInstallStateContents(manifestsToUpdate));
                         }
+                        else if (SpecifiedWorkloadSetVersionOnCommandLine)
+                        {
+                            _workloadInstaller.AdjustWorkloadSetInInstallState(_sdkFeatureBand, resolvedWorkloadSetVersion);
+                        }
                         else if (this is WorkloadUpdateCommand)
                         {
-                            //  For workload updates, if you don't specify a rollback file, then we should update to a new version of the manifests or workload set, and
+                            //  For workload updates, if you don't specify a rollback file, or a workload version then we should update to a new version of the manifests or workload set, and
                             //  should remove the install state that pins to the other version
-                            //  TODO: Do we need to do something similar if the workload set version is pinned in the install state?
                             _workloadInstaller.RemoveManifestsFromInstallState(_sdkFeatureBand);
+                            _workloadInstaller.AdjustWorkloadSetInInstallState(_sdkFeatureBand, null);
                         }
-
-                        _workloadInstaller.AdjustWorkloadSetInInstallState(_sdkFeatureBand, resolvedWorkloadSetVersion);
                     }
 
                     _workloadResolver.RefreshWorkloadManifests();

src/Tests/dotnet-MsiInstallation.Tests/WorkloadSetTests.cs

@@ -81,9 +81,7 @@ public void UpdateWithWorkloadSets()
             AddNuGetSource(@"c:\SdkTesting\WorkloadSets");
 
             VM.CreateRunCommand("dotnet", "workload", "update")
-                .Execute()
-                .Should()
-                .Pass();
+                .Execute().Should().Pass();
 
             var newRollback = GetRollback();
 
@@ -174,7 +172,6 @@ public void UpdateToUnavailableWorkloadSetVersion()
             GetWorkloadVersion().Should().Be(workloadVersionBeforeUpdate);
         }
 
-
         [Fact]
         public void UpdateWorkloadSetWithoutAvailableManifests()
         {
@@ -220,6 +217,32 @@ public void UpdateToWorkloadSetVersionWithManifestsNotAvailable()
             GetWorkloadVersion().Should().Be(workloadVersionBeforeUpdate);
         }
 
+        [Fact]
+        public void UpdateShouldNotPinWorkloadSet()
+        {
+            InstallSdk();
+            UpdateAndSwitchToWorkloadSetMode(out _, out _);
+
+            AddNuGetSource(@"c:\SdkTesting\WorkloadSets");
+
+            //  Rename latest workload set so it won't be installed
+            VM.CreateRunCommand("cmd", "/c", "ren", @$"c:\SdkTesting\WorkloadSets\Microsoft.NET.Workloads.8.0.300-preview.*.24217.2.nupkg", $"Microsoft.NET.Workloads.8.0.300-preview.*.24217.2.bak")
+                .Execute().Should().Pass();
+
+            VM.CreateRunCommand("dotnet", "workload", "update")
+                .Execute().Should().Pass();
+
+            GetWorkloadVersion().Should().Be("8.0.300-preview.0.24178.1");
+
+            //  Bring latest workload set version back, so installing workload should update to it
+            VM.CreateRunCommand("cmd", "/c", "ren", @$"c:\SdkTesting\WorkloadSets\Microsoft.NET.Workloads.8.0.300-preview.*.24217.2.bak", $"Microsoft.NET.Workloads.8.0.300-preview.*.24217.2.nupkg")
+                .Execute().Should().Pass();
+
+            InstallWorkload("aspire", skipManifestUpdate: false);
+
+            GetWorkloadVersion().Should().Be("8.0.300-preview.0.24217.2");
+        }
+
         [Fact]
         public void WorkloadSetInstallationRecordIsWrittenCorrectly()
         {