Skip to content

Commit c744e79

Browse files
TylerLeonhardtTylerLeonhardt
authored
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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * Enable alias corrections (#1053) * Codacy comments
1 parent 8332631 commit c744e79

File tree

374 files changed

+9820
-16364
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

374 files changed

+9820
-16364
lines changed

‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ docs/metadata/
3737
*.zip
3838

3939
# Generated build info file
40-
src/PowerShellEditorServices.Host/BuildInfo/BuildInfo.cs
40+
src/PowerShellEditorServices/Hosting/BuildInfo.cs
4141

4242
# quickbuild.exe
4343
/VersionGeneratingLogs/
@@ -67,6 +67,7 @@ PowerShellEditorServices.sln.ide/storage.ide
6767

6868
# Don't include PlatyPS generated MAML
6969
module/PowerShellEditorServices/Commands/en-US/*-help.xml
70+
module/PowerShellEditorServices.VSCode/en-US/*-help.xml
7071

7172
# Don't include Third Party Notices in module folder
7273
module/PowerShellEditorServices/Third\ Party\ Notices.txt

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

+1
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,4 @@ steps:
2323
inputs:
2424
ArtifactName: PowerShellEditorServices-CI
2525
PathtoPublish: '$(Build.ArtifactStagingDirectory)'
26+
condition: succeededOrFailed()

‎NuGet.Config

+4
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@
33
<solution>
44
<add key="disableSourceControlIntegration" value="true" />
55
</solution>
6+
<packageSources>
7+
<add key="omnisharp" value="https://www.myget.org/F/omnisharp/api/v3/index.json" protocolVersion="3" />
8+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
9+
</packageSources>
610
</configuration>

‎PowerShellEditorServices.build.ps1

+32-63
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,12 @@ $script:IsUnix = $PSVersionTable.PSEdition -and $PSVersionTable.PSEdition -eq "C
2222
$script:TargetPlatform = "netstandard2.0"
2323
$script:TargetFrameworksParam = "/p:TargetFrameworks=`"$script:TargetPlatform`""
2424
$script:RequiredSdkVersion = (Get-Content (Join-Path $PSScriptRoot 'global.json') | ConvertFrom-Json).sdk.version
25-
$script:MinimumPesterVersion = '4.7'
2625
$script:NugetApiUriBase = 'https://www.nuget.org/api/v2/package'
2726
$script:ModuleBinPath = "$PSScriptRoot/module/PowerShellEditorServices/bin/"
2827
$script:VSCodeModuleBinPath = "$PSScriptRoot/module/PowerShellEditorServices.VSCode/bin/"
2928
$script:WindowsPowerShellFrameworkTarget = 'net461'
3029
$script:NetFrameworkPlatformId = 'win'
31-
$script:BuildInfoPath = [System.IO.Path]::Combine($PSScriptRoot, "src", "PowerShellEditorServices.Host", "BuildInfo", "BuildInfo.cs")
30+
$script:BuildInfoPath = [System.IO.Path]::Combine($PSScriptRoot, "src", "PowerShellEditorServices", "Hosting", "BuildInfo.cs")
3231

3332
$script:PSCoreModulePath = $null
3433

@@ -52,27 +51,28 @@ Schema is:
5251
$script:RequiredBuildAssets = @{
5352
$script:ModuleBinPath = @{
5453
'PowerShellEditorServices' = @(
55-
'publish/Serilog.dll',
56-
'publish/Serilog.Sinks.Async.dll',
57-
'publish/Serilog.Sinks.Console.dll',
58-
'publish/Serilog.Sinks.File.dll',
54+
'publish/Microsoft.Extensions.DependencyInjection.Abstractions.dll',
55+
'publish/Microsoft.Extensions.DependencyInjection.dll',
5956
'publish/Microsoft.Extensions.FileSystemGlobbing.dll',
60-
'Microsoft.PowerShell.EditorServices.dll',
61-
'Microsoft.PowerShell.EditorServices.pdb'
62-
)
63-
64-
'PowerShellEditorServices.Host' = @(
65-
'publish/UnixConsoleEcho.dll',
66-
'publish/runtimes/osx-64/native/libdisablekeyecho.dylib',
67-
'publish/runtimes/linux-64/native/libdisablekeyecho.so',
57+
'publish/Microsoft.Extensions.Logging.Abstractions.dll',
58+
'publish/Microsoft.Extensions.Logging.dll',
59+
'publish/Microsoft.Extensions.Options.dll',
60+
'publish/Microsoft.Extensions.Primitives.dll',
61+
'publish/Microsoft.PowerShell.EditorServices.dll',
62+
'publish/Microsoft.PowerShell.EditorServices.pdb',
6863
'publish/Newtonsoft.Json.dll',
69-
'Microsoft.PowerShell.EditorServices.Host.dll',
70-
'Microsoft.PowerShell.EditorServices.Host.pdb'
71-
)
72-
73-
'PowerShellEditorServices.Protocol' = @(
74-
'Microsoft.PowerShell.EditorServices.Protocol.dll',
75-
'Microsoft.PowerShell.EditorServices.Protocol.pdb'
64+
'publish/OmniSharp.Extensions.JsonRpc.dll',
65+
'publish/OmniSharp.Extensions.LanguageProtocol.dll',
66+
'publish/OmniSharp.Extensions.LanguageServer.dll',
67+
'publish/OmniSharp.Extensions.DebugAdapter.dll',
68+
'publish/OmniSharp.Extensions.DebugAdapter.Server.dll',
69+
'publish/runtimes/linux-64/native/libdisablekeyecho.so',
70+
'publish/runtimes/osx-64/native/libdisablekeyecho.dylib',
71+
'publish/Serilog.dll',
72+
'publish/Serilog.Extensions.Logging.dll',
73+
'publish/Serilog.Sinks.File.dll',
74+
'publish/System.Reactive.dll',
75+
'publish/UnixConsoleEcho.dll'
7676
)
7777
}
7878

@@ -102,12 +102,6 @@ $script:RequiredNugetBinaries = @{
102102
@{ PackageName = 'System.Security.AccessControl'; PackageVersion = '4.5.0'; TargetRuntime = 'net461' },
103103
@{ PackageName = 'System.IO.Pipes.AccessControl'; PackageVersion = '4.5.1'; TargetRuntime = 'net461' }
104104
)
105-
106-
'6.0' = @(
107-
@{ PackageName = 'System.Security.Principal.Windows'; PackageVersion = '4.5.0'; TargetRuntime = 'netcoreapp2.0' },
108-
@{ PackageName = 'System.Security.AccessControl'; PackageVersion = '4.5.0'; TargetRuntime = 'netcoreapp2.0' },
109-
@{ PackageName = 'System.IO.Pipes.AccessControl'; PackageVersion = '4.5.1'; TargetRuntime = 'netstandard2.0' }
110-
)
111105
}
112106

113107
if (Get-Command git -ErrorAction SilentlyContinue) {
@@ -180,7 +174,7 @@ function Invoke-WithCreateDefaultHook {
180174
}
181175
}
182176

183-
task SetupDotNet -Before Clean, Build, TestHost, TestServer, TestProtocol, PackageNuGet {
177+
task SetupDotNet -Before Clean, Build, TestHost, TestServer, TestProtocol, TestE2E {
184178

185179
$dotnetPath = "$PSScriptRoot/.dotnet"
186180
$dotnetExePath = if ($script:IsUnix) { "$dotnetPath/dotnet" } else { "$dotnetPath/dotnet.exe" }
@@ -259,7 +253,7 @@ task Clean {
259253
Get-ChildItem $PSScriptRoot\module\PowerShellEditorServices\Commands\en-US\*-help.xml | Remove-Item -Force -ErrorAction Ignore
260254
}
261255

262-
task GetProductVersion -Before PackageNuGet, PackageModule, UploadArtifacts {
256+
task GetProductVersion -Before PackageModule, UploadArtifacts {
263257
[xml]$props = Get-Content .\PowerShellEditorServices.Common.props
264258

265259
$script:BuildNumber = 9999
@@ -310,7 +304,7 @@ task CreateBuildInfo -Before Build {
310304
[string]$buildTime = [datetime]::Now.ToString("s", [System.Globalization.CultureInfo]::InvariantCulture)
311305

312306
$buildInfoContents = @"
313-
namespace Microsoft.PowerShell.EditorServices.Host
307+
namespace Microsoft.PowerShell.EditorServices.Hosting
314308
{
315309
public static class BuildInfo
316310
{
@@ -326,21 +320,16 @@ namespace Microsoft.PowerShell.EditorServices.Host
326320

327321
task Build {
328322
exec { & $script:dotnetExe publish -c $Configuration .\src\PowerShellEditorServices\PowerShellEditorServices.csproj -f $script:TargetPlatform }
329-
exec { & $script:dotnetExe publish -c $Configuration .\src\PowerShellEditorServices.Host\PowerShellEditorServices.Host.csproj -f $script:TargetPlatform }
330323
exec { & $script:dotnetExe build -c $Configuration .\src\PowerShellEditorServices.VSCode\PowerShellEditorServices.VSCode.csproj $script:TargetFrameworksParam }
331324
}
332325

333-
task BuildPsesClientModule SetupDotNet,{
334-
Write-Verbose 'Building PsesPsClient testing module'
335-
& $PSScriptRoot/tools/PsesPsClient/build.ps1 -DotnetExe $script:dotnetExe
336-
}
337-
338326
function DotNetTestFilter {
339327
# Reference https://docs.microsoft.com/en-us/dotnet/core/testing/selective-unit-tests
340328
if ($TestFilter) { @("--filter",$TestFilter) } else { "" }
341329
}
342330

343-
task Test TestServer,TestProtocol,TestPester
331+
# task Test TestServer,TestProtocol,TestE2E
332+
task Test TestE2E
344333

345334
task TestServer {
346335
Set-Location .\test\PowerShellEditorServices.Test\
@@ -378,26 +367,11 @@ task TestHost {
378367
exec { & $script:dotnetExe test -f $script:TestRuntime.Core (DotNetTestFilter) }
379368
}
380369

381-
task TestPester Build,BuildPsesClientModule,EnsurePesterInstalled,{
382-
$testParams = @{}
383-
if ($env:TF_BUILD)
384-
{
385-
$testParams += @{
386-
OutputFormat = 'NUnitXml'
387-
OutputFile = 'TestResults.xml'
388-
}
389-
}
390-
$result = Invoke-Pester "$PSScriptRoot/test/Pester/" @testParams -PassThru
370+
task TestE2E {
371+
Set-Location .\test\PowerShellEditorServices.Test.E2E\
391372

392-
if ($result.FailedCount -gt 0)
393-
{
394-
throw "$($result.FailedCount) tests failed."
395-
}
396-
}
397-
398-
task EnsurePesterInstalled -If (-not (Get-Module Pester -ListAvailable | Where-Object Version -ge $script:MinimumPesterVersion)) {
399-
Write-Warning "Required Pester version not found, installing Pester to current user scope"
400-
Install-Module -Scope CurrentUser Pester -Force -SkipPublisherCheck
373+
$env:PWSH_EXE_NAME = if ($IsCoreCLR) { "pwsh" } else { "powershell" }
374+
exec { & $script:dotnetExe test --logger trx -f $script:TestRuntime.Core (DotNetTestFilter) }
401375
}
402376

403377
task LayoutModule -After Build {
@@ -502,12 +476,7 @@ task RestorePsesModules -After Build {
502476

503477
task BuildCmdletHelp {
504478
New-ExternalHelp -Path $PSScriptRoot\module\docs -OutputPath $PSScriptRoot\module\PowerShellEditorServices\Commands\en-US -Force
505-
}
506-
507-
task PackageNuGet {
508-
exec { & $script:dotnetExe pack -c $Configuration --version-suffix $script:VersionSuffix .\src\PowerShellEditorServices\PowerShellEditorServices.csproj $script:TargetFrameworksParam }
509-
exec { & $script:dotnetExe pack -c $Configuration --version-suffix $script:VersionSuffix .\src\PowerShellEditorServices.Protocol\PowerShellEditorServices.Protocol.csproj $script:TargetFrameworksParam }
510-
exec { & $script:dotnetExe pack -c $Configuration --version-suffix $script:VersionSuffix .\src\PowerShellEditorServices.Host\PowerShellEditorServices.Host.csproj $script:TargetFrameworksParam }
479+
New-ExternalHelp -Path $PSScriptRoot\module\PowerShellEditorServices.VSCode\docs -OutputPath $PSScriptRoot\module\PowerShellEditorServices.VSCode\en-US -Force
511480
}
512481

513482
task PackageModule {
@@ -523,4 +492,4 @@ task UploadArtifacts -If ($null -ne $env:TF_BUILD) {
523492
}
524493

525494
# The default task is to run the entire CI build
526-
task . GetProductVersion, Clean, Build, Test, BuildCmdletHelp, PackageNuGet, PackageModule, UploadArtifacts
495+
task . GetProductVersion, Clean, Build, Test, BuildCmdletHelp, PackageModule, UploadArtifacts

‎PowerShellEditorServices.sln

+30-45
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F594E7FD-1E7
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{422E561A-8118-4BE7-A54F-9309E4F03AAE}"
99
EndProject
10-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerShellEditorServices", "src\PowerShellEditorServices\PowerShellEditorServices.csproj", "{81E8CBCD-6319-49E7-9662-0475BD0791F4}"
11-
EndProject
12-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerShellEditorServices.Host", "src\PowerShellEditorServices.Host\PowerShellEditorServices.Host.csproj", "{B2F6369A-D737-4AFD-8B81-9B094DB07DA7}"
13-
EndProject
1410
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerShellEditorServices.Test.Host", "test\PowerShellEditorServices.Test.Host\PowerShellEditorServices.Test.Host.csproj", "{3A5DDD20-5BD0-42F4-89F4-ACC0CE554028}"
1511
EndProject
1612
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
2218
scripts\AddCopyrightHeaders.ps1 = scripts\AddCopyrightHeaders.ps1
2319
EndProjectSection
2420
EndProject
25-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerShellEditorServices.Protocol", "src\PowerShellEditorServices.Protocol\PowerShellEditorServices.Protocol.csproj", "{F8A0946A-5D25-4651-8079-B8D5776916FB}"
26-
EndProject
2721
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerShellEditorServices.Test.Protocol", "test\PowerShellEditorServices.Test.Protocol\PowerShellEditorServices.Test.Protocol.csproj", "{E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4}"
2822
EndProject
2923
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerShellEditorServices.VSCode", "src\PowerShellEditorServices.VSCode\PowerShellEditorServices.VSCode.csproj", "{3B38E8DA-8BFF-4264-AF16-47929E6398A3}"
3024
EndProject
25+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerShellEditorServices", "src\PowerShellEditorServices\PowerShellEditorServices.csproj", "{29EEDF03-0990-45F4-846E-2616970D1FA2}"
26+
EndProject
27+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerShellEditorServices.Test.E2E", "test\PowerShellEditorServices.Test.E2E\PowerShellEditorServices.Test.E2E.csproj", "{2561F253-8F72-436A-BCC3-AA63AB82EDC0}"
28+
EndProject
3129
Global
3230
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3331
Debug|Any CPU = Debug|Any CPU
@@ -38,30 +36,6 @@ Global
3836
Release|x86 = Release|x86
3937
EndGlobalSection
4038
GlobalSection(ProjectConfigurationPlatforms) = postSolution
41-
{81E8CBCD-6319-49E7-9662-0475BD0791F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
42-
{81E8CBCD-6319-49E7-9662-0475BD0791F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
43-
{81E8CBCD-6319-49E7-9662-0475BD0791F4}.Debug|x64.ActiveCfg = Debug|Any CPU
44-
{81E8CBCD-6319-49E7-9662-0475BD0791F4}.Debug|x64.Build.0 = Debug|Any CPU
45-
{81E8CBCD-6319-49E7-9662-0475BD0791F4}.Debug|x86.ActiveCfg = Debug|Any CPU
46-
{81E8CBCD-6319-49E7-9662-0475BD0791F4}.Debug|x86.Build.0 = Debug|Any CPU
47-
{81E8CBCD-6319-49E7-9662-0475BD0791F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
48-
{81E8CBCD-6319-49E7-9662-0475BD0791F4}.Release|Any CPU.Build.0 = Release|Any CPU
49-
{81E8CBCD-6319-49E7-9662-0475BD0791F4}.Release|x64.ActiveCfg = Release|Any CPU
50-
{81E8CBCD-6319-49E7-9662-0475BD0791F4}.Release|x64.Build.0 = Release|Any CPU
51-
{81E8CBCD-6319-49E7-9662-0475BD0791F4}.Release|x86.ActiveCfg = Release|Any CPU
52-
{81E8CBCD-6319-49E7-9662-0475BD0791F4}.Release|x86.Build.0 = Release|Any CPU
53-
{B2F6369A-D737-4AFD-8B81-9B094DB07DA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54-
{B2F6369A-D737-4AFD-8B81-9B094DB07DA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
55-
{B2F6369A-D737-4AFD-8B81-9B094DB07DA7}.Debug|x64.ActiveCfg = Debug|Any CPU
56-
{B2F6369A-D737-4AFD-8B81-9B094DB07DA7}.Debug|x64.Build.0 = Debug|Any CPU
57-
{B2F6369A-D737-4AFD-8B81-9B094DB07DA7}.Debug|x86.ActiveCfg = Debug|Any CPU
58-
{B2F6369A-D737-4AFD-8B81-9B094DB07DA7}.Debug|x86.Build.0 = Debug|Any CPU
59-
{B2F6369A-D737-4AFD-8B81-9B094DB07DA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
60-
{B2F6369A-D737-4AFD-8B81-9B094DB07DA7}.Release|Any CPU.Build.0 = Release|Any CPU
61-
{B2F6369A-D737-4AFD-8B81-9B094DB07DA7}.Release|x64.ActiveCfg = Release|Any CPU
62-
{B2F6369A-D737-4AFD-8B81-9B094DB07DA7}.Release|x64.Build.0 = Release|Any CPU
63-
{B2F6369A-D737-4AFD-8B81-9B094DB07DA7}.Release|x86.ActiveCfg = Release|Any CPU
64-
{B2F6369A-D737-4AFD-8B81-9B094DB07DA7}.Release|x86.Build.0 = Release|Any CPU
6539
{3A5DDD20-5BD0-42F4-89F4-ACC0CE554028}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6640
{3A5DDD20-5BD0-42F4-89F4-ACC0CE554028}.Debug|Any CPU.Build.0 = Debug|Any CPU
6741
{3A5DDD20-5BD0-42F4-89F4-ACC0CE554028}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -98,18 +72,6 @@ Global
9872
{6A20B9E9-DE66-456E-B4F5-ACFD1A95C3CA}.Release|x64.Build.0 = Release|Any CPU
9973
{6A20B9E9-DE66-456E-B4F5-ACFD1A95C3CA}.Release|x86.ActiveCfg = Release|Any CPU
10074
{6A20B9E9-DE66-456E-B4F5-ACFD1A95C3CA}.Release|x86.Build.0 = Release|Any CPU
101-
{F8A0946A-5D25-4651-8079-B8D5776916FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
102-
{F8A0946A-5D25-4651-8079-B8D5776916FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
103-
{F8A0946A-5D25-4651-8079-B8D5776916FB}.Debug|x64.ActiveCfg = Debug|Any CPU
104-
{F8A0946A-5D25-4651-8079-B8D5776916FB}.Debug|x64.Build.0 = Debug|Any CPU
105-
{F8A0946A-5D25-4651-8079-B8D5776916FB}.Debug|x86.ActiveCfg = Debug|Any CPU
106-
{F8A0946A-5D25-4651-8079-B8D5776916FB}.Debug|x86.Build.0 = Debug|Any CPU
107-
{F8A0946A-5D25-4651-8079-B8D5776916FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
108-
{F8A0946A-5D25-4651-8079-B8D5776916FB}.Release|Any CPU.Build.0 = Release|Any CPU
109-
{F8A0946A-5D25-4651-8079-B8D5776916FB}.Release|x64.ActiveCfg = Release|Any CPU
110-
{F8A0946A-5D25-4651-8079-B8D5776916FB}.Release|x64.Build.0 = Release|Any CPU
111-
{F8A0946A-5D25-4651-8079-B8D5776916FB}.Release|x86.ActiveCfg = Release|Any CPU
112-
{F8A0946A-5D25-4651-8079-B8D5776916FB}.Release|x86.Build.0 = Release|Any CPU
11375
{E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
11476
{E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
11577
{E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -134,18 +96,41 @@ Global
13496
{3B38E8DA-8BFF-4264-AF16-47929E6398A3}.Release|x64.Build.0 = Release|Any CPU
13597
{3B38E8DA-8BFF-4264-AF16-47929E6398A3}.Release|x86.ActiveCfg = Release|Any CPU
13698
{3B38E8DA-8BFF-4264-AF16-47929E6398A3}.Release|x86.Build.0 = Release|Any CPU
99+
{29EEDF03-0990-45F4-846E-2616970D1FA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
100+
{29EEDF03-0990-45F4-846E-2616970D1FA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
101+
{29EEDF03-0990-45F4-846E-2616970D1FA2}.Debug|x64.ActiveCfg = Debug|Any CPU
102+
{29EEDF03-0990-45F4-846E-2616970D1FA2}.Debug|x64.Build.0 = Debug|Any CPU
103+
{29EEDF03-0990-45F4-846E-2616970D1FA2}.Debug|x86.ActiveCfg = Debug|Any CPU
104+
{29EEDF03-0990-45F4-846E-2616970D1FA2}.Debug|x86.Build.0 = Debug|Any CPU
105+
{29EEDF03-0990-45F4-846E-2616970D1FA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
106+
{29EEDF03-0990-45F4-846E-2616970D1FA2}.Release|Any CPU.Build.0 = Release|Any CPU
107+
{29EEDF03-0990-45F4-846E-2616970D1FA2}.Release|x64.ActiveCfg = Release|Any CPU
108+
{29EEDF03-0990-45F4-846E-2616970D1FA2}.Release|x64.Build.0 = Release|Any CPU
109+
{29EEDF03-0990-45F4-846E-2616970D1FA2}.Release|x86.ActiveCfg = Release|Any CPU
110+
{29EEDF03-0990-45F4-846E-2616970D1FA2}.Release|x86.Build.0 = Release|Any CPU
111+
{2561F253-8F72-436A-BCC3-AA63AB82EDC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
112+
{2561F253-8F72-436A-BCC3-AA63AB82EDC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
113+
{2561F253-8F72-436A-BCC3-AA63AB82EDC0}.Debug|x64.ActiveCfg = Debug|Any CPU
114+
{2561F253-8F72-436A-BCC3-AA63AB82EDC0}.Debug|x64.Build.0 = Debug|Any CPU
115+
{2561F253-8F72-436A-BCC3-AA63AB82EDC0}.Debug|x86.ActiveCfg = Debug|Any CPU
116+
{2561F253-8F72-436A-BCC3-AA63AB82EDC0}.Debug|x86.Build.0 = Debug|Any CPU
117+
{2561F253-8F72-436A-BCC3-AA63AB82EDC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
118+
{2561F253-8F72-436A-BCC3-AA63AB82EDC0}.Release|Any CPU.Build.0 = Release|Any CPU
119+
{2561F253-8F72-436A-BCC3-AA63AB82EDC0}.Release|x64.ActiveCfg = Release|Any CPU
120+
{2561F253-8F72-436A-BCC3-AA63AB82EDC0}.Release|x64.Build.0 = Release|Any CPU
121+
{2561F253-8F72-436A-BCC3-AA63AB82EDC0}.Release|x86.ActiveCfg = Release|Any CPU
122+
{2561F253-8F72-436A-BCC3-AA63AB82EDC0}.Release|x86.Build.0 = Release|Any CPU
137123
EndGlobalSection
138124
GlobalSection(SolutionProperties) = preSolution
139125
HideSolutionNode = FALSE
140126
EndGlobalSection
141127
GlobalSection(NestedProjects) = preSolution
142-
{81E8CBCD-6319-49E7-9662-0475BD0791F4} = {F594E7FD-1E72-4E51-A496-B019C2BA3180}
143-
{B2F6369A-D737-4AFD-8B81-9B094DB07DA7} = {F594E7FD-1E72-4E51-A496-B019C2BA3180}
144128
{3A5DDD20-5BD0-42F4-89F4-ACC0CE554028} = {422E561A-8118-4BE7-A54F-9309E4F03AAE}
145129
{8ED116F4-9DDF-4C49-AB96-AE462E3D64C3} = {422E561A-8118-4BE7-A54F-9309E4F03AAE}
146130
{6A20B9E9-DE66-456E-B4F5-ACFD1A95C3CA} = {422E561A-8118-4BE7-A54F-9309E4F03AAE}
147-
{F8A0946A-5D25-4651-8079-B8D5776916FB} = {F594E7FD-1E72-4E51-A496-B019C2BA3180}
148131
{E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4} = {422E561A-8118-4BE7-A54F-9309E4F03AAE}
149132
{3B38E8DA-8BFF-4264-AF16-47929E6398A3} = {F594E7FD-1E72-4E51-A496-B019C2BA3180}
133+
{29EEDF03-0990-45F4-846E-2616970D1FA2} = {F594E7FD-1E72-4E51-A496-B019C2BA3180}
134+
{2561F253-8F72-436A-BCC3-AA63AB82EDC0} = {422E561A-8118-4BE7-A54F-9309E4F03AAE}
150135
EndGlobalSection
151136
EndGlobal

‎docs/api/index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ the PowerShell debugger.
2020
Use the @Microsoft.PowerShell.EditorServices.Console.ConsoleService to provide interactive
2121
console support in the user's editor.
2222

23-
Use the @Microsoft.PowerShell.EditorServices.Extensions.ExtensionService to allow
23+
Use the @Microsoft.PowerShell.EditorServices.Services.ExtensionService to allow
2424
the user to extend the host editor with new capabilities using PowerShell code.
2525

2626
The core of all the services is the @Microsoft.PowerShell.EditorServices.PowerShellContext
2727
class. This class manages a session's runspace and handles script and command
28-
execution no matter what state the runspace is in.
28+
execution no matter what state the runspace is in.

0 commit comments

Comments
 (0)