From 661384637db384fe5d4e6224069adbe708580b16 Mon Sep 17 00:00:00 2001
From: Karl Burtram <karlb@microsoft.com>
Date: Wed, 21 Dec 2022 11:01:44 -0800
Subject: [PATCH] Port fix for vscode issue 160827 to release/1.40 (#21466)

* port fix for vscode issue 160827 (#21457)

* Update build version

Co-authored-by: Hai Cao <hacao@microsoft.com>
---
 package.json                                      | 2 +-
 src/vs/platform/terminal/node/terminalProfiles.ts | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/package.json b/package.json
index b192a1fe4ebe..d41cfa41ba16 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "azuredatastudio",
-  "version": "1.40.1",
+  "version": "1.40.2",
   "distro": "c6da977529b6719ff1974faa53a73abe01ec13ac",
   "author": {
     "name": "Microsoft Corporation"
diff --git a/src/vs/platform/terminal/node/terminalProfiles.ts b/src/vs/platform/terminal/node/terminalProfiles.ts
index d108071dbedf..6619ef0339cb 100644
--- a/src/vs/platform/terminal/node/terminalProfiles.ts
+++ b/src/vs/platform/terminal/node/terminalProfiles.ts
@@ -103,14 +103,6 @@ async function detectAvailableWindowsProfiles(
 			source: ProfileSource.GitBash,
 			isAutoDetected: true
 		});
-		detectedProfiles.set('Cygwin', {
-			path: [
-				`${process.env['HOMEDRIVE']}\\cygwin64\\bin\\bash.exe`,
-				`${process.env['HOMEDRIVE']}\\cygwin\\bin\\bash.exe`
-			],
-			args: ['--login'],
-			isAutoDetected: true
-		});
 		detectedProfiles.set('Command Prompt', {
 			path: `${system32Path}\\cmd.exe`,
 			icon: Codicon.terminalCmd,
@@ -212,7 +204,6 @@ async function initializeWindowsProfiles(testPwshSourcePaths?: string[]): Promis
 			`${process.env['ProgramFiles']}\\Git\\usr\\bin\\bash.exe`,
 			`${process.env['LocalAppData']}\\Programs\\Git\\bin\\bash.exe`,
 			`${process.env['UserProfile']}\\scoop\\apps\\git-with-openssh\\current\\bin\\bash.exe`,
-			`${process.env['AllUsersProfile']}\\scoop\\apps\\git-with-openssh\\current\\bin\\bash.exe`
 		],
 		args: ['--login']
 	});