Migrate to netstandard2.0 and PSStandard

.travis.yml

@@ -3,12 +3,13 @@ language: cpp
 git:
   depth: 1000
 
-os:
-  - linux
-  - osx
-sudo: required
-dist: trusty
-osx_image: xcode8.3
+matrix:
+  include:
+    - os: linux
+      dist: trusty
+      sudo: required
+    - os: osx
+      osx_image: xcode9.4
 
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
@@ -26,4 +27,4 @@ install:
 
 script:
   - ulimit -n 4096
-  - powershell -File scripts/travis.ps1
+  - pwsh -File scripts/travis.ps1

PowerShellEditorServices.Common.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>1.8.2</VersionPrefix>
+    <VersionPrefix>2.0.0</VersionPrefix>
     <Company>Microsoft</Company>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <PackageTags>PowerShell;editor;development;language;debugging</PackageTags>
@@ -9,6 +9,5 @@
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/PowerShell/PowerShellEditorServices</RepositoryUrl>
     <DebugType>portable</DebugType>
-    <RuntimeFrameworkVersion>1.0.3</RuntimeFrameworkVersion>
   </PropertyGroup>
 </Project>

module/PowerShellEditorServices.VSCode/PowerShellEditorServices.VSCode.psm1

@@ -3,12 +3,7 @@
 # Licensed under the MIT license. See LICENSE file in the project root for full license information.
 #
 
-if (!$PSVersionTable.PSEdition -or $PSVersionTable.PSEdition -eq "Desktop") {
-    Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Desktop/Microsoft.PowerShell.EditorServices.VSCode.dll"
-}
-else {
-    Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Core/Microsoft.PowerShell.EditorServices.VSCode.dll"
-}
+Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Microsoft.PowerShell.EditorServices.VSCode.dll"
 
 if ($psEditor -is [Microsoft.PowerShell.EditorServices.Extensions.EditorObject]) {
     [Microsoft.PowerShell.EditorServices.VSCode.ComponentRegistration]::Register($psEditor.Components)

module/PowerShellEditorServices/PowerShellEditorServices.psm1

@@ -3,16 +3,21 @@
 # Licensed under the MIT license. See LICENSE file in the project root for full license information.
 #
 
-if (!$PSVersionTable.PSEdition -or $PSVersionTable.PSEdition -eq "Desktop") {
-    Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Desktop/Microsoft.PowerShell.EditorServices.dll"
-    Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Desktop/Microsoft.PowerShell.EditorServices.Host.dll"
-}
-else {
-    Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Core/Microsoft.PowerShell.EditorServices.dll"
-    Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Core/Microsoft.PowerShell.EditorServices.Protocol.dll"
-    Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Core/Microsoft.PowerShell.EditorServices.Host.dll"
+# Need to load pipe handling shim assemblies in Windows PowerShell and PSCore 6.0 because they don't have WCP
+if ($PSEdition -eq 'Desktop') {
+    Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Desktop/System.IO.Pipes.AccessControl.dll"
+    Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Desktop/System.Security.AccessControl.dll"
+    Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Desktop/System.Security.Principal.Windows.dll"
+} elseif ($PSVersionTable.PSVersion -ge '6.0' -and $PSVersionTable.PSVersion -lt '6.1' -and $IsWindows) {
+    Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/6.0/System.IO.Pipes.AccessControl.dll"
+    Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/6.0/System.Security.AccessControl.dll"
+    Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/6.0/System.Security.Principal.Windows.dll"
 }
 
+Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Microsoft.PowerShell.EditorServices.dll"
+Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Microsoft.PowerShell.EditorServices.Host.dll"
+Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Microsoft.PowerShell.EditorServices.Protocol.dll"
+
 function Start-EditorServicesHost {
     [CmdletBinding()]
     param(

scripts/download.sh

@@ -1,153 +1,3 @@
 #!/usr/bin/env bash
 
-# Let's quit on interrupt of subcommands
-trap '
-  trap - INT # restore default INT handler
-  echo "Interrupted"
-  kill -s INT "$$"
-' INT
-
-get_url() {
-    fork=$2
-    release=v6.0.0-beta.1
-    echo "https://github.com/$fork/PowerShell/releases/download/$release/$1"
-}
-
-fork="PowerShell"
-# Get OS specific asset ID and package name
-case "$OSTYPE" in
-    linux*)
-        source /etc/os-release
-        # Install curl and wget to download package
-        case "$ID" in
-            centos*)
-                if ! hash curl 2>/dev/null; then
-                    echo "curl not found, installing..."
-                    sudo yum install -y curl
-                fi
-
-                package=powershell-6.0.0_beta.1-1.el7.centos.x86_64.rpm
-                ;;
-            ubuntu)
-                if ! hash curl 2>/dev/null; then
-                    echo "curl not found, installing..."
-                    sudo apt-get install -y curl
-                fi
-
-                case "$VERSION_ID" in
-                    14.04)
-                        package=powershell_6.0.0-beta.1-1ubuntu1.14.04.1_amd64.deb
-                        ;;
-                    16.04)
-                        package=powershell_6.0.0-beta.1-1ubuntu1.16.04.1_amd64.deb
-                        ;;
-                    *)
-                        echo "Ubuntu $VERSION_ID is not supported!" >&2
-                        exit 2
-                esac
-                ;;
-            opensuse)
-                if ! hash curl 2>/dev/null; then
-                    echo "curl not found, installing..."
-                    sudo zypper install -y curl
-                fi
-
-
-                case "$VERSION_ID" in
-                    42.1)
-                        # TODO during next release remove fork and fix package name
-                        fork=TravisEz13
-                        package=powershell-6.0.0_beta.1-1.suse.42.1.x86_64.rpm
-                        ;;
-                    *)
-                        echo "OpenSUSE $VERSION_ID is not supported!" >&2
-                        exit 2
-                esac
-                ;;
-            *)
-                echo "$NAME is not supported!" >&2
-                exit 2
-        esac
-        ;;
-    darwin*)
-        # We don't check for curl as macOS should have a system version
-        package=powershell-6.0.0-beta.1-osx.10.12-x64.pkg
-        ;;
-    *)
-        echo "$OSTYPE is not supported!" >&2
-        exit 2
-        ;;
-esac
-
-curl -L -o "$package" $(get_url "$package" "$fork")
-
-if [[ ! -r "$package" ]]; then
-    echo "ERROR: $package failed to download! Aborting..." >&2
-    exit 1
-fi
-
-# Installs PowerShell package
-case "$OSTYPE" in
-    linux*)
-        source /etc/os-release
-        # Install dependencies
-        echo "Installing PowerShell with sudo..."
-        case "$ID" in
-            centos)
-                # yum automatically resolves dependencies for local packages
-                sudo yum install "./$package"
-                ;;
-            ubuntu)
-                # dpkg does not automatically resolve dependencies, but spouts ugly errors
-                sudo dpkg -i "./$package" &> /dev/null
-                # Resolve dependencies
-                sudo apt-get install -f
-                ;;
-            opensuse)
-                # Install the Microsoft public key so that zypper trusts the package
-                sudo rpm --import https://packages.microsoft.com/keys/microsoft.asc
-                # zypper automatically resolves dependencies for local packages
-                sudo zypper --non-interactive install "./$package" &> /dev/null
-                ;;
-            *)
-        esac
-        ;;
-    darwin*)
-        patched=0
-        if hash brew 2>/dev/null; then
-            brew update
-            if [[ ! -d $(brew --prefix openssl) ]]; then
-               echo "Installing OpenSSL with brew..."
-               if ! brew install openssl; then
-                   echo "ERROR: OpenSSL failed to install! Crypto functions will not work..." >&2
-                   # Don't abort because it is not fatal
-               elif ! brew install curl --with-openssl; then
-                   echo "ERROR: curl failed to build against OpenSSL; SSL functions will not work..." >&2
-                   # Still not fatal
-               else
-                   # OpenSSL installation succeeded; reme           mber to patch System.Net.Http after PowerShell installation
-                   patched=1
-               fi
-            fi
-
-        else
-            echo "ERROR: brew not found! OpenSSL may not be available..." >&2
-            # Don't abort because it is not fatal
-        fi
-
-        echo "Installing $package with sudo ..."
-        sudo installer -pkg "./$package" -target /
-        if [[ $patched -eq 1 ]]; then
-            echo "Patching System.Net.Http for libcurl and OpenSSL..."
-            find /usr/local/microsoft/powershell -name System.Net.Http.Native.dylib | xargs sudo install_name_tool -change /usr/lib/libcurl.4.dylib /usr/local/opt/curl/lib/libcurl.4.dylib
-        fi
-        ;;
-esac
-
-powershell -noprofile -c '"Congratulations! PowerShell is installed at $PSHOME"'
-success=$?
-
-if [[ "$success" != 0 ]]; then
-    echo "ERROR: PowerShell failed to install!" >&2
-    exit "$success"
-fi
+bash <(curl -s https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/install-powershell.sh)

scripts/travis.ps1

@@ -1,11 +1,4 @@
-Get-Module PowerShellGet,PackageManagement | Remove-Module -Force -Verbose
-powershell -Command { Install-Module -Name PowershellGet -MinimumVersion 1.6 -Scope CurrentUser -force -confirm:$false -verbose }
-powershell -Command { Install-Module -Name PackageManagement -MinimumVersion 1.1.7.0 -Scope CurrentUser -Force -Confirm:$false -Verbose }
-Import-Module -Name PowerShellGet -MinimumVersion 1.6 -Force
-Import-Module -Name PackageManagement -MinimumVersion 1.1.7.0 -Force
-Install-PackageProvider -Name NuGet -Force | Out-Null
-Import-PackageProvider NuGet -Force | Out-Null
-Set-PSRepository -Name PSGallery -InstallationPolicy Trusted | Out-Null
+$ErrorActionPreference = 'Stop'
 
 # Install InvokeBuild
 Install-Module InvokeBuild -MaximumVersion 5.1.0 -Scope CurrentUser -Force

src/PowerShellEditorServices.Host/EditorServicesHost.cs

@@ -19,6 +19,7 @@
 using System.Management.Automation.Runspaces;
 using System.Reflection;
 using System.Threading.Tasks;
+using System.Runtime.InteropServices;
 
 namespace Microsoft.PowerShell.EditorServices.Host
 {
@@ -118,9 +119,7 @@ public EditorServicesHost(
 #endif
 
             // Catch unhandled exceptions for logging purposes
-#if !CoreCLR
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
-#endif
         }
 
         #endregion
@@ -139,21 +138,12 @@ public void StartLogging(string logFilePath, LogLevel logLevel)
                             .AddLogFile(logFilePath)
                             .Build();
 
-#if CoreCLR
             FileVersionInfo fileVersionInfo =
                 FileVersionInfo.GetVersionInfo(this.GetType().GetTypeInfo().Assembly.Location);
 
-            // TODO #278: Need the correct dependency package for this to work correctly
-            //string osVersionString = RuntimeInformation.OSDescription;
-            //string processArchitecture = RuntimeInformation.ProcessArchitecture == Architecture.X64 ? "64-bit" : "32-bit";
-            //string osArchitecture = RuntimeInformation.OSArchitecture == Architecture.X64 ? "64-bit" : "32-bit";
-#else
-            FileVersionInfo fileVersionInfo =
-                FileVersionInfo.GetVersionInfo(this.GetType().Assembly.Location);
-            string osVersionString = Environment.OSVersion.VersionString;
-            string processArchitecture = Environment.Is64BitProcess ? "64-bit" : "32-bit";
-            string osArchitecture = Environment.Is64BitOperatingSystem ? "64-bit" : "32-bit";
-#endif
+            string osVersionString = RuntimeInformation.OSDescription;
+            string processArchitecture = RuntimeInformation.ProcessArchitecture == Architecture.X64 ? "64-bit" : "32-bit";
+            string osArchitecture = RuntimeInformation.OSArchitecture == Architecture.X64 ? "64-bit" : "32-bit";
 
             string newLine = Environment.NewLine;
 
@@ -165,14 +155,10 @@ public void StartLogging(string logFilePath, LogLevel logLevel)
                     $"    Name:      {this.hostDetails.Name}" + newLine +
                     $"    ProfileId: {this.hostDetails.ProfileId}" + newLine +
                     $"    Version:   {this.hostDetails.Version}" + newLine +
-#if !CoreCLR
                     $"    Arch:      {processArchitecture}" + newLine + newLine +
                      "  Operating system details:" + newLine + newLine +
                     $"    Version: {osVersionString}" + newLine +
                     $"    Arch:    {osArchitecture}"));
-#else
-                    ""));
-#endif
         }
 
         /// <summary>
@@ -231,7 +217,7 @@ private async void OnLanguageServiceClientConnect(
             await this.editorSession.PowerShellContext.ImportCommandsModule(
                 Path.Combine(
                     Path.GetDirectoryName(this.GetType().GetTypeInfo().Assembly.Location),
-                    @"..\..\Commands"));
+                    @"..\Commands"));
 
             this.languageServer.Start();
 
@@ -441,19 +427,13 @@ private void ProtocolEndpoint_UnhandledException(object sender, Exception e)
             this.serverCompletedTask.SetException(e);
         }
 
-#if !CoreCLR
         private void CurrentDomain_UnhandledException(
             object sender,
             UnhandledExceptionEventArgs e)
         {
             // Log the exception
-            this.logger.Write(
-                LogLevel.Error,
-                string.Format(
-                    "FATAL UNHANDLED EXCEPTION:\r\n\r\n{0}",
-                    e.ExceptionObject.ToString()));
+            this.logger.Write(LogLevel.Error, $"FATAL UNHANDLED EXCEPTION: {e.ExceptionObject}");
         }
-#endif
         private IServerListener CreateServiceListener(MessageProtocolType protocol, EditorServiceTransportConfig config)
         {
             switch (config.TransportType)

src/PowerShellEditorServices.Host/PowerShellEditorServices.Host.csproj

@@ -4,30 +4,19 @@
   <PropertyGroup>
     <AssemblyTitle>PowerShell Editor Services Host Process</AssemblyTitle>
     <Description>Provides a process for hosting the PowerShell Editor Services library exposed by a JSON message protocol.</Description>
-    <TargetFrameworks>netstandard1.6;net451</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <AssemblyName>Microsoft.PowerShell.EditorServices.Host</AssemblyName>
   </PropertyGroup>
 
+  <!--<PropertyGroup>
+    <WarningsAsErrors>1591,1573,1572</WarningsAsErrors>
+    <DocumentationFile>bin\$(TargetFramework)\$(Configuration)\Microsoft.PowerShell.EditorServices.xml</DocumentationFile>
+  </PropertyGroup>-->
+
   <ItemGroup>
     <ProjectReference Include="..\PowerShellEditorServices\PowerShellEditorServices.csproj" />
     <ProjectReference Include="..\PowerShellEditorServices.Protocol\PowerShellEditorServices.Protocol.csproj" />
+    <PackageReference Include="PowerShellStandard.Library" Version="5.1.0-preview-06" PrivateAssets="All"/>
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json">
-      <Version>10.0.3</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.PowerShell.SDK">
-      <Version>6.0.0-alpha13</Version>
-    </PackageReference>
-  </ItemGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
-    <DefineConstants>$(DefineConstants);CoreCLR</DefineConstants>
-  </PropertyGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
 </Project>