Bump OmniSharp to v0.19.3

So `v0.19.4` is out on GitHub, but has not yet released to the NuGet gallery, and I don't wish to delay this any longer. We'll let Dependabot bring that in as soon as it can be. The only thing missing is the DryIoc update, which we're simply hoping solves an issue.
PowerShell · Aug 19, 2021 · cd29c49 · cd29c49
1 parent e28292f
commit cd29c49
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 30 deletions.
diff --git a/.vsts-ci/azure-pipelines-ci.yml b/.vsts-ci/azure-pipelines-ci.yml
@@ -16,15 +16,6 @@ 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,23 +7,18 @@ 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: $(Build.SourcesDirectory)/PowerShellEditorServices/tools/azurePipelinesBuild.ps1
-    workingDirectory: $(Build.SourcesDirectory)/PowerShellEditorServices
+    filePath: tools/azurePipelinesBuild.ps1
     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: $(Build.SourcesDirectory)/PowerShellEditorServices/module
+    rootFolderOrFile: module
     includeRootFolder: false
     archiveType: zip
     archiveFile: PowerShellEditorServices-Build.zip

diff --git a/src/PowerShellEditorServices/PowerShellEditorServices.csproj b/src/PowerShellEditorServices/PowerShellEditorServices.csproj
@@ -28,11 +28,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" />
-    <!-- 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="OmniSharp.Extensions.LanguageServer" Version="0.19.3" />
+    <PackageReference Include="OmniSharp.Extensions.DebugAdapter.Server" Version="0.19.3" />
     <PackageReference Include="PowerShellStandard.Library" Version="5.1.1" />
     <PackageReference Include="Serilog" Version="2.10.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
@@ -45,6 +42,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,11 +10,8 @@
     <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" />
-    <!-- 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="OmniSharp.Extensions.LanguageClient" Version="0.19.3" />
+    <PackageReference Include="OmniSharp.Extensions.DebugAdapter.Client" Version="0.19.3" />
     <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,9 +34,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" />
-    <!-- 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" />
+    <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.3" />
   </ItemGroup>
 
   <ItemGroup>