Fix combinations of workload install, global install state, and global.json or command-line specified workload set version

Author: dsplaisted

src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs

@@ -147,6 +147,8 @@ public override int Execute()
                     {
                         var installStateFilePath = Path.Combine(WorkloadInstallType.GetInstallStateFolder(_sdkFeatureBand, _dotnetPath), "default.json");
                         if (string.IsNullOrWhiteSpace(_fromRollbackDefinition) &&
+                            !SpecifiedWorkloadSetVersionOnCommandLine &&
+                            !SpecifiedWorkloadSetVersionInGlobalJson &&
                             InstallStateContents.FromPath(installStateFilePath) is InstallStateContents installState &&
                             (installState.Manifests != null || installState.WorkloadVersion != null))
                         {

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

@@ -247,7 +247,6 @@ void SetupWorkloadSetInGlobalJson(out WorkloadSet originalRollback)
             result.StdErr.Should().Contain(versionToUpdateTo);
 
             AddNuGetSource(@"C:\SdkTesting\workloadsets", SdkTestingDirectory);
-            
         }
 
         [Fact]
@@ -294,6 +293,52 @@ public void InstallWithVersionAndSkipManifestUpdate()
                 .And.HaveStdErrContaining("--sdk-version");
         }
 
+        [Fact]
+        public void InstallWithVersionWhenPinned()
+        {
+            InstallSdk();
+
+            AddNuGetSource(@"c:\SdkTesting\WorkloadSets");
+
+            string originalVersion = GetWorkloadVersion();
+            originalVersion.Should().NotBe("8.0.300-preview.0.24178.1");
+
+            VM.CreateRunCommand("dotnet", "workload", "update", "--version", "8.0.300-preview.0.24178.1")
+                .Execute().Should().Pass();
+
+            GetWorkloadVersion().Should().Be("8.0.300-preview.0.24178.1");
+
+            VM.CreateRunCommand("dotnet", "workload", "install", "aspire", "--version", "8.0.300-preview.0.24217.2")
+                .Execute().Should().Pass();
+
+            GetWorkloadVersion().Should().Be("8.0.300-preview.0.24217.2");
+        }
+
+        [Fact]
+        public void InstallWithGlobalJsonWhenPinned()
+        {
+            SetupWorkloadSetInGlobalJson(out var originalRollback);
+
+            //AddNuGetSource(@"c:\SdkTesting\WorkloadSets");
+
+            string originalVersion = GetWorkloadVersion();
+            originalVersion.Should().NotBe("8.0.300-preview.0.24178.1");
+
+            VM.CreateRunCommand("dotnet", "workload", "update", "--version", "8.0.300-preview.0.24178.1")
+                .Execute().Should().Pass();
+
+            GetWorkloadVersion().Should().Be("8.0.300-preview.0.24178.1");
+
+            VM.CreateRunCommand("dotnet", "workload", "install", "aspire")
+                .WithWorkingDirectory(SdkTestingDirectory)
+                .Execute().Should().Pass();
+
+            GetWorkloadVersion(SdkTestingDirectory).Should().Be("8.0.300-preview.0.24217.2");
+
+            GetRollback(SdkTestingDirectory).Should().NotBe(originalRollback);
+
+        }
+
         [Fact]
         public void UpdateShouldNotPinWorkloadSet()
         {