Skip to content

Commit 40126f9

Browse files
committed
Remove PowerShellEditorServices.VSCode module / ContentViews feature
As it took a year (presumably, maybe a more recent VS Code update is what broke it) to come up that indicates its usage is too low for us to go about fixing. If someone wants to figure it out we'll be happy to take a PR. For now we're removing the code (which is also a massive simplification because it was the entirety of the "VSCode" module we had to build and ship with the extension).
1 parent 6cffb4a commit 40126f9

27 files changed

+2
-1796
lines changed

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ PowerShellEditorServices.sln.ide/storage.ide
6868

6969
# Don't include PlatyPS generated MAML
7070
module/PowerShellEditorServices/Commands/en-US/*-help.xml
71-
module/PowerShellEditorServices.VSCode/en-US/*-help.xml
7271

7372
# Don't include Third Party Notices in module folder
7473
module/PowerShellEditorServices/Third\ Party\ Notices.txt

.vsts-ci/templates/ci-general.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ steps:
5050
targetType: inline
5151
pwsh: true
5252
script: |
53-
$assembly = [Reflection.Assembly]::LoadFile("$(Build.SourcesDirectory)/module/PowerShellEditorServices.VSCode/bin/Microsoft.PowerShell.EditorServices.VSCode.dll")
53+
$assembly = [Reflection.Assembly]::LoadFile("$(Build.SourcesDirectory)/module/PowerShellEditorServices/bin/Core/Microsoft.PowerShell.EditorServices.Hosting.dll")
5454
if ($assembly.GetCustomAttributes([System.Diagnostics.DebuggableAttribute], $true).IsJITOptimizerDisabled) {
5555
Write-Host "##vso[task.LogIssue type=error;] PowerShell Editor Services bits were not built in release configuration!"
5656
exit 1

.vsts-ci/templates/release-general.yml

-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ steps:
2727
PowerShellEditorServices/Commands/**/*.{ps1,psd1,psm1,ps1xml}
2828
# PowerShellEditorServices Binaries
2929
PowerShellEditorServices/**/Microsoft.PowerShell.EditorServices*.dll
30-
# PowerShellEditorServices.VSCode Script
31-
PowerShellEditorServices.VSCode/PowerShellEditorServices.VSCode.psd1
32-
# PowerShellEditorServices.VSCode Binary
33-
PowerShellEditorServices.VSCode/bin/Microsoft.PowerShell.EditorServices.VSCode.dll
3430
3531
- template: EsrpSign.yml@ComplianceRepo
3632
parameters:

PowerShellEditorServices.build.ps1

+1-15
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ $script:NetFramework = @{
5959
$script:HostCoreOutput = "$PSScriptRoot/src/PowerShellEditorServices.Hosting/bin/$Configuration/$($script:NetFramework.PS72)/publish"
6060
$script:HostDeskOutput = "$PSScriptRoot/src/PowerShellEditorServices.Hosting/bin/$Configuration/$($script:NetFramework.PS51)/publish"
6161
$script:PsesOutput = "$PSScriptRoot/src/PowerShellEditorServices/bin/$Configuration/$($script:NetFramework.Standard)/publish"
62-
$script:VSCodeOutput = "$PSScriptRoot/src/PowerShellEditorServices.VSCode/bin/$Configuration/$($script:NetFramework.Standard)/publish"
6362

6463
if (Get-Command git -ErrorAction SilentlyContinue) {
6564
# ignore changes to this file
@@ -79,7 +78,6 @@ Task FindDotNet {
7978
Task BinClean {
8079
Remove-BuildItem $PSScriptRoot\.tmp
8180
Remove-BuildItem $PSScriptRoot\module\PowerShellEditorServices\bin
82-
Remove-BuildItem $PSScriptRoot\module\PowerShellEditorServices.VSCode\bin
8381
}
8482

8583
Task Clean FindDotNet, BinClean, {
@@ -170,9 +168,6 @@ Task Build FindDotNet, CreateBuildInfo, {
170168
if (-not $script:IsNix) {
171169
Invoke-BuildExec { & dotnet publish $script:dotnetBuildArgs .\src\PowerShellEditorServices.Hosting\PowerShellEditorServices.Hosting.csproj -f $script:NetFramework.PS51 }
172170
}
173-
174-
# Build PowerShellEditorServices.VSCode module
175-
Invoke-BuildExec { & dotnet publish $script:dotnetBuildArgs .\src\PowerShellEditorServices.VSCode\PowerShellEditorServices.VSCode.csproj -f $script:NetFramework.Standard }
176171
}
177172

178173
# The concise set of tests (for pull requests)
@@ -291,14 +286,13 @@ Task TestE2EPowerShellCLM -If (-not $script:IsNix) Build, SetupHelpForTests, {
291286

292287
Task LayoutModule -After Build {
293288
$modulesDir = "$PSScriptRoot/module"
294-
$psesVSCodeBinOutputPath = "$modulesDir/PowerShellEditorServices.VSCode/bin"
295289
$psesOutputPath = "$modulesDir/PowerShellEditorServices"
296290
$psesBinOutputPath = "$PSScriptRoot/module/PowerShellEditorServices/bin"
297291
$psesDepsPath = "$psesBinOutputPath/Common"
298292
$psesCoreHostPath = "$psesBinOutputPath/Core"
299293
$psesDeskHostPath = "$psesBinOutputPath/Desktop"
300294

301-
foreach ($dir in $psesDepsPath, $psesCoreHostPath, $psesDeskHostPath, $psesVSCodeBinOutputPath) {
295+
foreach ($dir in $psesDepsPath, $psesCoreHostPath, $psesDeskHostPath) {
302296
New-Item -Force -Path $dir -ItemType Directory | Out-Null
303297
}
304298

@@ -338,13 +332,6 @@ Task LayoutModule -After Build {
338332
}
339333
}
340334
}
341-
342-
# Assemble the PowerShellEditorServices.VSCode module
343-
foreach ($vscodeComponent in Get-ChildItem $script:VSCodeOutput) {
344-
if (-not $includedDlls.Contains($vscodeComponent.Name)) {
345-
Copy-Item -Path $vscodeComponent.FullName -Destination $psesVSCodeBinOutputPath -Force
346-
}
347-
}
348335
}
349336

350337
task RestorePsesModules -After Build {
@@ -400,7 +387,6 @@ task RestorePsesModules -After Build {
400387

401388
Task BuildCmdletHelp -After LayoutModule {
402389
New-ExternalHelp -Path $PSScriptRoot\module\docs -OutputPath $PSScriptRoot\module\PowerShellEditorServices\Commands\en-US -Force | Out-Null
403-
New-ExternalHelp -Path $PSScriptRoot\module\PowerShellEditorServices.VSCode\docs -OutputPath $PSScriptRoot\module\PowerShellEditorServices.VSCode\en-US -Force | Out-Null
404390
}
405391

406392
# The default task is to run the entire CI build

PowerShellEditorServices.sln

-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{E231
1616
scripts\AddCopyrightHeaders.ps1 = scripts\AddCopyrightHeaders.ps1
1717
EndProjectSection
1818
EndProject
19-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerShellEditorServices.VSCode", "src\PowerShellEditorServices.VSCode\PowerShellEditorServices.VSCode.csproj", "{3B38E8DA-8BFF-4264-AF16-47929E6398A3}"
20-
EndProject
2119
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerShellEditorServices", "src\PowerShellEditorServices\PowerShellEditorServices.csproj", "{29EEDF03-0990-45F4-846E-2616970D1FA2}"
2220
EndProject
2321
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerShellEditorServices.Test.E2E", "test\PowerShellEditorServices.Test.E2E\PowerShellEditorServices.Test.E2E.csproj", "{2561F253-8F72-436A-BCC3-AA63AB82EDC0}"

module/PowerShellEditorServices.VSCode/PowerShellEditorServices.VSCode.psd1

-126
This file was deleted.

module/PowerShellEditorServices.VSCode/docs/Close-VSCodeHtmlContentView.md

-64
This file was deleted.

module/PowerShellEditorServices.VSCode/docs/New-VSCodeHtmlContentView.md

-92
This file was deleted.

0 commit comments

Comments
 (0)