From b4058ea4a26049583eb1abfa533d88882fd38f42 Mon Sep 17 00:00:00 2001
From: Anthony Dresser <andresse@microsoft.com>
Date: Wed, 22 Apr 2020 12:54:50 -0700
Subject: [PATCH] update versions for 1.18

---
 CHANGELOG.md                           | 12 ++++++++++++
 extensions/agent/package.json          |  2 +-
 extensions/dacpac/package.json         |  2 +-
 extensions/schema-compare/package.json |  2 +-
 package.json                           |  2 +-
 product.json                           |  2 +-
 6 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf9efe2bb843..d91456d992a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Change Log
 
+## Version 1.17.0
+* Release date: April 23, 2020
+* Release status: General Availability
+* New Welcome Page
+* New Notebook features
+    * New Markdown editor toolbar
+    * Books viewlet now works with notebooks
+* Improved dashboard
+* Always encrypted support
+* Accessibility bugs
+* VS Code merge
+
 ## Version 1.16.0
 * Release date: March 18, 2020
 * Release status: General Availability
diff --git a/extensions/agent/package.json b/extensions/agent/package.json
index b8e22ac104a4..218dbff658b6 100644
--- a/extensions/agent/package.json
+++ b/extensions/agent/package.json
@@ -2,7 +2,7 @@
   "name": "agent",
   "displayName": "SQL Server Agent",
   "description": "Manage and troubleshoot SQL Server Agent jobs",
-  "version": "0.47.0",
+  "version": "0.48.0",
   "publisher": "Microsoft",
   "preview": true,
   "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt",
diff --git a/extensions/dacpac/package.json b/extensions/dacpac/package.json
index fe26e1793a53..71c0bb539b53 100644
--- a/extensions/dacpac/package.json
+++ b/extensions/dacpac/package.json
@@ -2,7 +2,7 @@
   "name": "dacpac",
   "displayName": "SQL Server Dacpac",
   "description": "SQL Server Dacpac for Azure Data Studio.",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "publisher": "Microsoft",
   "preview": false,
   "engines": {
diff --git a/extensions/schema-compare/package.json b/extensions/schema-compare/package.json
index 74da000147cc..e80d996ce645 100644
--- a/extensions/schema-compare/package.json
+++ b/extensions/schema-compare/package.json
@@ -2,7 +2,7 @@
   "name": "schema-compare",
   "displayName": "%displayName%",
   "description": "%description%",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "publisher": "Microsoft",
   "preview": false,
   "engines": {
diff --git a/package.json b/package.json
index f8d746bdd058..bf213c6a3936 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "azuredatastudio",
-  "version": "1.17.0",
+  "version": "1.18.0",
   "distro": "1a99144c4c1f884810b37cdc9be608372e99d168",
   "author": {
     "name": "Microsoft Corporation"
diff --git a/product.json b/product.json
index 75c2490140f8..890872c65e56 100644
--- a/product.json
+++ b/product.json
@@ -34,7 +34,7 @@
 	"gettingStartedUrl": "https://go.microsoft.com/fwlink/?linkid=862039",
 	"releaseNotesUrl": "https://go.microsoft.com/fwlink/?linkid=875578",
 	"documentationUrl": "https://go.microsoft.com/fwlink/?linkid=862277",
-	"vscodeVersion": "1.44.0",
+	"vscodeVersion": "1.45.0",
 	"commit": "9ca6200018fc206d67a47229f991901a8a453781",
 	"date": "2017-12-15T12:00:00.000Z",
 	"recommendedExtensions": [