Redesign the subset feature (#34663)

* Redesign subset feature and remove subsetcategory

Implement proposal from https://github.com/dotnet/runtime/issues/34403.
Remove subsetcategory and allow all subsets to specified via the -subset
switch.

1 files changed, 2 insertions, 20 deletions

diff --git a/eng/build.ps1 b/eng/build.ps1
index 17c61ae492d..363c76645e8 100644
--- a/eng/build.ps1
+++ b/eng/build.ps1
@@ -11,8 +11,7 @@ Param(
   [string]$testscope,
   [switch]$testnobuild,
   [string[]][Alias('a')]$arch = @([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()),
-  [string]$subsetCategory,
-  [string]$subset,
+  [Parameter(Position=0)][string]$subset,
   [ValidateSet("Debug","Release","Checked")][string]$runtimeConfiguration,
   [ValidateSet("Debug","Release")][string]$librariesConfiguration,
   [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
@@ -21,7 +20,6 @@ Param(
 function Get-Help() {
   Write-Host "Common settings:"
   Write-Host "  -subset                   Build a subset, print available subsets with -subset help"
-  Write-Host "  -subsetCategory           Build a subsetCategory, print available subsetCategories with -subset help"
   Write-Host "  -vs                       Open the solution with VS for Test Explorer support. Path or solution name (ie -vs Microsoft.CSharp)"
   Write-Host "  -os                       Build operating system: Windows_NT or Unix"
   Write-Host "  -arch                     Build platform: x86, x64, arm or arm64 (short: -a). Pass a comma-separated list to build for multiple architectures."
@@ -61,8 +59,6 @@ if ($help -or (($null -ne $properties) -and ($properties.Contains('/help') -or $
   exit 0
 }
 
-$subsetCategory = $subsetCategory.ToLowerInvariant()
-
 # VS Test Explorer support for libraries
 if ($vs) {
   . $PSScriptRoot\common\tools.ps1
@@ -124,20 +120,6 @@ if (!$actionPassedIn) {
   $arguments = "-restore -build"
 }
 
-$solutionLeaf = if($properties.Length -gt 0) { $properties[0]; } else { $null }
-
-if ($null -ne $solutionLeaf) {
-  if (Test-Path $solutionLeaf) {
-    $properties[0] = "-projects $(Resolve-Path $solutionLeaf)"
-  }
-  else {
-    $dtb = Join-Path "$PSSCriptRoot\..\src\libraries" $solutionLeaf | Join-Path -ChildPath "$solutionLeaf.sln"
-    if (Test-Path $dtb) { 
-      $properties[0] = "-projects $(Resolve-Path $dtb)"
-    }
-  }
-}
-
 foreach ($argument in $PSBoundParameters.Keys)
 {
   switch($argument)
@@ -177,4 +159,4 @@ if ($failedBuilds.Count -ne 0) {
     exit 1
 }
 
-exit 0
+exit 0
\ No newline at end of file