diff --git a/.vsts-ci/azure-pipelines-ci.yml b/.vsts-ci/azure-pipelines-ci.yml
index f0e84e1f24..25706f2c09 100644
--- 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
index d853e38022..016b340dc3 100644
--- a/.vsts-ci/templates/ci-general.yml
+++ b/.vsts-ci/templates/ci-general.yml
@@ -7,15 +7,10 @@ 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,
@@ -23,7 +18,7 @@ steps:
- 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
index fe24243804..a18cc4be05 100644
--- a/src/PowerShellEditorServices/PowerShellEditorServices.csproj
+++ b/src/PowerShellEditorServices/PowerShellEditorServices.csproj
@@ -28,11 +28,8 @@
-
-
-
-
-
+
+
@@ -45,6 +42,6 @@
-
+
diff --git a/test/PowerShellEditorServices.Test.E2E/PowerShellEditorServices.Test.E2E.csproj b/test/PowerShellEditorServices.Test.E2E/PowerShellEditorServices.Test.E2E.csproj
index 224c8f3fb2..e7c907a000 100644
--- a/test/PowerShellEditorServices.Test.E2E/PowerShellEditorServices.Test.E2E.csproj
+++ b/test/PowerShellEditorServices.Test.E2E/PowerShellEditorServices.Test.E2E.csproj
@@ -10,11 +10,8 @@
-
-
-
-
-
+
+
diff --git a/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj b/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj
index 1434afa0e8..c801384ab8 100644
--- a/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj
+++ b/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj
@@ -34,9 +34,7 @@
-
-
-
+