Skip to content

Commit 14de362

Browse files
committed
Temporarily include OmniSharp via project reference
So that we can build from our fork while we wait for an upcoming release.
1 parent f78dc32 commit 14de362

File tree

5 files changed

+30
-9
lines changed

5 files changed

+30
-9
lines changed

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

+9
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,15 @@ 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+
1928
jobs:
2029
- job: PS51_Win2016
2130
displayName: PowerShell 5.1 - Windows Server 2016

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

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

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

1621
# NOTE: We zip the artifacts because they're ~20 MB compressed, but ~300 MB raw,
1722
# and we have limited pipeline artifact storage space.
1823
- task: ArchiveFiles@2
1924
displayName: Zip pipeline artifacts
2025
inputs:
21-
rootFolderOrFile: module
26+
rootFolderOrFile: $(Build.SourcesDirectory)/PowerShellEditorServices/module
2227
includeRootFolder: false
2328
archiveType: zip
2429
archiveFile: PowerShellEditorServices-Build.zip

src/PowerShellEditorServices/PowerShellEditorServices.csproj

+6-3
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,11 @@
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-
<PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.2" />
32-
<PackageReference Include="OmniSharp.Extensions.DebugAdapter.Server" Version="0.19.2" />
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" />
3336
<PackageReference Include="PowerShellStandard.Library" Version="5.1.1" />
3437
<PackageReference Include="Serilog" Version="2.10.0" />
3538
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
@@ -42,6 +45,6 @@
4245
</ItemGroup>
4346

4447
<ItemGroup>
45-
<Compile Remove="Extensions\Api\DocumentSymbolService.cs"/>
48+
<Compile Remove="Extensions\Api\DocumentSymbolService.cs" />
4649
</ItemGroup>
4750
</Project>

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

+5-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@
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-
<PackageReference Include="OmniSharp.Extensions.LanguageClient" Version="0.19.2" />
14-
<PackageReference Include="OmniSharp.Extensions.DebugAdapter.Client" Version="0.19.2" />
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" />
1518
<PackageReference Include="xunit" Version="2.4.1" />
1619
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
1720
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />

test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj

+3-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@
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-
<PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.2" />
38-
<DotNetCliToolReference Include="dotnet-xunit" Version="2.4.0-beta.1.build3958" />
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" />
3940
</ItemGroup>
4041

4142
<ItemGroup>

0 commit comments

Comments
 (0)