Commit 4cf1387

authored

Merge pull request #1460 from PowerShell/andschwa/omnisharp

Bump OmniSharp package to `0.19.2-beta0001`

2 parents 7c035bc + 21c351b commit 4cf1387Copy full SHA for 4cf1387

File tree

+18

-9

lines changed

+18

-9

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`using Microsoft.PowerShell.EditorServices.Utility;`
`12`	`12`	`using OmniSharp.Extensions.LanguageServer.Protocol.Server;`
`13`	`13`
`14`		`-using Internal = Microsoft.PowerShell.EditorServices.Services;`
	`14`	`+using InternalServices = Microsoft.PowerShell.EditorServices.Services;`
`15`	`15`
`16`	`16`	`namespace Microsoft.PowerShell.EditorServices.Extensions.Services`
`17`	`17`	`{`
`@@ -46,7 +46,7 @@ internal EditorExtensionServiceProvider(IServiceProvider serviceProvider)`
`46`	`46`	`LanguageServer = new LanguageServerService(_serviceProvider.GetService<ILanguageServerFacade>());`
`47`	`47`	`//DocumentSymbols = new DocumentSymbolService(_serviceProvider.GetService<SymbolsService>());`
`48`	`48`	`ExtensionCommands = new ExtensionCommandService(_serviceProvider.GetService<ExtensionService>());`
`49`		`- Workspace = new WorkspaceService(_serviceProvider.GetService<Internal.WorkspaceService>());`
	`49`	`+ Workspace = new WorkspaceService(_serviceProvider.GetService<InternalServices.WorkspaceService>());`
`50`	`50`	`EditorContext = new EditorContextService(_serviceProvider.GetService<ILanguageServerFacade>());`
`51`	`51`	`EditorUI = new EditorUIService(_serviceProvider.GetService<ILanguageServerFacade>());`
`52`	`52`	`}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@`
`29`	`29`	`<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />`
`30`	`30`	`<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="5.0.0" />`
`31`	`31`	`<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />`
`32`		`- <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.0" />`
`33`		`- <PackageReference Include="OmniSharp.Extensions.DebugAdapter.Server" Version="0.19.0" />`
	`32`	`+ <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.2-beta0001" />`
	`33`	`+ <PackageReference Include="OmniSharp.Extensions.DebugAdapter.Server" Version="0.19.2-beta0001" />`
`34`	`34`	`<PackageReference Include="PowerShellStandard.Library" Version="5.1.1" />`
`35`	`35`	`<PackageReference Include="Serilog" Version="2.10.0" />`
`36`	`36`	`<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />`

Lines changed: 11 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,17 +7,26 @@`
`7`	`7`	`using System.Threading.Tasks;`
`8`	`8`	`using OmniSharp.Extensions.DebugAdapter.Protocol.Models;`
`9`	`9`	`using OmniSharp.Extensions.DebugAdapter.Protocol.Requests;`
	`10`	`+using Thread = OmniSharp.Extensions.DebugAdapter.Protocol.Models.Thread;`
`10`	`11`
`11`	`12`	`namespace Microsoft.PowerShell.EditorServices.Handlers`
`12`	`13`	`{`
`13`	`14`	`internal class ThreadsHandler : IThreadsHandler`
`14`	`15`	`{`
	`16`	`+ internal static Thread PipelineThread { get; } =`
	`17`	`+ new Thread { Id = 1, Name = "PowerShell Pipeline Thread" };`
	`18`	`+`
`15`	`19`	`public Task<ThreadsResponse> Handle(ThreadsArguments request, CancellationToken cancellationToken)`
`16`	`20`	`{`
`17`	`21`	`return Task.FromResult(new ThreadsResponse`
`18`	`22`	`{`
`19`		`- // TODO: This is an empty container of threads...do we need to make a thread?`
`20`		`- Threads = new Container<System.Threading.Thread>()`
	`23`	`+ // TODO: OmniSharp supports multithreaded debugging (where`
	`24`	`+ // multiple threads can be debugged at once), but we don't. This`
	`25`	`+ // means we always need to set AllThreadsStoppped and`
	`26`	`+ // AllThreadsContinued in our events. But if we one day support`
	`27`	`+ // multithreaded debugging, we'd need a way to associate`
	`28`	`+ // debugged runspaces with .NET threads in a consistent way.`
	`29`	`+ Threads = new Container<Thread>(PipelineThread)`
`21`	`30`	`});`
`22`	`31`	`}`
`23`	`32`	`}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@`
`10`	`10`	`<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />`
`11`	`11`	`<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />`
`12`	`12`	`<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />`
`13`		`- <PackageReference Include="OmniSharp.Extensions.LanguageClient" Version="0.19.0" />`
`14`		`- <PackageReference Include="OmniSharp.Extensions.DebugAdapter.Client" Version="0.19.0" />`
	`13`	`+ <PackageReference Include="OmniSharp.Extensions.LanguageClient" Version="0.19.2-beta0001" />`
	`14`	`+ <PackageReference Include="OmniSharp.Extensions.DebugAdapter.Client" Version="0.19.2-beta0001" />`
`15`	`15`	`<PackageReference Include="xunit" Version="2.4.1" />`
`16`	`16`	`<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />`
`17`	`17`	`<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`<PackageReference Include="xunit" Version="2.4.1" />`
`28`	`28`	`<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />`
`29`	`29`	`<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />`
`30`		`- <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.0" />`
	`30`	`+ <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.2-beta0001" />`
`31`	`31`	`<DotNetCliToolReference Include="dotnet-xunit" Version="2.4.0-beta.1.build3958" />`
`32`	`32`	`</ItemGroup>`
`33`	`33`	`<ItemGroup>`

Comments

(0)