From 4517bc53a704ccfb13f1910a22a5e3a29a9d6bf3 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Mon, 5 Sep 2016 16:16:25 +0200
Subject: [PATCH] Update changelog and dependencies

---
 CHANGELOG.md | 26 ++++++++++++++++++++++++++
 package.json | 10 +++++-----
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6cccaa0d..5f41fd12 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,31 @@
 # Monaco Editor Change log
 
+## [0.6.0]
+- This will be the last release that contains specific IE9 and IE10 fixes/workarounds. We will begin cleaning our code-base and remove them.
+- `javascript` and `typescript` language services:
+  - exposed API to get to the underlying language service.
+  - fixed a bug that prevented modifying `extraLibs`.
+- Multiple improvements/bugfixes to the `css`, `less`, `scss` and `json` language services.
+
+### API changes:
+  - settings:
+    - new: `mouseWheelZoom`, `wordWrap`, `snippetSuggestions`, `tabCompletion`, `wordBasedSuggestions`, `renderControlCharacters`, `renderLineHighlight`, `fontWeight`.
+    - removed: `tabFocusMode`, `outlineMarkers`.
+    - renamed: `indentGuides` -> `renderIndentGuides`, `referenceInfos` -> `codeLens`
+  - added `editor.pushUndoStop()` to explicitly push an undo stop
+  - added `suppressMouseDown` to `IContentWidget`
+  - added optional `resolveLink` to `ILinkProvider`
+  - removed `enablement`, `contextMenuGroupId` from `IActionDescriptor`
+  - removed exposed constants for editor context keys.
+
+### Notable bugfixes:
+  - Icons missing in the find widget in IE11 [#148](https://github.com/Microsoft/monaco-editor/issues/148)
+  - Multiple context menu issues
+  - Multiple clicking issues in IE11/Edge ([#137](https://github.com/Microsoft/monaco-editor/issues/137), [#118](https://github.com/Microsoft/monaco-editor/issues/118))
+  - Multiple issues with the high-contrast theme.
+  - Multiple IME issues in IE11, Edge and Firefox.
+
+
 ## [0.5.1]
 
 - Fixed mouse handling in IE
diff --git a/package.json b/package.json
index d557a621..bc4f1f4f 100644
--- a/package.json
+++ b/package.json
@@ -19,11 +19,11 @@
     "event-stream": "^3.3.2",
     "gulp": "^3.9.1",
     "http-server": "^0.9.0",
-    "monaco-css": "1.1.3-next.1",
-    "monaco-editor-core": "0.5.3",
-    "monaco-json": "1.0.5-next.1",
-    "monaco-languages": "0.3.1",
-    "monaco-typescript": "0.5.0",
+    "monaco-css": "1.1.4",
+    "monaco-editor-core": "0.6.0",
+    "monaco-json": "1.0.7",
+    "monaco-languages": "0.4.0",
+    "monaco-typescript": "0.6.1",
     "rimraf": "^2.5.2"
   }
 }