Fix installing and updating workloads with global.json-specified workload set version

Author: dsplaisted

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

@@ -141,7 +141,6 @@ public override int Execute()
                         Reporter.WriteLine(string.Format(LocalizableStrings.WorkloadAlreadyInstalled, string.Join(" ", previouslyInstalledWorkloads)).Yellow());
                     }
                     workloadIds = workloadIds.Concat(installedWorkloads).Distinct();
-                    workloadIds = WriteSDKInstallRecordsForVSWorkloads(workloadIds);
 
                     if (!_skipManifestUpdate)
                     {
@@ -168,6 +167,10 @@ public override int Execute()
                             }
                             UpdateWorkloadManifests(context, offlineCache);
                         }
+
+                        //   This depends on getting the available workloads, so it needs to run after manifests hae potentially been installed
+                        workloadIds = WriteSDKInstallRecordsForVSWorkloads(workloadIds);
+
                         _workloadInstaller.InstallWorkloads(workloadIds, _sdkFeatureBand, context, offlineCache);
 
                         //  Write workload installation records

src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs

@@ -94,13 +94,17 @@ public override int Execute()
                 Reporter.WriteLine();
                 try
                 {
-                    var workloadIds = WriteSDKInstallRecordsForVSWorkloads(GetUpdatableWorkloads());
+                    IEnumerable<WorkloadId> workloadIds = Enumerable.Empty<WorkloadId>();                    
 
                     DirectoryPath? offlineCache = string.IsNullOrWhiteSpace(_fromCacheOption) ? null : new DirectoryPath(_fromCacheOption);
 
                     RunInNewTransaction(context =>
                     {
                         UpdateWorkloadManifests(context, offlineCache);
+
+                        //   This depends on getting the available workloads, so it needs to run after manifests hae potentially been installed
+                        workloadIds = WriteSDKInstallRecordsForVSWorkloads(GetUpdatableWorkloads());
+
                         _workloadInstaller.InstallWorkloads(workloadIds, _sdkFeatureBand, context, offlineCache);
                     });