Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c (#8525)

* Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c

* remove files we don't want

* fix hygiene

* update distro

* update distro

* fix hygiene

* fix strict nulls

* distro

* distro

* fix tests

* fix tests

* add another edit

* fix viewlet icon

* fix azure dialog

* fix some padding

* fix more padding issues

extensions/git-ui/package.json

@@ -7,7 +7,9 @@
   "engines": {
     "vscode": "^1.5.0"
   },
-  "extensionKind": "ui",
+  "extensionKind": [
+    "ui"
+  ],
   "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
   "enableProposedApi": true,
   "categories": [
@@ -23,6 +25,6 @@
     "watch": "gulp watch-extension:git-ui"
   },
   "devDependencies": {
-    "@types/node": "^10.14.8"
+    "@types/node": "^12.11.7"
   }
-}
+}

extensions/git-ui/src/main.ts

@@ -41,12 +41,12 @@ export function exec(command: string, options: cp.ExecOptions & { stdin?: string
 			(error ? reject : resolve)({ error, stdout, stderr });
 		});
 		if (options.stdin) {
-			child.stdin.write(options.stdin, (err: any) => {
+			child.stdin!.write(options.stdin, (err: any) => {
 				if (err) {
 					reject(err);
 					return;
 				}
-				child.stdin.end((err: any) => {
+				child.stdin!.end((err: any) => {
 					if (err) {
 						reject(err);
 					}

extensions/git-ui/yarn.lock

@@ -2,7 +2,7 @@
 # yarn lockfile v1
 
 
-"@types/node@^10.14.8":
-  version "10.14.8"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.8.tgz#fe444203ecef1162348cd6deb76c62477b2cc6e9"
-  integrity sha512-I4+DbJEhLEg4/vIy/2gkWDvXBOOtPKV9EnLhYjMoqxcRW+TTZtUftkHktz/a8suoD5mUL7m6ReLrkPvSsCQQmw==
+"@types/node@^12.11.7":
+  version "12.11.7"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.7.tgz#57682a9771a3f7b09c2497f28129a0462966524a"
+  integrity sha512-JNbGaHFCLwgHn/iCckiGSOZ1XYHsKFwREtzPwSGCVld1SGhOlmZw2D4ZI94HQCrBHbADzW9m4LER/8olJTRGHA==