From b812d3954d9a2825342e357a9b3301c88e012e63 Mon Sep 17 00:00:00 2001 From: Tyler Leonhardt Date: Mon, 5 Aug 2019 11:34:44 -0700 Subject: [PATCH 1/9] only run pester so CI runs properly --- PowerShellEditorServices.build.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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\ From 84608960a22d01c9b822ba21fb2da1ccad300b3e Mon Sep 17 00:00:00 2001 From: Tyler Leonhardt Date: Mon, 5 Aug 2019 11:37:49 -0700 Subject: [PATCH 2/9] also add nuget.org to config --- NuGet.Config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NuGet.Config b/NuGet.Config index 79196aec8..2f64451ed 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -4,6 +4,7 @@ - + + From e9962ce902a28c29d74ba9cf672f70d648961857 Mon Sep 17 00:00:00 2001 From: Tyler Leonhardt Date: Mon, 5 Aug 2019 11:49:10 -0700 Subject: [PATCH 3/9] don't hardcode configuration --- test/Pester/EditorServices.Integration.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Pester/EditorServices.Integration.Tests.ps1 b/test/Pester/EditorServices.Integration.Tests.ps1 index 3903e3f32..c6788f1bb 100644 --- a/test/Pester/EditorServices.Integration.Tests.ps1 +++ b/test/Pester/EditorServices.Integration.Tests.ps1 @@ -89,7 +89,7 @@ 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 (Resolve-Path "$PSScriptRoot/../../src/PowerShellEditorServices.Engine/bin/*/netstandard2.0/publish/Omnisharp.Extensions.LanguageProtocol.dll") Import-Module -Force "$PSScriptRoot/../../tools/PsesPsClient/out/PsesPsClient" Import-Module -Force "$PSScriptRoot/../../tools/PsesLogAnalyzer" From 2c72eb5bc8295014ab3c3ae631d2c067e850b6e2 Mon Sep 17 00:00:00 2001 From: Tyler Leonhardt Date: Mon, 5 Aug 2019 12:02:47 -0700 Subject: [PATCH 4/9] Move imports and include newtonsoft --- test/Pester/EditorServices.Integration.Tests.ps1 | 2 -- tools/PsesPsClient/PsesPsClient.csproj | 4 ++++ tools/PsesPsClient/PsesPsClient.psm1 | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/test/Pester/EditorServices.Integration.Tests.ps1 b/test/Pester/EditorServices.Integration.Tests.ps1 index c6788f1bb..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 (Resolve-Path "$PSScriptRoot/../../src/PowerShellEditorServices.Engine/bin/*/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..31a02e72c 100644 --- a/tools/PsesPsClient/PsesPsClient.csproj +++ b/tools/PsesPsClient/PsesPsClient.csproj @@ -13,4 +13,8 @@ + + + + diff --git a/tools/PsesPsClient/PsesPsClient.psm1 b/tools/PsesPsClient/PsesPsClient.psm1 index d2395368a..db8a7d2b4 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 From ef433888d7ed61b3369dc679f6b36f2a7e1c50c3 Mon Sep 17 00:00:00 2001 From: Tyler Leonhardt Date: Mon, 5 Aug 2019 12:09:37 -0700 Subject: [PATCH 5/9] paths --- tools/PsesPsClient/PsesPsClient.psm1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/PsesPsClient/PsesPsClient.psm1 b/tools/PsesPsClient/PsesPsClient.psm1 index db8a7d2b4..69404f03a 100644 --- a/tools/PsesPsClient/PsesPsClient.psm1 +++ b/tools/PsesPsClient/PsesPsClient.psm1 @@ -6,8 +6,8 @@ $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") +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 { From 94c5c097add33dd4ef892636bb77178849b9daaa Mon Sep 17 00:00:00 2001 From: Tyler Leonhardt Date: Mon, 5 Aug 2019 12:17:40 -0700 Subject: [PATCH 6/9] upgrade newtonsoft --- tools/PsesPsClient/PsesPsClient.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/PsesPsClient/PsesPsClient.csproj b/tools/PsesPsClient/PsesPsClient.csproj index 31a02e72c..60abcb721 100644 --- a/tools/PsesPsClient/PsesPsClient.csproj +++ b/tools/PsesPsClient/PsesPsClient.csproj @@ -14,7 +14,7 @@ - + From 5b367c4da56d7b869d00fbbb1992b3baf59ac7b5 Mon Sep 17 00:00:00 2001 From: Tyler Leonhardt Date: Mon, 5 Aug 2019 12:24:10 -0700 Subject: [PATCH 7/9] specify newtonsoft --- tools/PsesPsClient/PsesPsClient.psd1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/PsesPsClient/PsesPsClient.psd1 b/tools/PsesPsClient/PsesPsClient.psd1 index 5a296e017..a53ad5b1a 100644 --- a/tools/PsesPsClient/PsesPsClient.psd1 +++ b/tools/PsesPsClient/PsesPsClient.psd1 @@ -54,7 +54,7 @@ PowerShellVersion = '5.1' # RequiredModules = @() # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = @('Newtonsoft.Json.dll') # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() From 282e7ce4216774015b81f0e0443c4cadb6463df5 Mon Sep 17 00:00:00 2001 From: Tyler Leonhardt Date: Mon, 5 Aug 2019 12:30:04 -0700 Subject: [PATCH 8/9] update protocol newtonsoft verison because it's used in tests --- .../PowerShellEditorServices.Protocol.csproj | 2 +- tools/PsesPsClient/PsesPsClient.psd1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/tools/PsesPsClient/PsesPsClient.psd1 b/tools/PsesPsClient/PsesPsClient.psd1 index a53ad5b1a..5a296e017 100644 --- a/tools/PsesPsClient/PsesPsClient.psd1 +++ b/tools/PsesPsClient/PsesPsClient.psd1 @@ -54,7 +54,7 @@ PowerShellVersion = '5.1' # RequiredModules = @() # Assemblies that must be loaded prior to importing this module -RequiredAssemblies = @('Newtonsoft.Json.dll') +# RequiredAssemblies = @() # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() From 9e927f44c7e515769b267f12848ac8b675c5e2e0 Mon Sep 17 00:00:00 2001 From: Tyler Leonhardt Date: Mon, 5 Aug 2019 12:33:42 -0700 Subject: [PATCH 9/9] update other version of Newtonsoft --- tools/PsesPsClient/PsesPsClient.csproj | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tools/PsesPsClient/PsesPsClient.csproj b/tools/PsesPsClient/PsesPsClient.csproj index 60abcb721..6e80e81fa 100644 --- a/tools/PsesPsClient/PsesPsClient.csproj +++ b/tools/PsesPsClient/PsesPsClient.csproj @@ -5,7 +5,7 @@ - + @@ -13,8 +13,4 @@ - - - -