Skip to content

Commit 94ef008

Browse files
andyleejordanandyleejordan
authored
Remove the MSI install logic (it's unreliable) (#4570)
And instead just open the release in the browser for the user.
1 parent 436fd90 commit 94ef008

File tree

3 files changed

+16
-102
lines changed

3 files changed

+16
-102
lines changed

‎src/features/UpdatePowerShell.ts‎

Lines changed: 6 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,13 @@
11
// Copyright (c) Microsoft Corporation.
22
// Licensed under the MIT License.
33

4-
import { spawn } from "child_process";
5-
import * as fs from "fs"; // TODO: Remove, but it's for a stream.
64
import fetch from "node-fetch";
7-
import * as os from "os";
8-
import * as path from "path";
95
import { SemVer } from "semver";
10-
import * as stream from "stream";
11-
import * as util from "util";
126
import vscode = require("vscode");
137

148
import { ILogger } from "../logging";
15-
import { IPowerShellVersionDetails, SessionManager } from "../session";
9+
import { IPowerShellVersionDetails } from "../session";
1610
import { changeSetting, Settings } from "../settings";
17-
import { isWindows } from "../utils";
18-
19-
const streamPipeline = util.promisify(stream.pipeline);
2011

2112
interface IUpdateMessageItem extends vscode.MessageItem {
2213
id: number;
@@ -29,7 +20,6 @@ export class UpdatePowerShell {
2920
private static LTSBuildInfoURL = "https://aka.ms/pwsh-buildinfo-lts";
3021
private static StableBuildInfoURL = "https://aka.ms/pwsh-buildinfo-stable";
3122
private static PreviewBuildInfoURL = "https://aka.ms/pwsh-buildinfo-preview";
32-
private static GitHubAPIReleaseURL = "https://api.github.com/repos/PowerShell/PowerShell/releases/tags/";
3323
private static GitHubWebReleaseURL = "https://github.com/PowerShell/PowerShell/releases/tag/";
3424
private static promptOptions: IUpdateMessageItem[] = [
3525
{
@@ -46,10 +36,8 @@ export class UpdatePowerShell {
4636
},
4737
];
4838
private localVersion: SemVer;
49-
private architecture: string;
5039

5140
constructor(
52-
private sessionManager: SessionManager,
5341
private sessionSettings: Settings,
5442
private logger: ILogger,
5543
versionDetails: IPowerShellVersionDetails) {
@@ -58,7 +46,6 @@ export class UpdatePowerShell {
5846
// to SemVer. The version handler in PSES handles Windows PowerShell and
5947
// just returns the first three fields like '5.1.22621'.
6048
this.localVersion = new SemVer(versionDetails.commit);
61-
this.architecture = versionDetails.architecture.toLowerCase();
6249
}
6350

6451
private shouldCheckForUpdate(): boolean {
@@ -173,74 +160,13 @@ export class UpdatePowerShell {
173160
await vscode.env.openExternal(url);
174161
}
175162

176-
private async updateWindows(tag: string): Promise<void> {
177-
let msiMatcher: string;
178-
if (this.architecture === "x64") {
179-
msiMatcher = "win-x64.msi";
180-
} else if (this.architecture === "x86") {
181-
msiMatcher = "win-x86.msi";
182-
} else {
183-
// We shouldn't get here, but do something sane anyway.
184-
return this.openReleaseInBrowser(tag);
185-
}
186-
187-
let response = await fetch(UpdatePowerShell.GitHubAPIReleaseURL + tag);
188-
if (!response.ok) {
189-
throw new Error("Failed to fetch GitHub release info!");
190-
}
191-
const release = await response.json();
192-
193-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
194-
const asset = release.assets.filter((a: any) => a.name.indexOf(msiMatcher) >= 0)[0];
195-
const msiDownloadPath = path.join(os.tmpdir(), asset.name);
196-
197-
response = await fetch(asset.browser_download_url);
198-
if (!response.ok) {
199-
throw new Error("Failed to fetch MSI!");
200-
}
201-
202-
const progressOptions = {
203-
title: "Downloading PowerShell Installer...",
204-
location: vscode.ProgressLocation.Notification,
205-
cancellable: false,
206-
};
207-
// Streams the body of the request to a file.
208-
await vscode.window.withProgress(progressOptions,
209-
async () => { await streamPipeline(response.body, fs.createWriteStream(msiDownloadPath)); });
210-
211-
// Stop the session because Windows likes to hold on to files.
212-
this.logger.writeDiagnostic("MSI downloaded, stopping session and closing terminals!");
213-
await this.sessionManager.stop();
214-
215-
// Close all terminals with the name "pwsh" in the current VS Code session.
216-
// This will encourage folks to not close the instance of VS Code that spawned
217-
// the MSI process.
218-
for (const terminal of vscode.window.terminals) {
219-
if (terminal.name === "pwsh") {
220-
terminal.dispose();
221-
}
222-
}
223-
224-
// Invoke the MSI via cmd.
225-
this.logger.writeDiagnostic(`Running '${msiDownloadPath}' to update PowerShell...`);
226-
const msi = spawn("msiexec", ["/i", msiDownloadPath]);
227-
228-
msi.on("close", () => {
229-
// Now that the MSI is finished, restart the session.
230-
this.logger.writeDiagnostic("MSI installation finished, restarting session.");
231-
void this.sessionManager.start();
232-
fs.unlinkSync(msiDownloadPath);
233-
});
234-
}
235-
236163
private async installUpdate(tag: string): Promise<void> {
237164
const releaseVersion = new SemVer(tag);
238165
const result = await vscode.window.showInformationMessage(
239-
`You have an old version of PowerShell (${this.localVersion.version}). The current latest release is ${releaseVersion.version}.
240-
Would you like to update the version? ${isWindows
241-
? "This will close ALL pwsh terminals running in this VS Code session!"
242-
: "We can't update you automatically, but we can open the latest release in your browser!"
243-
}`, ...UpdatePowerShell.promptOptions);
166+
`You have an old version of PowerShell (${this.localVersion.version}).
167+
The current latest release is ${releaseVersion.version}.
168+
Would you like to open the GitHub release in your browser?`,
169+
...UpdatePowerShell.promptOptions);
244170

245171
// If the user cancels the notification.
246172
if (!result) {
@@ -253,11 +179,7 @@ export class UpdatePowerShell {
253179
switch (result.id) {
254180
// Yes
255181
case 0:
256-
if (isWindows && (this.architecture === "x64" || this.architecture === "x86")) {
257-
await this.updateWindows(tag);
258-
} else {
259-
await this.openReleaseInBrowser(tag);
260-
}
182+
await this.openReleaseInBrowser(tag);
261183
break;
262184
// Not Now
263185
case 1:

‎src/session.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ export class SessionManager implements Middleware {
479479
"commit": version, // Actually used by UpdatePowerShell
480480
"architecture": process.arch // Best guess based off Code's architecture
481481
};
482-
const updater = new UpdatePowerShell(this, this.sessionSettings, this.logger, versionDetails);
482+
const updater = new UpdatePowerShell(this.sessionSettings, this.logger, versionDetails);
483483
void updater.checkForUpdate();
484484
}
485485
return;
@@ -735,7 +735,7 @@ Type 'help' to get help.
735735
// We haven't "started" until we're done getting the version information.
736736
this.started = true;
737737

738-
const updater = new UpdatePowerShell(this, this.sessionSettings, this.logger, this.versionDetails);
738+
const updater = new UpdatePowerShell(this.sessionSettings, this.logger, this.versionDetails);
739739
// NOTE: We specifically don't want to wait for this.
740740
void updater.checkForUpdate();
741741
}

‎test/features/UpdatePowerShell.test.ts‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ describe("UpdatePowerShell feature", function () {
3333
"commit": "7.3.0",
3434
"architecture": "X64"
3535
};
36-
// @ts-expect-error testing doesn't require all arguments.
37-
const updater = new UpdatePowerShell(undefined, settings, testLogger, version);
36+
const updater = new UpdatePowerShell(settings, testLogger, version);
3837
// @ts-expect-error method is private.
3938
assert(!updater.shouldCheckForUpdate());
4039
});
@@ -46,8 +45,7 @@ describe("UpdatePowerShell feature", function () {
4645
"commit": "5.1.22621",
4746
"architecture": "X64"
4847
};
49-
// @ts-expect-error testing doesn't require all arguments.
50-
const updater = new UpdatePowerShell(undefined, settings, testLogger, version);
48+
const updater = new UpdatePowerShell(settings, testLogger, version);
5149
// @ts-expect-error method is private.
5250
assert(!updater.shouldCheckForUpdate());
5351
});
@@ -59,8 +57,7 @@ describe("UpdatePowerShell feature", function () {
5957
"commit": "7.3.0-preview.3-508-g07175ae0ff8eb7306fe0b0fc7d19bdef4fbf2d67",
6058
"architecture": "Arm64"
6159
};
62-
// @ts-expect-error testing doesn't require all arguments.
63-
const updater = new UpdatePowerShell(undefined, settings, testLogger, version);
60+
const updater = new UpdatePowerShell(settings, testLogger, version);
6461
// @ts-expect-error method is private.
6562
assert(!updater.shouldCheckForUpdate());
6663
});
@@ -72,8 +69,7 @@ describe("UpdatePowerShell feature", function () {
7269
"commit": "7.3.0-daily20221206.1",
7370
"architecture": "Arm64"
7471
};
75-
// @ts-expect-error testing doesn't require all arguments.
76-
const updater = new UpdatePowerShell(undefined, settings, testLogger, version);
72+
const updater = new UpdatePowerShell(settings, testLogger, version);
7773
// @ts-expect-error method is private.
7874
assert(!updater.shouldCheckForUpdate());
7975
});
@@ -86,8 +82,7 @@ describe("UpdatePowerShell feature", function () {
8682
"commit": "7.3.0",
8783
"architecture": "X64"
8884
};
89-
// @ts-expect-error testing doesn't require all arguments.
90-
const updater = new UpdatePowerShell(undefined, settings, testLogger, version);
85+
const updater = new UpdatePowerShell(settings, testLogger, version);
9186
// @ts-expect-error method is private.
9287
assert(!updater.shouldCheckForUpdate());
9388
});
@@ -99,8 +94,7 @@ describe("UpdatePowerShell feature", function () {
9994
"commit": "7.3.0",
10095
"architecture": "X64"
10196
};
102-
// @ts-expect-error testing doesn't require all arguments.
103-
const updater = new UpdatePowerShell(undefined, settings, testLogger, version);
97+
const updater = new UpdatePowerShell(settings, testLogger, version);
10498
// @ts-expect-error method is private.
10599
assert(updater.shouldCheckForUpdate());
106100
});
@@ -115,8 +109,7 @@ describe("UpdatePowerShell feature", function () {
115109
"commit": "7.0.0",
116110
"architecture": "X64"
117111
};
118-
// @ts-expect-error testing doesn't require all arguments.
119-
const updater = new UpdatePowerShell(undefined, settings, testLogger, version);
112+
const updater = new UpdatePowerShell(settings, testLogger, version);
120113
// @ts-expect-error method is private.
121114
const tag: string | undefined = await updater.maybeGetNewRelease();
122115
// NOTE: This will need to be updated each new major LTS.
@@ -130,8 +123,7 @@ describe("UpdatePowerShell feature", function () {
130123
"commit": "7.0.0",
131124
"architecture": "X64"
132125
};
133-
// @ts-expect-error testing doesn't require all arguments.
134-
const updater = new UpdatePowerShell(undefined, settings, testLogger, version);
126+
const updater = new UpdatePowerShell(settings, testLogger, version);
135127
// @ts-expect-error method is private.
136128
const tag: string | undefined = await updater.maybeGetNewRelease();
137129
// NOTE: This will need to be updated each new major stable.

0 commit comments

Comments
 (0)