From 4eb98a9dcc523525bb6c7f84a1f31b499e322508 Mon Sep 17 00:00:00 2001
From: Anthony Dresser <andresse@microsoft.com>
Date: Wed, 2 Sep 2020 19:58:27 -0700
Subject: [PATCH] fix hygiene

remove sqllint for now

fix hygiene

Revert "remove sqllint for now"

This reverts commit 981ff90b9a5bbf3710d0f0ce58a8b67a92fe64eb.

distro

update smoke version

fix default theme
---
 .eslintrc.json                                     | 14 +++++++-------
 .../linux/continuous-build-linux.yml               |  2 +-
 package.json                                       |  2 +-
 src/tsconfig.vscode.json                           |  1 +
 .../services/themes/common/themeConfiguration.ts   |  2 +-
 test/smoke/src/sql/main.ts                         |  2 +-
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 03d0f427bf..8465d350a8 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -687,13 +687,13 @@
                 "restrictions": [
                     "vs/nls",
                     "vs/css!./**/*",
-                    "**/vs/base/**/{common,worker}/**",
-                    "**/vs/platform/**/common/**",
-                    "**/vs/editor/**",
-                    "**/vs/workbench/common/**",
-                    "**/vs/workbench/api/common/**",
-                    "**/vs/workbench/services/**/common/**",
-                    "**/vs/workbench/contrib/**/common/**"
+                    "**/{vs,sql}/base/**/{common,worker}/**",
+                    "**/{vs,sql}/platform/**/common/**",
+                    "**/{vs,sql}/editor/**",
+                    "**/{vs,sql}/workbench/common/**",
+                    "**/{vs,sql}/workbench/api/common/**",
+                    "**/{vs,sql}/workbench/services/**/common/**",
+                    "**/{vs,sql}/workbench/contrib/**/common/**"
                 ]
             },
             {
diff --git a/build/azure-pipelines/linux/continuous-build-linux.yml b/build/azure-pipelines/linux/continuous-build-linux.yml
index a15d212485..752ed81750 100644
--- a/build/azure-pipelines/linux/continuous-build-linux.yml
+++ b/build/azure-pipelines/linux/continuous-build-linux.yml
@@ -44,8 +44,8 @@ steps:
 
 - script: | # {{SQL CARBON EDIT}} add strict null check
     yarn strict-vscode
-
   displayName: Run Strict Null Check
+
 # - script: | {{SQL CARBON EDIT}} remove monaco editor checks
 #     yarn monaco-compile-check
 #   displayName: Run Monaco Editor Checks
diff --git a/package.json b/package.json
index 5b7bf2a7e9..25d49a687c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "azuredatastudio",
   "version": "1.22.0",
-  "distro": "facf51cc91bfb7ca0d4f5904480c1e7f09c3c115",
+  "distro": "05f08ef15e584dd5d5b5e3d03d447265869d2b0d",
   "author": {
     "name": "Microsoft Corporation"
   },
diff --git a/src/tsconfig.vscode.json b/src/tsconfig.vscode.json
index d6dcca51eb..f2dbced6fb 100644
--- a/src/tsconfig.vscode.json
+++ b/src/tsconfig.vscode.json
@@ -89,6 +89,7 @@
 		"./vs/workbench/api/node/**/*.ts", // 328 errors
 		"./vs/workbench/api/worker/**/*.ts", // 294 errors
 		"./vs/workbench/contrib/backup/**/*.ts", // 3162 errors
+		"./vs/workbench/contrib/bulkEdit/**/*.ts",
 		"./vs/workbench/contrib/codeEditor/**/*.ts", // 3162 errors
 		"./vs/workbench/contrib/comments/**/*.ts", // 64 errors
 		"./vs/workbench/contrib/configExporter/**/*.ts", // 3162 errors
diff --git a/src/vs/workbench/services/themes/common/themeConfiguration.ts b/src/vs/workbench/services/themes/common/themeConfiguration.ts
index 12589c85c5..e9cfcc5583 100644
--- a/src/vs/workbench/services/themes/common/themeConfiguration.ts
+++ b/src/vs/workbench/services/themes/common/themeConfiguration.ts
@@ -33,7 +33,7 @@ const colorThemeSettingEnumDescriptions: string[] = [];
 const colorThemeSettingSchema: IConfigurationPropertySchema = {
 	type: 'string',
 	description: nls.localize('colorTheme', "Specifies the color theme used in the workbench."),
-	default: isWeb ? DEFAULT_THEME_LIGHT_SETTING_VALUE : DEFAULT_THEME_DARK_SETTING_VALUE,
+	default: isWeb ? DEFAULT_THEME_LIGHT_SETTING_VALUE : DEFAULT_THEME_LIGHT_SETTING_VALUE,
 	enum: colorThemeSettingEnum,
 	enumDescriptions: colorThemeSettingEnumDescriptions,
 	errorMessage: nls.localize('colorThemeError', "Theme is unknown or not installed."),
diff --git a/test/smoke/src/sql/main.ts b/test/smoke/src/sql/main.ts
index 1560b57434..7d04a6bac0 100644
--- a/test/smoke/src/sql/main.ts
+++ b/test/smoke/src/sql/main.ts
@@ -27,7 +27,7 @@ const PLATFORM = '${PLATFORM}';
 const RUNTIME = '${RUNTIME}';
 const VERSION = '${VERSION}';
 
-const sqliteUrl = `https://github.com/anthonydresser/azuredatastudio-sqlite/releases/download/1.0.18/azuredatastudio-sqlite-${PLATFORM}-${RUNTIME}-${VERSION}.zip`;
+const sqliteUrl = `https://github.com/anthonydresser/azuredatastudio-sqlite/releases/download/1.0.19/azuredatastudio-sqlite-${PLATFORM}-${RUNTIME}-${VERSION}.zip`;
 
 export async function setup(app: ApplicationOptions): Promise<void> {
 	console.log('*** Downloading test extensions');