Skip to content

Commit ba430f6

Browse files
Merge pull request #4306 from PowerShell/andschwa/auto-update
Rewrite `UpdatePowerShell` feature
2 parents 1d855be + 8801680 commit ba430f6

17 files changed

+441
-248
lines changed

.vsts-ci/templates/ci-general.yml

+1
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ steps:
7070
inputs:
7171
targetType: inline
7272
script: |
73+
Get-ChildItem env:
7374
Get-Module -ListAvailable Pester
7475
Install-Module InvokeBuild -Scope CurrentUser -Force
7576
Install-Module platyPS -Scope CurrentUser -Force

src/features/Console.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import vscode = require("vscode");
55
import { NotificationType, RequestType } from "vscode-languageclient";
66
import { LanguageClient } from "vscode-languageclient/node";
77
import { ICheckboxQuickPickItem, showCheckboxQuickPick } from "../controls/checkboxQuickPick";
8-
import { Logger } from "../logging";
8+
import { ILogger } from "../logging";
99
import { getSettings } from "../settings";
1010
import { LanguageClientConsumer } from "../languageClientConsumer";
1111

@@ -170,7 +170,7 @@ export class ConsoleFeature extends LanguageClientConsumer {
170170
private commands: vscode.Disposable[];
171171
private handlers: vscode.Disposable[] = [];
172172

173-
constructor(private logger: Logger) {
173+
constructor(private logger: ILogger) {
174174
super();
175175
this.commands = [
176176
vscode.commands.registerCommand("PowerShell.RunSelection", async () => {

src/features/DebugSession.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { getPlatformDetails, OperatingSystem } from "../platform";
1212
import { PowerShellProcess } from "../process";
1313
import { IEditorServicesSessionDetails, SessionManager, SessionStatus } from "../session";
1414
import { getSettings } from "../settings";
15-
import { Logger } from "../logging";
15+
import { ILogger } from "../logging";
1616
import { LanguageClientConsumer } from "../languageClientConsumer";
1717
import path = require("path");
1818
import utils = require("../utils");
@@ -65,7 +65,7 @@ export class DebugSessionFeature extends LanguageClientConsumer
6565
},
6666
};
6767

68-
constructor(context: ExtensionContext, private sessionManager: SessionManager, private logger: Logger) {
68+
constructor(context: ExtensionContext, private sessionManager: SessionManager, private logger: ILogger) {
6969
super();
7070
// Register a debug configuration provider
7171
context.subscriptions.push(vscode.debug.registerDebugConfigurationProvider("PowerShell", this));
@@ -359,7 +359,7 @@ export class PickPSHostProcessFeature extends LanguageClientConsumer {
359359
private waitingForClientToken?: vscode.CancellationTokenSource;
360360
private getLanguageClientResolve?: (value: LanguageClient) => void;
361361

362-
constructor(private logger: Logger) {
362+
constructor(private logger: ILogger) {
363363
super();
364364

365365
this.command =
@@ -485,7 +485,7 @@ export class PickRunspaceFeature extends LanguageClientConsumer {
485485
private waitingForClientToken?: vscode.CancellationTokenSource;
486486
private getLanguageClientResolve?: (value: LanguageClient) => void;
487487

488-
constructor(private logger: Logger) {
488+
constructor(private logger: ILogger) {
489489
super();
490490
this.command =
491491
vscode.commands.registerCommand("PowerShell.PickRunspace", (processId) => {

src/features/ExtensionCommands.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
Position, Range, RequestType
1010
} from "vscode-languageclient";
1111
import { LanguageClient } from "vscode-languageclient/node";
12-
import { Logger } from "../logging";
12+
import { ILogger } from "../logging";
1313
import { getSettings, validateCwdSetting } from "../settings";
1414
import { LanguageClientConsumer } from "../languageClientConsumer";
1515

@@ -149,7 +149,7 @@ export class ExtensionCommandsFeature extends LanguageClientConsumer {
149149
private handlers: vscode.Disposable[] = [];
150150
private extensionCommands: IExtensionCommand[] = [];
151151

152-
constructor(private logger: Logger) {
152+
constructor(private logger: ILogger) {
153153
super();
154154
this.commands = [
155155
vscode.commands.registerCommand("PowerShell.ShowAdditionalCommands", async () => {

src/features/ExternalApi.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import * as vscode from "vscode";
55
import { v4 as uuidv4 } from "uuid";
66
import { LanguageClientConsumer } from "../languageClientConsumer";
7-
import { Logger } from "../logging";
7+
import { ILogger } from "../logging";
88
import { SessionManager } from "../session";
99

1010
export interface IExternalPowerShellDetails {
@@ -39,7 +39,7 @@ export class ExternalApiFeature extends LanguageClientConsumer implements IPower
3939
constructor(
4040
private extensionContext: vscode.ExtensionContext,
4141
private sessionManager: SessionManager,
42-
private logger: Logger) {
42+
private logger: ILogger) {
4343
super();
4444
}
4545

src/features/GetCommands.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import * as vscode from "vscode";
55
import { RequestType0 } from "vscode-languageclient";
66
import { LanguageClient } from "vscode-languageclient/node";
7-
import { Logger } from "../logging";
7+
import { ILogger } from "../logging";
88
import { LanguageClientConsumer } from "../languageClientConsumer";
99
import { getSettings } from "../settings";
1010

@@ -30,7 +30,7 @@ export class GetCommandsFeature extends LanguageClientConsumer {
3030
private commandsExplorerProvider: CommandsExplorerProvider;
3131
private commandsExplorerTreeView: vscode.TreeView<Command>;
3232

33-
constructor(private logger: Logger) {
33+
constructor(private logger: ILogger) {
3434
super();
3535
this.commands = [
3636
vscode.commands.registerCommand("PowerShell.RefreshCommandsExplorer",

src/features/NewFileOrProject.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ import vscode = require("vscode");
55
import { RequestType } from "vscode-languageclient";
66
import { LanguageClient } from "vscode-languageclient/node";
77
import { LanguageClientConsumer } from "../languageClientConsumer";
8-
import { Logger } from "../logging";
8+
import { ILogger } from "../logging";
99

1010
export class NewFileOrProjectFeature extends LanguageClientConsumer {
1111

1212
private readonly loadIcon = " $(sync) ";
1313
private command: vscode.Disposable;
1414
private waitingForClientToken?: vscode.CancellationTokenSource;
1515

16-
constructor(private logger: Logger) {
16+
constructor(private logger: ILogger) {
1717
super();
1818
this.command =
1919
vscode.commands.registerCommand("PowerShell.NewProjectFromTemplate", async () => {

src/features/PesterTests.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import * as path from "path";
55
import vscode = require("vscode");
6-
import { Logger } from "../logging";
6+
import { ILogger } from "../logging";
77
import { SessionManager } from "../session";
88
import { getSettings, chosenWorkspace, validateCwdSetting } from "../settings";
99
import utils = require("../utils");
@@ -17,7 +17,7 @@ export class PesterTestsFeature implements vscode.Disposable {
1717
private commands: vscode.Disposable[];
1818
private invokePesterStubScriptPath: string;
1919

20-
constructor(private sessionManager: SessionManager, private logger: Logger) {
20+
constructor(private sessionManager: SessionManager, private logger: ILogger) {
2121
this.invokePesterStubScriptPath = path.resolve(__dirname, "../modules/PowerShellEditorServices/InvokePesterStub.ps1");
2222
this.commands = [
2323
// File context-menu command - Run Pester Tests

src/features/RunCode.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import vscode = require("vscode");
55
import { SessionManager } from "../session";
6-
import { Logger } from "../logging";
6+
import { ILogger } from "../logging";
77
import { getSettings, chosenWorkspace, validateCwdSetting } from "../settings";
88

99
enum LaunchType {
@@ -14,7 +14,7 @@ enum LaunchType {
1414
export class RunCodeFeature implements vscode.Disposable {
1515
private command: vscode.Disposable;
1616

17-
constructor(private sessionManager: SessionManager, private logger: Logger) {
17+
constructor(private sessionManager: SessionManager, private logger: ILogger) {
1818
this.command = vscode.commands.registerCommand(
1919
"PowerShell.RunCode",
2020
async (runInDebugger: boolean, scriptToRun: string, args: string[]) => {

0 commit comments

Comments
 (0)