diff --git a/package.json b/package.json index eee8a06a17..b50b864b73 100644 --- a/package.json +++ b/package.json @@ -643,7 +643,9 @@ "languages": [ "csharp", "razor", - "aspnetcorerazor" + "aspnetcorerazor", + "vb", + "fsharp" ], "configurationAttributes": { "launch": { diff --git a/src/debugging/netSdk/NetSdkDebugHelper.ts b/src/debugging/netSdk/NetSdkDebugHelper.ts index fccbd78076..7b4c18961a 100644 --- a/src/debugging/netSdk/NetSdkDebugHelper.ts +++ b/src/debugging/netSdk/NetSdkDebugHelper.ts @@ -37,7 +37,7 @@ export class NetSdkDebugHelper extends NetCoreDebugHelper { }; await netContainerBuild(netCoreBuildContext); // prompt user whether to use .NET container SDK build - if (netCoreBuildContext?.containerBuildOptions === AllNetContainerBuildOptions[1]) { + if (netCoreBuildContext?.containerBuildOption === AllNetContainerBuildOptions[1]) { options = options || {}; options.appProject = options.appProject || await NetCoreTaskHelper.inferAppProject(context); // This method internally checks the user-defined input first diff --git a/src/scaffolding/wizard/net/NetContainerBuild.ts b/src/scaffolding/wizard/net/NetContainerBuild.ts index 3187d98e9e..5fa86f6178 100644 --- a/src/scaffolding/wizard/net/NetContainerBuild.ts +++ b/src/scaffolding/wizard/net/NetContainerBuild.ts @@ -6,10 +6,10 @@ import { AzureWizard, AzureWizardPromptStep, UserCancelledError } from '@microsoft/vscode-azext-utils'; import * as vscode from 'vscode'; import { ScaffoldingWizardContext } from '../ScaffoldingWizardContext'; -import { NetContainerBuildOptions, NetSdkChooseBuildStep } from './NetSdkChooseBuildStep'; +import { NetContainerBuildOption, NetSdkChooseBuildStep } from './NetSdkChooseBuildStep'; export interface NetChooseBuildTypeContext extends ScaffoldingWizardContext { - containerBuildOptions?: NetContainerBuildOptions; + containerBuildOption?: NetContainerBuildOption; } export async function netContainerBuild(wizardContext: Partial, apiInput?: NetChooseBuildTypeContext): Promise { diff --git a/src/scaffolding/wizard/net/NetSdkChooseBuildStep.ts b/src/scaffolding/wizard/net/NetSdkChooseBuildStep.ts index d32cf04b90..f8acadb0e0 100644 --- a/src/scaffolding/wizard/net/NetSdkChooseBuildStep.ts +++ b/src/scaffolding/wizard/net/NetSdkChooseBuildStep.ts @@ -19,18 +19,18 @@ export const AllNetContainerBuildOptions = [ ] as const; type NetContainerBuildOptionsTuple = typeof AllNetContainerBuildOptions; -export type NetContainerBuildOptions = NetContainerBuildOptionsTuple[number]; +export type NetContainerBuildOption = NetContainerBuildOptionsTuple[number]; export class NetSdkChooseBuildStep extends TelemetryPromptStep { public async prompt(wizardContext: NetChooseBuildTypeContext): Promise { await this.ensureCSharpExtension(wizardContext); // get workspace momento storage - const containerBuildOptions = await ext.context.workspaceState.get(NetContainerBuildOptionsKey); + const containerBuildOption = await ext.context.workspaceState.get(NetContainerBuildOptionsKey); // only remember if it was 'Use .NET SDK', otherwise prompt again - if (containerBuildOptions === AllNetContainerBuildOptions[1]) { - wizardContext.containerBuildOptions = containerBuildOptions; + if (containerBuildOption === AllNetContainerBuildOptions[1]) { + wizardContext.containerBuildOption = containerBuildOption; return; } @@ -40,22 +40,22 @@ export class NetSdkChooseBuildStep extends TelemetryPromptStep >{ label: p, data: p }); + const buildOptions = AllNetContainerBuildOptions as readonly NetContainerBuildOption[]; + const items = buildOptions.map(p => >{ label: p, data: p }); const response = await wizardContext.ui.showQuickPick(items, opt); - wizardContext.containerBuildOptions = response.data; + wizardContext.containerBuildOption = response.data; // update workspace momento storage - await ext.context.workspaceState.update(NetContainerBuildOptionsKey, wizardContext.containerBuildOptions); + await ext.context.workspaceState.update(NetContainerBuildOptionsKey, wizardContext.containerBuildOption); } public shouldPrompt(wizardContext: NetChooseBuildTypeContext): boolean { - return !wizardContext.containerBuildOptions; + return !wizardContext.containerBuildOption; } protected setTelemetry(wizardContext: NetChooseBuildTypeContext): void { - wizardContext.telemetry.properties.netSdkBuildStep = wizardContext.containerBuildOptions; + wizardContext.telemetry.properties.netSdkBuildStep = wizardContext.containerBuildOption; } private async ensureCSharpExtension(wizardContext: NetChooseBuildTypeContext): Promise {