diff --git a/NuGet.Config b/NuGet.Config index 79196aec8..2f64451ed 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -4,6 +4,7 @@ - + + diff --git a/PowerShellEditorServices.build.ps1 b/PowerShellEditorServices.build.ps1 index c9c8cd17f..464bfb1f2 100644 --- a/PowerShellEditorServices.build.ps1 +++ b/PowerShellEditorServices.build.ps1 @@ -353,7 +353,8 @@ function DotNetTestFilter { if ($TestFilter) { @("--filter",$TestFilter) } else { "" } } -task Test TestServer,TestProtocol,TestPester +# task Test TestServer,TestProtocol,TestPester +task Test TestPester task TestServer { Set-Location .\test\PowerShellEditorServices.Test\ diff --git a/src/PowerShellEditorServices.Protocol/PowerShellEditorServices.Protocol.csproj b/src/PowerShellEditorServices.Protocol/PowerShellEditorServices.Protocol.csproj index b35efa528..6857c083c 100644 --- a/src/PowerShellEditorServices.Protocol/PowerShellEditorServices.Protocol.csproj +++ b/src/PowerShellEditorServices.Protocol/PowerShellEditorServices.Protocol.csproj @@ -14,7 +14,7 @@ - + diff --git a/test/Pester/EditorServices.Integration.Tests.ps1 b/test/Pester/EditorServices.Integration.Tests.ps1 index 3903e3f32..2dd7079ba 100644 --- a/test/Pester/EditorServices.Integration.Tests.ps1 +++ b/test/Pester/EditorServices.Integration.Tests.ps1 @@ -88,8 +88,6 @@ function New-TestFile Describe "Loading and running PowerShellEditorServices" { BeforeAll { - Import-Module -Force "$PSScriptRoot/../../module/PowerShellEditorServices" - Import-Module -Force "$PSScriptRoot/../../src/PowerShellEditorServices.Engine/bin/Debug/netstandard2.0/publish/Omnisharp.Extensions.LanguageProtocol.dll" Import-Module -Force "$PSScriptRoot/../../tools/PsesPsClient/out/PsesPsClient" Import-Module -Force "$PSScriptRoot/../../tools/PsesLogAnalyzer" diff --git a/tools/PsesPsClient/PsesPsClient.csproj b/tools/PsesPsClient/PsesPsClient.csproj index 6b30f989b..6e80e81fa 100644 --- a/tools/PsesPsClient/PsesPsClient.csproj +++ b/tools/PsesPsClient/PsesPsClient.csproj @@ -5,7 +5,7 @@ - + diff --git a/tools/PsesPsClient/PsesPsClient.psm1 b/tools/PsesPsClient/PsesPsClient.psm1 index d2395368a..69404f03a 100644 --- a/tools/PsesPsClient/PsesPsClient.psm1 +++ b/tools/PsesPsClient/PsesPsClient.psm1 @@ -6,6 +6,9 @@ $script:PsesBundledModulesDir = $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath( "$PSScriptRoot/../../../../module") +Import-Module -Force "$PSScriptRoot/../../../../module/PowerShellEditorServices" +Import-Module -Force (Resolve-Path "$PSScriptRoot/../../../../src/PowerShellEditorServices.Engine/bin/*/netstandard2.0/publish/Omnisharp.Extensions.LanguageProtocol.dll") + class PsesStartupOptions { [string] $LogPath