Switch out call from Invoke-Expression to direct usage

Thanks to jborean from the PowerShell Discord community Had tried escaping quotes for PowerShell passing in CodeQL build, but was issue with CodeQL itself, see github/codeql-action#851 (comment) Related PowerShell Info: https://stackoverflow.com/questions/6714165/powershell-stripping-double-quotes-from-command-line-arguments https://learn.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_parsing?view=powershell-7.3#passing-arguments-that-contain-quote-characters
CommunityToolkit · Aug 25, 2023 · 384dbef · 384dbef
1 parent aca3ba7
commit 384dbef
Showing 1 changed file with 29 additions and 7 deletions.
diff --git a/GenerateAllSolution.ps1 b/GenerateAllSolution.ps1
@@ -33,8 +33,14 @@ Param (
 
 # Set up constant values
 $generatedSolutionFilePath = 'CommunityToolkit.AllComponents.sln'
-$platforms = '"Any CPU;x64;x86;ARM64"'
-$slngenConfig = "--folders true --collapsefolders true --ignoreMainProject"
+$platforms = 'Any CPU;x64;x86;ARM64'
+$slngenConfig = @(
+    '--folders'
+    'true'
+    '--collapsefolders'
+    'true'
+    '--ignoreMainProject'
+)
 
 # Remove previous file if it exists
 if (Test-Path -Path $generatedSolutionFilePath)
@@ -69,17 +75,33 @@ if ($IncludeHeads -ne 'uwp')
 
 if ($UseDiagnostics.IsPresent)
 {
-    $sdkoptions = " -d"
-    $diagnostics = '-bl:slngen.binlog --consolelogger:"ShowEventId;Summary;Verbosity=Detailed" '
+    $sdkoptions = "-d"
+    $diagnostics = @(
+        '-bl:slngen.binlog'
+        '--consolelogger:"ShowEventId;Summary;Verbosity=Detailed"'
+    )
 }
 else
 {
     $sdkoptions = ""
     $diagnostics = ""
 }
 
-$cmd = "dotnet$sdkoptions tool run slngen -o $generatedSolutionFilePath $slngenConfig $diagnostics--platform $platforms $($projects -Join ' ')"
+$cmd = 'dotnet'
+$arguments = @(
+    $sdkoptions
+    'tool'
+    'run'
+    'slngen'
+    '-o'
+    $generatedSolutionFilePath
+    $slngenConfig
+    $diagnostics
+    '--platform'
+    $platforms
+    $projects
+)
 
-Write-Output "Running Command: $cmd"
+Write-Output "Running Command: $cmd $arguments"
 
-Invoke-Expression $cmd
+&$cmd @arguments