Skip to content

Commit 95a7c29

Browse files
author
Christoph Bergmeister
committed
Merge branch 'master' of https://github.com/PowerShell/vscode-powershell into refactor-IFeature
2 parents 4afcb90 + d1a8e9e commit 95a7c29

20 files changed

+400
-149
lines changed

.github/workflows/codeql.yml

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: "Code scanning - action"
2+
3+
on:
4+
push:
5+
pull_request:
6+
schedule:
7+
- cron: '0 19 * * 0'
8+
9+
jobs:
10+
CodeQL-Build:
11+
12+
# CodeQL runs on ubuntu-latest and windows-latest
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- name: Checkout repository
17+
uses: actions/checkout@v2
18+
with:
19+
# We must fetch at least the immediate parents so that if this is
20+
# a pull request then we can checkout the head.
21+
fetch-depth: 2
22+
23+
# If this run was triggered by a pull request event, then checkout
24+
# the head of the pull request instead of the merge commit.
25+
- run: git checkout HEAD^2
26+
if: ${{ github.event_name == 'pull_request' }}
27+
28+
# Initializes the CodeQL tools for scanning.
29+
- name: Initialize CodeQL
30+
uses: github/codeql-action/init@v1
31+
# Override language selection by uncommenting this and choosing your languages
32+
# with:
33+
# languages: go, javascript, csharp, python, cpp, java
34+
35+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
36+
# If this step fails, then you should remove it and run the build manually (see below)
37+
- name: Autobuild
38+
uses: github/codeql-action/autobuild@v1
39+
40+
# ℹ️ Command-line programs to run using the OS shell.
41+
# 📚 https://git.io/JvXDl
42+
43+
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
44+
# and modify them (or add more) to build your code if your project
45+
# uses a compiled language
46+
47+
#- run: |
48+
# make bootstrap
49+
# make release
50+
51+
- name: Perform CodeQL Analysis
52+
uses: github/codeql-action/analyze@v1

CHANGELOG.md

+43-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,52 @@
11
# PowerShell Extension Release History
22

3-
## v2020.5.0
4-
### Wednesday, May 06, 2020
3+
## v2020.6.0-preview
4+
### Monday, June 01, 2020
55
#### [vscode-PowerShell](https://github.com/PowerShell/vscode-PowerShell)
66

7-
- [vscode-powershell #2676](https://github.com/PowerShell/vscode-powershell/pull/2676) -
7+
- 🐢✨ [vscode-powershell #2730](https://github.com/PowerShell/vscode-powershell/pull/2730) -
8+
Support adding an `OutputFile` and allow running Pester tests from the command pallet.
9+
- 🔗🐛 [vscode-powershell #2705](https://github.com/PowerShell/vscode-powershell/pull/2705) -
10+
Tweak CodeLens logic now that we use Omnisharp's serializer.
11+
- 📺✨ [vscode-powershell #2702](https://github.com/PowerShell/vscode-powershell/pull/2702) -
12+
Add coloring for `$` and remove it from `wordSepartors`. (Thanks @MJECloud!)
13+
- 📺✨ [vscode-powershell #2704](https://github.com/PowerShell/vscode-powershell/pull/2704) -
14+
Add buttons for moving the terminal pane around. (Thanks @MartinGC94!)
15+
- 👮‍🐛 [vscode-powershell #2703](https://github.com/PowerShell/vscode-powershell/pull/2703) -
16+
Tweak `whitespaceAroundPipe` settings migration logic to do it only once. (Thanks @bergmeister!)
17+
- 👮‍🐛 [vscode-powershell #2698](https://github.com/PowerShell/vscode-powershell/pull/2698) -
18+
Change default of `powershell.codeFormatting.pipelineIndentationStyle` from None back to NoIndentation due to PSScriptAnalyzer bug. (Thanks @bergmeister!)
19+
20+
#### [PowerShellEditorServices](https://github.com/PowerShell/PowerShellEditorServices)
21+
22+
- 🚂✨ [PowerShellEditorServices #1301](https://github.com/PowerShell/PowerShellEditorServices/pull/1301) -
23+
Fix `AddLanguageProtocolLogging` OmniSharp breaking change.
24+
- 🚨✨ [PowerShellEditorServices #1298](https://github.com/PowerShell/PowerShellEditorServices/pull/1298) -
25+
Remove leftover csproj reference to already removed project in test project PowerShellEditorServices.Test.Host.csproj. (Thanks @bergmeister!)
26+
- 🚂✨ [PowerShellEditorServices #1300](https://github.com/PowerShell/PowerShellEditorServices/pull/1300) -
27+
Address breaking changes in Omnisharp lib and depend on `DocumentUri` more.
28+
- 🚂✨ [PowerShellEditorServices #1291](https://github.com/PowerShell/PowerShellEditorServices/pull/1291) -
29+
Depend on `DocumentUri` for handing vscode `Uri`'s.
30+
- 🧠✨ [vscode-powershell #2706](https://github.com/PowerShell/PowerShellEditorServices/pull/1294) -
31+
Support `completionItem/resolve` request for comparison operators to show tooltip information.
32+
33+
## v2020.5.0-preview
34+
### Wednesday, May 13, 2020
35+
#### [vscode-PowerShell](https://github.com/PowerShell/vscode-PowerShell)
36+
37+
- ✨🐢 [vscode-powershell #2670](https://github.com/PowerShell/vscode-powershell/pull/2670) -
38+
Add debug output setting for Pester. (Thanks @nohwnd!)
39+
- ✨🔧 [vscode-powershell #2689](https://github.com/PowerShell/vscode-powershell/pull/2689) -
40+
Migrate setting value of `powershell.codeFormatting.whitespaceAroundPipe` to `powershell.codeFormatting.addWhitespaceAroundPipe` automatically. (Thanks @bergmeister!)
41+
- 🐛🔧 [vscode-powershell #2688](https://github.com/PowerShell/vscode-powershell/pull/2688) -
42+
Respect user choice when dismissing the `powerShellExePath` dialog. (Thanks @bergmeister!)
43+
- ✨👷 [vscode-powershell #2686](https://github.com/PowerShell/vscode-powershell/pull/2686) -
44+
Code clean up around some unused variables. (Thanks @bergmeister!)
45+
- 🐛🐢 [vscode-powershell #2676](https://github.com/PowerShell/vscode-powershell/pull/2676) -
846
Fix Pester invocation for 3x versions. (Thanks @nohwnd!)
9-
- [vscode-powershell #2674](https://github.com/PowerShell/vscode-powershell/pull/2674) -
47+
- ✨👮‍ [vscode-powershell #2674](https://github.com/PowerShell/vscode-powershell/pull/2674) -
1048
Add additional settings for PSScriptAnalyzer 1.19. (Thanks @bergmeister!)
11-
- [vscode-powershell #2672](https://github.com/PowerShell/vscode-powershell/pull/2672) -
49+
- ⚡️🔍 [vscode-powershell #2672](https://github.com/PowerShell/vscode-powershell/pull/2672) -
1250
Use in-memory debug adapter instead of spinning up new process.
1351

1452
#### [PowerShellEditorServices](https://github.com/PowerShell/PowerShellEditorServices)

InvokePesterStub.ps1

+21-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,10 @@ param(
5353
[switch] $MinimumVersion5,
5454

5555
[Parameter(Mandatory)]
56-
[string] $Output
56+
[string] $Output,
57+
58+
[Parameter()]
59+
[string] $OutputPath
5760
)
5861

5962
$pesterModule = Microsoft.PowerShell.Core\Get-Module Pester
@@ -103,6 +106,14 @@ if ($All) {
103106
if ("FromPreference" -ne $Output) {
104107
$configuration.Add('Output', @{ Verbosity = $Output })
105108
}
109+
110+
if ($OutputPath) {
111+
$configuration.Add('TestResult', @{
112+
Enabled = $true
113+
OutputFormat = "NUnit2.5"
114+
OutputPath = $OutputPath
115+
})
116+
}
106117
Pester\Invoke-Pester -Configuration $configuration | Out-Null
107118
}
108119
elseif ($pesterModule.Version -ge '3.4.5') {
@@ -132,6 +143,15 @@ elseif (($LineNumber -match '\d+') -and ($pesterModule.Version -ge '4.6.0')) {
132143
if ("FromPreference" -ne $Output) {
133144
$configuration.Add('Output', @{ Verbosity = $Output })
134145
}
146+
147+
if ($OutputPath) {
148+
$configuration.Add('TestResult', @{
149+
Enabled = $true
150+
OutputFormat = "NUnit2.5"
151+
OutputPath = $OutputPath
152+
})
153+
}
154+
135155
Pester\Invoke-Pester -Configuration $configuration | Out-Null
136156
}
137157
else {

package-lock.json

+47-47
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)