From 646b001160c1af07f11fcb9b65fd437b608e706d Mon Sep 17 00:00:00 2001
From: Karl Burtram <karlb@microsoft.com>
Date: Wed, 27 Sep 2023 10:21:00 -0700
Subject: [PATCH] Feat/bumpelectron22324 (#24497)

* Bump Electron to 22.3.24

* Bump distro

* Bump to release version in main.ts

* revert bump in this branch

* Bump to distro to fix conflict

* bump to releaseVersion in main

* changed distro to one in branch

* Revert "changed distro to one in branch"

This reverts commit 60213995a1fd2b9b548790c090c5a57ea363d278.

* Revert "Bump to distro to fix conflict"

This reverts commit e5119783f835a70fb56d52b8bc2919a311607f6c.

* Bump to distro (new)

---------

Co-authored-by: Alex Ma <alma1@microsoft.com>
---
 .yarnrc                    | 2 +-
 package.json               | 4 ++--
 test/smoke/src/sql/main.ts | 2 +-
 yarn.lock                  | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.yarnrc b/.yarnrc
index a205516e56..780af88d73 100644
--- a/.yarnrc
+++ b/.yarnrc
@@ -1,4 +1,4 @@
 disturl "https://electronjs.org/headers"
-target "22.3.14"
+target "22.3.24"
 runtime "electron"
 build_from_source "true"
diff --git a/package.json b/package.json
index cba37fbae2..a90a4f9544 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "azuredatastudio",
   "version": "1.47.0",
-  "distro": "7f4613d9a9266732a1d3a616e3d4112495083a71",
+  "distro": "41647dfcd06c80cc0efd0885849cb6f2ce86ecbe",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -178,7 +178,7 @@
     "cssnano": "^4.1.11",
     "debounce": "^1.0.0",
     "deemon": "^1.8.0",
-    "electron": "22.3.21",
+    "electron": "22.3.24",
     "eslint": "8.36.0",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-jsdoc": "^39.3.2",
diff --git a/test/smoke/src/sql/main.ts b/test/smoke/src/sql/main.ts
index 11ab4c7421..7eb11259bc 100644
--- a/test/smoke/src/sql/main.ts
+++ b/test/smoke/src/sql/main.ts
@@ -43,7 +43,7 @@ const sqliteUrl = `https://github.com/Microsoft/azuredatastudio-sqlite/releases/
 
 export async function setup(app: ApplicationOptions): Promise<void> {
 	console.log('*** Downloading test extensions');
-	const releaseVersion = '1.13.0';
+	const releaseVersion = '1.14.0';
 	const requestUrl = sqliteUrl.replace(RELEASE_VERSION, releaseVersion).replace(PLATFORM, process.platform).replace(RUNTIME, getRuntime(app.web || app.remote || false)).replace(VERSION, getVersion(app.web || app.remote || false));
 	const zip = await fetch(requestUrl);
 	if (!zip) {
diff --git a/yarn.lock b/yarn.lock
index 781a818bde..ed3a140ce9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3658,10 +3658,10 @@ electron-to-chromium@^1.4.284:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.311.tgz#953bc9a4767f5ce8ec125f9a1ad8e00e8f67e479"
   integrity sha512-RoDlZufvrtr2Nx3Yx5MB8jX3aHIxm8nRWPJm3yVvyHmyKaRvn90RjzB6hNnt0AkhS3IInJdyRfQb4mWhPvUjVw==
 
-electron@22.3.21:
-  version "22.3.21"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-22.3.21.tgz#a817446cc1e62e9650522fa7eae389f9fc5b5e19"
-  integrity sha512-9JzWgvehRrqA30M7RvWCwwbyq2EgPUSbCFaqyZGnG0B52m4ayB8H+uFNIKXyWuyFwAEPDpQW5cGwCzXir1HuLA==
+electron@22.3.24:
+  version "22.3.24"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-22.3.24.tgz#14479cf11cf4709f78d324015429fa82492c2150"
+  integrity sha512-wnGsShoRVk1Jmgr7h/jZK9bI5UwMF88sdQ5c8z2j2N8B9elhF/jKDFjwDXUrY1Y0xzAskOP0tYIDE+UbUM4byQ==
   dependencies:
     "@electron/get" "^2.0.0"
     "@types/node" "^16.11.26"