feat(vscode): add container support for extension dependencies - [Do not merge]

apps/vs-code-designer/package.json

@@ -57,13 +57,14 @@
   "scripts": {
     "build:extension": "tsup && pnpm run copyFiles",
     "build:ui": "tsup --config tsup.e2e.test.config.ts",
-    "copyFiles": "node extension-copy-svgs.js",
+    "copyFiles": "node scripts/extension-copy-svgs.js",
     "vscode:designer:pack": "pnpm run vscode:designer:pack:step1 && pnpm run vscode:designer:pack:step2",
     "vscode:designer:pack:step1": "cd ./dist && npm install",
     "vscode:designer:pack:step2": "cd ./dist && vsce package",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "test:extension-unit": "vitest run --retry=3",
     "vscode:designer:e2e:ui": "pnpm run build:ui && cd dist && extest setup-and-run ../out/test/**/*.js --coverage",
-    "vscode:designer:e2e:headless": "pnpm run build:ui && cd dist && extest setup-and-run ../out/test/**/*.js --coverage"
+    "vscode:designer:e2e:headless": "pnpm run build:ui && cd dist && extest setup-and-run ../out/test/**/*.js --coverage",
+    "update:extension-bundle-version": "node scripts/update-extension-bundle-version.js"
   }
 }

apps/vs-code-designer/extension-copy-svgs.js → apps/vs-code-designer/scripts/extension-copy-svgs.js

@@ -6,7 +6,7 @@ const copyDoc = async (projectPath) => {
   await copy('./src', `${projectPath}`, {
     filter: ['LICENSE.md', 'package.json', 'README.md', 'assets/**'],
   });
-  await copy(path.resolve(__dirname, '..', '..'), `${projectPath}`, {
+  await copy(path.resolve(__dirname, '..'), `${projectPath}`, {
     filter: ['CHANGELOG.md'],
   });
 };

apps/vs-code-designer/scripts/update-extension-bundle-version.js

@@ -0,0 +1,41 @@
+#!/usr/bin/env node
+/* eslint-disable no-undef */
+const fs = require('fs/promises');
+const path = require('path');
+
+async function main() {
+  const version = process.argv[2];
+  if (!version) {
+    console.error('Usage: node scripts/update-extension-bundle-version.js <version>');
+    process.exitCode = 1;
+    return;
+  }
+
+  const constantsPath = path.resolve(__dirname, '../src/constants.ts');
+  const dockerfilePath = path.resolve(__dirname, '../src/container/Dockerfile');
+
+  await updateFile(
+    constantsPath,
+    /export const EXTENSION_BUNDLE_VERSION = ['"][^'"]+['"];\s*/,
+    `export const EXTENSION_BUNDLE_VERSION = '${version}';\n`
+  );
+  await updateFile(dockerfilePath, /ARG EXTENSION_BUNDLE_VERSION=[^\s]+/, `ARG EXTENSION_BUNDLE_VERSION=${version}`);
+
+  console.log(`Updated extension bundle version to ${version}`);
+}
+
+async function updateFile(filePath, regex, replacement) {
+  const original = await fs.readFile(filePath, 'utf8');
+  if (!regex.test(original)) {
+    throw new Error(`Could not find target pattern in ${filePath}`);
+  }
+  const updated = original.replace(regex, replacement);
+  if (updated !== original) {
+    await fs.writeFile(filePath, updated);
+  }
+}
+
+main().catch((err) => {
+  console.error(err.message || err);
+  process.exitCode = 1;
+});

apps/vs-code-designer/src/app/commands/cloudToLocal/cloudToLocal.ts

@@ -10,7 +10,7 @@ import { LogicAppNameStep } from '../createProject/createProjectSteps/logicAppNa
 import { WorkspaceNameStep } from '../createWorkspace/createWorkspaceSteps/workspaceNameStep';
 import { AzureWizard } from '@microsoft/vscode-azext-utils';
 import type { IActionContext } from '@microsoft/vscode-azext-utils';
-import { latestGAVersion, OpenBehavior } from '@microsoft/vscode-extension-logic-apps';
+import { latestGAVersion } from '@microsoft/vscode-extension-logic-apps';
 import type { ICreateFunctionOptions, IFunctionWizardContext, ProjectLanguage } from '@microsoft/vscode-extension-logic-apps';
 import { ProcessPackageStep } from './cloudToLocalSteps/processPackageStep';
 import { SelectFolderForNewWorkspaceStep } from './cloudToLocalSteps/selectFolderForNewWorkspaceStep';
@@ -43,9 +43,7 @@ export async function cloudToLocal(
     projectPath: options.folderPath,
   });
 
-  if (options.suppressOpenFolder) {
-    wizardContext.openBehavior = OpenBehavior.dontOpen;
-  } else if (!wizardContext.openBehavior) {
+  if (!wizardContext.openBehavior) {
     wizardContext.openBehavior = getWorkspaceSetting(projectOpenBehaviorSetting);
     context.telemetry.properties.openBehaviorFromSetting = String(!!wizardContext.openBehavior);
   }
@@ -57,6 +55,7 @@ export async function cloudToLocal(
       // TODO(aeldridge): Can we just use WorkspaceFolderStep instead?
       new SelectFolderForNewWorkspaceStep(),
       new WorkspaceNameStep(),
+      // new DevcontainerStep(),
       new LogicAppNameStep(),
       await ProjectTypeStep.create(context, options.templateId, options.functionSettings, true),
       new WorkspaceSettingsStep(),

apps/vs-code-designer/src/app/commands/convertToWorkspace.ts

@@ -60,7 +60,7 @@ export async function convertToWorkspace(context: IActionContext): Promise<boole
       if (shouldCreateWorkspace === DialogResponses.yes) {
         const workspaceWizard: AzureWizard<IFunctionWizardContext> = new AzureWizard(wizardContext, {
           title: localize('convertToWorkspace', 'Convert to workspace'),
-          promptSteps: [new WorkspaceFolderStep(), new WorkspaceNameStep(), new WorkspaceFileStep()],
+          promptSteps: [new WorkspaceFolderStep(), new WorkspaceNameStep(), /*new DevcontainerStep(), */ new WorkspaceFileStep()],
           executeSteps: [new OpenFolderStep()],
         });
 

apps/vs-code-designer/src/app/commands/createLogicApp/createLogicAppSteps/logicAppCreateStep.ts

@@ -30,7 +30,7 @@ import type { CustomLocation } from '@microsoft/vscode-azext-azureappservice';
 import { LocationListStep } from '@microsoft/vscode-azext-azureutils';
 import { AzureWizardExecuteStep, nonNullOrEmptyValue, nonNullProp } from '@microsoft/vscode-azext-utils';
 import type { ILogicAppWizardContext, ConnectionStrings } from '@microsoft/vscode-extension-logic-apps';
-import { StorageOptions, FuncVersion, WorkerRuntime } from '@microsoft/vscode-extension-logic-apps';
+import { StorageOptions, WorkerRuntime } from '@microsoft/vscode-extension-logic-apps';
 import type { Progress } from 'vscode';
 
 export class LogicAppCreateStep extends AzureWizardExecuteStep<ILogicAppWizardContext> {
@@ -191,18 +191,7 @@ export class LogicAppCreateStep extends AzureWizardExecuteStep<ILogicAppWizardCo
       );
     }
 
-    if (context.version === FuncVersion.v1) {
-      appSettings.push({
-        name: 'AzureWebJobsDashboard',
-        value: storageConnectionString.azureWebJobsDashboardValue,
-      });
-    }
-
-    if (
-      context.newSiteOS === WebsiteOS.windows &&
-      runtimeWithoutVersion.toLowerCase() === WorkerRuntime.Node &&
-      context.version !== FuncVersion.v1
-    ) {
+    if (context.newSiteOS === WebsiteOS.windows && runtimeWithoutVersion.toLowerCase() === WorkerRuntime.Node) {
       // Linux doesn't need this because it uses linuxFxVersion
       // v1 doesn't need this because it only supports one version of Node
       appSettings.push({

apps/vs-code-designer/src/app/commands/createProject/createCustomCodeProjectSteps/functionAppFilesStep.ts

@@ -287,7 +287,7 @@ export class FunctionAppFilesStep extends AzureWizardPromptStep<IProjectWizardCo
       tasks: [
         {
           label: 'build',
-          command: '${config:azureLogicAppsStandard.dotnetBinaryPath}',
+          command: 'dotnet',
           type: 'process',
           args: ['build', '${workspaceFolder}'],
           group: {

apps/vs-code-designer/src/app/commands/createProject/createCustomCodeProjectSteps/initCustomCodeProjectStep.ts

@@ -2,37 +2,25 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { binariesExist } from '../../../utils/binaries';
-import { extensionCommand, func, funcDependencyName, funcWatchProblemMatcher, hostStartCommand } from '../../../../constants';
+import { extensionCommand, funcWatchProblemMatcher } from '../../../../constants';
 import { InitCustomCodeScriptProjectStep } from './initCustomCodeScriptProjectStep';
 import type { ITaskInputs, ISettingToAdd } from '@microsoft/vscode-extension-logic-apps';
 import type { TaskDefinition } from 'vscode';
 
 export class InitCustomCodeProjectStep extends InitCustomCodeScriptProjectStep {
   protected getTasks(): TaskDefinition[] {
-    const funcBinariesExist = binariesExist(funcDependencyName);
-    const binariesOptions = funcBinariesExist
-      ? {
-          options: {
-            env: {
-              PATH: '${config:azureLogicAppsStandard.autoRuntimeDependenciesPath}\\NodeJs;${config:azureLogicAppsStandard.autoRuntimeDependenciesPath}\\DotNetSDK;$env:PATH',
-            },
-          },
-        }
-      : {};
     return [
       {
         label: 'generateDebugSymbols',
-        command: '${config:azureLogicAppsStandard.dotnetBinaryPath}',
+        command: 'dotnet',
         args: ['${input:getDebugSymbolDll}'],
         type: 'process',
         problemMatcher: '$msCompile',
       },
       {
-        type: funcBinariesExist ? 'shell' : func,
-        command: funcBinariesExist ? '${config:azureLogicAppsStandard.funcCoreToolsBinaryPath}' : hostStartCommand,
-        args: funcBinariesExist ? ['host', 'start'] : undefined,
-        ...binariesOptions,
+        type: 'shell',
+        command: 'func',
+        args: ['host', 'start'],
         problemMatcher: funcWatchProblemMatcher,
         isBackground: true,
         label: 'func: host start',