Improve client module building

test/Pester/EditorServices.Integration.Tests.ps1

@@ -1,6 +1,7 @@
 Describe "Loading and running PowerShellEditorServices" {
     BeforeAll {
-        Import-Module "$PSScriptRoot/../../tools/PsesPsClient"
+        Import-Module "$PSScriptRoot/../../module/PowerShellEditorServices"
+        Import-Module "$PSScriptRoot/../../tools/PsesPsClient/out/PsesPsClient"
 
         $psesServer = Start-PsesServer
         $pipe = Connect-NamedPipe -PipeName $psesServer.SessionDetails.languageServicePipeName

tools/PsesPsClient/LspPipe.cs

@@ -1,4 +1,9 @@
-using System;
+//
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+//
+
+using System;
 using System.IO.Pipes;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;

tools/PsesPsClient/PsesPsClient.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
     <PackageReference Include="System.IO.Pipes" Version="4.3.0" />
   </ItemGroup>
 

tools/PsesPsClient/PsesPsClient.psd1

@@ -0,0 +1,124 @@
+#
+# Module manifest for module 'PsesPsClient'
+#
+# Generated by: Microsoft Corporation
+#
+# Generated on: 26/4/19
+#
+
+@{
+
+# Script module or binary module file associated with this manifest.
+RootModule = 'PsesPsClient.psm1'
+
+# Version number of this module.
+ModuleVersion = '0.0.1'
+
+# Supported PSEditions
+CompatiblePSEditions = 'Core', 'Desktop'
+
+# ID used to uniquely identify this module
+GUID = 'ce491ff9-3eab-443c-b3a2-cc412ddeef65'
+
+# Author of this module
+Author = 'Microsoft Corporation'
+
+# Company or vendor of this module
+CompanyName = 'Unknown'
+
+# Copyright statement for this module
+Copyright = '(c) Microsoft Corporation'
+
+# Description of the functionality provided by this module
+# Description = ''
+
+# Minimum version of the PowerShell engine required by this module
+PowerShellVersion = '5.1'
+
+# Name of the PowerShell host required by this module
+# PowerShellHostName = ''
+
+# Minimum version of the PowerShell host required by this module
+# PowerShellHostVersion = ''
+
+# Minimum version of Microsoft .NET Framework required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
+# DotNetFrameworkVersion = ''
+
+# Minimum version of the common language runtime (CLR) required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
+# CLRVersion = ''
+
+# Processor architecture (None, X86, Amd64) required by this module
+# ProcessorArchitecture = ''
+
+# Modules that must be imported into the global environment prior to importing this module
+# RequiredModules = @()
+
+# Assemblies that must be loaded prior to importing this module
+# RequiredAssemblies = @()
+
+# Script files (.ps1) that are run in the caller's environment prior to importing this module.
+# ScriptsToProcess = @()
+
+# Type files (.ps1xml) to be loaded when importing this module
+# TypesToProcess = @()
+
+# Format files (.ps1xml) to be loaded when importing this module
+# FormatsToProcess = @()
+
+# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
+NestedModules = @('PsesPsClient.dll')
+
+# Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
+FunctionsToExport = 'Start-PsesServer', 'Connect-NamedPipe', 'Send-LspInitializeRequest', 
+               'Send-LspShutdownRequest'
+
+# Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
+CmdletsToExport = '*'
+
+# Variables to export from this module
+VariablesToExport = '*'
+
+# Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export.
+AliasesToExport = '*'
+
+# DSC resources to export from this module
+# DscResourcesToExport = @()
+
+# List of all modules packaged with this module
+# ModuleList = @()
+
+# List of all files packaged with this module
+# FileList = @()
+
+# Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.
+PrivateData = @{
+
+    PSData = @{
+
+        # Tags applied to this module. These help with module discovery in online galleries.
+        # Tags = @()
+
+        # A URL to the license for this module.
+        # LicenseUri = ''
+
+        # A URL to the main website for this project.
+        # ProjectUri = ''
+
+        # A URL to an icon representing this module.
+        # IconUri = ''
+
+        # ReleaseNotes of this module
+        # ReleaseNotes = ''
+
+    } # End of PSData hashtable
+
+} # End of PrivateData hashtable
+
+# HelpInfo URI of this module
+# HelpInfoURI = ''
+
+# Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix.
+# DefaultCommandPrefix = ''
+
+}
+

tools/PsesPsClient/PsesPsClient.psm1

@@ -1,9 +1,10 @@
-$script:PsesBundledModulesDir = $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath(
-    "$PSScriptRoot/../../module")
-
-Import-Module "$script:PsesBundledModulesDir/PowerShellEditorServices"
+#
+# Copyright (c) Microsoft. All rights reserved.
+# Licensed under the MIT license. See LICENSE file in the project root for full license information.
+#
 
-Import-Module $PSScriptRoot/bin/Debug/netstandard2.0/PsesPsClient.dll
+$script:PsesBundledModulesDir = $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath(
+    "$PSScriptRoot/../../../../module")
 
 class PsesStartupOptions
 {

tools/PsesPsClient/build.ps1

@@ -1,13 +1,30 @@
+#
+# Copyright (c) Microsoft. All rights reserved.
+# Licensed under the MIT license. See LICENSE file in the project root for full license information.
+#
+
 param(
     [switch]
     $Clean
 )
 
+$ErrorActionPreference = 'Stop'
+
+$script:OutDir = "$PSScriptRoot/out"
+$script:OutModDir = "$script:OutDir/PsesPsClient"
+
+$script:ModuleComponents = @{
+    "bin/Debug/netstandard2.0/publish/PsesPsClient.dll" = "PsesPsClient.dll"
+    "bin/Debug/netstandard2.0/publish/Newtonsoft.Json.dll" = "Newtonsoft.Json.dll"
+    "PsesPsClient.psm1" = "PsesPsClient.psm1"
+    "PsesPsClient.psd1" = "PsesPsClient.psd1"
+}
+
 if ($Clean)
 {
     $binDir = "$PSScriptRoot/bin"
     $objDir = "$PSScriptRoot/obj"
-    foreach ($dir in $binDir,$objDir)
+    foreach ($dir in $binDir,$objDir,$script:OutDir)
     {
         if (Test-Path $dir)
         {
@@ -19,7 +36,14 @@ if ($Clean)
 Push-Location $PSScriptRoot
 try
 {
-    dotnet build
+    dotnet publish
+
+    New-Item -Path $script:OutModDir -ItemType Directory
+    foreach ($key in $script:ModuleComponents.get_Keys())
+    {
+        $val = $script:ModuleComponents[$key]
+        Copy-Item -Path "$PSScriptRoot/$key" -Destination "$script:OutModDir/$val"
+    }
 }
 finally
 {