From 499abdf26cd05f1a0f0356bb236bfe0c05d6c0eb Mon Sep 17 00:00:00 2001 From: Joaquin Coromina <75667013+bjoaquinc@users.noreply.github.com> Date: Sun, 30 Mar 2025 18:40:41 -0400 Subject: [PATCH 1/3] Fixed serverConfig.ts to pull voidVersion instead of version --- extensions/open-remote-ssh/src/serverConfig.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/extensions/open-remote-ssh/src/serverConfig.ts b/extensions/open-remote-ssh/src/serverConfig.ts index 3f2758fa..eb8224fb 100644 --- a/extensions/open-remote-ssh/src/serverConfig.ts +++ b/extensions/open-remote-ssh/src/serverConfig.ts @@ -32,12 +32,13 @@ export async function getVSCodeServerConfig(): Promise { const customServerBinaryName = vscode.workspace.getConfiguration('remote.SSH.experimental').get('serverBinaryName', ''); return { - version: vscode.version.replace('-insider', ''), commit: productJson.commit, quality: productJson.quality, release: productJson.release, serverApplicationName: customServerBinaryName || productJson.serverApplicationName, serverDataFolderName: productJson.serverDataFolderName, - serverDownloadUrlTemplate: productJson.serverDownloadUrlTemplate + serverDownloadUrlTemplate: productJson.serverDownloadUrlTemplate, + // Edited for Void + version: productJson.voidVersion || vscode.version.replace('-insider', ''), // Try void version first, fallback to vscode version }; } From 0294cb3b98f9b2cac61e01a600eafb56d12d2c2c Mon Sep 17 00:00:00 2001 From: Joaquin Coromina <75667013+bjoaquinc@users.noreply.github.com> Date: Sun, 30 Mar 2025 22:51:40 -0400 Subject: [PATCH 2/3] Removed the fall back, restored the original code and commented it out --- extensions/open-remote-ssh/src/serverConfig.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/open-remote-ssh/src/serverConfig.ts b/extensions/open-remote-ssh/src/serverConfig.ts index eb8224fb..6e22f7ba 100644 --- a/extensions/open-remote-ssh/src/serverConfig.ts +++ b/extensions/open-remote-ssh/src/serverConfig.ts @@ -32,6 +32,7 @@ export async function getVSCodeServerConfig(): Promise { const customServerBinaryName = vscode.workspace.getConfiguration('remote.SSH.experimental').get('serverBinaryName', ''); return { + // version: vscode.version.replace('-insider', ''), commit: productJson.commit, quality: productJson.quality, release: productJson.release, @@ -39,6 +40,6 @@ export async function getVSCodeServerConfig(): Promise { serverDataFolderName: productJson.serverDataFolderName, serverDownloadUrlTemplate: productJson.serverDownloadUrlTemplate, // Edited for Void - version: productJson.voidVersion || vscode.version.replace('-insider', ''), // Try void version first, fallback to vscode version + version: productJson.voidVersion }; } From 7631b41b276b297d9eec1a1ef58172d610671749 Mon Sep 17 00:00:00 2001 From: Andrew Pareles Date: Sun, 30 Mar 2025 20:45:42 -0700 Subject: [PATCH 3/3] comment --- extensions/open-remote-ssh/src/serverConfig.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/open-remote-ssh/src/serverConfig.ts b/extensions/open-remote-ssh/src/serverConfig.ts index 6e22f7ba..2478df5d 100644 --- a/extensions/open-remote-ssh/src/serverConfig.ts +++ b/extensions/open-remote-ssh/src/serverConfig.ts @@ -39,7 +39,7 @@ export async function getVSCodeServerConfig(): Promise { serverApplicationName: customServerBinaryName || productJson.serverApplicationName, serverDataFolderName: productJson.serverDataFolderName, serverDownloadUrlTemplate: productJson.serverDownloadUrlTemplate, - // Edited for Void + // Void changed this version: productJson.voidVersion }; }