Skip to content

Mark unused useX86Host setting as deprecated #4034

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 22, 2022
Merged

Mark unused useX86Host setting as deprecated #4034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,14 +564,14 @@
},
"powershell.powerShellDefaultVersion": {
"type": "string",
"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."
"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."
},
"powershell.powerShellExePath": {
"type": "string",
"default": "",
"scope": "machine",
"description": "REMOVED. Please use the \"powershell.powerShellDefaultVersion\" setting instead.",
"deprecationMessage": "Please use the \"powershell.powerShellDefaultVersion\" setting instead."
"description": "REMOVED: Please use the \"powershell.powerShellAdditionalExePaths\" setting instead.",
"deprecationMessage": "Please use the \"powershell.powerShellAdditionalExePaths\" setting instead."
},
"powershell.promptToUpdatePowerShell": {
"type": "boolean",
Expand All @@ -580,8 +580,8 @@
},
"powershell.promptToUpdatePackageManagement": {
"type": "boolean",
"description": "Specifies whether you should be prompted to update your version of PackageManagement if it's under 1.4.6.",
"default": true,
"description": "REMOVED: Specifies whether you should be prompted to update your version of PackageManagement if it's under 1.4.6.",
"default": false,
"deprecationMessage": "This prompt has been removed as it's no longer strictly necessary to upgrade the PackageManagement module."
},
"powershell.startAsLoginShell.osx": {
Expand All @@ -602,7 +602,8 @@
"powershell.useX86Host": {
"type": "boolean",
"default": false,
"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."
"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.",
"deprecationMessage": "This setting was removed when the PowerShell installation searcher was added. Please use the \"powershell.powerShellAdditionalExePaths\" setting instead."
},
"powershell.enableProfileLoading": {
"type": "boolean",
Expand Down
4 changes: 1 addition & 3 deletions src/session.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,9 +394,7 @@ export class SessionManager implements Middleware {

// Detect any setting changes that would affect the session
if (!this.suppressRestartPrompt &&
(settings.useX86Host !==
this.sessionSettings.useX86Host ||
settings.powerShellDefaultVersion.toLowerCase() !==
(settings.powerShellDefaultVersion.toLowerCase() !==
this.sessionSettings.powerShellDefaultVersion.toLowerCase() ||
settings.developer.editorServicesLogLevel.toLowerCase() !==
this.sessionSettings.developer.editorServicesLogLevel.toLowerCase() ||
Expand Down
3 changes: 0 additions & 3 deletions src/settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ export interface ISettings {
bundledModulesPath?: string;
startAsLoginShell?: IStartAsLoginShellSettings;
startAutomatically?: boolean;
useX86Host?: boolean;
enableProfileLoading?: boolean;
helpCompletion: string;
scriptAnalysis?: IScriptAnalysisSettings;
Expand Down Expand Up @@ -233,8 +232,6 @@ export function load(): ISettings {
configuration.get<boolean>("promptToUpdatePowerShell", true),
bundledModulesPath:
"../modules", // Because the extension is always at `<root>/out/main.js`
useX86Host:
configuration.get<boolean>("useX86Host", false),
enableProfileLoading:
configuration.get<boolean>("enableProfileLoading", false),
helpCompletion:
Expand Down
2 changes: 1 addition & 1 deletion test/core/paths.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import utils = require("../utils");
describe("Path assumptions", function () {
before(utils.ensureEditorServicesIsConnected);

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