From 8b4bc01166a6be2d44daff49f441355176914238 Mon Sep 17 00:00:00 2001
From: Eric Amodio <eamodio@microsoft.com>
Date: Wed, 2 Jun 2021 19:22:16 -0400
Subject: [PATCH] Removes RemoteHub

---
 product.json                                  | 38 ++-----------------
 src/vs/platform/product/common/product.ts     |  6 +--
 .../browser/authenticationService.ts          |  2 +-
 3 files changed, 7 insertions(+), 39 deletions(-)

diff --git a/product.json b/product.json
index 3f00f8e146897..778c72c3db428 100644
--- a/product.json
+++ b/product.json
@@ -26,10 +26,10 @@
 	"extensionAllowedProposedApi": [
 		"ms-vscode.vscode-js-profile-flame",
 		"ms-vscode.vscode-js-profile-table",
-		"ms-vscode.github-browser",
-		"ms-vscode.github-richnav",
 		"ms-vscode.remotehub",
-		"ms-vscode.remotehub-insiders"
+		"ms-vscode.remotehub-insiders",
+		"GitHub.remotehub",
+		"GitHub.remotehub-insiders"
 	],
 	"builtInExtensions": [
 		{
@@ -121,38 +121,6 @@
 				},
 				"publisherDisplayName": "Microsoft"
 			}
-		},
-		{
-			"name": "ms-vscode.remotehub",
-			"version": "0.5.4",
-			"repo": "https://github.com/microsoft/vscode-remotehub",
-			"metadata": {
-				"id": "ed0ffe1d-36f0-49a0-bafe-da68355eb33a",
-				"publisherId": {
-					"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
-					"publisherName": "ms-vscode",
-					"displayName": "Microsoft",
-					"flags": "verified"
-				},
-				"publisherDisplayName": "Microsoft"
-			}
-		}
-	],
-	"webBuiltInExtensions": [
-		{
-			"name": "ms-vscode.remotehub",
-			"version": "0.5.4",
-			"repo": "https://github.com/microsoft/vscode-remotehub",
-			"metadata": {
-				"id": "ed0ffe1d-36f0-49a0-bafe-da68355eb33a",
-				"publisherId": {
-					"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
-					"publisherName": "ms-vscode",
-					"displayName": "Microsoft",
-					"flags": "verified"
-				},
-				"publisherDisplayName": "Microsoft"
-			}
 		}
 	]
 }
diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
index 28e367041286b..4a0b94187d631 100644
--- a/src/vs/platform/product/common/product.ts
+++ b/src/vs/platform/product/common/product.ts
@@ -66,10 +66,10 @@ else {
 			extensionAllowedProposedApi: [
 				'ms-vscode.vscode-js-profile-flame',
 				'ms-vscode.vscode-js-profile-table',
-				'ms-vscode.github-browser',
-				'ms-vscode.github-richnav',
 				'ms-vscode.remotehub',
-				'ms-vscode.remotehub-insiders'
+				'ms-vscode.remotehub-insiders',
+				'GitHub.remotehub',
+				'GitHub.remotehub-insiders'
 			],
 		});
 	}
diff --git a/src/vs/workbench/services/authentication/browser/authenticationService.ts b/src/vs/workbench/services/authentication/browser/authenticationService.ts
index 2d938765cd1d4..8652c0c8dd205 100644
--- a/src/vs/workbench/services/authentication/browser/authenticationService.ts
+++ b/src/vs/workbench/services/authentication/browser/authenticationService.ts
@@ -37,7 +37,7 @@ export interface IAccountUsage {
 	lastUsed: number;
 }
 
-const VSO_ALLOWED_EXTENSIONS = ['github.vscode-pull-request-github', 'github.vscode-pull-request-github-insiders', 'vscode.git', 'ms-vsonline.vsonline', 'vscode.github-browser', 'ms-vscode.github-browser', 'ms-vscode.remotehub', 'ms-vscode.remotehub-insiders', 'github.codespaces'];
+const VSO_ALLOWED_EXTENSIONS = ['github.vscode-pull-request-github', 'github.vscode-pull-request-github-insiders', 'vscode.git', 'ms-vsonline.vsonline', 'ms-vscode.remotehub', 'ms-vscode.remotehub-insiders', 'github.remotehub', 'github.remotehub-insiders', 'github.codespaces'];
 
 export function readAccountUsages(storageService: IStorageService, providerId: string, accountName: string,): IAccountUsage[] {
 	const accountKey = `${providerId}-${accountName}-usages`;