@@ -34,7 +34,7 @@ $script:IsNix = $IsLinux -or $IsMacOS
34
34
# For Apple M1, pwsh might be getting emulated, in which case we need to check
35
35
# for the proc_translated flag, otherwise we can check the architecture.
36
36
$script :IsAppleM1 = $IsMacOS -and ((sysctl - n sysctl.proc_translated) -eq 1 -or (uname - m) -eq " arm64" )
37
- $script :IsArm64 = -not $script :IsNix -and @ (" ARM64" , " AMD64 " ) -contains $env: PROCESSOR_ARCHITECTURE
37
+ $script :IsArm64 = -not $script :IsNix -and @ (" ARM64" ) -contains $env: PROCESSOR_ARCHITECTURE
38
38
$script :BuildInfoPath = [System.IO.Path ]::Combine($PSScriptRoot , " src" , " PowerShellEditorServices.Hosting" , " BuildInfo.cs" )
39
39
$script :PsesCommonProps = [xml ](Get-Content - Raw " $PSScriptRoot /PowerShellEditorServices.Common.props" )
40
40
@@ -176,7 +176,9 @@ Task Test TestServer, TestE2E
176
176
177
177
Task TestServer TestServerWinPS, TestServerPS7, TestServerPS72
178
178
179
- Task TestServerWinPS - If (-not $script :IsNix ) Build, SetupHelpForTests, {
179
+ # NOTE: While these can run under `pwsh.exe` we only want them to run under
180
+ # `powershell.exe` so that the CI time isn't doubled.
181
+ Task TestServerWinPS - If ($PSVersionTable.PSEdition -eq " Desktop" ) Build, SetupHelpForTests, {
180
182
Set-Location .\test\PowerShellEditorServices.Test\
181
183
# TODO: See https://github.com/dotnet/sdk/issues/18353 for x64 test host
182
184
# that is debuggable! If architecture is added, the assembly path gets an
@@ -185,12 +187,12 @@ Task TestServerWinPS -If (-not $script:IsNix) Build, SetupHelpForTests, {
185
187
Exec { & dotnet $script :dotnetTestArgs $script :NetRuntime.Desktop }
186
188
}
187
189
188
- Task TestServerPS7 - If (-not $script :IsAppleM1 -and -not $script :IsArm64 ) Build, SetupHelpForTests, {
190
+ Task TestServerPS7 - If ($PSVersionTable .PSEdition -eq " Core " -and -not $script :IsAppleM1 -and -not $script :IsArm64 ) Build, SetupHelpForTests, {
189
191
Set-Location .\test\PowerShellEditorServices.Test\
190
192
Exec { & dotnet $script :dotnetTestArgs $script :NetRuntime.PS7 }
191
193
}
192
194
193
- Task TestServerPS72 Build, SetupHelpForTests, {
195
+ Task TestServerPS72 - If ( $PSVersionTable .PSEdition -eq " Core " ) Build, SetupHelpForTests, {
194
196
Set-Location .\test\PowerShellEditorServices.Test\
195
197
Exec { & dotnet $script :dotnetTestArgs $script :NetRuntime.PS72 }
196
198
}
0 commit comments