Merge branch 'ads-main-vscode-2020-07-23T02-21-03' into main

This commit is contained in:
Anthony Dresser
2020-07-22 21:31:16 -07:00
82 changed files with 1735 additions and 828 deletions

View File

@@ -1801,7 +1801,7 @@
"Ignore",
"ignore"
],
"filenames": [
"extensions": [
".gitignore_global",
".gitignore"
],

View File

@@ -74,7 +74,7 @@ async function createModel(context: ExtensionContext, outputChannel: OutputChann
new GitTimelineProvider(model)
);
// await checkGitVersion(info); {{SQL CARBON EDIT}} Don't check git version
// checkGitVersion(info); {{SQL CARBON EDIT}} Don't check git version
return model;
}

View File

@@ -3,7 +3,7 @@
"version": "0.0.1",
"description": "Dependencies shared by all extensions",
"dependencies": {
"typescript": "3.9.6"
"typescript": "3.9.7"
},
"scripts": {
"postinstall": "node ./postinstall"

View File

@@ -76,10 +76,10 @@ rimraf@^3.0.2:
dependencies:
glob "^7.1.3"
typescript@3.9.6:
version "3.9.6"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.6.tgz#8f3e0198a34c3ae17091b35571d3afd31999365a"
integrity sha512-Pspx3oKAPJtjNwE92YS05HQoY7z2SFyOpHo9MqJor3BXAGNaPUs83CuVp9VISFkSjyRfiTpmKuAYGJB7S7hOxw==
typescript@3.9.7:
version "3.9.7"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa"
integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==
wrappy@1:
version "1.0.2"