Merge branch 'master' into release

Because we re-released from an old tag, we're merging `master` back into
the `release` branch with the `theirs` strategy to prefer all changes
from `master`.

Author: andyleejordan

.github/CODEOWNERS

@@ -1,7 +1,7 @@
 # https://help.github.com/articles/about-codeowners/
 
 # Global reviewers
-* @andschwa @rjmholt
+* @andschwa
 
 # Area: Analysis & Formatting
 src/PowerShellEditorServices/Analysis/                 @rjmholt

.github/dependabot.yml

@@ -8,4 +8,3 @@ updates:
     timezone: America/Los_Angeles
   reviewers:
     - "andschwa"
-    - "rjmholt"

.vsts-ci/azure-pipelines-ci.yml

@@ -8,24 +8,7 @@ variables:
   - name: DOTNET_CLI_TELEMETRY_OPTOUT
     value: 'true'
 
-trigger:
-  branches:
-    include:
-      - master
-
-pr:
-- master
-
 jobs:
-- job: PS51_Win2016
-  displayName: PowerShell 5.1 - Windows Server 2016
-  pool:
-    vmImage: vs2017-win2016
-  steps:
-  - template: templates/ci-general.yml
-    parameters:
-      pwsh: false
-
 - job: PS51_Win2019
   displayName: PowerShell 5.1 - Windows Server 2019
   pool:

CHANGELOG.md

@@ -5,6 +5,106 @@
 
 No changes. We're re-releasing to update signatures with a new certificate.
 
+## v3.0.3
+### Monday, December 20, 2021
+
+- 🐛 🚂 [vscode-powershell #3718](https://github.com/PowerShell/PowerShellEditorServices/pull/1647) - Create `$psEditor` as a constant.
+- #️⃣ 🙏 [PowerShellEditorServices #1641](https://github.com/PowerShell/PowerShellEditorServices/pull/1641) - Added check to see if `PSModulePath` already contained `BundledModulePath`. (Thanks @dkattan!)
+- #️⃣ 🙏 [PowerShellEditorServices #1640](https://github.com/PowerShell/PowerShellEditorServices/pull/1640) - Implemented `-LanguageServiceOnly` switch. (Thanks @dkattan!)
+- 🐛 🛫 [PowerShellEditorServices #1638](https://github.com/PowerShell/PowerShellEditorServices/pull/1638) - Fix `BundledModulePath` and PSReadLine loading (redux).
+- 🐛 🔍 [PowerShellEditorServices #1635](https://github.com/PowerShell/PowerShellEditorServices/pull/1635) - Re-enable `DebugServiceTests` suite.
+
+## v3.0.2
+### Monday, November 22, 2021
+
+- ✨ 📖 [PowerShellEditorServices #1631](https://github.com/PowerShell/PowerShellEditorServices/pull/1631) - Add Justin Grote as maintainer.
+- 🐛 🔍 [vscode-powershell #3667](https://github.com/PowerShell/PowerShellEditorServices/pull/1630) - Improve debugger's variable population mechanism. (Thanks @JustinGrote and @SeeminglyScience!)
+- 🐛 👷 [PowerShellEditorServices #1628](https://github.com/PowerShell/PowerShellEditorServices/pull/1628) - Fix build for Apple M1 when running PowerShell 7.2 (arm64).
+- 🐛 👷 [PowerShellEditorServices #1626](https://github.com/PowerShell/PowerShellEditorServices/pull/1626) - Remove Windows Server 2016 from CI.
+- ✨ 👷 [PowerShellEditorServices #1619](https://github.com/PowerShell/PowerShellEditorServices/pull/1619) - Install a single `dotnet` SDK.
+
+## v3.0.1
+### Wednesday, November 03, 2021
+
+- 🐛 🔍 [PowerShellEditorServices #1608](https://github.com/PowerShell/PowerShellEditorServices/pull/1611) - Improve PowerShell command and argument escaping. (Thanks @JustinGrote!)
+- 🐛 📟 [PowerShellEditorServices #1603](https://github.com/PowerShell/PowerShellEditorServices/pull/1606) - Add `LengthInBufferCells` back to `EditorServicesConsolePSHostRawUserInterface`.
+- #️⃣ 🙏 [PowerShellEditorServices #1604](https://github.com/PowerShell/PowerShellEditorServices/pull/1604) - Fix profile loading and `$PROFILE` variable.
+
+## v3.0.0
+### Thursday, October 28, 2021
+
+This preview release includes a complete overhaul of the core PowerShell engine
+of PowerShell Editor Services.
+This represents over a year's work,
+tracked in [PSES #1295](https://github.com/PowerShell/PowerShellEditorServices/issues/1295)
+and implemented in [PSES #1459](https://github.com/PowerShell/PowerShellEditorServices/pull/1459),
+and is our answer to many, many issues
+opened by users over the last few years.
+We're hoping you'll see a marked improvement
+in the reliability, performance and footprint
+of the extension as a result.
+
+Previously the Integrated Console was run
+by setting threadpool tasks on a shared main runspace,
+and where LSP servicing was done with PowerShell idle events.
+This lead to overhead, threading issues
+and a complex implementation intended to work around
+the asymmetry between PowerShell as a synchronous,
+single-threaded runtime and a language server
+as an asynchronous, multi-threaded service.
+
+Now, PowerShell Editor Services maintains its own dedicated pipeline thread,
+which is able to service requests similar to JavaScript's event loop,
+meaning we can run everything synchronously on the correct thread.
+We also get more efficiency because we can directly call
+PowerShell APIs and code written in C# from this thread,
+without the overhead of a PowerShell pipeline.
+
+This change has overhauled how we service LSP requests,
+how the Integrated Console works,
+how PSReadLine is integrated,
+how debugging is implemented,
+how remoting is handled,
+and a long tail of other features in PowerShell Editor Services.
+
+Also, in making it, while 6,000 lines of code were added,
+we removed 12,000,
+for a more maintainable, more efficient
+and easier to understand extension backend.
+
+While most of our testing has been re-enabled
+(and we're working on adding more),
+there are bound to be issues with this new implementation.
+Please give this a try and let us know if you run into anything.
+
+We also want to thank [@SeeminglyScience](https://github.com/SeeminglyScience)
+for his help and knowledge as we've made this migration.
+
+Finally, a crude breakdown of the work from the commits:
+
+- An initial dedicated pipeline thread consumer implementation
+- Implement the console REPL
+- Implement PSRL idle handling
+- Implement completions
+- Move to invoking PSRL as a C# delegate
+- Implement cancellation and <kbd>Ctrl</kbd>+<kbd>C</kbd>
+- Make <kbd>F8</kbd> work again
+- Ensure execution policy is set correctly
+- Implement $PROFILE support
+- Make nested prompts work
+- Implement REPL debugging
+- Implement remote debugging in the REPL
+- Hook up the debugging UI
+- Implement a new concurrent priority queue for PowerShell tasks
+- Reimplement the REPL synchronously rather than on its own thread
+- Really get debugging working...
+- Implement DSC breakpoint support
+- Reimplement legacy readline support
+- Ensure stdio is still supported as an LSP transport
+- Remove PowerShellContextService and other defunct code
+- Get integration tests working again (and improve diagnosis of PSES failures)
+- Get unit testing working again (except debug service tests)
+
 ## v2.5.2
 ### Monday, October 18, 2021
 

PowerShellEditorServices.Common.props

@@ -1,10 +1,10 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>2.5.3</VersionPrefix>
+    <VersionPrefix>3.0.3</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <Company>Microsoft</Company>
     <Copyright>© Microsoft Corporation.</Copyright>
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>latest</LangVersion>
     <PackageTags>PowerShell;editor;development;language;debugging</PackageTags>
     <PackageLicenseUrl>https://raw.githubusercontent.com/PowerShell/PowerShellEditorServices/master/LICENSE</PackageLicenseUrl>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>

PowerShellEditorServices.build.ps1

@@ -29,7 +29,9 @@ $script:dotnetTestArgs = @(
 )
 
 $script:IsNix = $IsLinux -or $IsMacOS
-$script:IsRosetta = $IsMacOS -and (sysctl -n sysctl.proc_translated) -eq 1 # Mac M1
+# For Apple M1, pwsh might be getting emulated, in which case we need to check
+# for the proc_translated flag, otherwise we can check the architecture.
+$script:IsAppleM1 = $IsMacOS -and ((sysctl -n sysctl.proc_translated) -eq 1 -or (uname -m) -eq "arm64")
 $script:BuildInfoPath = [System.IO.Path]::Combine($PSScriptRoot, "src", "PowerShellEditorServices.Hosting", "BuildInfo.cs")
 $script:PsesCommonProps = [xml](Get-Content -Raw "$PSScriptRoot/PowerShellEditorServices.Common.props")
 
@@ -52,12 +54,16 @@ if (Get-Command git -ErrorAction SilentlyContinue) {
 
 function Install-Dotnet {
     param (
-        [string[]]$Channel
+        [string[]]$Channel,
+        [switch]$Runtime
     )
 
     $env:DOTNET_INSTALL_DIR = "$PSScriptRoot/.dotnet"
 
-    Write-Host "Installing .NET channels $Channel" -ForegroundColor Green
+    $components = if ($Runtime) { "Runtime " } else { "SDK and Runtime " }
+    $components += $Channel -join ', '
+
+    Write-Host "Installing .NET $components" -ForegroundColor Green
 
     # The install script is platform-specific
     $installScriptExt = if ($script:IsNix) { "sh" } else { "ps1" }
@@ -70,18 +76,13 @@ function Install-Dotnet {
     # Download and install the different .NET channels
     foreach ($dotnetChannel in $Channel)
     {
-        Write-Host "`n### Installing .NET CLI $Version...`n"
-
         if ($script:IsNix) {
             chmod +x $installScriptPath
         }
 
-        $params = if ($script:IsNix)
-        {
+        $params = if ($script:IsNix) {
             @('-Channel', $dotnetChannel, '-InstallDir', $env:DOTNET_INSTALL_DIR, '-NoPath', '-Verbose')
-        }
-        else
-        {
+        } else {
             @{
                 Channel = $dotnetChannel
                 InstallDir = $env:DOTNET_INSTALL_DIR
@@ -90,9 +91,13 @@ function Install-Dotnet {
             }
         }
 
-        & $installScriptPath @params
+        # Install just the runtime, not the SDK
+        if ($Runtime) {
+            if ($script:IsNix) { $params += @('-Runtime', 'dotnet') }
+            else { $params['Runtime'] = 'dotnet' }
+        }
 
-        Write-Host "`n### Installation complete for version $Version."
+        exec { & $installScriptPath @params }
     }
 
     $env:PATH = $env:DOTNET_INSTALL_DIR + [System.IO.Path]::PathSeparator + $env:PATH
@@ -107,7 +112,12 @@ task SetupDotNet -Before Clean, Build, TestServerWinPS, TestServerPS7, TestServe
 
     if (!(Test-Path $dotnetExePath)) {
         # TODO: Test .NET 5 with PowerShell 7.1
-        Install-Dotnet -Channel '3.1','5.0','6.0'
+        #
+        # We use the .NET 6 SDK, so we always install it and its runtime.
+        Install-Dotnet -Channel '6.0' # SDK and runtime
+        # Anywhere other than on a Mac with an M1 processor, we additionally
+        # install the .NET 3.1 and 5.0 runtimes (but not their SDKs).
+        if (!$script:IsAppleM1) { Install-Dotnet -Channel '3.1','5.0' -Runtime }
     }
 
     # This variable is used internally by 'dotnet' to know where it's installed
@@ -228,10 +238,14 @@ task TestServer TestServerWinPS,TestServerPS7,TestServerPS72
 
 task TestServerWinPS -If (-not $script:IsNix) {
     Set-Location .\test\PowerShellEditorServices.Test\
+    # TODO: See https://github.com/dotnet/sdk/issues/18353 for x64 test host
+    # that is debuggable! If architecture is added, the assembly path gets an
+    # additional folder, necesstiating fixes to find the commands definition
+    # file and test files.
     exec { & $script:dotnetExe $script:dotnetTestArgs $script:NetRuntime.Desktop }
 }
 
-task TestServerPS7 -If (-not $script:IsRosetta) {
+task TestServerPS7 -If (-not $script:IsAppleM1) {
     Set-Location .\test\PowerShellEditorServices.Test\
     exec { & $script:dotnetExe $script:dotnetTestArgs $script:NetRuntime.PS7 }
 }
@@ -245,7 +259,7 @@ task TestE2E {
     Set-Location .\test\PowerShellEditorServices.Test.E2E\
 
     $env:PWSH_EXE_NAME = if ($IsCoreCLR) { "pwsh" } else { "powershell" }
-    $NetRuntime = if ($IsRosetta) { $script:NetRuntime.PS72 } else { $script:NetRuntime.PS7 }
+    $NetRuntime = if ($IsAppleM1) { $script:NetRuntime.PS72 } else { $script:NetRuntime.PS7 }
     exec { & $script:dotnetExe $script:dotnetTestArgs $NetRuntime }
 
     # Run E2E tests in ConstrainedLanguage mode.

README.md

@@ -157,10 +157,16 @@ contribute code, documentation, tests, or bug reports, please read our [Contribu
 
 ## Maintainers
 
+- [Justin Grote](https://github.com/JustinGrote) - [@JustinWGrote](https://twitter.com/justinwgrote)
 - [Patrick Meinecke](https://github.com/SeeminglyScience) - [@SeeminglyScienc](http://twitter.com/SeeminglyScienc)
-- [Rob Holt](https://github.com/rjmholt) - [@rjmholt](https://twitter.com/rjmholt)
 - [Andy Schwartzmeyer](https://github.com/andschwa) - [andschwa.com](https://andschwa.com/)
 
+### Emeriti
+
+- [Rob Holt](https://github.com/rjmholt) - [@rjmholt](https://twitter.com/rjmholt)
+- [Tyler Leonhardt](https://github.com/TylerLeonhardt) - [tylerleonhardt.com](https://tylerleonhardt.com)
+- [David Wilson](https://github.com/daviwil) - [@daviwil](https://twitter.com/daviwil)
+
 ## License
 
 This project is [licensed under the MIT License](LICENSE).

global.json

@@ -0,0 +1,7 @@
+{
+  "sdk": {
+    "version": "6.0",
+    "rollForward": "latestFeature",
+    "allowPrerelease": true
+  }
+}

module/PowerShellEditorServices/PowerShellEditorServices.psd1

@@ -19,7 +19,7 @@ RootModule = if ($PSEdition -eq 'Core')
     }
 
 # Version number of this module.
-ModuleVersion = '2.5.3'
+ModuleVersion = '3.0.3'
 
 # ID used to uniquely identify this module
 GUID = '9ca15887-53a2-479a-9cda-48d26bcb6c47'

module/PowerShellEditorServices/Start-EditorServices.ps1

@@ -66,6 +66,9 @@ param(
     [switch]
     $DebugServiceOnly,
 
+    [switch]
+    $LanguageServiceOnly,
+
     [string[]]
     $AdditionalModules,
 

modules.json

@@ -6,6 +6,7 @@
         "Version": "1.1.3"
     },
     "PSReadLine": {
-        "Version": "2.1.0"
+        "Version": "2.2.0-beta4",
+        "AllowPrerelease": true
     }
 }