Merge from vscode a4177f50c475fc0fa278a78235e3bee9ffdec781 (#8649)

* Merge from vscode a4177f50c475fc0fa278a78235e3bee9ffdec781

* distro

* fix tests
This commit is contained in:
Anthony Dresser
2019-12-11 22:42:23 -08:00
committed by GitHub
parent 82974a2135
commit 4ba6a979ba
280 changed files with 10898 additions and 14231 deletions

View File

@@ -1,7 +1,7 @@
{
"name": "azuredatastudio",
"version": "1.14.0",
"distro": "0fd359ecaf4b9ee6948b976a69a36a2179deaefd",
"distro": "70b195f4ddcfa2e6540928240456ed949ffb6ae0",
"author": {
"name": "Microsoft Corporation"
},
@@ -65,7 +65,7 @@
"reflect-metadata": "^0.1.8",
"rxjs": "5.4.0",
"sanitize-html": "^1.19.1",
"semver-umd": "^5.5.3",
"semver-umd": "^5.5.5",
"slickgrid": "github:anthonydresser/SlickGrid#2.3.32",
"spdlog": "^0.11.1",
"sudo-prompt": "9.1.1",
@@ -99,7 +99,6 @@
"@types/node": "^10.12.12",
"@types/plotly.js": "^1.44.9",
"@types/sanitize-html": "^1.18.2",
"@types/semver": "^5.5.0",
"@types/sinon": "^1.16.36",
"@types/webpack": "^4.4.10",
"@types/windows-foreground-love": "^0.3.0",
@@ -114,6 +113,7 @@
"coveralls": "^2.11.11",
"cson-parser": "^1.3.3",
"debounce": "^1.0.0",
"electron": "6.1.5",
"event-stream": "3.3.4",
"express": "^4.13.1",
"fancy-log": "^1.3.3",
@@ -169,7 +169,7 @@
"tslint": "^5.16.0",
"tslint-microsoft-contrib": "^6.0.0",
"typemoq": "^0.3.2",
"typescript": "3.7.2",
"typescript": "3.7.3",
"typescript-formatter": "7.1.0",
"vinyl": "^2.0.0",
"vinyl-fs": "^3.0.0",