Merge pull request LykosAI#1171 from ionite34/downmerg-from-public-again

Downmerg from public again

Author: mohnjiles

StabilityMatrix.Avalonia/Helpers/WindowsPrerequisiteHelper.cs

@@ -334,10 +334,10 @@ public async Task InstallPackageRequirements(
             await InstallTkinterIfNecessary(PyInstallationManager.Python_3_10_11, progress);
         }
 
-        // if (prerequisites.Contains(PackagePrerequisite.VcBuildTools))
-        // {
-        //     await InstallVcBuildToolsIfNecessary(progress);
-        // }
+        if (prerequisites.Contains(PackagePrerequisite.VcBuildTools))
+        {
+            await InstallVcBuildToolsIfNecessary(progress);
+        }
     }
 
     public async Task InstallAllIfNecessary(IProgress<ProgressReport>? progress = null)
@@ -782,7 +782,18 @@ await downloadService.DownloadToFileAsync(
 
         var process = ProcessRunner.StartAnsiProcess(
             VcBuildToolsDownloadPath,
-            "--quiet --wait --add Microsoft.VisualStudio.Workload.VCTools;includeRecommended;includeOptional",
+            "--quiet --wait " +
+            "--add Microsoft.VisualStudio.Workload.VCTools " +
+            "--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 " +
+            "--add Microsoft.VisualStudio.Component.VC.CMake.Project " +
+            "--add Microsoft.VisualStudio.Component.VC.Llvm.Clang " +
+            "--add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang " +
+            "--add Microsoft.VisualStudio.Component.Windows10SDK.18362 " +
+            "--add Microsoft.VisualStudio.Component.Windows10SDK.19041 " +
+            "--add Microsoft.VisualStudio.Component.Windows10SDK.20348 " +
+            "--add Microsoft.VisualStudio.Component.Windows11SDK.22000 " +
+            "--add Microsoft.VisualStudio.Component.Windows11SDK.22621 " +
+            "--add Microsoft.VisualStudio.Component.Windows11SDK.26100",
             outputDataReceived: output =>
                 progress?.Report(
                     new ProgressReport(

StabilityMatrix.Core/Models/Packages/ComfyZluda.cs

@@ -39,6 +39,7 @@ IPyInstallationManager pyInstallationManager
         "Windows-only version of ComfyUI which uses ZLUDA to get better performance with AMD GPUs.";
     public override string Disclaimer =>
         "Prerequisite install may require admin privileges and a reboot. "
+        + "Visual Studio Build Tools for C++ Desktop Development will be installed automatically. "
         + "AMD GPUs under the RX 6800 may require additional manual setup.";
     public override string LaunchCommand => Path.Combine("zluda", "zluda.exe");
     public override IEnumerable<TorchIndex> AvailableTorchIndices => [TorchIndex.Zluda];
@@ -52,11 +53,11 @@ IPyInstallationManager pyInstallationManager
     public override bool ShouldIgnoreReleases => true;
 
     public override IEnumerable<PackagePrerequisite> Prerequisites =>
-        base.Prerequisites.Concat([PackagePrerequisite.HipSdk]);
+        base.Prerequisites.Concat([PackagePrerequisite.HipSdk, PackagePrerequisite.VcBuildTools]);
 
     public override bool InstallRequiresAdmin => true;
     public override string AdminRequiredReason =>
-        "HIP SDK installation and (if applicable) ROCmLibs patching requires admin privileges for accessing the HIP SDK files in the Program Files directory.";
+        "HIP SDK and Visual Studio Build Tools installation, as well as (if applicable) ROCmLibs patching, require admin privileges for accessing files in the Program Files directory. This may take several minutes to complete.";
 
     public override async Task InstallPackage(
         string installLocation,