mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 10:58:30 -05:00
Merge from vscode bead496a613e475819f89f08e9e882b841bc1fe8 (#14883)
* Merge from vscode bead496a613e475819f89f08e9e882b841bc1fe8 * Bump distro * Upgrade GCC to 4.9 due to yarn install errors * Update build image * Fix bootstrap base url * Bump distro * Fix build errors * Update source map file * Disable checkbox for blocking migration issues (#15131) * disable checkbox for blocking issues * wip * disable checkbox fixes * fix strings * Remove duplicate tsec command * Default to off for tab color if settings not present * re-skip failing tests * Fix mocha error * Bump sqlite version & fix notebooks search view * Turn off esbuild warnings * Update esbuild log level * Fix overflowactionbar tests * Fix ts-ignore in dropdown tests * cleanup/fixes * Fix hygiene * Bundle in entire zone.js module * Remove extra constructor param * bump distro for web compile break * bump distro for web compile break v2 * Undo log level change * New distro * Fix integration test scripts * remove the "no yarn.lock changes" workflow * fix scripts v2 * Update unit test scripts * Ensure ads-kerberos2 updates in .vscodeignore * Try fix unit tests * Upload crash reports * remove nogpu * always upload crashes * Use bash script * Consolidate data/ext dir names * Create in tmp directory Co-authored-by: chlafreniere <hichise@gmail.com> Co-authored-by: Christopher Suh <chsuh@microsoft.com> Co-authored-by: chgagnon <chgagnon@microsoft.com>
This commit is contained in:
Karl Burtram
@@ -1,30 +1,53 @@
|
||||
{
|
||||
"name": "powershell",
|
||||
"displayName": "%displayName%",
|
||||
"description": "%description%",
|
||||
"version": "1.0.0",
|
||||
"publisher": "vscode",
|
||||
"license": "MIT",
|
||||
"engines": { "vscode": "*" },
|
||||
"contributes": {
|
||||
"languages": [{
|
||||
"id": "powershell",
|
||||
"extensions": [ ".ps1", ".psm1", ".psd1", ".pssc", ".psrc" ],
|
||||
"aliases": [ "PowerShell", "powershell", "ps", "ps1" ],
|
||||
"firstLine": "^#!\\s*/.*\\bpwsh\\b",
|
||||
"configuration": "./language-configuration.json"
|
||||
}],
|
||||
"grammars": [{
|
||||
"language": "powershell",
|
||||
"scopeName": "source.powershell",
|
||||
"path": "./syntaxes/powershell.tmLanguage.json"
|
||||
}],
|
||||
"snippets": [{
|
||||
"language": "powershell",
|
||||
"path": "./snippets/powershell.code-snippets"
|
||||
}]
|
||||
},
|
||||
"scripts": {
|
||||
"update-grammar": "node ../../build/npm/update-grammar.js PowerShell/EditorSyntax PowerShellSyntax.tmLanguage ./syntaxes/powershell.tmLanguage.json"
|
||||
}
|
||||
"name": "powershell",
|
||||
"displayName": "%displayName%",
|
||||
"description": "%description%",
|
||||
"version": "1.0.0",
|
||||
"publisher": "vscode",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"vscode": "*"
|
||||
},
|
||||
"contributes": {
|
||||
"languages": [
|
||||
{
|
||||
"id": "powershell",
|
||||
"extensions": [
|
||||
".ps1",
|
||||
".psm1",
|
||||
".psd1",
|
||||
".pssc",
|
||||
".psrc"
|
||||
],
|
||||
"aliases": [
|
||||
"PowerShell",
|
||||
"powershell",
|
||||
"ps",
|
||||
"ps1"
|
||||
],
|
||||
"firstLine": "^#!\\s*/.*\\bpwsh\\b",
|
||||
"configuration": "./language-configuration.json"
|
||||
}
|
||||
],
|
||||
"grammars": [
|
||||
{
|
||||
"language": "powershell",
|
||||
"scopeName": "source.powershell",
|
||||
"path": "./syntaxes/powershell.tmLanguage.json"
|
||||
}
|
||||
],
|
||||
"snippets": [
|
||||
{
|
||||
"language": "powershell",
|
||||
"path": "./snippets/powershell.code-snippets"
|
||||
}
|
||||
]
|
||||
},
|
||||
"scripts": {
|
||||
"update-grammar": "node ../node_modules/.bin/vscode-grammar-updater PowerShell/EditorSyntax PowerShellSyntax.tmLanguage ./syntaxes/powershell.tmLanguage.json"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/microsoft/vscode.git"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"displayName": "Powershell Language Basics",
|
||||
"description": "Provides snippets, syntax highlighting, bracket matching and folding in Powershell files."
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
<#
|
||||
.
|
||||
#>
|
||||
@@ -1,43 +0,0 @@
|
||||
# Copyright Microsoft Corporation
|
||||
|
||||
function Test-IsAdmin() {
|
||||
try {
|
||||
$identity = [Security.Principal.WindowsIdentity]::GetCurrent()
|
||||
$principal = New-Object Security.Principal.WindowsPrincipal -ArgumentList $identity
|
||||
return $principal.IsInRole( [Security.Principal.WindowsBuiltInRole]::Administrator )
|
||||
} catch {
|
||||
throw "Failed to determine if the current user has elevated privileges. The error was: '{0}'." -f $_
|
||||
}
|
||||
}
|
||||
|
||||
function Invoke-Environment()
|
||||
{
|
||||
param
|
||||
(
|
||||
[Parameter(Mandatory=1)][string]$Command
|
||||
)
|
||||
|
||||
foreach($_ in cmd /c "$Command 2>&1 & set") {
|
||||
if ($_ -match '^([^=]+)=(.*)') {
|
||||
[System.Environment]::SetEnvironmentVariable($matches[1], $matches[2])
|
||||
}
|
||||
}
|
||||
}
|
||||
Write-Host -Object 'Initializing Azure PowerShell environment...';
|
||||
|
||||
# PowerShell commands need elevation for dependencies installation and running tests
|
||||
if (!(Test-IsAdmin)){
|
||||
Write-Host -Object 'Please launch command under administrator account. It is needed for environment setting up and unit test.' -ForegroundColor Red;
|
||||
}
|
||||
|
||||
$env:AzurePSRoot = Split-Path -Parent -Path $env:AzurePSRoot;
|
||||
|
||||
if (Test-Path -Path "$env:ADXSDKProgramFiles\Microsoft Visual Studio 12.0") {
|
||||
$vsVersion="12.0"
|
||||
} else {
|
||||
$vsVersion="11.0"
|
||||
}
|
||||
|
||||
$setVSEnv = '"{0}\Microsoft Visual Studio {1}\VC\vcvarsall.bat" x64' -f $env:ADXSDKProgramFiles, $vsVersion;
|
||||
|
||||
Invoke-Environment -Command $setVSEnv;
|
||||
@@ -1,35 +0,0 @@
|
||||
[
|
||||
{
|
||||
"c": "<#",
|
||||
"t": "source.powershell comment.block.powershell punctuation.definition.comment.block.begin.powershell",
|
||||
"r": {
|
||||
"dark_plus": "comment: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668"
|
||||
}
|
||||
},
|
||||
{
|
||||
"c": " .",
|
||||
"t": "source.powershell comment.block.powershell",
|
||||
"r": {
|
||||
"dark_plus": "comment: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668"
|
||||
}
|
||||
},
|
||||
{
|
||||
"c": "#>",
|
||||
"t": "source.powershell comment.block.powershell punctuation.definition.comment.block.end.powershell",
|
||||
"r": {
|
||||
"dark_plus": "comment: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668"
|
||||
}
|
||||
}
|
||||
]
|
||||
File diff suppressed because it is too large
Load Diff
4
extensions/powershell/yarn.lock
Normal file
4
extensions/powershell/yarn.lock
Normal file
@@ -0,0 +1,4 @@
|
||||
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
|
||||
# yarn lockfile v1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user