Skip to content

Commit

Permalink
Merge pull request #1186 from PowerShell/development
Browse files Browse the repository at this point in the history
Merge development branch into master branch for 1.18.0
  • Loading branch information
JamesWTruher authored Mar 22, 2019
2 parents 3a3ff48 + 23a18f6 commit 294696f
Show file tree
Hide file tree
Showing 209 changed files with 18,238 additions and 1,848 deletions.
233 changes: 0 additions & 233 deletions .build.ps1

This file was deleted.

18 changes: 8 additions & 10 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@

## PR Checklist

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`.

- [ ] PR has a meaningful title
- [ ] Use the present tense and imperative mood when describing your changes
- [ ] Summarized changes
- [ ] User facing documentation needed
- [ ] Change is not breaking
- [ ] Make sure you've added a new test if existing tests do not effectively test the code changed
- [ ] This PR is ready to merge and is not work in progress
- 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
- [ ] [PR has a meaningful title](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#pull-request---submission)
- Use the present tense and imperative mood when describing your changes
- [ ] [Summarized changes](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#pull-request---submission)
- [ ] [Change is not breaking](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#making-breaking-changes)
- [ ] [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)
- [ ] Make sure you've added a new test if existing tests do not effectively test the code changed and/or updated documentation
- [ ] 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).
- 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.
14 changes: 13 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ bld/
# Visual Studo 2015 cache/options directory
.vs/

# VSCode configuration directory
.vscode/

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*
Expand Down Expand Up @@ -205,4 +208,13 @@ FakesAssemblies/
*.opt

##Our project binplace location
PSScriptAnalyzer/
PSScriptAnalyzer/

# Vim swap files
*.swp

# Test result file
TestResults.xml

# PSCompatibilityAnalyzer module
PSCompatibilityAnalyzer/out/
8 changes: 8 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
// See http://go.microsoft.com/fwlink/?LinkId=827846
// for the documentation about the extensions.json format
"recommendations": [
"ms-vscode.PowerShell",
"ms-vscode.csharp"
]
}
13 changes: 11 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
// Place your settings in this file to overwrite default and user settings.
{
"editor.tabSize": 4,
"powershell.codeFormatting.preset": "Allman"
}
"powershell.codeFormatting.preset": "Allman",
"[powershell]": {
"files.trimTrailingWhitespace": true
},
"search.exclude": {
"**/node_modules": true,
"**/bower_components": true,
"/PSCompatibilityAnalyzer/profiles": true,
"/PSCompatibilityAnalyzer/optional_profiles": true
}
}
Loading

0 comments on commit 294696f

Please sign in to comment.