From f91ed143f4073a06df484d07e344e5adbc8e13c1 Mon Sep 17 00:00:00 2001
From: Joao Moreno <joao.moreno@microsoft.com>
Date: Fri, 30 Aug 2019 17:43:35 +0200
Subject: [PATCH 1/2] fix tests

---
 src/vs/base/parts/tree/browser/treeModel.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/base/parts/tree/browser/treeModel.ts b/src/vs/base/parts/tree/browser/treeModel.ts
index 3542756834c..ba1b0d77836 100644
--- a/src/vs/base/parts/tree/browser/treeModel.ts
+++ b/src/vs/base/parts/tree/browser/treeModel.ts
@@ -5,7 +5,7 @@
 
 import * as Assert from 'vs/base/common/assert';
 import { onUnexpectedError } from 'vs/base/common/errors';
-import { IDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, combinedDisposable, Disposable } from 'vs/base/common/lifecycle';
 import { INavigator } from 'vs/base/common/iterator';
 import * as _ from './tree';
 import { Event, Emitter, EventMultiplexer, Relay } from 'vs/base/common/event';
@@ -865,7 +865,7 @@ export class TreeModel {
 	private lock!: Lock;
 	private input: Item | null;
 	private registry: ItemRegistry = new ItemRegistry();
-	private registryDisposable!: IDisposable;
+	private registryDisposable: IDisposable = Disposable.None;
 	private traitsToItems: ITraitMap;
 
 	private _onSetInput = new Emitter<IInputEvent>();

From d32c857d1b11d4c4b7b9c1b5666f434c5f84219b Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Fri, 30 Aug 2019 17:56:56 +0200
Subject: [PATCH 2/2] tsconfig :lipstick:

---
 src/tsconfig.base.json   | 1 -
 test/smoke/tsconfig.json | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/tsconfig.base.json b/src/tsconfig.base.json
index b782f00466a..907c210b530 100644
--- a/src/tsconfig.base.json
+++ b/src/tsconfig.base.json
@@ -3,7 +3,6 @@
 		"module": "amd",
 		"moduleResolution": "node",
 		"noImplicitAny": true,
-		"target": "es5",
 		"experimentalDecorators": true,
 		"noImplicitReturns": true,
 		"noUnusedLocals": true,
diff --git a/test/smoke/tsconfig.json b/test/smoke/tsconfig.json
index 1b0b03c2d67..6f0b40e93e5 100644
--- a/test/smoke/tsconfig.json
+++ b/test/smoke/tsconfig.json
@@ -4,7 +4,7 @@
 		"noImplicitAny": false,
 		"removeComments": false,
 		"preserveConstEnums": true,
-		"target": "es2016",
+		"target": "es2017",
 		"strictNullChecks": true,
 		"noUnusedParameters": false,
 		"noUnusedLocals": true,
@@ -18,4 +18,4 @@
 	"exclude": [
 		"node_modules"
 	]
-}
\ No newline at end of file
+}