Skip to content

Commit 8548fb8

Browse files
rbucktonrbuckton
committed
Merge branch 'master' into libReference
2 parents 698f229 + dfef2fa commit 8548fb8

560 files changed

Lines changed: 23005 additions & 22968 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ scripts/buildProtocol.js
4040
scripts/ior.js
4141
scripts/authors.js
4242
scripts/configurePrerelease.js
43+
scripts/open-user-pr.js
4344
scripts/processDiagnosticMessages.d.ts
4445
scripts/processDiagnosticMessages.js
4546
scripts/importDefinitelyTypedTests/importDefinitelyTypedTests.js

‎.travis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ branches:
1818
- master
1919
- release-2.7
2020
- release-2.8
21+
- release-2.9
2122

2223
install:
2324
- npm uninstall typescript --no-save

‎Gulpfile.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ const cmdLineOptions = minimist(process.argv.slice(2), {
5555
debug: process.env.debug || process.env["debug-brk"] || process.env.d,
5656
inspect: process.env.inspect || process.env["inspect-brk"] || process.env.i,
5757
host: process.env.TYPESCRIPT_HOST || process.env.host || "node",
58-
browser: process.env.browser || process.env.b || "IE",
58+
browser: process.env.browser || process.env.b || (os.platform() === "win32" ? "edge" : "chrome"),
5959
timeout: process.env.timeout || 40000,
6060
tests: process.env.test || process.env.tests || process.env.t,
6161
runners: process.env.runners || process.env.runner || process.env.ru,
@@ -161,7 +161,7 @@ const generatedLCGFile = path.join(builtLocalDirectory, "enu", "diagnosticMessag
161161
* 2. 'src\compiler\diagnosticMessages.generated.json' => 'built\local\ENU\diagnosticMessages.generated.json.lcg'
162162
* generate the lcg file (source of messages to localize) from the diagnosticMessages.generated.json
163163
*/
164-
const localizationTargets = ["cs", "de", "es", "fr", "it", "ja", "ko", "pl", "pt-BR", "ru", "tr", "zh-CN", "zh-TW"]
164+
const localizationTargets = ["cs", "de", "es", "fr", "it", "ja", "ko", "pl", "pt-br", "ru", "tr", "zh-cn", "zh-tw"]
165165
.map(f => path.join(builtLocalDirectory, f, "diagnosticMessages.generated.json"))
166166
.concat(generatedLCGFile);
167167

‎Jakefile.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ var generatedLCGFile = path.join(builtLocalDirectory, "enu", "diagnosticMessages
131131
* 2. 'src\compiler\diagnosticMessages.generated.json' => 'built\local\ENU\diagnosticMessages.generated.json.lcg'
132132
* generate the lcg file (source of messages to localize) from the diagnosticMessages.generated.json
133133
*/
134-
var localizationTargets = ["cs", "de", "es", "fr", "it", "ja", "ko", "pl", "pt-BR", "ru", "tr", "zh-CN", "zh-TW"].map(function (f) {
134+
var localizationTargets = ["cs", "de", "es", "fr", "it", "ja", "ko", "pl", "pt-br", "ru", "tr", "zh-cn", "zh-tw"].map(function (f) {
135135
return path.join(builtLocalDirectory, f);
136136
}).concat(path.dirname(generatedLCGFile));
137137

@@ -922,7 +922,7 @@ desc("Runs the tests using the built run.js file like 'jake runtests'. Syntax is
922922
task("runtests-browser", ["browserify", nodeServerOutFile], function () {
923923
cleanTestDirs();
924924
host = "node";
925-
var browser = process.env.browser || process.env.b || (os.platform() === "linux" ? "chrome" : "IE");
925+
var browser = process.env.browser || process.env.b || (os.platform() === "win32" ? "edge" : "chrome");
926926
var runners = process.env.runners || process.env.runner || process.env.ru;
927927
var tests = process.env.test || process.env.tests || process.env.t;
928928
var light = process.env.light || false;

0 commit comments

Comments
 (0)