Skip to content

Reimplement the way PowerShell is run and hosted in PSES with a dedicated pipeline thread consumer #1459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 178 commits into from
Oct 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
178 commits
Select commit Hold shift + click to select a range
95558cc
Add progress
rjmholt Jun 18, 2020
bef1740
Get to console repl, remove PSContext dependency
rjmholt Jun 22, 2020
908a6df
Completions working
rjmholt Jun 23, 2020
b9b9b36
Convert MethodInfo to compiled delegate call
rjmholt Jun 23, 2020
9266126
Continue tweaking REPL
rjmholt Jun 24, 2020
b105808
Implement cancellation properly, make F8 work
rjmholt Jun 25, 2020
28e26cc
Set execution policy
rjmholt Jun 25, 2020
8c944fe
Make initialisation executions synchronous
rjmholt Jun 25, 2020
ab2b9a0
Remove extraneous runspace set
rjmholt Jun 25, 2020
98e931b
Reuse conhost for prompts
rjmholt Jun 25, 2020
1492dad
Fix newlines
rjmholt Jun 25, 2020
e3de6b5
Begin nested prompt implementation
rjmholt Jul 7, 2020
b7e99bb
Move to PSContext
rjmholt Jul 8, 2020
f94845e
Make nested prompts work
rjmholt Jul 8, 2020
200f1a1
Fix nesting issues with stacks
rjmholt Jul 8, 2020
25358ed
Fix handling of prompt cancellation
rjmholt Jul 14, 2020
827256e
Use concurrent datastructure for stacks
rjmholt Jul 14, 2020
1c5897e
Add simple debug REPL support
rjmholt Jul 17, 2020
1caaa3b
Fix out-string usage in debugger
rjmholt Jul 21, 2020
c1c9a2b
Attempt to handle debug exit
rjmholt Jul 21, 2020
1f7ae6b
Make debugger resume commands work
rjmholt Jul 23, 2020
f86f04c
Change use of PS context and events to safely manage prompts
rjmholt Jul 24, 2020
0cbf182
Improve debug handling, add remoting support, improve idle processing
rjmholt Jul 29, 2020
2af48b1
Merge PS context into execution service, make REPL service a subcompo…
rjmholt Aug 3, 2020
270cb64
Implement remote debugger waiting
rjmholt Aug 4, 2020
d217e1f
Improve cancellation handling and runspace cleanup
rjmholt Aug 5, 2020
ddf5bf1
Deal with debug abort in WinPS
rjmholt Aug 5, 2020
3d77cbe
Temp refactor
rjmholt Aug 10, 2020
3b8a8cf
Migrate runspace pieces
rjmholt Aug 20, 2020
404a943
Bring code up to compilation
rjmholt Aug 27, 2020
14c3085
Fix initialization
rjmholt Aug 28, 2020
38ad41b
Finally get the REPL and completions back
rjmholt Aug 28, 2020
f71811d
Fix cancellation
rjmholt Aug 28, 2020
9a4e2af
Get debugging to work again
rjmholt Aug 28, 2020
ca90b08
Fix rebase issues
rjmholt Apr 15, 2021
5eddb02
Fix incorrect namespace
rjmholt Sep 30, 2021
169c37e
Remove defunct comment
rjmholt Sep 30, 2021
3807555
Add comment about extension service
rjmholt Sep 30, 2021
dc49f45
Remove defunct code
rjmholt Sep 30, 2021
390df1b
Use correct wildcard escape method
rjmholt Sep 30, 2021
b0b3759
Remove unused value
rjmholt Sep 30, 2021
571afe4
Add comment about debugger implementation
rjmholt Sep 30, 2021
e6f369e
Add comment about Debugger.ProcessCommand()
rjmholt Sep 30, 2021
c1144e4
Add comments around exception handling
rjmholt Sep 30, 2021
8ae537d
Remove unused exception
rjmholt Sep 30, 2021
65447d9
Add comments to EvaluateHandler
rjmholt Sep 30, 2021
bdad3d7
Fix SessionDetails comment
rjmholt Sep 30, 2021
0285339
Add CancellationContext comment
rjmholt Sep 30, 2021
6a36ea2
Use FirstOrDefault()
rjmholt Sep 30, 2021
00d7da3
Add explanation to ErrorRecordExtensions
rjmholt Sep 30, 2021
30a594b
Add comments to PSCommandExtensions
rjmholt Sep 30, 2021
6e3a2e1
Add code ref to ErrorRecordExtensions
rjmholt Sep 30, 2021
8fefda9
Add comment to PowerShellExtensions
rjmholt Sep 30, 2021
80c472e
Simplify $PROFILE code
rjmholt Sep 30, 2021
f23cb4b
Document runspace extension method
rjmholt Sep 30, 2021
6388830
Fix profiling loading logic in config handler
rjmholt Sep 30, 2021
1d4c44b
Remove extraneous JS file
rjmholt May 10, 2021
2fde356
Debugging dependency injection
rjmholt Apr 20, 2021
4b31412
Get UI debugger running
rjmholt Apr 21, 2021
58edc09
Resolve commented-out code
rjmholt May 10, 2021
182d5e5
Improve queue implementation
rjmholt May 25, 2021
7f0e4c1
Add async error handling code
rjmholt May 10, 2021
d29ddc8
Rework execution queue to allow correct cancellation
rjmholt Jun 21, 2021
2673e8c
TEMP: Need to fix cancellation from PSRL scope
rjmholt Jun 28, 2021
0e4eb9e
TEMP: Moving to monolithic host
rjmholt Jul 20, 2021
0c11735
WIP
rjmholt Aug 4, 2021
7dccf66
Move all basic functionality into a new synchronous internal host
rjmholt Aug 13, 2021
26ef0c6
Restore host to simple working order
rjmholt Aug 24, 2021
e00394a
Add simple cancellation support
rjmholt Aug 30, 2021
a02f409
Ensure startup operations are performed before first prompt
rjmholt Aug 30, 2021
244dbe2
Fix dependency issue
rjmholt Aug 30, 2021
926460a
Fix incorrect remote runspace labelling
rjmholt Aug 30, 2021
0eed465
Begin to make the debugger work
rjmholt Aug 30, 2021
c660d38
Fix recursive PSRL cancellation token issue in debugger
rjmholt Sep 1, 2021
08d65b0
Enable proper debug UI interaction
rjmholt Sep 2, 2021
4652a49
Fix remote session connection
rjmholt Sep 3, 2021
7873e1e
Check the current runspace for debug API support
rjmholt Sep 8, 2021
81aab0e
Fix debug disconnect handling
rjmholt Sep 9, 2021
29ec7de
Make remote debugger function correctly
rjmholt Sep 14, 2021
f875a35
Remove dead code
rjmholt Sep 15, 2021
3f28ba2
Remove more dead code
rjmholt Sep 15, 2021
f5936a3
Add comment about remote debugging
rjmholt Sep 15, 2021
ba123c0
Rename event handler
rjmholt Sep 15, 2021
3b2204d
Add ConfigureAwait(false)
rjmholt Sep 15, 2021
d0334d0
Make psEditor variable name a constant
rjmholt Sep 15, 2021
c3942f9
Remove debug cancellation token
rjmholt Sep 15, 2021
9ced126
Remove duplicated check
rjmholt Sep 15, 2021
f7f62ce
Add comment
rjmholt Sep 15, 2021
e476975
Add data structure for interlocked latch pattern
rjmholt Sep 15, 2021
d6f5cd8
Move cancellation token argument to end of methods
rjmholt Sep 15, 2021
52480b0
Make BlockingConcurrentDeque disposable
rjmholt Sep 15, 2021
a3c0ff7
Rename PSES InternalHost to PsesInternalHost
rjmholt Oct 5, 2021
0765466
Change WriteErrorsToHost to ThrowOnError
rjmholt Oct 5, 2021
ca92aba
Make default PowerShellExecutionOptions static
rjmholt Oct 7, 2021
1c13b96
Remove PowerShellContextService
rjmholt Oct 7, 2021
bde38ef
Ensure ConfigureAwait(false) is used everywhere
rjmholt Oct 7, 2021
a8c4ae2
Fix debugger evaluation not being written out
rjmholt Oct 7, 2021
850c9f9
Add comment about nameless variables
rjmholt Oct 7, 2021
8b0f78b
Use nicer pattern matching for condition
rjmholt Oct 7, 2021
002884e
Add TODO about debugger disconnection handling
rjmholt Oct 7, 2021
fdb3e37
Convert to `is null` for consistency
rjmholt Oct 7, 2021
aac438f
Remove unused dependencies
rjmholt Oct 7, 2021
d05e65c
Use AllThreadsContinued consistently
rjmholt Oct 7, 2021
6972c05
Add comment about debug context lifetime
rjmholt Oct 7, 2021
b884408
Add context to comment
rjmholt Oct 7, 2021
1457327
Fix breakpoint API test
rjmholt Oct 8, 2021
ec8853d
Fix ThrowOnError configuration check
rjmholt Oct 8, 2021
5f58f8c
Ensure the DSC module import fails with an error
rjmholt Oct 8, 2021
d5df3a8
Remove unneeded async/await
rjmholt Oct 8, 2021
257cbdc
Add comment explaining remote debug setting
rjmholt Oct 8, 2021
e3470c7
Remove unused enum
rjmholt Oct 8, 2021
1dec31d
Add comment to execution options class
rjmholt Oct 8, 2021
7ceccc3
Add comment to synchronous task about synchronous results
rjmholt Oct 8, 2021
433ffd7
Ensure F8 works
rjmholt Oct 8, 2021
b6d44e7
Add comment about not exiting the top level
rjmholt Oct 8, 2021
50bf359
Generalize exit handling
rjmholt Oct 8, 2021
cd2b08e
Add comment about remote prompt
rjmholt Oct 9, 2021
110af60
Simplify nested PowerShell creation
rjmholt Oct 9, 2021
ccf62c3
Use a more explicit return
rjmholt Oct 9, 2021
af8b51d
Fix Ctrl-C detection
rjmholt Oct 9, 2021
4fb8ac7
Rename debug event handlers
rjmholt Oct 11, 2021
7b74c7e
Remove unneeded PSRL static ctor call - PSRL is now loaded on the pip…
rjmholt Oct 11, 2021
f114166
Move execution service to an interface
rjmholt Oct 11, 2021
257a69b
Enhance remoting comment
rjmholt Oct 11, 2021
d800a1d
Turn on psedit registration in remote sessions
rjmholt Oct 11, 2021
71cd709
Ensure failed remote file saves are logged
rjmholt Oct 11, 2021
a97afa9
Add comment about IsExternalInit
rjmholt Oct 11, 2021
8d69c46
Reinstate runspace cleanup logic
rjmholt Oct 11, 2021
5c9831f
Fix remote psedit registration
rjmholt Oct 11, 2021
b904503
Fix AnalysisService using
rjmholt Oct 11, 2021
cf86736
Fix InitialSessionState LanguageMode usage
rjmholt Oct 11, 2021
f825d89
Address static analyser compiler errors
rjmholt Oct 11, 2021
78b75b2
Apply suppression to ExitDebugLoop() API
rjmholt Oct 11, 2021
7909acd
Fix NRE in DSC capability discovery
rjmholt Oct 11, 2021
724f615
Remove unused using statements
rjmholt Oct 12, 2021
71d26c6
Add copyright headers
rjmholt Oct 12, 2021
ceb20e8
Remove unneeded internal usings
rjmholt Oct 12, 2021
ef5595b
Implement PowerShell engine OnIdle events
rjmholt Oct 12, 2021
d779a73
Improve artificial idle event comment
rjmholt Oct 13, 2021
9144a77
Fix typo
rjmholt Oct 13, 2021
39f8e4c
Change BlockingConcurrentDequeue to provide IsEmpty property
rjmholt Oct 13, 2021
022c9c7
Fix using
rjmholt Oct 13, 2021
4d5e067
Convert PSRL OnIdle handler to take a CancellationToken
rjmholt Oct 13, 2021
c1e317f
Add initial ReadLine implementation
rjmholt Oct 12, 2021
7ab8639
Add common secure string read functionality
rjmholt Oct 12, 2021
4e44a11
Implement shared Ctrl-C test implementation
rjmholt Oct 12, 2021
3f96f56
Avoid unused parser call
rjmholt Oct 12, 2021
9be9cce
Add idle support for legacy readline
rjmholt Oct 12, 2021
f9e35f3
Add comment about unimplemented line continuation support
rjmholt Oct 12, 2021
7912dcf
Hook up legacy readline support in the host
rjmholt Oct 13, 2021
bfc1b2e
Remove stale TODOs
rjmholt Oct 13, 2021
7149e18
Remove commented out code
rjmholt Oct 13, 2021
7754005
Remove unused usings
rjmholt Oct 13, 2021
fee5054
Remove unneeded readline interface methods
rjmholt Oct 14, 2021
36a9a5d
Update comment
rjmholt Oct 14, 2021
16cd6c4
Remove defunct internal cmdlets (#1593)
rjmholt Oct 26, 2021
8c568bc
Initial test build
rjmholt Oct 14, 2021
ec3ffdd
Add Host factory
rjmholt Oct 14, 2021
2475a64
Enable host with no repl
rjmholt Oct 19, 2021
a00cb49
Comment out LSP unit tests
rjmholt Oct 19, 2021
01a6b63
Bump CI
rjmholt Oct 19, 2021
28c990a
Add timeout to test
rjmholt Oct 20, 2021
c8b1f50
Ensure CI is triggered for PRs not for master
rjmholt Oct 20, 2021
7e5ece6
Route startup exceptions through and ensure startup has completed bef…
rjmholt Oct 20, 2021
9bf289c
Fix test compile error
rjmholt Oct 21, 2021
2809eea
Fix process exit throwing
rjmholt Oct 25, 2021
c05a296
Fix bad output when console repl is disabled
rjmholt Oct 25, 2021
03981d3
Add debug logging for integration test streams
rjmholt Oct 25, 2021
956571c
Fix overrides
rjmholt Oct 25, 2021
18ad303
Fix variable test with scope change
rjmholt Oct 25, 2021
5376d41
Fix assembly log exception
rjmholt Oct 25, 2021
01c8e52
Only set pipeline thread apartment state on Windows
rjmholt Oct 26, 2021
4db7a0b
Remove debug code
rjmholt Oct 26, 2021
20ac9ad
Reinstate language service unit tests (#1598)
rjmholt Oct 27, 2021
83244eb
Update PSReadLine to 2.2.0-beta4 for idle handler support
rjmholt Oct 28, 2021
a578ed4
Update CHANGELOG for `v3.0.0`
rjmholt Oct 28, 2021
1d9e60a
Bump version to `v3.0.0`
andyleejordan Oct 28, 2021
548fdda
Merge pull request #1600 from PowerShell/release
andyleejordan Oct 28, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .vsts-ci/azure-pipelines-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,6 @@ 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
Expand Down
75 changes: 75 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,80 @@
# PowerShell Editor Services Release History

## 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

Expand Down
2 changes: 1 addition & 1 deletion PowerShellEditorServices.Common.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<VersionPrefix>2.5.2</VersionPrefix>
<VersionPrefix>3.0.0</VersionPrefix>
<VersionSuffix></VersionSuffix>
<Company>Microsoft</Company>
<Copyright>© Microsoft Corporation.</Copyright>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ RootModule = if ($PSEdition -eq 'Core')
}

# Version number of this module.
ModuleVersion = '2.5.2'
ModuleVersion = '3.0.0'

# ID used to uniquely identify this module
GUID = '9ca15887-53a2-479a-9cda-48d26bcb6c47'
Expand Down
3 changes: 2 additions & 1 deletion modules.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"Version": "1.1.3"
},
"PSReadLine": {
"Version": "2.1.0"
"Version": "2.2.0-beta4",
"AllowPrerelease": true
}
}

This file was deleted.

This file was deleted.

5 changes: 5 additions & 0 deletions src/PowerShellEditorServices.Hosting/EditorServicesLoader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,11 @@ public static EditorServicesLoader Create(
{
AppDomain.CurrentDomain.AssemblyLoad += (object sender, AssemblyLoadEventArgs args) =>
{
if (args.LoadedAssembly.IsDynamic)
{
return;
}

logger.Log(
PsesLogLevel.Diagnostic,
$"Loaded '{args.LoadedAssembly.GetName()}' from '{args.LoadedAssembly.Location}'");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.PowerShell.EditorServices.Handlers;
using Microsoft.PowerShell.EditorServices.Services.Extension;
using OmniSharp.Extensions.LanguageServer.Protocol.Server;

namespace Microsoft.PowerShell.EditorServices.Extensions.Services
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Linq.Expressions;
using System.Reflection;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.PowerShell.EditorServices.Services;
using Microsoft.PowerShell.EditorServices.Services.Extension;
using Microsoft.PowerShell.EditorServices.Utility;
using OmniSharp.Extensions.LanguageServer.Protocol.Server;

Expand Down
14 changes: 10 additions & 4 deletions src/PowerShellEditorServices/Extensions/Api/EditorUIService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.PowerShell.EditorServices.Services.PowerShellContext;
using Microsoft.PowerShell.EditorServices.Services.Extension;
using OmniSharp.Extensions.LanguageServer.Protocol.Server;

namespace Microsoft.PowerShell.EditorServices.Extensions.Services
Expand Down Expand Up @@ -116,7 +116,9 @@ public async Task<string> PromptInputAsync(string message)
new ShowInputPromptRequest
{
Name = message,
}).Returning<ShowInputPromptResponse>(CancellationToken.None).ConfigureAwait(false);
})
.Returning<ShowInputPromptResponse>(CancellationToken.None)
.ConfigureAwait(false);

if (response.PromptCancelled)
{
Expand All @@ -142,7 +144,9 @@ public async Task<IReadOnlyList<string>> PromptMultipleSelectionAsync(string mes
Message = message,
Choices = choiceDetails,
DefaultChoices = defaultChoiceIndexes?.ToArray(),
}).Returning<ShowChoicePromptResponse>(CancellationToken.None).ConfigureAwait(false);
})
.Returning<ShowChoicePromptResponse>(CancellationToken.None)
.ConfigureAwait(false);

if (response.PromptCancelled)
{
Expand All @@ -168,7 +172,9 @@ public async Task<string> PromptSelectionAsync(string message, IReadOnlyList<Pro
Message = message,
Choices = choiceDetails,
DefaultChoices = defaultChoiceIndex > -1 ? new[] { defaultChoiceIndex } : null,
}).Returning<ShowChoicePromptResponse>(CancellationToken.None).ConfigureAwait(false);
})
.Returning<ShowChoicePromptResponse>(CancellationToken.None)
.ConfigureAwait(false);

if (response.PromptCancelled)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using Microsoft.PowerShell.EditorServices.Services;
using Microsoft.PowerShell.EditorServices.Services.Extension;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using MediatR;
using OmniSharp.Extensions.LanguageServer.Protocol.Server;
using System.Threading;
using System.Threading.Tasks;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using System;
using System.Collections.Generic;
using System.Management.Automation.Language;
using System.Threading.Tasks;

namespace Microsoft.PowerShell.EditorServices.Extensions.Services
{
Expand Down
1 change: 0 additions & 1 deletion src/PowerShellEditorServices/Extensions/EditorContext.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using System;
using Microsoft.PowerShell.EditorServices.Services.TextDocument;

namespace Microsoft.PowerShell.EditorServices.Extensions
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using Microsoft.PowerShell.EditorServices.Handlers;
using Microsoft.PowerShell.EditorServices.Services.Extension;
using Microsoft.PowerShell.EditorServices.Services.TextDocument;
using OmniSharp.Extensions.LanguageServer.Protocol.Models;
using System;
Expand Down
2 changes: 1 addition & 1 deletion src/PowerShellEditorServices/Extensions/EditorObject.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Reflection;
using System.Threading.Tasks;
using Microsoft.PowerShell.EditorServices.Extensions.Services;
using Microsoft.PowerShell.EditorServices.Services;
using Microsoft.PowerShell.EditorServices.Services.Extension;

namespace Microsoft.PowerShell.EditorServices.Extensions
{
Expand Down
2 changes: 0 additions & 2 deletions src/PowerShellEditorServices/Extensions/EditorWorkspace.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using System.Threading.Tasks;

namespace Microsoft.PowerShell.EditorServices.Extensions
{
/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
using Microsoft.Extensions.Logging;
using Microsoft.PowerShell.EditorServices.Logging;
using Microsoft.PowerShell.EditorServices.Server;
using Microsoft.PowerShell.EditorServices.Services;
using Serilog;
using Serilog.Events;
using OmniSharp.Extensions.LanguageServer.Protocol.Server;
using Microsoft.PowerShell.EditorServices.Services.Extension;

#if DEBUG
using Serilog.Debugging;
Expand Down
2 changes: 0 additions & 2 deletions src/PowerShellEditorServices/Logging/HostLoggerAdapter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
using System.Text;

namespace Microsoft.PowerShell.EditorServices.Logging
{
Expand Down
5 changes: 4 additions & 1 deletion src/PowerShellEditorServices/PowerShellEditorServices.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@
</ItemGroup>

<ItemGroup>
<Compile Remove="Extensions\Api\DocumentSymbolService.cs"/>
<Compile Remove="Extensions\Api\DocumentSymbolService.cs" />
<Compile Remove="Services\Extension\Templating\**" />
<EmbeddedResource Remove="Services\Extension\Templating\**" />
<None Remove="Services\Extension\Templating\**" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's not forget to delete all this code 🤣

</ItemGroup>
</Project>
Loading