Skip to content

Commit 0478d4b

Browse files
Merge pull request #3518 from PowerShell/andschwa/debug-config
Update build and task configurations
2 parents 2847f91 + 8ebbb55 commit 0478d4b

File tree

4 files changed

+18
-35
lines changed

4 files changed

+18
-35
lines changed

.vscode/launch.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"outFiles": [
1515
"${workspaceFolder}/out/src/**/*.js"
1616
],
17-
"preLaunchTask": "BuildAll"
17+
"preLaunchTask": "Build"
1818
},
1919
{
2020
"name": "Launch Extension (Build client only)",
@@ -47,6 +47,12 @@
4747
"${workspaceFolder}/out/**/*.js"
4848
],
4949
"preLaunchTask": "Build"
50-
}
50+
},
51+
{
52+
"name": "PowerShell Launch Current File",
53+
"type": "PowerShell",
54+
"request": "launch",
55+
"script": "${file}",
56+
},
5157
]
5258
}

.vscode/tasks.json

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -37,49 +37,32 @@
3737
},
3838
"tasks": [
3939
{
40-
"label": "Install",
40+
"label": "Restore",
4141
"type": "shell",
4242
"command": "Invoke-Build Restore",
43-
"problemMatcher": []
44-
},
45-
{
46-
"label": "CleanAll",
47-
"type": "shell",
48-
"command": "Invoke-Build CleanAll",
49-
"problemMatcher": []
5043
},
5144
{
5245
"label": "Clean",
5346
"type": "shell",
5447
"command": "Invoke-Build Clean",
55-
"problemMatcher": []
56-
},
57-
{
58-
"label": "BuildAll",
59-
"type": "shell",
60-
"command": "Invoke-Build BuildAll",
61-
"group": {
62-
"kind": "build",
63-
"isDefault": true
64-
},
65-
"problemMatcher": []
6648
},
6749
{
6850
"label": "Build",
6951
"type": "shell",
7052
"command": "Invoke-Build Build",
7153
"group": "build",
72-
"problemMatcher": []
7354
},
7455
{
7556
"label": "Test",
7657
"type": "shell",
7758
"command": "Invoke-Build Test",
78-
"group": {
79-
"kind": "test",
80-
"isDefault": true
81-
},
82-
"problemMatcher": []
59+
"group": "test",
60+
},
61+
{
62+
"label": "Package",
63+
"type": "shell",
64+
"command": "Invoke-Build Package",
65+
"group": "build"
8366
}
8467
]
8568
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@
459459
"type": "PowerShell",
460460
"request": "launch",
461461
"script": "^\"\\${file}\"",
462-
"cwd": "^\"\\${file}\""
462+
"cwd": "^\"\\${workspaceFolder}\""
463463
}
464464
},
465465
{

vscode-powershell.build.ps1

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ task CleanEditorServices -If (Get-EditorServicesPath) {
4949
Invoke-Build Clean (Get-EditorServicesPath)
5050
}
5151

52-
task CleanAll CleanEditorServices, Clean
53-
5452
#endregion
5553
#region Build tasks
5654

@@ -69,8 +67,6 @@ task Build CopyEditorServices, Restore, {
6967
exec { & npm run compile }
7068
}
7169

72-
task BuildAll BuildEditorServices, Build
73-
7470
#endregion
7571
#region Test tasks
7672

@@ -84,8 +80,6 @@ task TestEditorServices -If (Get-EditorServicesPath) {
8480
Invoke-Build Test (Get-EditorServicesPath)
8581
}
8682

87-
task TestAll TestEditorServices, Test
88-
8983
#endregion
9084

9185
#region Package tasks
@@ -106,7 +100,7 @@ task UpdateReadme -If { $script:IsPreviewExtension } {
106100
}
107101
}
108102

109-
task Package UpdateReadme, {
103+
task Package UpdateReadme, Build, {
110104
assert { Test-Path ./modules/PowerShellEditorServices }
111105
Write-Host "`n### Packaging $($script:PackageJson.name)-$($script:PackageJson.version).vsix`n" -ForegroundColor Green
112106
exec { & npm run package }

0 commit comments

Comments
 (0)