From 988063e9cf1cf066383e609845d267901923a882 Mon Sep 17 00:00:00 2001
From: Yui <yuit@users.noreply.github.com>
Date: Tue, 5 Apr 2016 11:08:26 -0700
Subject: [PATCH] Move PropertyKey from es5 to es2015.core

* Move propertyKey definition to es2015.core

* Update baselines to reflect how one will use --lib
---
 src/lib/es2015.core.d.ts                                        | 2 ++
 src/lib/es5.d.ts                                                | 2 --
 .../compiler/modularizeLibrary_UsingES5LibAndES6FeatureLibs.ts  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/es2015.core.d.ts b/src/lib/es2015.core.d.ts
index 2c1c063ab5c..23f341a3c4f 100644
--- a/src/lib/es2015.core.d.ts
+++ b/src/lib/es2015.core.d.ts
@@ -1,3 +1,5 @@
+declare type PropertyKey = string | number | symbol;
+
 interface Array<T> {
     /** 
       * Returns the value of the first element in the array where predicate is true, and undefined 
diff --git a/src/lib/es5.d.ts b/src/lib/es5.d.ts
index 65f4fbabf6b..26133c02bdb 100644
--- a/src/lib/es5.d.ts
+++ b/src/lib/es5.d.ts
@@ -1247,8 +1247,6 @@ interface TypedPropertyDescriptor<T> {
     set?: (value: T) => void;
 }
 
-declare type PropertyKey = string | number | symbol;
-
 declare type ClassDecorator = <TFunction extends Function>(target: TFunction) => TFunction | void;
 declare type PropertyDecorator = (target: Object, propertyKey: string | symbol) => void;
 declare type MethodDecorator = <T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T> | void;
diff --git a/tests/cases/compiler/modularizeLibrary_UsingES5LibAndES6FeatureLibs.ts b/tests/cases/compiler/modularizeLibrary_UsingES5LibAndES6FeatureLibs.ts
index 2e75dc13e95..327df2e679f 100644
--- a/tests/cases/compiler/modularizeLibrary_UsingES5LibAndES6FeatureLibs.ts
+++ b/tests/cases/compiler/modularizeLibrary_UsingES5LibAndES6FeatureLibs.ts
@@ -1,4 +1,4 @@
-// @lib: es5,es2015.symbol,es2015.proxy,es2015.generator,es2015.iterable,es2015.reflect
+// @lib: es5,es2015.core,es2015.symbol,es2015.proxy,es2015.generator,es2015.iterable,es2015.reflect
 // @target: es6
 
 var s = Symbol();