Merge branch 'master' into release/0.25

CHANGELOG.md

@@ -1,5 +1,29 @@
 # Change Log
 
+## Version 0.25.2
+* Release date: January 17, 2017
+* Release status: Public Preview
+
+## What's new in this version
+The January release focuses on addressing a few of the top upvoted feature suggestions, as well as fixing high-priority bugs.  This release period coincides with holiday vacations, so the churn in this release is
+relatively scoped.
+
+Here's some of the highlights in the January release.
+
+* Tab-coloring based on Server Group
+* Saved Server connections are available in Connection Dialog
+* Enable HotExit feature
+* Fix broken Run Current Query command
+* Fix drag-and-drop breaking scripting bug
+* Fix incorrect pinned Start Menu icon
+* Fix missing Azure Account branding icon
+* Change "Server name" to "Server" in Connection Dialog
+
+## Contributions and "thank you"
+We would like to thank all our users who raised issues, and in particular the following users who helped contribute fixes:
+
+* alextercete for `Fix "No extension gallery service configured" error (#427)`
+
 ## Version 0.24.1
 * Release date: December 19, 2017
 * Release status: Public Preview

extensions/mssql/client/src/config.json

@@ -1,7 +1,7 @@
 {
 	"service": {
 		"downloadUrl": "https://github.com/Microsoft/sqltoolsservice/releases/download/v{#version#}/microsoft.sqltools.servicelayer-{#fileName#}",
-		"version": "1.2.0-alpha.49",
+		"version": "1.4.0-alpha.3",
 			"downloadFileNames": {
 			"Windows_86": "win-x86-netcoreapp2.0.zip",
 			"Windows_64": "win-x64-netcoreapp2.0.zip",

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "sqlops",
-  "version": "0.25.1",
+  "version": "0.25.2",
   "dependencies": {
     "@angular/animations": {
       "version": "4.1.3",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sqlops",
-  "version": "0.25.1",
+  "version": "0.25.2",
   "electronVersion": "1.7.9",
   "distro": "8c3e97e3425cc9814496472ab73e076de2ba99ee",
   "author": {

src/sql/workbench/update/releaseNotes.ts

@@ -68,7 +68,7 @@ export class ProductContribution implements IWorkbenchContribution {
 				text => editorService.openEditor(instantiationService.createInstance(ReleaseNotesInput, pkg.version, text), { pinned: true }),
 				() => {
 					messageService.show(Severity.Info, {
-						message: nls.localize('read the release notes', "Welcome to {0} December Public Preview! Would you like to view the Getting Started Guide?", product.nameLong, pkg.version),
+						message: nls.localize('read the release notes', "Welcome to {0} January Public Preview! Would you like to view the Getting Started Guide?", product.nameLong, pkg.version),
 						actions: [
 							instantiationService.createInstance(OpenGettingStartedInBrowserAction),
 							CloseAction

src/vs/workbench/services/textfile/common/textFileService.ts

@@ -366,7 +366,10 @@ export abstract class TextFileService implements ITextFileService {
 		}
 
 		// Hot exit
-		const hotExitMode = configuration && configuration.files ? configuration.files.hotExit : HotExitConfiguration.ON_EXIT;
+		// {{SQL CARBON EDIT}}
+
+		// const hotExitMode = configuration && configuration.files ? configuration.files.hotExit : HotExitConfiguration.ON_EXIT;
+		const hotExitMode = HotExitConfiguration.OFF;
 		if (hotExitMode === HotExitConfiguration.OFF || hotExitMode === HotExitConfiguration.ON_EXIT_AND_WINDOW_CLOSE) {
 			this.configuredHotExit = hotExitMode;
 		} else {