From dd58228861f45847c2b8036a3fb880464ae9209a Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Mon, 11 Jan 2016 21:34:52 -0800
Subject: [PATCH 1/2] add no-default-lib tag to core libraries

---
 Jakefile.js         | 8 ++++----
 src/lib/core.d.ts   | 2 --
 src/lib/header.d.ts | 1 +
 3 files changed, 5 insertions(+), 6 deletions(-)
 create mode 100644 src/lib/header.d.ts

diff --git a/Jakefile.js b/Jakefile.js
index b62cbed327..0749ba8cc2 100644
--- a/Jakefile.js
+++ b/Jakefile.js
@@ -163,13 +163,13 @@ var harnessSources = harnessCoreSources.concat([
 }));
 
 var librarySourceMap = [
-        { target: "lib.core.d.ts", sources: ["core.d.ts"] },
+        { target: "lib.core.d.ts", sources: ["header.d.ts", "core.d.ts"] },
         { target: "lib.dom.d.ts", sources: ["importcore.d.ts", "intl.d.ts", "dom.generated.d.ts"], },
         { target: "lib.webworker.d.ts", sources: ["importcore.d.ts", "intl.d.ts", "webworker.generated.d.ts"], },
         { target: "lib.scriptHost.d.ts", sources: ["importcore.d.ts", "scriptHost.d.ts"], },
-        { target: "lib.d.ts", sources: ["core.d.ts", "intl.d.ts", "dom.generated.d.ts", "webworker.importscripts.d.ts", "scriptHost.d.ts"], },
-        { target: "lib.core.es6.d.ts", sources: ["core.d.ts", "es6.d.ts"]},
-        { target: "lib.es6.d.ts", sources: ["es6.d.ts", "core.d.ts", "intl.d.ts", "dom.generated.d.ts", "dom.es6.d.ts", "webworker.importscripts.d.ts", "scriptHost.d.ts"] }
+        { target: "lib.d.ts", sources: ["header.d.ts", "core.d.ts", "intl.d.ts", "dom.generated.d.ts", "webworker.importscripts.d.ts", "scriptHost.d.ts"], },
+        { target: "lib.core.es6.d.ts", sources: ["header.d.ts", "core.d.ts", "es6.d.ts"]},
+        { target: "lib.es6.d.ts", sources: ["header.d.ts", "es6.d.ts", "core.d.ts", "intl.d.ts", "dom.generated.d.ts", "dom.es6.d.ts", "webworker.importscripts.d.ts", "scriptHost.d.ts"] }
 ];
 
 var libraryTargets = librarySourceMap.map(function (f) {
diff --git a/src/lib/core.d.ts b/src/lib/core.d.ts
index 12df449931..dbd4d37ef9 100644
--- a/src/lib/core.d.ts
+++ b/src/lib/core.d.ts
@@ -1,5 +1,3 @@
-/// <reference no-default-lib="true"/>
-
 /////////////////////////////
 /// ECMAScript APIs
 /////////////////////////////
diff --git a/src/lib/header.d.ts b/src/lib/header.d.ts
new file mode 100644
index 0000000000..129e4739a8
--- /dev/null
+++ b/src/lib/header.d.ts
@@ -0,0 +1 @@
+/// <reference no-default-lib="true"/>

From 1a964394b2440d4ddc23b8fed89b16bd485da5f8 Mon Sep 17 00:00:00 2001
From: vladima <vladima@microsoft.com>
Date: Mon, 11 Jan 2016 22:32:05 -0800
Subject: [PATCH 2/2] accept baselines

---
 .../reference/variableDeclarationInStrictMode1.errors.txt       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt b/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt
index 328e080fba..9dd9a8d41a 100644
--- a/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt
+++ b/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt
@@ -1,4 +1,4 @@
-lib.d.ts(29,18): error TS2300: Duplicate identifier 'eval'.
+lib.d.ts(28,18): error TS2300: Duplicate identifier 'eval'.
 tests/cases/compiler/variableDeclarationInStrictMode1.ts(2,5): error TS1100: Invalid use of 'eval' in strict mode.
 tests/cases/compiler/variableDeclarationInStrictMode1.ts(2,5): error TS2300: Duplicate identifier 'eval'.