Skip to content

Commit ddfbe86

Browse files
committed
Bump OmniSharp to v0.19.3
1 parent 14de362 commit ddfbe86

File tree

5 files changed

+8
-30
lines changed

5 files changed

+8
-30
lines changed

.vsts-ci/azure-pipelines-ci.yml

-9
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,6 @@ trigger:
1616
pr:
1717
- master
1818

19-
# TODO: Remove this when OmniSharp updates
20-
resources:
21-
repositories:
22-
- repository: OmniSharp
23-
type: github
24-
endpoint: GitHub
25-
name: andschwa/csharp-language-server-protocol
26-
ref: preview
27-
2819
jobs:
2920
- job: PS51_Win2016
3021
displayName: PowerShell 5.1 - Windows Server 2016

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

+2-7
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,18 @@ steps:
77
- pwsh: $PSVersionTable
88
displayName: PowerShell version
99

10-
# TODO: Remove this when OmniSharp updates
11-
- checkout: self
12-
- checkout: OmniSharp
13-
1410
- task: PowerShell@2
1511
displayName: Build and test
1612
inputs:
17-
filePath: $(Build.SourcesDirectory)/PowerShellEditorServices/tools/azurePipelinesBuild.ps1
18-
workingDirectory: $(Build.SourcesDirectory)/PowerShellEditorServices
13+
filePath: tools/azurePipelinesBuild.ps1
1914
pwsh: ${{ parameters.pwsh }}
2015

2116
# NOTE: We zip the artifacts because they're ~20 MB compressed, but ~300 MB raw,
2217
# and we have limited pipeline artifact storage space.
2318
- task: ArchiveFiles@2
2419
displayName: Zip pipeline artifacts
2520
inputs:
26-
rootFolderOrFile: $(Build.SourcesDirectory)/PowerShellEditorServices/module
21+
rootFolderOrFile: module
2722
includeRootFolder: false
2823
archiveType: zip
2924
archiveFile: PowerShellEditorServices-Build.zip

src/PowerShellEditorServices/PowerShellEditorServices.csproj

+3-6
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,8 @@
2828
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
2929
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="5.0.0" />
3030
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
31-
<!-- TODO: Update to 0.19.3 when available -->
32-
<!-- <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.2" /> -->
33-
<!-- <PackageReference Include="OmniSharp.Extensions.DebugAdapter.Server" Version="0.19.2" /> -->
34-
<ProjectReference Include="..\..\..\csharp-language-server-protocol\src\Server\Server.csproj" />
35-
<ProjectReference Include="..\..\..\csharp-language-server-protocol\src\Dap.Server\Dap.Server.csproj" />
31+
<PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.3" />
32+
<PackageReference Include="OmniSharp.Extensions.DebugAdapter.Server" Version="0.19.3" />
3633
<PackageReference Include="PowerShellStandard.Library" Version="5.1.1" />
3734
<PackageReference Include="Serilog" Version="2.10.0" />
3835
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
@@ -45,6 +42,6 @@
4542
</ItemGroup>
4643

4744
<ItemGroup>
48-
<Compile Remove="Extensions\Api\DocumentSymbolService.cs" />
45+
<Compile Remove="Extensions\Api\DocumentSymbolService.cs"/>
4946
</ItemGroup>
5047
</Project>

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

+2-5
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,8 @@
1010
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
1111
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
1212
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
13-
<!-- TODO: Update to 0.19.3 when available -->
14-
<!-- <PackageReference Include="OmniSharp.Extensions.LanguageClient" Version="0.19.2" /> -->
15-
<!-- <PackageReference Include="OmniSharp.Extensions.DebugAdapter.Client" Version="0.19.2" /> -->
16-
<ProjectReference Include="..\..\..\csharp-language-server-protocol\src\Client\Client.csproj" />
17-
<ProjectReference Include="..\..\..\csharp-language-server-protocol\src\Dap.Client\Dap.Client.csproj" />
13+
<PackageReference Include="OmniSharp.Extensions.LanguageClient" Version="0.19.3" />
14+
<PackageReference Include="OmniSharp.Extensions.DebugAdapter.Client" Version="0.19.3" />
1815
<PackageReference Include="xunit" Version="2.4.1" />
1916
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
2017
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />

test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj

+1-3
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@
3434
<PackageReference Include="xunit" Version="2.4.1" />
3535
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
3636
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
37-
<!-- TODO: Update to 0.19.3 when available -->
38-
<!-- <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.2" /> -->
39-
<ProjectReference Include="..\..\..\csharp-language-server-protocol\src\Server\Server.csproj" />
37+
<PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.3" />
4038
</ItemGroup>
4139

4240
<ItemGroup>

0 commit comments

Comments
 (0)