RI Develop to Main

.github/scripts/Build-ChangedSamples.ps1

@@ -22,7 +22,7 @@ foreach ($file in $ChangedFiles) {
     $filename = Split-Path $file -Leaf
 
     # Files that can affect how every sample is built should trigger a full build
-    if ($filename -eq "Build-AllSamples.ps1" -or $filename -eq "Build-Sample.ps1" -or $filename -eq "Build-SampleSet.ps1" -or $filename -eq "exclusions.csv" -or $filename -eq "Directory.Build.props" -or $filename -eq "packages.config") {
+    if ($filename -eq "Build-Samples.ps1" -or $filename -eq "exclusions.csv" -or $filename -eq "Directory.Build.props" -or $filename -eq "packages.config") {
         $buildAll = $true
     }
     if ($dir -like "$root\.github\scripts" -or $dir -like "$root\.github\scripts\*") {
@@ -52,9 +52,10 @@ foreach ($file in $ChangedFiles) {
 }
 
 if ($buildAll) {
-    .\Build-AllSamples -Verbose:$Verbose -LogFilesDirectory (Join-Path $root "_logs")
+    .\Build-Samples -Verbose:$Verbose -LogFilesDirectory (Join-Path $root "_logs")
 }
 else {
-    .\Build-SampleSet -SampleSet $sampleSet -Verbose:$Verbose -LogFilesDirectory (Join-Path $root "_logs")
+    $sampleNames = $sampleSet.Keys | Sort-Object
+    .\Build-Samples -Samples $sampleNames -Verbose:$Verbose -LogFilesDirectory (Join-Path $root "_logs")
 }
 

.github/workflows/Code-Scanning.yml

@@ -66,7 +66,7 @@ jobs:
           WDS_Platform: x64
           WDS_WipeOutputs: ${{ true }}
       - if: github.event_name == 'push'
-        run: .\Build-AllSamples.ps1 -Verbose -ThrottleLimit 1
+        run: .\Build-Samples.ps1 -Verbose -ThrottleLimit 1
         env:
           WDS_Configuration: Debug
           WDS_Platform: x64

.github/workflows/ci.yml

@@ -29,7 +29,7 @@ jobs:
         run: nuget restore .\packages.config -PackagesDirectory .\packages\
 
       - name: Retrieve and build all available solutions
-        run: .\Build-AllSamples.ps1 -Verbose
+        run: .\Build-Samples.ps1 -Verbose
         env:
           WDS_Configuration: ${{ matrix.configuration }}
           WDS_Platform: ${{ matrix.platform }}