Skip to content

Backport PRs post 2019.5.0 #2102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jul 26, 2019
Merged

Backport PRs post 2019.5.0 #2102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
24e8e00
Edit snippets to support $TM_SELECTED_TEXT (#1945)
travisclagrone May 11, 2019
7bfcaee
Add ArgumentCompleter snippets (#1946)
travisclagrone Jun 25, 2019
dad582d
Add #Requires snippets (#1974)
travisclagrone Jul 9, 2019
794a66c
Fix node version detect logic to handle node v10 (#2025)
rkeithhill Jun 25, 2019
2be3d85
#1019: Get format settings from document editor instead of global. (#…
tillig Jun 25, 2019
db8e7d1
Update PSSA docs Url to point to master branch because master is now …
bergmeister Jun 25, 2019
21645ff
add machine scope (#2039)
TylerLeonhardt Jul 17, 2019
8333d54
Add param-block snippet (#2081)
AspenForester Jul 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,17 @@ function needsVSCode () {

function needsNodeJS () {
try {
$nodeJSVersion = (node -v)

$nodeJSVersion = node -v
} catch {
return $true
}
return ($nodeJSVersion.Substring(1,1) -lt 6)

if ($nodeJSVersion -notmatch 'v(\d+\.\d+\.\d+)') {
return $true
}

$nodeVer = [System.Version]$matches[1]
return ($nodeVer.Major -lt 6)
}

function needsPowerShellGet () {
Expand Down
12 changes: 3 additions & 9 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"publisher": "ms-vscode",
"description": "Develop PowerShell scripts in Visual Studio Code!",
"engines": {
"vscode": "^1.31.0"
"vscode": "^1.34.0"
},
"license": "SEE LICENSE IN LICENSE.txt",
"homepage": "https://github.com/PowerShell/vscode-powershell/blob/master/README.md",
Expand Down Expand Up @@ -545,13 +545,13 @@
"powershell.powerShellExePath": {
"type": "string",
"default": "",
"isExecutable": true,
"scope": "machine",
"description": "Specifies the full path to a PowerShell executable. Changes the installation of PowerShell used for language and debugging services."
},
"powershell.powerShellAdditionalExePaths": {
"type": "array",
"description": "Specifies an array of versionName / exePath pairs where exePath points to a non-standard install location for PowerShell and versionName can be used to reference this path with the powershell.powerShellDefaultVersion setting.",
"isExecutable": true,
"scope": "machine",
"uniqueItems": true,
"items": {
"type": "object",
Expand Down Expand Up @@ -751,12 +751,6 @@
"type": "boolean",
"default": false,
"description": "Indicates that the powerShellExePath points to a developer build of Windows PowerShell and configures it for development."
},
"powershell.developer.powerShellExePath": {
"type": "string",
"default": "",
"isExecutable": true,
"description": "Deprecated. Please use the 'powershell.powerShellExePath' setting instead"
}
}
},
Expand Down
Loading