diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb584dd5eac..ff17fbbd36b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,56 @@
+
+# [6.0.0 vibranium-vivarium](https://github.com/angular/material2/compare/6.0.0-rc.14...6.0.0) (2018-05-03)
+
+### Highlights
+
+* [`MatTree`](https://material.angular.io/components/tree/overview) component is now available, [@tinayuangao](https://github.com/tinayuangao) recently gave a [talk at ng-conf about the new component](https://www.youtube.com/watch?v=s0Vy3sLbeyA)
+* `` and `` now native [`` elements](https://material.angular.io/components/table/overview#applying-material-styles-to-native-table) in addition to the existing [`display: flex` based layout](https://material.angular.io/components/table/overview#tables-with-code-display-flex-code-)
+* `MatTable` now supports having an optional [footer row](https://material.angular.io/components/table/overview#footer_row)
+* [Schematics](https://material.angular.io/guides/schematics) are now available for Angular Material, [@jelbourn](https://github.com/jelbourn) recently gave a [talk at ng-conf about using schematics](https://www.youtube.com/watch?v=v__RuD9RX3I)
+* `MatTabs` content can now be [lazy loaded](https://material.angular.io/components/tabs/overview#lazy_loading)
+* [`MatBadge`](https://material.angular.io/components/badge/overview) and [`MatBottomSheet`](https://material.angular.io/components/bottom-sheet/overview) components are now available
+* `@angular/cdk/overlay` has a new positioning strategy available, [`FlexibleConnectedPositionStrategy`](https://material.angular.io/cdk/overlay/overview#position-strategies), which intelligently handles sizing and positioning to ensure that overlay contents always remain on the screen
+* `MatIcon` now allows SVG icons to be registered from strings
+* `@angular/cdk/keycodes` now includes most keycodes you might need for building a web application
+* 130+ bug fixes
+* Docs for v5 are now available at [v5.material.angular.io](https://v5.material.angular.io)
+* A version picker is available [material.angular.io](https://material.angular.io) to switch between docs versions
+
+
+### Upgrading to Angular Material 6.0
+
+With the Angular CLI v6.0+, you can use the `ng update` command to automatically migrate to the new APIs
+```
+ng update @angular/material
+```
+**NOTE:** There may be some cases where the tool may be unable to automatically migrate, but will notify you of those cases
+
+
+### Breaking Changes
+* A number of APIs that were deprecated during beta have been removed, see [here for complete list](https://github.com/angular/material2/blob/master/CHANGELOG.md#600-beta5-2018-03-23)
+* See `ng update` tooling above to automatically migrate to the new APIs
+
+
+
+### Bug Fixes
+
+* **autocomplete:** panel direction not being updated if the trigger direction changes ([#10916](https://github.com/angular/material2/issues/10916)) ([8c30cee](https://github.com/angular/material2/commit/8c30cee))
+* **button-toggle:** not usable in high contrast mode ([#11097](https://github.com/angular/material2/issues/11097)) ([dd2f465](https://github.com/angular/material2/commit/dd2f465))
+* **dialog:** add generic parameter for the dialog result to open method ([#11059](https://github.com/angular/material2/issues/11059)) ([bf1bdc0](https://github.com/angular/material2/commit/bf1bdc0))
+* **form-field:** inconsistent underline height at different DPIs ([#11062](https://github.com/angular/material2/issues/11062)) ([0f7d503](https://github.com/angular/material2/commit/0f7d503))
+* **form-field:** scrollbars appear on autosize textarea in chrome ([#10811](https://github.com/angular/material2/issues/10811)) ([385f96d](https://github.com/angular/material2/commit/385f96d))
+* **form-field,select:** handle form field controls inside toolbar ([#10627](https://github.com/angular/material2/issues/10627)) ([1a3993e](https://github.com/angular/material2/commit/1a3993e))
+* **list:** selection list always firing change event for selectAll and deselectAll ([#11029](https://github.com/angular/material2/issues/11029)) ([54c0b00](https://github.com/angular/material2/commit/54c0b00))
+* **menu:** not updating panel direction after init ([#11070](https://github.com/angular/material2/issues/11070)) ([294ba3c](https://github.com/angular/material2/commit/294ba3c))
+* **menu:** unable to open same sub-menu from different triggers and not picking up indirect descendant items ([#10132](https://github.com/angular/material2/issues/10132)) ([5393bfe](https://github.com/angular/material2/commit/5393bfe))
+* **overlay:** error when rendering flexible overlay on the server ([#11072](https://github.com/angular/material2/issues/11072)) ([422d102](https://github.com/angular/material2/commit/422d102))
+* **paginator:** handle negative pageSize and pageIndex correctly ([#11068](https://github.com/angular/material2/issues/11068)) ([3f5e481](https://github.com/angular/material2/commit/3f5e481))
+* **select:** losing focus position when tabbing away after clicking inside multi select ([#10905](https://github.com/angular/material2/issues/10905)) ([c6ad1f8](https://github.com/angular/material2/commit/c6ad1f8))
+* **select:** unable to toggle multi select option after using the mouse ([#11061](https://github.com/angular/material2/issues/11061)) ([01d0993](https://github.com/angular/material2/commit/01d0993))
+* **sidenav:** box shadow visible while closed when rendering on the server ([#10969](https://github.com/angular/material2/issues/10969)) ([cfe6c1d](https://github.com/angular/material2/commit/cfe6c1d))
+
+
+
# [6.0.0-rc.14](https://github.com/angular/material2/compare/6.0.0-rc.12...6.0.0-rc.14) (2018-04-30)
@@ -513,7 +566,7 @@ We expect to have the tool ready when we release version 6.0.0.
-## [5.2.5 cardboard-kangaroo](https://github.com/angular/material2/compare/5.2.4...5.2.5) (2018-04-17)
+# [5.2.5 cardboard-kangaroo](https://github.com/angular/material2/compare/5.2.4...5.2.5) (2018-04-17)
### Highlights
@@ -522,7 +575,7 @@ We expect to have the tool ready when we release version 6.0.0.
-## [5.2.4 ash-submarine](https://github.com/angular/material2/compare/5.2.3...5.2.4) (2018-03-06)
+# [5.2.4 ash-submarine](https://github.com/angular/material2/compare/5.2.3...5.2.4) (2018-03-06)
### Bug Fixes
@@ -537,7 +590,7 @@ We expect to have the tool ready when we release version 6.0.0.
-## [5.2.3 diamond-silhouette](https://github.com/angular/material2/compare/5.2.2...5.2.3) (2018-02-27)
+# [5.2.3 diamond-silhouette](https://github.com/angular/material2/compare/5.2.2...5.2.3) (2018-02-27)
### Bug Fixes
@@ -556,7 +609,7 @@ We expect to have the tool ready when we release version 6.0.0.
-## [5.2.2 cork-yacht](https://github.com/angular/material2/compare/5.2.1...5.2.2) (2018-02-21)
+# [5.2.2 cork-yacht](https://github.com/angular/material2/compare/5.2.1...5.2.2) (2018-02-21)
### Bug Fixes
@@ -577,7 +630,7 @@ We expect to have the tool ready when we release version 6.0.0.
-## [5.2.1 ghillie-soup](https://github.com/angular/material2/compare/5.2.0...5.2.1) (2018-02-12)
+# [5.2.1 ghillie-soup](https://github.com/angular/material2/compare/5.2.0...5.2.1) (2018-02-12)
### Bug Fixes
@@ -811,7 +864,7 @@ We expect to have the tool ready when we release version 6.0.0.
-## [5.1.1 silk-xylophone](https://github.com/angular/material2/compare/5.1.0...5.1.1) (2018-01-29)
+# [5.1.1 silk-xylophone](https://github.com/angular/material2/compare/5.1.0...5.1.1) (2018-01-29)
### Bug Fixes
@@ -949,7 +1002,7 @@ We expect to have the tool ready when we release version 6.0.0.
-## [5.0.4 linoleum-wormhole](https://github.com/angular/material2/compare/5.0.0...5.0.4) (2018-01-08)
+# [5.0.4 linoleum-wormhole](https://github.com/angular/material2/compare/5.0.0...5.0.4) (2018-01-08)
### Bug Fixes
@@ -987,7 +1040,7 @@ We expect to have the tool ready when we release version 6.0.0.
-## [5.0.3 concrete-aeroplane](https://github.com/angular/material2/compare/5.0.1...5.0.3) (2018-01-02)
+# [5.0.3 concrete-aeroplane](https://github.com/angular/material2/compare/5.0.1...5.0.3) (2018-01-02)
### Bug Fixes
@@ -998,7 +1051,7 @@ We expect to have the tool ready when we release version 6.0.0.
-## [5.0.2 flannel-battlestar](https://github.com/angular/material2/compare/5.0.0...5.0.2) (2017-12-19)
+# [5.0.2 flannel-battlestar](https://github.com/angular/material2/compare/5.0.0...5.0.2) (2017-12-19)
### Bug Fixes
@@ -1041,7 +1094,7 @@ We expect to have the tool ready when we release version 6.0.0.
-## [5.0.1 ceramic-gravy](https://github.com/angular/material2/compare/5.0.0...5.0.1) (2017-12-11)
+# [5.0.1 ceramic-gravy](https://github.com/angular/material2/compare/5.0.0...5.0.1) (2017-12-11)
### Bug Fixes
diff --git a/package.json b/package.json
index d65651efe9b..2d216946c82 100644
--- a/package.json
+++ b/package.json
@@ -20,19 +20,19 @@
"docs": "gulp docs",
"api": "gulp api-docs"
},
- "version": "6.0.0-rc.14",
+ "version": "6.0.0",
"license": "MIT",
"engines": {
"node": ">= 5.4.1"
},
"dependencies": {
- "@angular/animations": "6.0.0-rc.6",
- "@angular/common": "6.0.0-rc.6",
- "@angular/compiler": "6.0.0-rc.6",
- "@angular/core": "6.0.0-rc.6",
- "@angular/elements": "6.0.0-rc.6",
- "@angular/forms": "6.0.0-rc.6",
- "@angular/platform-browser": "6.0.0-rc.6",
+ "@angular/animations": "6.0.0",
+ "@angular/common": "6.0.0",
+ "@angular/compiler": "6.0.0",
+ "@angular/core": "6.0.0",
+ "@angular/elements": "6.0.0",
+ "@angular/forms": "6.0.0",
+ "@angular/platform-browser": "6.0.0",
"@webcomponents/custom-elements": "^1.1.0",
"core-js": "^2.4.1",
"rxjs": "6.0.0",
@@ -42,18 +42,18 @@
"zone.js": "^0.8.4"
},
"devDependencies": {
- "@angular-devkit/core": "^0.5.6",
- "@angular-devkit/schematics": "^0.5.6",
- "@angular/bazel": "6.0.0-rc.6",
- "@angular/compiler-cli": "6.0.0-rc.6",
- "@angular/http": "6.0.0-rc.6",
- "@angular/platform-browser-dynamic": "6.0.0-rc.6",
- "@angular/platform-server": "6.0.0-rc.6",
- "@angular/router": "6.0.0-rc.6",
- "@angular/upgrade": "6.0.0-rc.6",
+ "@angular-devkit/core": "^0.5.12",
+ "@angular-devkit/schematics": "^0.5.12",
+ "@angular/bazel": "6.0.0",
+ "@angular/compiler-cli": "6.0.0",
+ "@angular/http": "6.0.0",
+ "@angular/platform-browser-dynamic": "6.0.0",
+ "@angular/platform-server": "6.0.0",
+ "@angular/router": "6.0.0",
+ "@angular/upgrade": "6.0.0",
"@bazel/ibazel": "0.3.1",
"@google-cloud/storage": "^1.1.1",
- "@schematics/angular": "^0.5.6",
+ "@schematics/angular": "^0.5.12",
"@types/chalk": "^0.4.31",
"@types/fs-extra": "^4.0.3",
"@types/glob": "^5.0.33",