Merge branch 'master' into moveToNewFile

microsoft · May 1, 2018 · 7f40d09 · 7f40d09
2 parents 8c46867 + cee4289
commit 7f40d09
Show file tree

Hide file tree

Showing 160 changed files with 6,636 additions and 2,137 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/Gulpfile.js b/Gulpfile.js
@@ -146,7 +146,8 @@ const es2017LibrarySourceMap = es2017LibrarySource.map(source =>
 
 const es2018LibrarySource = [
     "es2018.regexp.d.ts",
-    "es2018.promise.d.ts"
+    "es2018.promise.d.ts",
+    "es2018.intl.d.ts"
 ];
 const es2018LibrarySourceMap = es2018LibrarySource.map(source =>
     ({ target: "lib." + source, sources: ["header.d.ts", source] }));

diff --git a/Jakefile.js b/Jakefile.js
@@ -127,7 +127,8 @@ var es2017LibrarySourceMap = es2017LibrarySource.map(function (source) {
 
 var es2018LibrarySource = [
     "es2018.regexp.d.ts",
-    "es2018.promise.d.ts"
+    "es2018.promise.d.ts",
+    "es2018.intl.d.ts"
 ];
 
 var es2018LibrarySourceMap = es2018LibrarySource.map(function (source) {

diff --git a/issue_template.md b/issue_template.md
@@ -24,7 +24,7 @@ Please help us by doing the following steps before logging an issue:
 -->
 
 <!-- Please try to reproduce the issue with `typescript@next`. It may have already been fixed. -->
-**TypeScript Version:**  2.7.0-dev.201xxxxx
+**TypeScript Version:**  2.9.0-dev.201xxxxx
 
 <!-- Search terms you tried before logging this (so others can find this issue more easily) -->
 **Search Terms:** 

diff --git a/jenkins.sh b/jenkins.sh
diff --git a/netci.groovy b/netci.groovy