Comments

Author: Forgind

src/Cli/dotnet/commands/dotnet-workload/restore/WorkloadRestoreCommand.cs

@@ -56,7 +56,7 @@ public override int Execute()
                 // If there's a workload set version specified in the global.json file, we need to make sure the workload set is installed before we try to discover workload ids.
                 if (!string.IsNullOrWhiteSpace(workloadSetVersionFromGlobalJson))
                 {
-                    if (creationResult.WorkloadResolver.GetWorkloadManifestProvider() is SdkDirectoryWorkloadManifestProvider provider && provider.WouldThrowException())
+                    if (creationResult.WorkloadResolver.GetWorkloadManifestProvider().WouldThrowException())
                     {
                         new WorkloadUpdateCommand(_result).Execute();
                     }

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

@@ -17,5 +17,7 @@ public interface IWorkloadManifestProvider
         string? GetWorkloadVersion();
 
         Dictionary<string, WorkloadSet> GetAvailableWorkloadSets();
+
+        bool WouldThrowException();
     }
 }

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

@@ -55,5 +55,6 @@ public IEnumerable<string> GetManifestDirectories()
         public string GetSdkFeatureBand() => _sdkVersionBand;
         public string? GetWorkloadVersion() => _sdkVersionBand.ToString() + ".2";
         public Dictionary<string, WorkloadSet> GetAvailableWorkloadSets() => new();
+        public bool WouldThrowException() => false;
     }
 }

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

@@ -779,6 +779,7 @@ public void RefreshWorkloadManifests() { }
             public IEnumerable<ReadableWorkloadManifest> GetManifests() => Enumerable.Empty<ReadableWorkloadManifest>();
             public string GetSdkFeatureBand() => _sdkFeatureBand;
             public string? GetWorkloadVersion() => _sdkFeatureBand.ToString() + ".2";
+            public bool WouldThrowException() => false;
         }
     }
 

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

@@ -41,6 +41,7 @@ public IEnumerable<ReadableWorkloadManifest> GetManifests()
         public string GetSdkFeatureBand() => "8.0.100";
         public Dictionary<string, WorkloadSet> GetAvailableWorkloadSets() => throw new NotImplementedException();
         public string? GetWorkloadVersion() => "8.0.100.2";
+        public bool WouldThrowException() => false;
     }
 
     internal class InMemoryFakeManifestProvider : IWorkloadManifestProvider, IEnumerable<(string id, string content)>
@@ -68,5 +69,6 @@ public IEnumerable<ReadableWorkloadManifest> GetManifests()
         public string GetSdkFeatureBand() => "8.0.100";
         public Dictionary<string, WorkloadSet> GetAvailableWorkloadSets() => throw new NotImplementedException();
         public string? GetWorkloadVersion() => "8.0.100.2";
+        public bool WouldThrowException() => false;
     }
 }

test/dotnet-MsiInstallation.Tests/WorkloadSetTests.cs

@@ -274,24 +274,16 @@ void SetupWorkloadSetInGlobalJson(out WorkloadSet originalRollback)
             AddNuGetSource(@"C:\SdkTesting\workloadsets", SdkTestingDirectory);
         }
 
-        [Fact]
-        public void UpdateWorkloadSetViaGlobalJson()
-        {
-            SetupWorkloadSetInGlobalJson(out var originalRollback);
-
-            VM.CreateRunCommand("dotnet", "workload", "update").WithWorkingDirectory(SdkTestingDirectory).Execute().Should().Pass();
-            GetRollback(SdkTestingDirectory).Should().NotBe(originalRollback);
-        }
-
-        [Fact]
-        public void InstallWorkloadSetViaGlobalJson()
+        [Theory]
+        [InlineData("restore")]
+        [InlineData("update")]
+        [InlineData("install")]
+        public void UseGlobalJsonToSpecifyWorkloadSet(string command)
         {
             SetupWorkloadSetInGlobalJson(out var originalRollback);
 
-            VM.CreateRunCommand("dotnet", "workload", "install", "aspire")
-                .WithWorkingDirectory(SdkTestingDirectory)
-                .Execute().Should().Pass();
-
+            string[] args = command.Equals("install") ? ["dotnet", "workload", "install", "aspire"] : ["dotnet", "workload", command];
+            VM.CreateRunCommand(args).WithWorkingDirectory(SdkTestingDirectory).Execute().Should().Pass();
             GetRollback(SdkTestingDirectory).Should().NotBe(originalRollback);
         }
 

test/dotnet-workload-install.Tests/MockManifestProvider.cs

@@ -49,5 +49,6 @@ public IEnumerable<ReadableWorkloadManifest> GetManifests()
 
         public string GetSdkFeatureBand() => SdkFeatureBand.ToString();
         public string GetWorkloadVersion() => SdkFeatureBand.ToString() + ".2";
+        public bool WouldThrowException() => false;
     }
 }