Skip to content

Commit 294696f

Browse files
authored
Merge pull request #1186 from PowerShell/development
Merge development branch into master branch for 1.18.0
2 parents 3a3ff48 + 23a18f6 commit 294696f

File tree

209 files changed

+18238
-1848
lines changed

Some content is hidden

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

209 files changed

+18238
-1848
lines changed

.build.ps1

-233
This file was deleted.

.github/PULL_REQUEST_TEMPLATE.md

+8-10
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@
44

55
## PR Checklist
66

7-
Note: Tick the boxes below that apply to this pull request by putting an `x` between the square brackets. Please mark anything not applicable to this PR `NA`.
8-
9-
- [ ] PR has a meaningful title
10-
- [ ] Use the present tense and imperative mood when describing your changes
11-
- [ ] Summarized changes
12-
- [ ] User facing documentation needed
13-
- [ ] Change is not breaking
14-
- [ ] Make sure you've added a new test if existing tests do not effectively test the code changed
15-
- [ ] This PR is ready to merge and is not work in progress
16-
- If the PR is work in progress, please add the prefix `WIP:` to the beginning of the title and remove the prefix when the PR is ready
7+
- [ ] [PR has a meaningful title](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#pull-request---submission)
8+
- Use the present tense and imperative mood when describing your changes
9+
- [ ] [Summarized changes](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#pull-request---submission)
10+
- [ ] [Change is not breaking](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#making-breaking-changes)
11+
- [ ] [Make sure all `.cs`, `.ps1` and `.psm1` files have the correct copyright header](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#pull-request---submission)
12+
- [ ] Make sure you've added a new test if existing tests do not effectively test the code changed and/or updated documentation
13+
- [ ] This PR is ready to merge and is not [Work in Progress](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#pull-request---work-in-progress).
14+
- If the PR is work in progress, please add the prefix `WIP:` to the beginning of the title and remove the prefix when the PR is ready.

.gitignore

+13-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ bld/
2525
# Visual Studo 2015 cache/options directory
2626
.vs/
2727

28+
# VSCode configuration directory
29+
.vscode/
30+
2831
# MSTest test Results
2932
[Tt]est[Rr]esult*/
3033
[Bb]uild[Ll]og.*
@@ -205,4 +208,13 @@ FakesAssemblies/
205208
*.opt
206209

207210
##Our project binplace location
208-
PSScriptAnalyzer/
211+
PSScriptAnalyzer/
212+
213+
# Vim swap files
214+
*.swp
215+
216+
# Test result file
217+
TestResults.xml
218+
219+
# PSCompatibilityAnalyzer module
220+
PSCompatibilityAnalyzer/out/

.vscode/extensions.json

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
// See http://go.microsoft.com/fwlink/?LinkId=827846
3+
// for the documentation about the extensions.json format
4+
"recommendations": [
5+
"ms-vscode.PowerShell",
6+
"ms-vscode.csharp"
7+
]
8+
}

.vscode/settings.json

+11-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
// Place your settings in this file to overwrite default and user settings.
22
{
33
"editor.tabSize": 4,
4-
"powershell.codeFormatting.preset": "Allman"
5-
}
4+
"powershell.codeFormatting.preset": "Allman",
5+
"[powershell]": {
6+
"files.trimTrailingWhitespace": true
7+
},
8+
"search.exclude": {
9+
"**/node_modules": true,
10+
"**/bower_components": true,
11+
"/PSCompatibilityAnalyzer/profiles": true,
12+
"/PSCompatibilityAnalyzer/optional_profiles": true
13+
}
14+
}

0 commit comments

Comments
 (0)