Skip to content

Commit e7f3790

Browse files
Mark unused useX86Host setting as deprecated (#4034)
1 parent a8edf43 commit e7f3790

File tree

4 files changed

+9
-13
lines changed

4 files changed

+9
-13
lines changed

package.json

+7-6
Original file line numberDiff line numberDiff line change
@@ -564,14 +564,14 @@
564564
},
565565
"powershell.powerShellDefaultVersion": {
566566
"type": "string",
567-
"description": "Specifies the PowerShell version name, as displayed by the 'PowerShell: Show Session Menu' command, used when the extension loads e.g \"Windows PowerShell (x86)\" or \"PowerShell Core 6 (x64)\". You can specify additional PowerShell executables by using the \"powershell.powerShellAdditionalExePaths\" setting."
567+
"description": "Specifies the PowerShell version name, as displayed by the 'PowerShell: Show Session Menu' command, used when the extension loads e.g \"Windows PowerShell (x86)\" or \"PowerShell Core 7 (x64)\". You can specify additional PowerShell executables by using the \"powershell.powerShellAdditionalExePaths\" setting."
568568
},
569569
"powershell.powerShellExePath": {
570570
"type": "string",
571571
"default": "",
572572
"scope": "machine",
573-
"description": "REMOVED. Please use the \"powershell.powerShellDefaultVersion\" setting instead.",
574-
"deprecationMessage": "Please use the \"powershell.powerShellDefaultVersion\" setting instead."
573+
"description": "REMOVED: Please use the \"powershell.powerShellAdditionalExePaths\" setting instead.",
574+
"deprecationMessage": "Please use the \"powershell.powerShellAdditionalExePaths\" setting instead."
575575
},
576576
"powershell.promptToUpdatePowerShell": {
577577
"type": "boolean",
@@ -580,8 +580,8 @@
580580
},
581581
"powershell.promptToUpdatePackageManagement": {
582582
"type": "boolean",
583-
"description": "Specifies whether you should be prompted to update your version of PackageManagement if it's under 1.4.6.",
584-
"default": true,
583+
"description": "REMOVED: Specifies whether you should be prompted to update your version of PackageManagement if it's under 1.4.6.",
584+
"default": false,
585585
"deprecationMessage": "This prompt has been removed as it's no longer strictly necessary to upgrade the PackageManagement module."
586586
},
587587
"powershell.startAsLoginShell.osx": {
@@ -602,7 +602,8 @@
602602
"powershell.useX86Host": {
603603
"type": "boolean",
604604
"default": false,
605-
"description": "Uses the 32-bit language service on 64-bit Windows. This setting has no effect on 32-bit Windows or on the PowerShell extension debugger, which has its own architecture configuration."
605+
"description": "REMOVED: Uses the 32-bit language service on 64-bit Windows. This setting has no effect on 32-bit Windows or on the PowerShell extension debugger, which has its own architecture configuration.",
606+
"deprecationMessage": "This setting was removed when the PowerShell installation searcher was added. Please use the \"powershell.powerShellAdditionalExePaths\" setting instead."
606607
},
607608
"powershell.enableProfileLoading": {
608609
"type": "boolean",

src/session.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -394,9 +394,7 @@ export class SessionManager implements Middleware {
394394

395395
// Detect any setting changes that would affect the session
396396
if (!this.suppressRestartPrompt &&
397-
(settings.useX86Host !==
398-
this.sessionSettings.useX86Host ||
399-
settings.powerShellDefaultVersion.toLowerCase() !==
397+
(settings.powerShellDefaultVersion.toLowerCase() !==
400398
this.sessionSettings.powerShellDefaultVersion.toLowerCase() ||
401399
settings.developer.editorServicesLogLevel.toLowerCase() !==
402400
this.sessionSettings.developer.editorServicesLogLevel.toLowerCase() ||

src/settings.ts

-3
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ export interface ISettings {
8686
bundledModulesPath?: string;
8787
startAsLoginShell?: IStartAsLoginShellSettings;
8888
startAutomatically?: boolean;
89-
useX86Host?: boolean;
9089
enableProfileLoading?: boolean;
9190
helpCompletion: string;
9291
scriptAnalysis?: IScriptAnalysisSettings;
@@ -233,8 +232,6 @@ export function load(): ISettings {
233232
configuration.get<boolean>("promptToUpdatePowerShell", true),
234233
bundledModulesPath:
235234
"../modules", // Because the extension is always at `<root>/out/main.js`
236-
useX86Host:
237-
configuration.get<boolean>("useX86Host", false),
238235
enableProfileLoading:
239236
configuration.get<boolean>("enableProfileLoading", false),
240237
helpCompletion:

test/core/paths.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import utils = require("../utils");
1010
describe("Path assumptions", function () {
1111
before(utils.ensureEditorServicesIsConnected);
1212

13-
// TODO: This is skipped because it intereferes with other tests. Either
13+
// TODO: This is skipped because it interferes with other tests. Either
1414
// need to find a way to close the opened folder via a Code API, or find
1515
// another way to test this.
1616
it.skip("Opens the examples folder at the expected path", async function () {

0 commit comments

Comments
 (0)