Merge pull request #1460 from PowerShell/andschwa/omnisharp

Bump OmniSharp package to `0.19.2-beta0001`

Author: andyleejordan

src/PowerShellEditorServices/Extensions/Api/EditorExtensionServiceProvider.cs

@@ -11,7 +11,7 @@
 using Microsoft.PowerShell.EditorServices.Utility;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
 
-using Internal = Microsoft.PowerShell.EditorServices.Services;
+using InternalServices = Microsoft.PowerShell.EditorServices.Services;
 
 namespace Microsoft.PowerShell.EditorServices.Extensions.Services
 {
@@ -46,7 +46,7 @@ internal EditorExtensionServiceProvider(IServiceProvider serviceProvider)
             LanguageServer = new LanguageServerService(_serviceProvider.GetService<ILanguageServerFacade>());
             //DocumentSymbols = new DocumentSymbolService(_serviceProvider.GetService<SymbolsService>());
             ExtensionCommands = new ExtensionCommandService(_serviceProvider.GetService<ExtensionService>());
-            Workspace = new WorkspaceService(_serviceProvider.GetService<Internal.WorkspaceService>());
+            Workspace = new WorkspaceService(_serviceProvider.GetService<InternalServices.WorkspaceService>());
             EditorContext = new EditorContextService(_serviceProvider.GetService<ILanguageServerFacade>());
             EditorUI = new EditorUIService(_serviceProvider.GetService<ILanguageServerFacade>());
         }

src/PowerShellEditorServices/PowerShellEditorServices.csproj

@@ -29,8 +29,8 @@
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
-    <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.0" />
-    <PackageReference Include="OmniSharp.Extensions.DebugAdapter.Server" Version="0.19.0" />
+    <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.2-beta0001" />
+    <PackageReference Include="OmniSharp.Extensions.DebugAdapter.Server" Version="0.19.2-beta0001" />
     <PackageReference Include="PowerShellStandard.Library" Version="5.1.1" />
     <PackageReference Include="Serilog" Version="2.10.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />

src/PowerShellEditorServices/Services/DebugAdapter/Handlers/ThreadsHandler.cs

@@ -7,17 +7,26 @@
 using System.Threading.Tasks;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Models;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Requests;
+using Thread = OmniSharp.Extensions.DebugAdapter.Protocol.Models.Thread;
 
 namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     internal class ThreadsHandler : IThreadsHandler
     {
+        internal static Thread PipelineThread { get; } =
+            new Thread { Id = 1, Name = "PowerShell Pipeline Thread" };
+
         public Task<ThreadsResponse> Handle(ThreadsArguments request, CancellationToken cancellationToken)
         {
             return Task.FromResult(new ThreadsResponse
             {
-                // TODO: This is an empty container of threads...do we need to make a thread?
-                Threads = new Container<System.Threading.Thread>()
+                // TODO: OmniSharp supports multithreaded debugging (where
+                // multiple threads can be debugged at once), but we don't. This
+                // means we always need to set AllThreadsStoppped and
+                // AllThreadsContinued in our events. But if we one day support
+                // multithreaded debugging, we'd need a way to associate
+                // debugged runspaces with .NET threads in a consistent way.
+                Threads = new Container<Thread>(PipelineThread)
             });
         }
     }

test/PowerShellEditorServices.Test.E2E/PowerShellEditorServices.Test.E2E.csproj

@@ -10,8 +10,8 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
-    <PackageReference Include="OmniSharp.Extensions.LanguageClient" Version="0.19.0" />
-    <PackageReference Include="OmniSharp.Extensions.DebugAdapter.Client" Version="0.19.0" />
+    <PackageReference Include="OmniSharp.Extensions.LanguageClient" Version="0.19.2-beta0001" />
+    <PackageReference Include="OmniSharp.Extensions.DebugAdapter.Client" Version="0.19.2-beta0001" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />

test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj

@@ -27,7 +27,7 @@
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
-    <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.0" />
+    <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.2-beta0001" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.4.0-beta.1.build3958" />
   </ItemGroup>
   <ItemGroup>