Make tests compatible with Mac M1

Which only supports .NET Core 6.

Author: andyleejordan

PowerShellEditorServices.build.ps1

@@ -18,7 +18,8 @@ param(
 
 #Requires -Modules @{ModuleName="InvokeBuild";ModuleVersion="3.2.1"}
 
-$script:IsUnix = $PSVersionTable.PSEdition -and $PSVersionTable.PSEdition -eq "Core" -and !$IsWindows
+$script:IsNix = $IsLinux -or $IsMacOS
+$script:IsRosetta = $IsMacOS -and (sysctl -n sysctl.proc_translated) -eq 1 # Mac M1
 $script:BuildInfoPath = [System.IO.Path]::Combine($PSScriptRoot, "src", "PowerShellEditorServices.Hosting", "BuildInfo.cs")
 $script:PsesCommonProps = [xml](Get-Content -Raw "$PSScriptRoot/PowerShellEditorServices.Common.props")
 $script:IsPreview = [bool]($script:PsesCommonProps.Project.PropertyGroup.VersionSuffix)
@@ -62,7 +63,7 @@ function Install-Dotnet {
     Write-Host "Installing .NET channels $Channel" -ForegroundColor Green
 
     # The install script is platform-specific
-    $installScriptExt = if ($script:IsUnix) { "sh" } else { "ps1" }
+    $installScriptExt = if ($script:IsNix) { "sh" } else { "ps1" }
     $installScript = "dotnet-install.$installScriptExt"
 
     # Download the official installation script and run it
@@ -74,11 +75,11 @@ function Install-Dotnet {
     {
         Write-Host "`n### Installing .NET CLI $Version...`n"
 
-        if ($script:IsUnix) {
+        if ($script:IsNix) {
             chmod +x $installScriptPath
         }
 
-        $params = if ($script:IsUnix)
+        $params = if ($script:IsNix)
         {
             @('-Channel', $dotnetChannel, '-InstallDir', $env:DOTNET_INSTALL_DIR, '-NoPath', '-Verbose')
         }
@@ -105,7 +106,7 @@ function Install-Dotnet {
 task SetupDotNet -Before Clean, Build, TestServerWinPS, TestServerPS7, TestServerPS72, TestE2E {
 
     $dotnetPath = "$PSScriptRoot/.dotnet"
-    $dotnetExePath = if ($script:IsUnix) { "$dotnetPath/dotnet" } else { "$dotnetPath/dotnet.exe" }
+    $dotnetExePath = if ($script:IsNix) { "$dotnetPath/dotnet" } else { "$dotnetPath/dotnet.exe" }
 
     if (!(Test-Path $dotnetExePath)) {
         # TODO: Test .NET 5 with PowerShell 7.1, and add that channel here.
@@ -238,7 +239,7 @@ task SetupHelpForTests {
 task Build BinClean,{
     exec { & $script:dotnetExe publish -c $Configuration .\src\PowerShellEditorServices\PowerShellEditorServices.csproj -f $script:NetRuntime.Standard }
     exec { & $script:dotnetExe publish -c $Configuration .\src\PowerShellEditorServices.Hosting\PowerShellEditorServices.Hosting.csproj -f $script:NetRuntime.PS7 }
-    if (-not $script:IsUnix)
+    if (-not $script:IsNix)
     {
         exec { & $script:dotnetExe publish -c $Configuration .\src\PowerShellEditorServices.Hosting\PowerShellEditorServices.Hosting.csproj -f $script:NetRuntime.Desktop }
     }
@@ -256,12 +257,12 @@ task Test SetupHelpForTests,TestServer,TestE2E
 
 task TestServer TestServerWinPS,TestServerPS7,TestServerPS72
 
-task TestServerWinPS -If (-not $script:IsUnix) {
+task TestServerWinPS -If (-not $script:IsNix) {
     Set-Location .\test\PowerShellEditorServices.Test\
     exec { & $script:dotnetExe test --logger trx -f $script:NetRuntime.Desktop (DotNetTestFilter) }
 }
 
-task TestServerPS7 {
+task TestServerPS7 -If (-not $script:IsRosetta) {
     Set-Location .\test\PowerShellEditorServices.Test\
     Invoke-WithCreateDefaultHook -NewModulePath $script:PSCoreModulePath {
         exec { & $script:dotnetExe test --logger trx -f $script:NetRuntime.PS7 (DotNetTestFilter) }
@@ -279,10 +280,11 @@ task TestE2E {
     Set-Location .\test\PowerShellEditorServices.Test.E2E\
 
     $env:PWSH_EXE_NAME = if ($IsCoreCLR) { "pwsh" } else { "powershell" }
-    exec { & $script:dotnetExe test --logger trx -f $script:NetRuntime.PS7 (DotNetTestFilter) }
+    $NetRuntime = if ($IsRosetta) { $script:NetRuntime.PS72 } else { $script:NetRuntime.PS7 }
+    exec { & $script:dotnetExe test --logger trx -f $NetRuntime (DotNetTestFilter) }
 
     # Run E2E tests in ConstrainedLanguage mode.
-    if (!$script:IsUnix) {
+    if (!$script:IsNix) {
         try {
             [System.Environment]::SetEnvironmentVariable("__PSLockdownPolicy", "0x80000007", [System.EnvironmentVariableTarget]::Machine);
             exec { & $script:dotnetExe test --logger trx -f $script:NetRuntime.PS7 (DotNetTestFilter) }
@@ -340,7 +342,7 @@ task LayoutModule -After Build {
     }
 
     # PSES/bin/Desktop
-    if (-not $script:IsUnix)
+    if (-not $script:IsNix)
     {
         foreach ($hostComponent in Get-ChildItem $script:HostDeskOutput)
         {

test/PowerShellEditorServices.Test.E2E/PowerShellEditorServices.Test.E2E.csproj

@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-
+    <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>