Merge pull request microsoft#17838 from Microsoft/rev2.6.0

DanielRosenwasser · web-flow · commit a38da8af70e4 · 2017-08-16T23:50:50.000-07:00
Bump version to 2.6.0.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "http://typescriptlang.org/",
-    "version": "2.5.0",
+    "version": "2.6.0",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -4,7 +4,7 @@
 namespace ts {
     // WARNING: The script `configureNightly.ts` uses a regexp to parse out these values.
     // If changing the text in this section, be sure to test `configureNightly` too.
-    export const versionMajorMinor = "2.5";
+    export const versionMajorMinor = "2.6";
     /** The version of the TypeScript compiler release */
     export const version = `${versionMajorMinor}.0`;
 }
diff --git a/src/services/shims.ts b/src/services/shims.ts
@@ -1222,4 +1222,4 @@ namespace TypeScript.Services {
 // TODO: it should be moved into a namespace though.
 
 /* @internal */
-const toolsVersion = "2.5";
+const toolsVersion = "2.6";

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`namespace ts {`
`5`	`5`	// WARNING: The script `configureNightly.ts` uses a regexp to parse out these values.
`6`	`6`	// If changing the text in this section, be sure to test `configureNightly` too.
`7`		`- export const versionMajorMinor = "2.5";`
	`7`	`+ export const versionMajorMinor = "2.6";`
`8`	`8`	`/** The version of the TypeScript compiler release */`
`9`	`9`	export const version = `${versionMajorMinor}.0`;
`10`	`10`	`}`