diff --git a/extensions/configuration-editing/build/tsconfig.json b/extensions/configuration-editing/build/tsconfig.json
index 0ac2f0ded80..0f4c9da0af6 100644
--- a/extensions/configuration-editing/build/tsconfig.json
+++ b/extensions/configuration-editing/build/tsconfig.json
@@ -1,5 +1,5 @@
 {
-	"extends": "../../shared.tsconfig.json",
+	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"resolveJsonModule": true,
 		"outDir": "./out"
diff --git a/extensions/configuration-editing/tsconfig.json b/extensions/configuration-editing/tsconfig.json
index 296ddb38fcb..070854d6913 100644
--- a/extensions/configuration-editing/tsconfig.json
+++ b/extensions/configuration-editing/tsconfig.json
@@ -1,9 +1,9 @@
 {
-	"extends": "../shared.tsconfig.json",
+	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out"
 	},
 	"include": [
 		"src/**/*"
 	]
-}
\ No newline at end of file
+}
diff --git a/extensions/css-language-features/client/tsconfig.json b/extensions/css-language-features/client/tsconfig.json
index 3203105c05c..8b4aedde27d 100644
--- a/extensions/css-language-features/client/tsconfig.json
+++ b/extensions/css-language-features/client/tsconfig.json
@@ -1,9 +1,9 @@
 {
-	"extends": "../../shared.tsconfig.json",
+	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out"
 	},
 	"include": [
 		"src/**/*"
 	]
-}
\ No newline at end of file
+}
diff --git a/extensions/css-language-features/server/tsconfig.json b/extensions/css-language-features/server/tsconfig.json
index 3203105c05c..8b4aedde27d 100644
--- a/extensions/css-language-features/server/tsconfig.json
+++ b/extensions/css-language-features/server/tsconfig.json
@@ -1,9 +1,9 @@
 {
-	"extends": "../../shared.tsconfig.json",
+	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out"
 	},
 	"include": [
 		"src/**/*"
 	]
-}
\ No newline at end of file
+}
diff --git a/extensions/debug-auto-launch/tsconfig.json b/extensions/debug-auto-launch/tsconfig.json
index f9b780a0e1c..69aa5aa3a1e 100644
--- a/extensions/debug-auto-launch/tsconfig.json
+++ b/extensions/debug-auto-launch/tsconfig.json
@@ -1,5 +1,5 @@
 {
-	"extends": "../shared.tsconfig.json",
+	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out",
 		"downlevelIteration": true
@@ -7,4 +7,4 @@
 	"include": [
 		"src/**/*"
 	]
-}
\ No newline at end of file
+}
diff --git a/extensions/debug-server-ready/tsconfig.json b/extensions/debug-server-ready/tsconfig.json
index f9b780a0e1c..69aa5aa3a1e 100644
--- a/extensions/debug-server-ready/tsconfig.json
+++ b/extensions/debug-server-ready/tsconfig.json
@@ -1,5 +1,5 @@
 {
-	"extends": "../shared.tsconfig.json",
+	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out",
 		"downlevelIteration": true
@@ -7,4 +7,4 @@
 	"include": [
 		"src/**/*"
 	]
-}
\ No newline at end of file
+}
diff --git a/extensions/emmet/tsconfig.json b/extensions/emmet/tsconfig.json
index 936dac480cd..22cffd9cde0 100644
--- a/extensions/emmet/tsconfig.json
+++ b/extensions/emmet/tsconfig.json
@@ -1,5 +1,5 @@
 {
-	"extends": "../shared.tsconfig.json",
+	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out"
 	},
@@ -10,4 +10,4 @@
 	"include": [
 		"src/**/*"
 	]
-}
\ No newline at end of file
+}
diff --git a/extensions/extension-editing/tsconfig.json b/extensions/extension-editing/tsconfig.json
index 8aee88b552c..5a23aaef103 100644
--- a/extensions/extension-editing/tsconfig.json
+++ b/extensions/extension-editing/tsconfig.json
@@ -1,5 +1,5 @@
 {
-	"extends": "../shared.tsconfig.json",
+	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out",
 		"typeRoots": [
@@ -9,4 +9,4 @@
 	"include": [
 		"src/**/*"
 	]
-}
\ No newline at end of file
+}
diff --git a/extensions/git-ui/tsconfig.json b/extensions/git-ui/tsconfig.json
index 27e9268b39b..4e4f1252ee0 100644
--- a/extensions/git-ui/tsconfig.json
+++ b/extensions/git-ui/tsconfig.json
@@ -1,5 +1,5 @@
 {
-	"extends": "../shared.tsconfig.json",
+	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out",
 		"experimentalDecorators": true,
@@ -10,4 +10,4 @@
 	"include": [
 		"src/**/*"
 	]
-}
\ No newline at end of file
+}
diff --git a/extensions/git/tsconfig.json b/extensions/git/tsconfig.json
index 27e9268b39b..4e4f1252ee0 100644
--- a/extensions/git/tsconfig.json
+++ b/extensions/git/tsconfig.json
@@ -1,5 +1,5 @@
 {
-	"extends": "../shared.tsconfig.json",
+	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out",
 		"experimentalDecorators": true,
@@ -10,4 +10,4 @@
 	"include": [
 		"src/**/*"
 	]
-}
\ No newline at end of file
+}
diff --git a/extensions/github-authentication/tsconfig.json b/extensions/github-authentication/tsconfig.json
index 1225709307b..4e4f1252ee0 100644
--- a/extensions/github-authentication/tsconfig.json
+++ b/extensions/github-authentication/tsconfig.json
@@ -1,5 +1,5 @@
 {
-	"extends": "../shared.tsconfig.json",
+	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out",
 		"experimentalDecorators": true,
diff --git a/extensions/github/tsconfig.json b/extensions/github/tsconfig.json
index 1225709307b..4e4f1252ee0 100644
--- a/extensions/github/tsconfig.json
+++ b/extensions/github/tsconfig.json
@@ -1,5 +1,5 @@
 {
-	"extends": "../shared.tsconfig.json",
+	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out",
 		"experimentalDecorators": true,
diff --git a/extensions/grunt/tsconfig.json b/extensions/grunt/tsconfig.json
index 296ddb38fcb..070854d6913 100644
--- a/extensions/grunt/tsconfig.json
+++ b/extensions/grunt/tsconfig.json
@@ -1,9 +1,9 @@
 {
-	"extends": "../shared.tsconfig.json",
+	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out"
 	},
 	"include": [
 		"src/**/*"
 	]
-}
\ No newline at end of file
+}
diff --git a/extensions/gulp/tsconfig.json b/extensions/gulp/tsconfig.json
index 296ddb38fcb..070854d6913 100644
--- a/extensions/gulp/tsconfig.json
+++ b/extensions/gulp/tsconfig.json
@@ -1,9 +1,9 @@
 {
-	"extends": "../shared.tsconfig.json",
+	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out"
 	},
 	"include": [
 		"src/**/*"
 	]
-}
\ No newline at end of file
+}
diff --git a/extensions/html-language-features/client/tsconfig.json b/extensions/html-language-features/client/tsconfig.json
index 3203105c05c..8b4aedde27d 100644
--- a/extensions/html-language-features/client/tsconfig.json
+++ b/extensions/html-language-features/client/tsconfig.json
@@ -1,9 +1,9 @@
 {
-	"extends": "../../shared.tsconfig.json",
+	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out"
 	},
 	"include": [
 		"src/**/*"
 	]
-}
\ No newline at end of file
+}
diff --git a/extensions/html-language-features/server/tsconfig.json b/extensions/html-language-features/server/tsconfig.json
index 3203105c05c..8b4aedde27d 100644
--- a/extensions/html-language-features/server/tsconfig.json
+++ b/extensions/html-language-features/server/tsconfig.json
@@ -1,9 +1,9 @@
 {
-	"extends": "../../shared.tsconfig.json",
+	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out"
 	},
 	"include": [
 		"src/**/*"
 	]
-}
\ No newline at end of file
+}
diff --git a/extensions/image-preview/tsconfig.json b/extensions/image-preview/tsconfig.json
index d0797affbad..f34c085e93e 100644
--- a/extensions/image-preview/tsconfig.json
+++ b/extensions/image-preview/tsconfig.json
@@ -1,5 +1,5 @@
 {
-	"extends": "../shared.tsconfig.json",
+	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out",
 		"experimentalDecorators": true
diff --git a/extensions/jake/tsconfig.json b/extensions/jake/tsconfig.json
index 296ddb38fcb..070854d6913 100644
--- a/extensions/jake/tsconfig.json
+++ b/extensions/jake/tsconfig.json
@@ -1,9 +1,9 @@
 {
-	"extends": "../shared.tsconfig.json",
+	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out"
 	},
 	"include": [
 		"src/**/*"
 	]
-}
\ No newline at end of file
+}
diff --git a/extensions/json-language-features/client/tsconfig.json b/extensions/json-language-features/client/tsconfig.json
index 3203105c05c..8b4aedde27d 100644
--- a/extensions/json-language-features/client/tsconfig.json
+++ b/extensions/json-language-features/client/tsconfig.json
@@ -1,9 +1,9 @@
 {
-	"extends": "../../shared.tsconfig.json",
+	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out"
 	},
 	"include": [
 		"src/**/*"
 	]
-}
\ No newline at end of file
+}
diff --git a/extensions/json-language-features/server/tsconfig.json b/extensions/json-language-features/server/tsconfig.json
index c35c31f1117..48493e51e20 100644
--- a/extensions/json-language-features/server/tsconfig.json
+++ b/extensions/json-language-features/server/tsconfig.json
@@ -1,5 +1,5 @@
 {
-	"extends": "../../shared.tsconfig.json",
+	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out",
 		"sourceMap": true,
@@ -8,4 +8,4 @@
 	"include": [
 		"src/**/*"
 	]
-}
\ No newline at end of file
+}
diff --git a/extensions/markdown-language-features/notebook/tsconfig.json b/extensions/markdown-language-features/notebook/tsconfig.json
index e19cd4a675d..b1bede72c17 100644
--- a/extensions/markdown-language-features/notebook/tsconfig.json
+++ b/extensions/markdown-language-features/notebook/tsconfig.json
@@ -1,5 +1,5 @@
 {
-	"extends": "../../shared.tsconfig.json",
+	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./dist/",
 		"jsx": "react",
diff --git a/extensions/markdown-language-features/preview-src/tsconfig.json b/extensions/markdown-language-features/preview-src/tsconfig.json
index e19cd4a675d..b1bede72c17 100644
--- a/extensions/markdown-language-features/preview-src/tsconfig.json
+++ b/extensions/markdown-language-features/preview-src/tsconfig.json
@@ -1,5 +1,5 @@
 {
-	"extends": "../../shared.tsconfig.json",
+	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./dist/",
 		"jsx": "react",
diff --git a/extensions/markdown-language-features/tsconfig.json b/extensions/markdown-language-features/tsconfig.json
index b02362c2cbe..1decd91e333 100644
--- a/extensions/markdown-language-features/tsconfig.json
+++ b/extensions/markdown-language-features/tsconfig.json
@@ -1,5 +1,5 @@
 {
-	"extends": "../shared.tsconfig.json",
+	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out",
 		"experimentalDecorators": true,
@@ -14,4 +14,4 @@
 	"include": [
 		"src/**/*"
 	]
-}
\ No newline at end of file
+}
diff --git a/extensions/merge-conflict/tsconfig.json b/extensions/merge-conflict/tsconfig.json
index 296ddb38fcb..070854d6913 100644
--- a/extensions/merge-conflict/tsconfig.json
+++ b/extensions/merge-conflict/tsconfig.json
@@ -1,9 +1,9 @@
 {
-	"extends": "../shared.tsconfig.json",
+	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out"
 	},
 	"include": [
 		"src/**/*"
 	]
-}
\ No newline at end of file
+}
diff --git a/extensions/notebook-markdown-extensions/notebook/tsconfig.json b/extensions/notebook-markdown-extensions/notebook/tsconfig.json
index e19cd4a675d..b1bede72c17 100644
--- a/extensions/notebook-markdown-extensions/notebook/tsconfig.json
+++ b/extensions/notebook-markdown-extensions/notebook/tsconfig.json
@@ -1,5 +1,5 @@
 {
-	"extends": "../../shared.tsconfig.json",
+	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./dist/",
 		"jsx": "react",
diff --git a/extensions/npm/tsconfig.json b/extensions/npm/tsconfig.json
index a50348dc223..070854d6913 100644
--- a/extensions/npm/tsconfig.json
+++ b/extensions/npm/tsconfig.json
@@ -1,5 +1,5 @@
 {
-	"extends": "../shared.tsconfig.json",
+	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out"
 	},
diff --git a/extensions/php-language-features/tsconfig.json b/extensions/php-language-features/tsconfig.json
index 296ddb38fcb..070854d6913 100644
--- a/extensions/php-language-features/tsconfig.json
+++ b/extensions/php-language-features/tsconfig.json
@@ -1,9 +1,9 @@
 {
-	"extends": "../shared.tsconfig.json",
+	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out"
 	},
 	"include": [
 		"src/**/*"
 	]
-}
\ No newline at end of file
+}
diff --git a/extensions/search-result/tsconfig.json b/extensions/search-result/tsconfig.json
index 16ed233f6e8..08dcb31c2ee 100644
--- a/extensions/search-result/tsconfig.json
+++ b/extensions/search-result/tsconfig.json
@@ -1,5 +1,5 @@
 {
-	"extends": "../shared.tsconfig.json",
+	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out",
 	},
diff --git a/extensions/simple-browser/preview-src/tsconfig.json b/extensions/simple-browser/preview-src/tsconfig.json
index e19cd4a675d..b1bede72c17 100644
--- a/extensions/simple-browser/preview-src/tsconfig.json
+++ b/extensions/simple-browser/preview-src/tsconfig.json
@@ -1,5 +1,5 @@
 {
-	"extends": "../../shared.tsconfig.json",
+	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./dist/",
 		"jsx": "react",
diff --git a/extensions/simple-browser/tsconfig.json b/extensions/simple-browser/tsconfig.json
index d0797affbad..f34c085e93e 100644
--- a/extensions/simple-browser/tsconfig.json
+++ b/extensions/simple-browser/tsconfig.json
@@ -1,5 +1,5 @@
 {
-	"extends": "../shared.tsconfig.json",
+	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out",
 		"experimentalDecorators": true
diff --git a/extensions/testing-editor-contributions/tsconfig.json b/extensions/testing-editor-contributions/tsconfig.json
index 16ed233f6e8..08dcb31c2ee 100644
--- a/extensions/testing-editor-contributions/tsconfig.json
+++ b/extensions/testing-editor-contributions/tsconfig.json
@@ -1,5 +1,5 @@
 {
-	"extends": "../shared.tsconfig.json",
+	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out",
 	},
diff --git a/extensions/shared.tsconfig.json b/extensions/tsconfig.base.json
similarity index 100%
rename from extensions/shared.tsconfig.json
rename to extensions/tsconfig.base.json
diff --git a/extensions/typescript-language-features/tsconfig.json b/extensions/typescript-language-features/tsconfig.json
index 0efbb2328de..691bb523b9c 100644
--- a/extensions/typescript-language-features/tsconfig.json
+++ b/extensions/typescript-language-features/tsconfig.json
@@ -1,5 +1,5 @@
 {
-	"extends": "../shared.tsconfig.json",
+	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out",
 		"experimentalDecorators": true,
diff --git a/extensions/vscode-api-tests/tsconfig.json b/extensions/vscode-api-tests/tsconfig.json
index 296ddb38fcb..070854d6913 100644
--- a/extensions/vscode-api-tests/tsconfig.json
+++ b/extensions/vscode-api-tests/tsconfig.json
@@ -1,9 +1,9 @@
 {
-	"extends": "../shared.tsconfig.json",
+	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out"
 	},
 	"include": [
 		"src/**/*"
 	]
-}
\ No newline at end of file
+}
diff --git a/extensions/vscode-colorize-tests/tsconfig.json b/extensions/vscode-colorize-tests/tsconfig.json
index 296ddb38fcb..070854d6913 100644
--- a/extensions/vscode-colorize-tests/tsconfig.json
+++ b/extensions/vscode-colorize-tests/tsconfig.json
@@ -1,9 +1,9 @@
 {
-	"extends": "../shared.tsconfig.json",
+	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out"
 	},
 	"include": [
 		"src/**/*"
 	]
-}
\ No newline at end of file
+}
diff --git a/extensions/vscode-custom-editor-tests/tsconfig.json b/extensions/vscode-custom-editor-tests/tsconfig.json
index 296ddb38fcb..070854d6913 100644
--- a/extensions/vscode-custom-editor-tests/tsconfig.json
+++ b/extensions/vscode-custom-editor-tests/tsconfig.json
@@ -1,9 +1,9 @@
 {
-	"extends": "../shared.tsconfig.json",
+	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out"
 	},
 	"include": [
 		"src/**/*"
 	]
-}
\ No newline at end of file
+}
diff --git a/extensions/vscode-notebook-tests/tsconfig.json b/extensions/vscode-notebook-tests/tsconfig.json
index 296ddb38fcb..070854d6913 100644
--- a/extensions/vscode-notebook-tests/tsconfig.json
+++ b/extensions/vscode-notebook-tests/tsconfig.json
@@ -1,9 +1,9 @@
 {
-	"extends": "../shared.tsconfig.json",
+	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out"
 	},
 	"include": [
 		"src/**/*"
 	]
-}
\ No newline at end of file
+}
diff --git a/extensions/vscode-test-resolver/tsconfig.json b/extensions/vscode-test-resolver/tsconfig.json
index 296ddb38fcb..070854d6913 100644
--- a/extensions/vscode-test-resolver/tsconfig.json
+++ b/extensions/vscode-test-resolver/tsconfig.json
@@ -1,9 +1,9 @@
 {
-	"extends": "../shared.tsconfig.json",
+	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
 		"outDir": "./out"
 	},
 	"include": [
 		"src/**/*"
 	]
-}
\ No newline at end of file
+}