DO NOT MERGE Rebase attempt

.gitignore

@@ -29,6 +29,7 @@ registered_data.ini
 .dotnet/
 module/Plaster
 module/PSScriptAnalyzer
+module/PSReadLine
 docs/_site/
 docs/_repo/
 docs/metadata/

.travis.yml

@@ -3,12 +3,13 @@ language: cpp
 git:
   depth: 1000
 
-os:
-  - linux
-  - osx
-sudo: required
-dist: trusty
-osx_image: xcode8.3
+matrix:
+  include:
+    - os: linux
+      dist: trusty
+      sudo: required
+    - os: osx
+      osx_image: xcode9.4
 
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then

NuGet.Config

@@ -3,10 +3,4 @@
   <solution>
     <add key="disableSourceControlIntegration" value="true" />
   </solution>
-  <packageSources>
-    <clear />
-    <add key="CI Builds (dotnet-core)" value="https://www.myget.org/F/dotnet-core/api/v3/index.json" />
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="powershell-core" value="https://powershell.myget.org/F/powershell-core/api/v3/index.json" />
-  </packageSources>
-</configuration>
+</configuration>

PowerShellEditorServices.Common.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>1.10.2</VersionPrefix>
+    <VersionPrefix>2.0.0</VersionPrefix>
     <Company>Microsoft</Company>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <PackageTags>PowerShell;editor;development;language;debugging</PackageTags>
@@ -9,6 +9,5 @@
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/PowerShell/PowerShellEditorServices</RepositoryUrl>
     <DebugType>portable</DebugType>
-    <RuntimeFrameworkVersion>1.0.3</RuntimeFrameworkVersion>
   </PropertyGroup>
 </Project>

appveyor.yml

@@ -1,19 +1,26 @@
-version: '1.10.2{build}'
+version: '2.0.0{build}'
 image: Visual Studio 2017
 clone_depth: 10
 skip_tags: true
 
 branches:
   only:
   - master
+  - 2.0.0
+  - rebase-attempt
 
 environment:
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true  # Don't download unneeded packages
   DOTNET_CLI_TELEMETRY_OPTOUT: true        # Don't send telemetry
 
 install:
   - ps: |
-      Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force | Out-Null
+      Get-Module PowerShellGet,PackageManagement | Remove-Module -Force -Verbose
+      powershell -Command { Install-Module -Name PowershellGet -MinimumVersion 1.6 -force -confirm:$false -verbose }
+      powershell -Command { Install-Module -Name PackageManagement -MinimumVersion 1.1.7.0 -Force -Confirm:$false -Verbose }
+      Import-Module -Name PowerShellGet -MinimumVersion 1.6 -Force
+      Import-Module -Name PackageManagement -MinimumVersion 1.1.7.0 -Force
+      Install-PackageProvider -Name NuGet -Force | Out-Null
       Import-PackageProvider NuGet -Force | Out-Null
       Set-PSRepository -Name PSGallery -InstallationPolicy Trusted | Out-Null
       Install-Module InvokeBuild -MaximumVersion 5.1.0 -Scope CurrentUser -Force | Out-Null

module/PowerShellEditorServices.VSCode/PowerShellEditorServices.VSCode.psm1

@@ -3,12 +3,7 @@
 # Licensed under the MIT license. See LICENSE file in the project root for full license information.
 #
 
-if (!$PSVersionTable.PSEdition -or $PSVersionTable.PSEdition -eq "Desktop") {
-    Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Desktop/Microsoft.PowerShell.EditorServices.VSCode.dll"
-}
-else {
-    Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Core/Microsoft.PowerShell.EditorServices.VSCode.dll"
-}
+Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Microsoft.PowerShell.EditorServices.VSCode.dll"
 
 if ($psEditor -is [Microsoft.PowerShell.EditorServices.Extensions.EditorObject]) {
     [Microsoft.PowerShell.EditorServices.VSCode.ComponentRegistration]::Register($psEditor.Components)

module/PowerShellEditorServices/PowerShellEditorServices.psd1

@@ -12,7 +12,7 @@
 RootModule = 'PowerShellEditorServices.psm1'
 
 # Version number of this module.
-ModuleVersion = '1.10.2'
+ModuleVersion = '2.0.0'
 
 # ID used to uniquely identify this module
 GUID = '9ca15887-53a2-479a-9cda-48d26bcb6c47'

module/PowerShellEditorServices/PowerShellEditorServices.psm1

@@ -3,16 +3,21 @@
 # Licensed under the MIT license. See LICENSE file in the project root for full license information.
 #
 
-if (!$PSVersionTable.PSEdition -or $PSVersionTable.PSEdition -eq "Desktop") {
-    Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Desktop/Microsoft.PowerShell.EditorServices.dll"
-    Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Desktop/Microsoft.PowerShell.EditorServices.Host.dll"
-}
-else {
-    Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Core/Microsoft.PowerShell.EditorServices.dll"
-    Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Core/Microsoft.PowerShell.EditorServices.Protocol.dll"
-    Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Core/Microsoft.PowerShell.EditorServices.Host.dll"
+# Need to load pipe handling shim assemblies in Windows PowerShell and PSCore 6.0 because they don't have WCP
+if ($PSEdition -eq 'Desktop') {
+    Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Desktop/System.IO.Pipes.AccessControl.dll"
+    Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Desktop/System.Security.AccessControl.dll"
+    Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Desktop/System.Security.Principal.Windows.dll"
+} elseif ($PSVersionTable.PSVersion -ge '6.0' -and $PSVersionTable.PSVersion -lt '6.1' -and $IsWindows) {
+    Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/6.0/System.IO.Pipes.AccessControl.dll"
+    Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/6.0/System.Security.AccessControl.dll"
+    Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/6.0/System.Security.Principal.Windows.dll"
 }
 
+Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Microsoft.PowerShell.EditorServices.dll"
+Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Microsoft.PowerShell.EditorServices.Host.dll"
+Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Microsoft.PowerShell.EditorServices.Protocol.dll"
+
 function Start-EditorServicesHost {
     [CmdletBinding()]
     param(

module/PowerShellEditorServices/Start-EditorServices.ps1

@@ -353,74 +353,54 @@ try {
 
     # Create the Editor Services host
     Log "Invoking Start-EditorServicesHost"
+
+    $splat = @{
+        HostName = $HostName
+        HostProfileId = $HostProfileId
+        HostVersion = $HostVersion
+        LogPath = $LogPath
+        LogLevel = $LogLevel
+        AdditionalModules = $AdditionalModules
+        BundledModulesPath = $BundledModulesPath
+        EnableConsoleRepl = $EnableConsoleRepl.IsPresent
+        DebugServiceOnly = $DebugServiceOnly.IsPresent
+        WaitForDebugger = $WaitForDebugger.IsPresent
+        FeatureFlags = $FeatureFlags
+    }
+
     # There could be only one service on Stdio channel
     # Locate available port numbers for services
     switch ($PSCmdlet.ParameterSetName) {
         "Stdio" {
-            $editorServicesHost = Start-EditorServicesHost `
-                                        -HostName $HostName `
-                                        -HostProfileId $HostProfileId `
-                                        -HostVersion $HostVersion `
-                                        -LogPath $LogPath `
-                                        -LogLevel $LogLevel `
-                                        -AdditionalModules $AdditionalModules `
-                                        -Stdio `
-                                        -BundledModulesPath $BundledModulesPath `
-                                        -EnableConsoleRepl:$EnableConsoleRepl.IsPresent `
-                                        -DebugServiceOnly:$DebugServiceOnly.IsPresent `
-                                        -WaitForDebugger:$WaitForDebugger.IsPresent
+            $splat.Stdio = $true
+            $editorServicesHost = Start-EditorServicesHost @splat
             break
         }
 
         "NamedPipeSimplex" {
-            $LanguageServiceInPipeName = Get-ValidatedNamedPipeName $LanguageServiceInPipeName
-            $LanguageServiceOutPipeName = Get-ValidatedNamedPipeName $LanguageServiceOutPipeName
-            $DebugServiceInPipeName = Get-ValidatedNamedPipeName $DebugServiceInPipeName
-            $DebugServiceOutPipeName = Get-ValidatedNamedPipeName $DebugServiceOutPipeName
-
-            $editorServicesHost = Start-EditorServicesHost `
-                                        -HostName $HostName `
-                                        -HostProfileId $HostProfileId `
-                                        -HostVersion $HostVersion `
-                                        -LogPath $LogPath `
-                                        -LogLevel $LogLevel `
-                                        -AdditionalModules $AdditionalModules `
-                                        -LanguageServiceInNamedPipe $LanguageServiceInPipeName `
-                                        -LanguageServiceOutNamedPipe $LanguageServiceOutPipeName `
-                                        -DebugServiceInNamedPipe $DebugServiceInPipeName `
-                                        -DebugServiceOutNamedPipe $DebugServiceOutPipeName `
-                                        -BundledModulesPath $BundledModulesPath `
-                                        -EnableConsoleRepl:$EnableConsoleRepl.IsPresent `
-                                        -DebugServiceOnly:$DebugServiceOnly.IsPresent `
-                                        -WaitForDebugger:$WaitForDebugger.IsPresent
-
-            Set-PipeFileResult $resultDetails "languageServiceReadPipeName" $LanguageServiceInPipeName
-            Set-PipeFileResult $resultDetails "languageServiceWritePipeName" $LanguageServiceOutPipeName
-            Set-PipeFileResult $resultDetails "debugServiceReadPipeName" $DebugServiceInPipeName
-            Set-PipeFileResult $resultDetails "debugServiceWritePipeName" $DebugServiceOutPipeName
+            $splat.LanguageServiceInNamedPipe = Get-ValidatedNamedPipeName $LanguageServiceInPipeName
+            $splat.LanguageServiceOutNamedPipe = Get-ValidatedNamedPipeName $LanguageServiceOutPipeName
+            $splat.DebugServiceInNamedPipe = Get-ValidatedNamedPipeName $DebugServiceInPipeName
+            $splat.DebugServiceOutNamedPipe = Get-ValidatedNamedPipeName $DebugServiceOutPipeName
+
+            $editorServicesHost = Start-EditorServicesHost @splat
+
+            Set-PipeFileResult $resultDetails "languageServiceReadPipeName" $splat.LanguageServiceInNamedPipe
+            Set-PipeFileResult $resultDetails "languageServiceWritePipeName" $splat.LanguageServiceOutNamedPipe
+            Set-PipeFileResult $resultDetails "debugServiceReadPipeName" $splat.DebugServiceInNamedPipe
+            Set-PipeFileResult $resultDetails "debugServiceWritePipeName" $splat.DebugServiceOutNamedPipe
             break
         }
 
         Default {
-            $LanguageServicePipeName = Get-ValidatedNamedPipeName $LanguageServicePipeName
-            $DebugServicePipeName = Get-ValidatedNamedPipeName $DebugServicePipeName
-
-            $editorServicesHost = Start-EditorServicesHost `
-                                        -HostName $HostName `
-                                        -HostProfileId $HostProfileId `
-                                        -HostVersion $HostVersion `
-                                        -LogPath $LogPath `
-                                        -LogLevel $LogLevel `
-                                        -AdditionalModules $AdditionalModules `
-                                        -LanguageServiceNamedPipe $LanguageServicePipeName `
-                                        -DebugServiceNamedPipe $DebugServicePipeName `
-                                        -BundledModulesPath $BundledModulesPath `
-                                        -EnableConsoleRepl:$EnableConsoleRepl.IsPresent `
-                                        -DebugServiceOnly:$DebugServiceOnly.IsPresent `
-                                        -WaitForDebugger:$WaitForDebugger.IsPresent
-
-            Set-PipeFileResult $resultDetails "languageServicePipeName" $LanguageServicePipeName
-            Set-PipeFileResult $resultDetails "debugServicePipeName" $DebugServicePipeName
+            $splat.LanguageServiceNamedPipe = Get-ValidatedNamedPipeName $LanguageServicePipeName
+            $splat.DebugServiceNamedPipe = Get-ValidatedNamedPipeName $DebugServicePipeName
+
+            $editorServicesHost = Start-EditorServicesHost @splat
+            Log ($splat | Out-String)
+            Log $LanguageServicePipeName
+            Set-PipeFileResult $resultDetails "languageServicePipeName" $splat.LanguageServiceNamedPipe
+            Set-PipeFileResult $resultDetails "debugServicePipeName" $splat.DebugServiceNamedPipe
             break
         }
     }

modules.json

@@ -8,5 +8,10 @@
         "MinimumVersion":"1.0",
         "MaximumVersion":"1.99",
         "AllowPrerelease":false
+    },
+    "PSReadLine":{
+        "MinimumVersion":"2.0.0-beta3",
+        "MaximumVersion":"2.1",
+        "AllowPrerelease":true
     }
 }

scripts/travis.ps1

@@ -1,4 +1,4 @@
-
+$ErrorActionPreference = 'Stop'
 
 # Install InvokeBuild
 Install-Module InvokeBuild -MaximumVersion 5.1.0 -Scope CurrentUser -Force

src/PowerShellEditorServices.Channel.WebSocket/WebsocketClientChannel.cs

@@ -39,7 +39,7 @@ public WebsocketClientChannel(string url)
             this.serverUrl = url;
         }
 
-        public override async Task WaitForConnection()
+        public override async Task WaitForConnectionAsync()
         {
             try
             {
@@ -52,7 +52,7 @@ public override async Task WaitForConnection()
                 {
                     Logger.Write(LogLevel.Warning,
                         string.Format("Failed to connect to WebSocket server. Error was '{0}'", wsException.Message));
-                   
+
                 }
 
                 throw;
@@ -99,7 +99,7 @@ protected override void Shutdown()
     }
 
     /// <summary>
-    /// Extension of <see cref="MemoryStream"/> that sends data to a WebSocket during FlushAsync 
+    /// Extension of <see cref="MemoryStream"/> that sends data to a WebSocket during FlushAsync
     /// and reads during WriteAsync.
     /// </summary>
     internal class ClientWebSocketStream : MemoryStream
@@ -110,7 +110,7 @@ internal class ClientWebSocketStream : MemoryStream
         /// Constructor
         /// </summary>
         /// <remarks>
-        /// It is expected that the socket is in an Open state. 
+        /// It is expected that the socket is in an Open state.
         /// </remarks>
         /// <param name="socket"></param>
         public ClientWebSocketStream(ClientWebSocket socket)
@@ -119,7 +119,7 @@ public ClientWebSocketStream(ClientWebSocket socket)
         }
 
         /// <summary>
-        /// Reads from the WebSocket. 
+        /// Reads from the WebSocket.
         /// </summary>
         /// <param name="buffer"></param>
         /// <param name="offset"></param>
@@ -138,7 +138,7 @@ public override async Task<int> ReadAsync(byte[] buffer, int offset, int count,
             {
                 result = await socket.ReceiveAsync(new ArraySegment<byte>(buffer, offset, count), cancellationToken);
             } while (!result.EndOfMessage);
-          
+
             if (result.MessageType == WebSocketMessageType.Close)
             {
                 await socket.CloseAsync(WebSocketCloseStatus.NormalClosure, "Closing", cancellationToken);