Skip to content

Commit 9358709

Browse files
rjmholtrjmholt
authored
Merge pull request #852 from PowerShell/2.0.0
[Ignore] Bring master forward to 2.0.0
2 parents 161a3ed + 91f9b1a commit 9358709

File tree

151 files changed

+4970
-2053
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+4970
-2053
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ registered_data.ini
2929
.dotnet/
3030
module/Plaster
3131
module/PSScriptAnalyzer
32+
module/PSReadLine
3233
docs/_site/
3334
docs/_repo/
3435
docs/metadata/

‎.travis.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ language: cpp
33
git:
44
depth: 1000
55

6-
os:
7-
- linux
8-
- osx
9-
sudo: required
10-
dist: trusty
11-
osx_image: xcode8.3
6+
matrix:
7+
include:
8+
- os: linux
9+
dist: trusty
10+
sudo: required
11+
- os: osx
12+
osx_image: xcode9.4
1213

1314
before_install:
1415
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then

‎NuGet.Config‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,4 @@
33
<solution>
44
<add key="disableSourceControlIntegration" value="true" />
55
</solution>
6-
<packageSources>
7-
<clear />
8-
<add key="CI Builds (dotnet-core)" value="https://www.myget.org/F/dotnet-core/api/v3/index.json" />
9-
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
10-
<add key="powershell-core" value="https://powershell.myget.org/F/powershell-core/api/v3/index.json" />
11-
</packageSources>
12-
</configuration>
6+
</configuration>

‎PowerShellEditorServices.Common.props‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<VersionPrefix>1.10.3</VersionPrefix>
3+
<VersionPrefix>2.0.0</VersionPrefix>
44
<Company>Microsoft</Company>
55
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
66
<PackageTags>PowerShell;editor;development;language;debugging</PackageTags>
@@ -9,6 +9,5 @@
99
<RepositoryType>git</RepositoryType>
1010
<RepositoryUrl>https://github.com/PowerShell/PowerShellEditorServices</RepositoryUrl>
1111
<DebugType>portable</DebugType>
12-
<RuntimeFrameworkVersion>1.0.3</RuntimeFrameworkVersion>
1312
</PropertyGroup>
1413
</Project>

‎PowerShellEditorServices.build.ps1‎

Lines changed: 214 additions & 92 deletions
Large diffs are not rendered by default.

‎appveyor.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
1-
version: '1.10.3{build}'
1+
version: '2.0.0-{build}'
22
image: Visual Studio 2017
33
clone_depth: 10
44
skip_tags: true
55

66
branches:
77
only:
88
- master
9+
- 2.0.0
910

1011
environment:
1112
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true # Don't download unneeded packages
1213
DOTNET_CLI_TELEMETRY_OPTOUT: true # Don't send telemetry
1314

1415
install:
1516
- ps: |
16-
Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force | Out-Null
17+
Get-Module PowerShellGet,PackageManagement | Remove-Module -Force -Verbose
18+
powershell -Command { Install-Module -Name PowershellGet -MinimumVersion 1.6 -force -confirm:$false -verbose }
19+
powershell -Command { Install-Module -Name PackageManagement -MinimumVersion 1.1.7.0 -Force -Confirm:$false -Verbose }
20+
Import-Module -Name PowerShellGet -MinimumVersion 1.6 -Force
21+
Import-Module -Name PackageManagement -MinimumVersion 1.1.7.0 -Force
22+
Install-PackageProvider -Name NuGet -Force | Out-Null
1723
Import-PackageProvider NuGet -Force | Out-Null
1824
Set-PSRepository -Name PSGallery -InstallationPolicy Trusted | Out-Null
1925
Install-Module InvokeBuild -MaximumVersion 5.1.0 -Scope CurrentUser -Force | Out-Null

‎module/PowerShellEditorServices.VSCode/PowerShellEditorServices.VSCode.psm1‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,7 @@
33
# Licensed under the MIT license. See LICENSE file in the project root for full license information.
44
#
55

6-
if (!$PSVersionTable.PSEdition -or $PSVersionTable.PSEdition -eq "Desktop") {
7-
Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Desktop/Microsoft.PowerShell.EditorServices.VSCode.dll"
8-
}
9-
else {
10-
Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Core/Microsoft.PowerShell.EditorServices.VSCode.dll"
11-
}
6+
Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Microsoft.PowerShell.EditorServices.VSCode.dll"
127

138
if ($psEditor -is [Microsoft.PowerShell.EditorServices.Extensions.EditorObject]) {
149
[Microsoft.PowerShell.EditorServices.VSCode.ComponentRegistration]::Register($psEditor.Components)

‎module/PowerShellEditorServices/PowerShellEditorServices.psd1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
RootModule = 'PowerShellEditorServices.psm1'
1313

1414
# Version number of this module.
15-
ModuleVersion = '1.10.3'
15+
ModuleVersion = '2.0.0'
1616

1717
# ID used to uniquely identify this module
1818
GUID = '9ca15887-53a2-479a-9cda-48d26bcb6c47'

‎module/PowerShellEditorServices/PowerShellEditorServices.psm1‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,21 @@
33
# Licensed under the MIT license. See LICENSE file in the project root for full license information.
44
#
55

6-
if (!$PSVersionTable.PSEdition -or $PSVersionTable.PSEdition -eq "Desktop") {
7-
Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Desktop/Microsoft.PowerShell.EditorServices.dll"
8-
Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Desktop/Microsoft.PowerShell.EditorServices.Host.dll"
9-
}
10-
else {
11-
Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Core/Microsoft.PowerShell.EditorServices.dll"
12-
Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Core/Microsoft.PowerShell.EditorServices.Protocol.dll"
13-
Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Core/Microsoft.PowerShell.EditorServices.Host.dll"
6+
# Need to load pipe handling shim assemblies in Windows PowerShell and PSCore 6.0 because they don't have WCP
7+
if ($PSEdition -eq 'Desktop') {
8+
Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Desktop/System.IO.Pipes.AccessControl.dll"
9+
Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Desktop/System.Security.AccessControl.dll"
10+
Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Desktop/System.Security.Principal.Windows.dll"
11+
} elseif ($PSVersionTable.PSVersion -ge '6.0' -and $PSVersionTable.PSVersion -lt '6.1' -and $IsWindows) {
12+
Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/6.0/System.IO.Pipes.AccessControl.dll"
13+
Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/6.0/System.Security.AccessControl.dll"
14+
Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/6.0/System.Security.Principal.Windows.dll"
1415
}
1516

17+
Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Microsoft.PowerShell.EditorServices.dll"
18+
Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Microsoft.PowerShell.EditorServices.Host.dll"
19+
Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Microsoft.PowerShell.EditorServices.Protocol.dll"
20+
1621
function Start-EditorServicesHost {
1722
[CmdletBinding()]
1823
param(

‎module/PowerShellEditorServices/Start-EditorServices.ps1‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ try {
349349
"status" = "not started";
350350
"languageServiceTransport" = $PSCmdlet.ParameterSetName;
351351
"debugServiceTransport" = $PSCmdlet.ParameterSetName;
352-
};
352+
}
353353

354354
# Create the Editor Services host
355355
Log "Invoking Start-EditorServicesHost"
@@ -368,7 +368,8 @@ try {
368368
-BundledModulesPath $BundledModulesPath `
369369
-EnableConsoleRepl:$EnableConsoleRepl.IsPresent `
370370
-DebugServiceOnly:$DebugServiceOnly.IsPresent `
371-
-WaitForDebugger:$WaitForDebugger.IsPresent
371+
-WaitForDebugger:$WaitForDebugger.IsPresent `
372+
-FeatureFlags $FeatureFlags
372373
break
373374
}
374375

@@ -392,7 +393,8 @@ try {
392393
-BundledModulesPath $BundledModulesPath `
393394
-EnableConsoleRepl:$EnableConsoleRepl.IsPresent `
394395
-DebugServiceOnly:$DebugServiceOnly.IsPresent `
395-
-WaitForDebugger:$WaitForDebugger.IsPresent
396+
-WaitForDebugger:$WaitForDebugger.IsPresent `
397+
-FeatureFlags $FeatureFlags
396398

397399
Set-PipeFileResult $resultDetails "languageServiceReadPipeName" $LanguageServiceInPipeName
398400
Set-PipeFileResult $resultDetails "languageServiceWritePipeName" $LanguageServiceOutPipeName
@@ -417,7 +419,8 @@ try {
417419
-BundledModulesPath $BundledModulesPath `
418420
-EnableConsoleRepl:$EnableConsoleRepl.IsPresent `
419421
-DebugServiceOnly:$DebugServiceOnly.IsPresent `
420-
-WaitForDebugger:$WaitForDebugger.IsPresent
422+
-WaitForDebugger:$WaitForDebugger.IsPresent `
423+
-FeatureFlags $FeatureFlags
421424

422425
Set-PipeFileResult $resultDetails "languageServicePipeName" $LanguageServicePipeName
423426
Set-PipeFileResult $resultDetails "debugServicePipeName" $DebugServicePipeName

0 commit comments

Comments
 (0)