Move the Omnisharp work into master (#1056)

* Add starting point

* x

* More work

* Make integration tests pass for omnisharp

* Changes

* add dummy workspace symbols handler

* use LoggerFactory

* A working WorkspaceSymbolsHandler

* working text document syncer

* needed document selector and getVersion handler to work with vscode

* Added Diagnostics

* didChangeConfiguration message and general settings support

* Add diagnostics (#18)

* initial folding support

* added test for folding

* Add setting support (#19)

* Added Diagnostics

* didChangeConfiguration message and general settings support

* Apply suggestions from code review

Co-Authored-By: Robert Holt <rjmholt@gmail.com>

* Folding support (#20)

* Added Diagnostics

* didChangeConfiguration message and general settings support

* initial folding support

* log level trace

* folding works with latest omnisharp version

* comment typo

* added test for folding

* formatting support

* remove merge conflict

* add formatting tests

* DocumentSymbols and References support (#997)

* working formatting

* add tests

* delete commented out code

* [Omnisharp-LSP] textDocument/documentHighlight support (#999)

* Add handler scaffold

* More stuff

* Make handler work

* Add copyright

* Add tests, fix bugs

* Fix small issues

* codelens support (#1001)

* codelens support

* address rob's feedback

* powerShell/getPSHostProcesses and powerShell/getRunspace (#1002)

* Test only pester for now (#1003)

* Implement textDocument/codeAction (#1004)

* Add initial handler

* Add working codeAction implementation

* Crash

* Make tests work

* Fix issues

* Make tests work in WinPS

* Add powershellcontext (#1005)

* Add powershellcontext

* using file sink now instead

* all the newlines

* support $psEditor (#1006)

* support $psEditor

* deleted commented out code

* fix initial build failures due to lack of certain assemblies

* use different RootPath

* wait an extra 5 seconds just in case

* refactor initialize script

* Re-add Stdio option and replace Pester tests with xunit tests. (#1008)

* Completion Support (#1007)

* completion support

* misc codacy fixes

* use BUILD_ARTIFACTSTAGINGDIRECTORY so logs can be uploaded

* publish artifacts even if build fails

* handle log messages

* give PSES a chance to run what it needs to run

* switch to using xUnit output helper

* treat DynamicKeywords as Keyword

* completionresolve support (#1009)

* handle log messages

* switch to using xUnit output helper

* Add completionItem/resolve request

* feedback

* update build to run update-help for signature help test

* removing scope hoping it works in CI

* setting to EA silentlycontinue

* change to language=powershell

* hover support (#1010)

* handle log messages

* switch to using xUnit output helper

* add hover handler

* move to language=powershell

* refactoring for feedback

* codacy

* Omni signaturehelp (#1011)

* handle log messages

* switch to using xUnit output helper

* Support SignatureHelp

* concurrentdict

* Add definition handler (#1013)

* add definition handler

* codacy

* sneak in powerShell/executionStatusChanged

* codacy

* Add Plaster messages (#1014)

* Comment Help and Evaluate (#1015)

* Support for Comment Help generator

* add evaluate handler

* Last LSP messages (#1016)

* support CommandExporer commands and powerShell/runspaceChanged

* expand alias

* refactor server setup (#1018)

* rename namespaces (#1019)

* The entire Debug Adapter moved over... (#1043)

* initial non-working dap

* working launch but not attach

* working attach handler

* update namespaces

* Disconnect support and handling of JsonRpcServer teardown

* Add foundation for debug tests - stdio and fixures

* all handlers

* remote file manager working

* rest of debug adapter

* use actual release

* Apply suggestions from code review

Co-Authored-By: Robert Holt <rjmholt@gmail.com>

* Delete projects we wont be keeping around and get pses.vscode working again (#1046)

* delete other folders and tweak build script for BuildInfo

* working PowerShellEditorServices.VSCode now a binary module!

* some typo

* Apply suggestions from code review

Co-Authored-By: Patrick Meinecke <SeeminglyScience@users.noreply.github.com>

* address additional comments

* don't checkin maml

* add error handling

* deleted buildinfo and address rob's comments

* Remove engine from files and namespaces (#1048)

* apply apt state for PS7 (#1051)

* delete buildinfo

* implement powerShell/startDebugger (#1049)

* implement powerShell/startDebugger

* add line

Co-Authored-By: Patrick Meinecke <SeeminglyScience@users.noreply.github.com>

* Enable alias corrections (#1053)

* Codacy comments

Author: TylerLeonhardt

.gitignore

@@ -37,7 +37,7 @@ docs/metadata/
 *.zip
 
 # Generated build info file
-src/PowerShellEditorServices.Host/BuildInfo/BuildInfo.cs
+src/PowerShellEditorServices/Hosting/BuildInfo.cs
 
 # quickbuild.exe
 /VersionGeneratingLogs/
@@ -67,6 +67,7 @@ PowerShellEditorServices.sln.ide/storage.ide
 
 # Don't include PlatyPS generated MAML
 module/PowerShellEditorServices/Commands/en-US/*-help.xml
+module/PowerShellEditorServices.VSCode/en-US/*-help.xml
 
 # Don't include Third Party Notices in module folder
 module/PowerShellEditorServices/Third\ Party\ Notices.txt

.vsts-ci/templates/ci-general.yml

@@ -23,3 +23,4 @@ steps:
     inputs:
       ArtifactName: PowerShellEditorServices-CI
       PathtoPublish: '$(Build.ArtifactStagingDirectory)'
+    condition: succeededOrFailed()

NuGet.Config

@@ -3,4 +3,8 @@
   <solution>
     <add key="disableSourceControlIntegration" value="true" />
   </solution>
+  <packageSources>
+    <add key="omnisharp" value="https://www.myget.org/F/omnisharp/api/v3/index.json" protocolVersion="3" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+  </packageSources>
 </configuration>

PowerShellEditorServices.build.ps1

@@ -22,13 +22,12 @@ $script:IsUnix = $PSVersionTable.PSEdition -and $PSVersionTable.PSEdition -eq "C
 $script:TargetPlatform = "netstandard2.0"
 $script:TargetFrameworksParam = "/p:TargetFrameworks=`"$script:TargetPlatform`""
 $script:RequiredSdkVersion = (Get-Content (Join-Path $PSScriptRoot 'global.json') | ConvertFrom-Json).sdk.version
-$script:MinimumPesterVersion = '4.7'
 $script:NugetApiUriBase = 'https://www.nuget.org/api/v2/package'
 $script:ModuleBinPath = "$PSScriptRoot/module/PowerShellEditorServices/bin/"
 $script:VSCodeModuleBinPath = "$PSScriptRoot/module/PowerShellEditorServices.VSCode/bin/"
 $script:WindowsPowerShellFrameworkTarget = 'net461'
 $script:NetFrameworkPlatformId = 'win'
-$script:BuildInfoPath = [System.IO.Path]::Combine($PSScriptRoot, "src", "PowerShellEditorServices.Host", "BuildInfo", "BuildInfo.cs")
+$script:BuildInfoPath = [System.IO.Path]::Combine($PSScriptRoot, "src", "PowerShellEditorServices", "Hosting", "BuildInfo.cs")
 
 $script:PSCoreModulePath = $null
 
@@ -52,27 +51,28 @@ Schema is:
 $script:RequiredBuildAssets = @{
     $script:ModuleBinPath = @{
         'PowerShellEditorServices' = @(
-            'publish/Serilog.dll',
-            'publish/Serilog.Sinks.Async.dll',
-            'publish/Serilog.Sinks.Console.dll',
-            'publish/Serilog.Sinks.File.dll',
+            'publish/Microsoft.Extensions.DependencyInjection.Abstractions.dll',
+            'publish/Microsoft.Extensions.DependencyInjection.dll',
             'publish/Microsoft.Extensions.FileSystemGlobbing.dll',
-            'Microsoft.PowerShell.EditorServices.dll',
-            'Microsoft.PowerShell.EditorServices.pdb'
-        )
-
-        'PowerShellEditorServices.Host' = @(
-            'publish/UnixConsoleEcho.dll',
-            'publish/runtimes/osx-64/native/libdisablekeyecho.dylib',
-            'publish/runtimes/linux-64/native/libdisablekeyecho.so',
+            'publish/Microsoft.Extensions.Logging.Abstractions.dll',
+            'publish/Microsoft.Extensions.Logging.dll',
+            'publish/Microsoft.Extensions.Options.dll',
+            'publish/Microsoft.Extensions.Primitives.dll',
+            'publish/Microsoft.PowerShell.EditorServices.dll',
+            'publish/Microsoft.PowerShell.EditorServices.pdb',
             'publish/Newtonsoft.Json.dll',
-            'Microsoft.PowerShell.EditorServices.Host.dll',
-            'Microsoft.PowerShell.EditorServices.Host.pdb'
-        )
-
-        'PowerShellEditorServices.Protocol' = @(
-            'Microsoft.PowerShell.EditorServices.Protocol.dll',
-            'Microsoft.PowerShell.EditorServices.Protocol.pdb'
+            'publish/OmniSharp.Extensions.JsonRpc.dll',
+            'publish/OmniSharp.Extensions.LanguageProtocol.dll',
+            'publish/OmniSharp.Extensions.LanguageServer.dll',
+            'publish/OmniSharp.Extensions.DebugAdapter.dll',
+            'publish/OmniSharp.Extensions.DebugAdapter.Server.dll',
+            'publish/runtimes/linux-64/native/libdisablekeyecho.so',
+            'publish/runtimes/osx-64/native/libdisablekeyecho.dylib',
+            'publish/Serilog.dll',
+            'publish/Serilog.Extensions.Logging.dll',
+            'publish/Serilog.Sinks.File.dll',
+            'publish/System.Reactive.dll',
+            'publish/UnixConsoleEcho.dll'
         )
     }
 
@@ -102,12 +102,6 @@ $script:RequiredNugetBinaries = @{
         @{ PackageName = 'System.Security.AccessControl';     PackageVersion = '4.5.0'; TargetRuntime = 'net461' },
         @{ PackageName = 'System.IO.Pipes.AccessControl';     PackageVersion = '4.5.1'; TargetRuntime = 'net461' }
     )
-
-    '6.0' = @(
-        @{ PackageName = 'System.Security.Principal.Windows'; PackageVersion = '4.5.0'; TargetRuntime = 'netcoreapp2.0' },
-        @{ PackageName = 'System.Security.AccessControl';     PackageVersion = '4.5.0'; TargetRuntime = 'netcoreapp2.0' },
-        @{ PackageName = 'System.IO.Pipes.AccessControl';     PackageVersion = '4.5.1'; TargetRuntime = 'netstandard2.0' }
-    )
 }
 
 if (Get-Command git -ErrorAction SilentlyContinue) {
@@ -180,7 +174,7 @@ function Invoke-WithCreateDefaultHook {
     }
 }
 
-task SetupDotNet -Before Clean, Build, TestHost, TestServer, TestProtocol, PackageNuGet {
+task SetupDotNet -Before Clean, Build, TestHost, TestServer, TestProtocol, TestE2E {
 
     $dotnetPath = "$PSScriptRoot/.dotnet"
     $dotnetExePath = if ($script:IsUnix) { "$dotnetPath/dotnet" } else { "$dotnetPath/dotnet.exe" }
@@ -259,7 +253,7 @@ task Clean {
     Get-ChildItem $PSScriptRoot\module\PowerShellEditorServices\Commands\en-US\*-help.xml | Remove-Item -Force -ErrorAction Ignore
 }
 
-task GetProductVersion -Before PackageNuGet, PackageModule, UploadArtifacts {
+task GetProductVersion -Before PackageModule, UploadArtifacts {
     [xml]$props = Get-Content .\PowerShellEditorServices.Common.props
 
     $script:BuildNumber = 9999
@@ -310,7 +304,7 @@ task CreateBuildInfo -Before Build {
     [string]$buildTime = [datetime]::Now.ToString("s", [System.Globalization.CultureInfo]::InvariantCulture)
 
     $buildInfoContents = @"
-namespace Microsoft.PowerShell.EditorServices.Host
+namespace Microsoft.PowerShell.EditorServices.Hosting
 {
     public static class BuildInfo
     {
@@ -326,21 +320,16 @@ namespace Microsoft.PowerShell.EditorServices.Host
 
 task Build {
     exec { & $script:dotnetExe publish -c $Configuration .\src\PowerShellEditorServices\PowerShellEditorServices.csproj -f $script:TargetPlatform }
-    exec { & $script:dotnetExe publish -c $Configuration .\src\PowerShellEditorServices.Host\PowerShellEditorServices.Host.csproj -f $script:TargetPlatform }
     exec { & $script:dotnetExe build -c $Configuration .\src\PowerShellEditorServices.VSCode\PowerShellEditorServices.VSCode.csproj $script:TargetFrameworksParam }
 }
 
-task BuildPsesClientModule SetupDotNet,{
-    Write-Verbose 'Building PsesPsClient testing module'
-    & $PSScriptRoot/tools/PsesPsClient/build.ps1 -DotnetExe $script:dotnetExe
-}
-
 function DotNetTestFilter {
     # Reference https://docs.microsoft.com/en-us/dotnet/core/testing/selective-unit-tests
     if ($TestFilter) { @("--filter",$TestFilter) } else { "" }
 }
 
-task Test TestServer,TestProtocol,TestPester
+# task Test TestServer,TestProtocol,TestE2E
+task Test TestE2E
 
 task TestServer {
     Set-Location .\test\PowerShellEditorServices.Test\
@@ -378,26 +367,11 @@ task TestHost {
     exec { & $script:dotnetExe test -f $script:TestRuntime.Core (DotNetTestFilter) }
 }
 
-task TestPester Build,BuildPsesClientModule,EnsurePesterInstalled,{
-    $testParams = @{}
-    if ($env:TF_BUILD)
-    {
-        $testParams += @{
-            OutputFormat = 'NUnitXml'
-            OutputFile = 'TestResults.xml'
-        }
-    }
-    $result = Invoke-Pester "$PSScriptRoot/test/Pester/" @testParams -PassThru
+task TestE2E {
+    Set-Location .\test\PowerShellEditorServices.Test.E2E\
 
-    if ($result.FailedCount -gt 0)
-    {
-        throw "$($result.FailedCount) tests failed."
-    }
-}
-
-task EnsurePesterInstalled -If (-not (Get-Module Pester -ListAvailable | Where-Object Version -ge $script:MinimumPesterVersion)) {
-    Write-Warning "Required Pester version not found, installing Pester to current user scope"
-    Install-Module -Scope CurrentUser Pester -Force -SkipPublisherCheck
+    $env:PWSH_EXE_NAME = if ($IsCoreCLR) { "pwsh" } else { "powershell" }
+    exec { & $script:dotnetExe test --logger trx -f $script:TestRuntime.Core (DotNetTestFilter) }
 }
 
 task LayoutModule -After Build {
@@ -502,12 +476,7 @@ task RestorePsesModules -After Build {
 
 task BuildCmdletHelp {
     New-ExternalHelp -Path $PSScriptRoot\module\docs -OutputPath $PSScriptRoot\module\PowerShellEditorServices\Commands\en-US -Force
-}
-
-task PackageNuGet {
-    exec { & $script:dotnetExe pack -c $Configuration --version-suffix $script:VersionSuffix .\src\PowerShellEditorServices\PowerShellEditorServices.csproj $script:TargetFrameworksParam }
-    exec { & $script:dotnetExe pack -c $Configuration --version-suffix $script:VersionSuffix .\src\PowerShellEditorServices.Protocol\PowerShellEditorServices.Protocol.csproj $script:TargetFrameworksParam }
-    exec { & $script:dotnetExe pack -c $Configuration --version-suffix $script:VersionSuffix .\src\PowerShellEditorServices.Host\PowerShellEditorServices.Host.csproj $script:TargetFrameworksParam }
+    New-ExternalHelp -Path $PSScriptRoot\module\PowerShellEditorServices.VSCode\docs -OutputPath $PSScriptRoot\module\PowerShellEditorServices.VSCode\en-US -Force
 }
 
 task PackageModule {
@@ -523,4 +492,4 @@ task UploadArtifacts -If ($null -ne $env:TF_BUILD) {
 }
 
 # The default task is to run the entire CI build
-task . GetProductVersion, Clean, Build, Test, BuildCmdletHelp, PackageNuGet, PackageModule, UploadArtifacts
+task . GetProductVersion, Clean, Build, Test, BuildCmdletHelp, PackageModule, UploadArtifacts

PowerShellEditorServices.sln

@@ -7,10 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F594E7FD-1E7
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{422E561A-8118-4BE7-A54F-9309E4F03AAE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerShellEditorServices", "src\PowerShellEditorServices\PowerShellEditorServices.csproj", "{81E8CBCD-6319-49E7-9662-0475BD0791F4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerShellEditorServices.Host", "src\PowerShellEditorServices.Host\PowerShellEditorServices.Host.csproj", "{B2F6369A-D737-4AFD-8B81-9B094DB07DA7}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerShellEditorServices.Test.Host", "test\PowerShellEditorServices.Test.Host\PowerShellEditorServices.Test.Host.csproj", "{3A5DDD20-5BD0-42F4-89F4-ACC0CE554028}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerShellEditorServices.Test", "test\PowerShellEditorServices.Test\PowerShellEditorServices.Test.csproj", "{8ED116F4-9DDF-4C49-AB96-AE462E3D64C3}"
@@ -22,12 +18,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{E231
 		scripts\AddCopyrightHeaders.ps1 = scripts\AddCopyrightHeaders.ps1
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerShellEditorServices.Protocol", "src\PowerShellEditorServices.Protocol\PowerShellEditorServices.Protocol.csproj", "{F8A0946A-5D25-4651-8079-B8D5776916FB}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerShellEditorServices.Test.Protocol", "test\PowerShellEditorServices.Test.Protocol\PowerShellEditorServices.Test.Protocol.csproj", "{E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerShellEditorServices.VSCode", "src\PowerShellEditorServices.VSCode\PowerShellEditorServices.VSCode.csproj", "{3B38E8DA-8BFF-4264-AF16-47929E6398A3}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerShellEditorServices", "src\PowerShellEditorServices\PowerShellEditorServices.csproj", "{29EEDF03-0990-45F4-846E-2616970D1FA2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerShellEditorServices.Test.E2E", "test\PowerShellEditorServices.Test.E2E\PowerShellEditorServices.Test.E2E.csproj", "{2561F253-8F72-436A-BCC3-AA63AB82EDC0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -38,30 +36,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{81E8CBCD-6319-49E7-9662-0475BD0791F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{81E8CBCD-6319-49E7-9662-0475BD0791F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{81E8CBCD-6319-49E7-9662-0475BD0791F4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{81E8CBCD-6319-49E7-9662-0475BD0791F4}.Debug|x64.Build.0 = Debug|Any CPU
-		{81E8CBCD-6319-49E7-9662-0475BD0791F4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{81E8CBCD-6319-49E7-9662-0475BD0791F4}.Debug|x86.Build.0 = Debug|Any CPU
-		{81E8CBCD-6319-49E7-9662-0475BD0791F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{81E8CBCD-6319-49E7-9662-0475BD0791F4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{81E8CBCD-6319-49E7-9662-0475BD0791F4}.Release|x64.ActiveCfg = Release|Any CPU
-		{81E8CBCD-6319-49E7-9662-0475BD0791F4}.Release|x64.Build.0 = Release|Any CPU
-		{81E8CBCD-6319-49E7-9662-0475BD0791F4}.Release|x86.ActiveCfg = Release|Any CPU
-		{81E8CBCD-6319-49E7-9662-0475BD0791F4}.Release|x86.Build.0 = Release|Any CPU
-		{B2F6369A-D737-4AFD-8B81-9B094DB07DA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B2F6369A-D737-4AFD-8B81-9B094DB07DA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B2F6369A-D737-4AFD-8B81-9B094DB07DA7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B2F6369A-D737-4AFD-8B81-9B094DB07DA7}.Debug|x64.Build.0 = Debug|Any CPU
-		{B2F6369A-D737-4AFD-8B81-9B094DB07DA7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B2F6369A-D737-4AFD-8B81-9B094DB07DA7}.Debug|x86.Build.0 = Debug|Any CPU
-		{B2F6369A-D737-4AFD-8B81-9B094DB07DA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B2F6369A-D737-4AFD-8B81-9B094DB07DA7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B2F6369A-D737-4AFD-8B81-9B094DB07DA7}.Release|x64.ActiveCfg = Release|Any CPU
-		{B2F6369A-D737-4AFD-8B81-9B094DB07DA7}.Release|x64.Build.0 = Release|Any CPU
-		{B2F6369A-D737-4AFD-8B81-9B094DB07DA7}.Release|x86.ActiveCfg = Release|Any CPU
-		{B2F6369A-D737-4AFD-8B81-9B094DB07DA7}.Release|x86.Build.0 = Release|Any CPU
 		{3A5DDD20-5BD0-42F4-89F4-ACC0CE554028}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3A5DDD20-5BD0-42F4-89F4-ACC0CE554028}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3A5DDD20-5BD0-42F4-89F4-ACC0CE554028}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -98,18 +72,6 @@ Global
 		{6A20B9E9-DE66-456E-B4F5-ACFD1A95C3CA}.Release|x64.Build.0 = Release|Any CPU
 		{6A20B9E9-DE66-456E-B4F5-ACFD1A95C3CA}.Release|x86.ActiveCfg = Release|Any CPU
 		{6A20B9E9-DE66-456E-B4F5-ACFD1A95C3CA}.Release|x86.Build.0 = Release|Any CPU
-		{F8A0946A-5D25-4651-8079-B8D5776916FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F8A0946A-5D25-4651-8079-B8D5776916FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F8A0946A-5D25-4651-8079-B8D5776916FB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F8A0946A-5D25-4651-8079-B8D5776916FB}.Debug|x64.Build.0 = Debug|Any CPU
-		{F8A0946A-5D25-4651-8079-B8D5776916FB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F8A0946A-5D25-4651-8079-B8D5776916FB}.Debug|x86.Build.0 = Debug|Any CPU
-		{F8A0946A-5D25-4651-8079-B8D5776916FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F8A0946A-5D25-4651-8079-B8D5776916FB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F8A0946A-5D25-4651-8079-B8D5776916FB}.Release|x64.ActiveCfg = Release|Any CPU
-		{F8A0946A-5D25-4651-8079-B8D5776916FB}.Release|x64.Build.0 = Release|Any CPU
-		{F8A0946A-5D25-4651-8079-B8D5776916FB}.Release|x86.ActiveCfg = Release|Any CPU
-		{F8A0946A-5D25-4651-8079-B8D5776916FB}.Release|x86.Build.0 = Release|Any CPU
 		{E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -134,18 +96,41 @@ Global
 		{3B38E8DA-8BFF-4264-AF16-47929E6398A3}.Release|x64.Build.0 = Release|Any CPU
 		{3B38E8DA-8BFF-4264-AF16-47929E6398A3}.Release|x86.ActiveCfg = Release|Any CPU
 		{3B38E8DA-8BFF-4264-AF16-47929E6398A3}.Release|x86.Build.0 = Release|Any CPU
+		{29EEDF03-0990-45F4-846E-2616970D1FA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{29EEDF03-0990-45F4-846E-2616970D1FA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{29EEDF03-0990-45F4-846E-2616970D1FA2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{29EEDF03-0990-45F4-846E-2616970D1FA2}.Debug|x64.Build.0 = Debug|Any CPU
+		{29EEDF03-0990-45F4-846E-2616970D1FA2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{29EEDF03-0990-45F4-846E-2616970D1FA2}.Debug|x86.Build.0 = Debug|Any CPU
+		{29EEDF03-0990-45F4-846E-2616970D1FA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{29EEDF03-0990-45F4-846E-2616970D1FA2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{29EEDF03-0990-45F4-846E-2616970D1FA2}.Release|x64.ActiveCfg = Release|Any CPU
+		{29EEDF03-0990-45F4-846E-2616970D1FA2}.Release|x64.Build.0 = Release|Any CPU
+		{29EEDF03-0990-45F4-846E-2616970D1FA2}.Release|x86.ActiveCfg = Release|Any CPU
+		{29EEDF03-0990-45F4-846E-2616970D1FA2}.Release|x86.Build.0 = Release|Any CPU
+		{2561F253-8F72-436A-BCC3-AA63AB82EDC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2561F253-8F72-436A-BCC3-AA63AB82EDC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2561F253-8F72-436A-BCC3-AA63AB82EDC0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2561F253-8F72-436A-BCC3-AA63AB82EDC0}.Debug|x64.Build.0 = Debug|Any CPU
+		{2561F253-8F72-436A-BCC3-AA63AB82EDC0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2561F253-8F72-436A-BCC3-AA63AB82EDC0}.Debug|x86.Build.0 = Debug|Any CPU
+		{2561F253-8F72-436A-BCC3-AA63AB82EDC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2561F253-8F72-436A-BCC3-AA63AB82EDC0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2561F253-8F72-436A-BCC3-AA63AB82EDC0}.Release|x64.ActiveCfg = Release|Any CPU
+		{2561F253-8F72-436A-BCC3-AA63AB82EDC0}.Release|x64.Build.0 = Release|Any CPU
+		{2561F253-8F72-436A-BCC3-AA63AB82EDC0}.Release|x86.ActiveCfg = Release|Any CPU
+		{2561F253-8F72-436A-BCC3-AA63AB82EDC0}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{81E8CBCD-6319-49E7-9662-0475BD0791F4} = {F594E7FD-1E72-4E51-A496-B019C2BA3180}
-		{B2F6369A-D737-4AFD-8B81-9B094DB07DA7} = {F594E7FD-1E72-4E51-A496-B019C2BA3180}
 		{3A5DDD20-5BD0-42F4-89F4-ACC0CE554028} = {422E561A-8118-4BE7-A54F-9309E4F03AAE}
 		{8ED116F4-9DDF-4C49-AB96-AE462E3D64C3} = {422E561A-8118-4BE7-A54F-9309E4F03AAE}
 		{6A20B9E9-DE66-456E-B4F5-ACFD1A95C3CA} = {422E561A-8118-4BE7-A54F-9309E4F03AAE}
-		{F8A0946A-5D25-4651-8079-B8D5776916FB} = {F594E7FD-1E72-4E51-A496-B019C2BA3180}
 		{E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4} = {422E561A-8118-4BE7-A54F-9309E4F03AAE}
 		{3B38E8DA-8BFF-4264-AF16-47929E6398A3} = {F594E7FD-1E72-4E51-A496-B019C2BA3180}
+		{29EEDF03-0990-45F4-846E-2616970D1FA2} = {F594E7FD-1E72-4E51-A496-B019C2BA3180}
+		{2561F253-8F72-436A-BCC3-AA63AB82EDC0} = {422E561A-8118-4BE7-A54F-9309E4F03AAE}
 	EndGlobalSection
 EndGlobal

docs/api/index.md

@@ -20,9 +20,9 @@ the PowerShell debugger.
 Use the @Microsoft.PowerShell.EditorServices.Console.ConsoleService to provide interactive
 console support in the user's editor.
 
-Use the @Microsoft.PowerShell.EditorServices.Extensions.ExtensionService to allow
+Use the @Microsoft.PowerShell.EditorServices.Services.ExtensionService to allow
 the user to extend the host editor with new capabilities using PowerShell code.
 
 The core of all the services is the @Microsoft.PowerShell.EditorServices.PowerShellContext
 class.  This class manages a session's runspace and handles script and command
-execution no matter what state the runspace is in.
+execution no matter what state the runspace is in.