From 8e7b8763a44ea33f1c9a4e2a1897a71595cd60c8 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Mon, 21 May 2018 12:42:58 -0700
Subject: [PATCH] Update LKG

---
 lib/tsc.js                | 2 +-
 lib/tsserver.js           | 4 ++--
 lib/tsserverlibrary.js    | 4 ++--
 lib/typescript.js         | 4 ++--
 lib/typescriptServices.js | 4 ++--
 lib/typingsInstaller.js   | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/tsc.js b/lib/tsc.js
index f39c393bfd1..349217d10d0 100644
--- a/lib/tsc.js
+++ b/lib/tsc.js
@@ -174,7 +174,7 @@ var ts;
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "2.9";
-    ts.version = ts.versionMajorMinor + ".0-dev";
+    ts.version = ts.versionMajorMinor + ".1";
 })(ts || (ts = {}));
 (function (ts) {
     function isExternalModuleNameRelative(moduleName) {
diff --git a/lib/tsserver.js b/lib/tsserver.js
index dc5875cc4b9..b60185f3458 100644
--- a/lib/tsserver.js
+++ b/lib/tsserver.js
@@ -1387,7 +1387,7 @@ var ts;
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "2.9";
-    ts.version = ts.versionMajorMinor + ".0-dev";
+    ts.version = ts.versionMajorMinor + ".1";
 })(ts || (ts = {}));
 (function (ts) {
     function isExternalModuleNameRelative(moduleName) {
@@ -84303,7 +84303,7 @@ var ts;
             for (var _b = 0, allSourceFiles_1 = allSourceFiles; _b < allSourceFiles_1.length; _b++) {
                 var sourceFile = allSourceFiles_1[_b];
                 if (ts.isExternalOrCommonJsModule(sourceFile)) {
-                    cb(sourceFile.symbol, sourceFile);
+                    cb(checker.getMergedSymbol(sourceFile.symbol), sourceFile);
                 }
             }
         }
diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js
index ae049cd4143..bc50a754604 100644
--- a/lib/tsserverlibrary.js
+++ b/lib/tsserverlibrary.js
@@ -1635,7 +1635,7 @@ var ts;
     // If changing the text in this section, be sure to test `configureNightly` too.
     ts.versionMajorMinor = "2.9";
     /** The version of the TypeScript compiler release */
-    ts.version = ts.versionMajorMinor + ".0-dev";
+    ts.version = ts.versionMajorMinor + ".1";
 })(ts || (ts = {}));
 (function (ts) {
     function isExternalModuleNameRelative(moduleName) {
@@ -101068,7 +101068,7 @@ var ts;
             for (var _b = 0, allSourceFiles_1 = allSourceFiles; _b < allSourceFiles_1.length; _b++) {
                 var sourceFile = allSourceFiles_1[_b];
                 if (ts.isExternalOrCommonJsModule(sourceFile)) {
-                    cb(sourceFile.symbol, sourceFile);
+                    cb(checker.getMergedSymbol(sourceFile.symbol), sourceFile);
                 }
             }
         }
diff --git a/lib/typescript.js b/lib/typescript.js
index 5a20323ef59..bd281d5c062 100644
--- a/lib/typescript.js
+++ b/lib/typescript.js
@@ -1635,7 +1635,7 @@ var ts;
     // If changing the text in this section, be sure to test `configureNightly` too.
     ts.versionMajorMinor = "2.9";
     /** The version of the TypeScript compiler release */
-    ts.version = ts.versionMajorMinor + ".0-dev";
+    ts.version = ts.versionMajorMinor + ".1";
 })(ts || (ts = {}));
 (function (ts) {
     function isExternalModuleNameRelative(moduleName) {
@@ -101068,7 +101068,7 @@ var ts;
             for (var _b = 0, allSourceFiles_1 = allSourceFiles; _b < allSourceFiles_1.length; _b++) {
                 var sourceFile = allSourceFiles_1[_b];
                 if (ts.isExternalOrCommonJsModule(sourceFile)) {
-                    cb(sourceFile.symbol, sourceFile);
+                    cb(checker.getMergedSymbol(sourceFile.symbol), sourceFile);
                 }
             }
         }
diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js
index 5a20323ef59..bd281d5c062 100644
--- a/lib/typescriptServices.js
+++ b/lib/typescriptServices.js
@@ -1635,7 +1635,7 @@ var ts;
     // If changing the text in this section, be sure to test `configureNightly` too.
     ts.versionMajorMinor = "2.9";
     /** The version of the TypeScript compiler release */
-    ts.version = ts.versionMajorMinor + ".0-dev";
+    ts.version = ts.versionMajorMinor + ".1";
 })(ts || (ts = {}));
 (function (ts) {
     function isExternalModuleNameRelative(moduleName) {
@@ -101068,7 +101068,7 @@ var ts;
             for (var _b = 0, allSourceFiles_1 = allSourceFiles; _b < allSourceFiles_1.length; _b++) {
                 var sourceFile = allSourceFiles_1[_b];
                 if (ts.isExternalOrCommonJsModule(sourceFile)) {
-                    cb(sourceFile.symbol, sourceFile);
+                    cb(checker.getMergedSymbol(sourceFile.symbol), sourceFile);
                 }
             }
         }
diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js
index ab3cb0310f4..40574ab68d5 100644
--- a/lib/typingsInstaller.js
+++ b/lib/typingsInstaller.js
@@ -180,7 +180,7 @@ var ts;
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "2.9";
-    ts.version = ts.versionMajorMinor + ".0-dev";
+    ts.version = ts.versionMajorMinor + ".1";
 })(ts || (ts = {}));
 (function (ts) {
     function isExternalModuleNameRelative(moduleName) {