Add option to include/exclude previews to workload search version com…

…mand Fixes #43890 (#45149)
dotnet · Nov 26, 2024 · 5e1bc3c · 5e1bc3c
2 parents e0e804a + 6ba0aa9
commit 5e1bc3c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/src/Cli/dotnet/commands/dotnet-workload/search/WorkloadSearchVersionsCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/search/WorkloadSearchVersionsCommand.cs
@@ -26,6 +26,7 @@ internal class WorkloadSearchVersionsCommand : WorkloadCommandBase
         private readonly string _workloadSetOutputFormat;
         private readonly FileBasedInstaller _installer;
         private readonly string _workloadVersion;
+        private readonly bool _includePreviews;
 
         public WorkloadSearchVersionsCommand(
             ParseResult result,
@@ -64,6 +65,10 @@ public WorkloadSearchVersionsCommand(
                 );
 
             _workloadVersion = result.GetValue(WorkloadSearchVersionsCommandParser.WorkloadVersionArgument);
+
+            _includePreviews = result.HasOption(WorkloadSearchVersionsCommandParser.IncludePreviewsOption) ?
+                result.GetValue(WorkloadSearchVersionsCommandParser.IncludePreviewsOption) :
+                new SdkFeatureBand(_sdkVersion).IsPrerelease;
         }
 
         public override int Execute()
@@ -76,7 +81,7 @@ public override int Execute()
                 List<string> versions;
                 try
                 {
-                    versions = PackageDownloader.GetLatestPackageVersions(packageId, _numberOfWorkloadSetsToTake, packageSourceLocation: null, includePreview: !string.IsNullOrWhiteSpace(_sdkVersion.Prerelease))
+                    versions = PackageDownloader.GetLatestPackageVersions(packageId, _numberOfWorkloadSetsToTake, packageSourceLocation: null, includePreview: _includePreviews)
                         .GetAwaiter().GetResult()
                         .Select(version => WorkloadSetVersion.FromWorkloadSetPackageVersion(featureBand, version.ToString()))
                         .ToList();

diff --git a/src/Cli/dotnet/commands/dotnet-workload/search/WorkloadSearchVersionsCommandParser.cs b/src/Cli/dotnet/commands/dotnet-workload/search/WorkloadSearchVersionsCommandParser.cs
@@ -23,6 +23,8 @@ internal static class WorkloadSearchVersionsCommandParser
             Description = LocalizableStrings.FormatOptionDescription
         };
 
+        public static readonly CliOption<bool> IncludePreviewsOption = new("--include-previews");
+
         private static readonly CliCommand Command = ConstructCommand();
 
         public static CliCommand GetCommand()
@@ -36,6 +38,7 @@ private static CliCommand ConstructCommand()
             command.Arguments.Add(WorkloadVersionArgument);
             command.Options.Add(FormatOption);
             command.Options.Add(TakeOption);
+            command.Options.Add(IncludePreviewsOption);
 
             TakeOption.Validators.Add(optionResult =>
             {

diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkFeatureBand.cs b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkFeatureBand.cs
@@ -29,6 +29,7 @@ public SdkFeatureBand(ReleaseVersion version)
             }
         }
 
+        public bool IsPrerelease => !string.IsNullOrEmpty(_featureBand.Prerelease);
         public int Major => _featureBand.Major;
         public int Minor => _featureBand.Minor;