Temporarily include OmniSharp via project reference

So that we can build from our fork while we wait for an upcoming release.
PowerShell · Aug 18, 2021 · 14de362 · 14de362
1 parent f78dc32
commit 14de362
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 9 deletions.
diff --git a/.vsts-ci/azure-pipelines-ci.yml b/.vsts-ci/azure-pipelines-ci.yml
@@ -16,6 +16,15 @@ trigger:
 pr:
 - master
 
+# TODO: Remove this when OmniSharp updates
+resources:
+  repositories:
+  - repository: OmniSharp
+    type: github
+    endpoint: GitHub
+    name: andschwa/csharp-language-server-protocol
+    ref: preview
+
 jobs:
 - job: PS51_Win2016
   displayName: PowerShell 5.1 - Windows Server 2016

diff --git a/.vsts-ci/templates/ci-general.yml b/.vsts-ci/templates/ci-general.yml
@@ -7,18 +7,23 @@ steps:
 - pwsh: $PSVersionTable
   displayName: PowerShell version
 
+# TODO: Remove this when OmniSharp updates
+- checkout: self
+- checkout: OmniSharp
+
 - task: PowerShell@2
   displayName: Build and test
   inputs:
-    filePath: tools/azurePipelinesBuild.ps1
+    filePath: $(Build.SourcesDirectory)/PowerShellEditorServices/tools/azurePipelinesBuild.ps1
+    workingDirectory: $(Build.SourcesDirectory)/PowerShellEditorServices
     pwsh: ${{ parameters.pwsh }}
 
 # NOTE: We zip the artifacts because they're ~20 MB compressed, but ~300 MB raw,
 # and we have limited pipeline artifact storage space.
 - task: ArchiveFiles@2
   displayName: Zip pipeline artifacts
   inputs:
-    rootFolderOrFile: module
+    rootFolderOrFile: $(Build.SourcesDirectory)/PowerShellEditorServices/module
     includeRootFolder: false
     archiveType: zip
     archiveFile: PowerShellEditorServices-Build.zip

diff --git a/src/PowerShellEditorServices/PowerShellEditorServices.csproj b/src/PowerShellEditorServices/PowerShellEditorServices.csproj
@@ -28,8 +28,11 @@
     <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.2" />
-    <PackageReference Include="OmniSharp.Extensions.DebugAdapter.Server" Version="0.19.2" />
+    <!-- TODO: Update to 0.19.3 when available -->
+    <!-- <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.2" /> -->
+    <!-- <PackageReference Include="OmniSharp.Extensions.DebugAdapter.Server" Version="0.19.2" /> -->
+    <ProjectReference Include="..\..\..\csharp-language-server-protocol\src\Server\Server.csproj" />
+    <ProjectReference Include="..\..\..\csharp-language-server-protocol\src\Dap.Server\Dap.Server.csproj" />
     <PackageReference Include="PowerShellStandard.Library" Version="5.1.1" />
     <PackageReference Include="Serilog" Version="2.10.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
@@ -42,6 +45,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Remove="Extensions\Api\DocumentSymbolService.cs"/>
+    <Compile Remove="Extensions\Api\DocumentSymbolService.cs" />
   </ItemGroup>
 </Project>
diff --git a/test/PowerShellEditorServices.Test.E2E/PowerShellEditorServices.Test.E2E.csproj b/test/PowerShellEditorServices.Test.E2E/PowerShellEditorServices.Test.E2E.csproj
@@ -10,8 +10,11 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="OmniSharp.Extensions.LanguageClient" Version="0.19.2" />
-    <PackageReference Include="OmniSharp.Extensions.DebugAdapter.Client" Version="0.19.2" />
+    <!-- TODO: Update to 0.19.3 when available -->
+    <!-- <PackageReference Include="OmniSharp.Extensions.LanguageClient" Version="0.19.2" /> -->
+    <!-- <PackageReference Include="OmniSharp.Extensions.DebugAdapter.Client" Version="0.19.2" /> -->
+    <ProjectReference Include="..\..\..\csharp-language-server-protocol\src\Client\Client.csproj" />
+    <ProjectReference Include="..\..\..\csharp-language-server-protocol\src\Dap.Client\Dap.Client.csproj" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />

diff --git a/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj b/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj
@@ -34,8 +34,9 @@
     <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.2" />
-    <DotNetCliToolReference Include="dotnet-xunit" Version="2.4.0-beta.1.build3958" />
+    <!-- TODO: Update to 0.19.3 when available -->
+    <!-- <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.2" /> -->
+    <ProjectReference Include="..\..\..\csharp-language-server-protocol\src\Server\Server.csproj" />
   </ItemGroup>
 
   <ItemGroup>