diff --git a/.gitignore b/.gitignore
index 088159d3d..91c573d9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,7 @@ registered_data.ini
.dotnet/
module/Plaster
module/PSScriptAnalyzer
+module/PSReadLine
docs/_site/
docs/_repo/
docs/metadata/
diff --git a/.travis.yml b/.travis.yml
index 8209d54c8..015e2dae1 100644
--- a/.travis.yml
+++ b/.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
diff --git a/NuGet.Config b/NuGet.Config
index 45f5379b9..6efc7f7b9 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -3,10 +3,4 @@
-
-
-
-
-
-
-
\ No newline at end of file
+
diff --git a/PowerShellEditorServices.Common.props b/PowerShellEditorServices.Common.props
index baaba85ea..751a5f07e 100644
--- a/PowerShellEditorServices.Common.props
+++ b/PowerShellEditorServices.Common.props
@@ -1,6 +1,6 @@
- 1.10.3
+ 2.0.0
Microsoft
© Microsoft Corporation. All rights reserved.
PowerShell;editor;development;language;debugging
@@ -9,6 +9,5 @@
git
https://github.com/PowerShell/PowerShellEditorServices
portable
- 1.0.3
diff --git a/PowerShellEditorServices.build.ps1 b/PowerShellEditorServices.build.ps1
index 409eb5ee6..8f543c3a4 100644
--- a/PowerShellEditorServices.build.ps1
+++ b/PowerShellEditorServices.build.ps1
@@ -20,10 +20,96 @@ param(
$script:IsCIBuild = $env:APPVEYOR -ne $null
$script:IsUnix = $PSVersionTable.PSEdition -and $PSVersionTable.PSEdition -eq "Core" -and !$IsWindows
-$script:TargetFrameworksParam = "/p:TargetFrameworks=\`"$(if (!$script:IsUnix) { "net452;" })netstandard1.6\`""
-$script:SaveModuleSupportsAllowPrerelease = (Get-Command Save-Module).Parameters.ContainsKey("AllowPrerelease")
+$script:TargetPlatform = "netstandard2.0"
+$script:TargetFrameworksParam = "/p:TargetFrameworks=`"$script:TargetPlatform`""
+$script:RequiredSdkVersion = "2.1.402"
+$script:NugetApiUriBase = 'https://www.nuget.org/api/v2/package'
+$script:ModuleBinPath = "$PSScriptRoot/module/PowerShellEditorServices/bin/"
+$script:VSCodeModuleBinPath = "$PSScriptRoot/module/PowerShellEditorServices.VSCode/bin/"
+$script:WindowsPowerShellFrameworkTarget = 'net461'
+$script:NetFrameworkPlatformId = 'win'
+$script:NetCoreTestingFrameworkVersion = '2.1.4'
$script:BuildInfoPath = [System.IO.Path]::Combine($PSScriptRoot, "src", "PowerShellEditorServices.Host", "BuildInfo", "BuildInfo.cs")
+$script:PSCoreModulePath = $null
+
+$script:TestRuntime = @{
+ 'Core' = 'netcoreapp2.1'
+ 'Desktop' = 'net461'
+}
+
+<#
+Declarative specification of binary assets produced
+in the build that need to be binplaced in the module.
+Schema is:
+{
+