Azure · ccastrotrejo · Nov 3, 2023 · Jul 6, 2023 · Jul 26, 2023 · Jul 26, 2023
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -599,10 +599,8 @@
 
 ## [2.28.0](https://github.com/Azure/LogicAppsUX/compare/v2.27.0...v2.28.0) (2023-06-13)
 
-
 ## [2.23.0](https://github.com/Azure/LogicAppsUX/compare/v2.22.0...v2.23.0) (2023-05-31)
 
-
 ### Features
 
 - **Data Mapper:** Able to select schemas from folders within 'Schemas' folder ([#2700](https://github.com/Azure/LogicAppsUX/issues/2700)) ([3999cd3](https://github.com/Azure/LogicAppsUX/commit/3999cd312d414e2a915ace6a65c0cda46d64db87))

diff --git a/apps/vs-code-designer/.eslintrc.json b/apps/vs-code-designer/.eslintrc.json
@@ -5,7 +5,8 @@
     {
       "files": ["*.ts"],
       "rules": {
-        "no-param-reassign": "off"
+        "no-param-reassign": "off",
+        "react-hooks/rules-of-hooks": "off"
       }
     },
     {

@@ -0,0 +1,22 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import { azuriteExtensionId } from '../../constants';
+import { localize } from '../../localize';
+import type { IActionContext } from '@microsoft/vscode-azext-utils';
+import { extensions } from 'vscode';
+import * as vscode from 'vscode';
+
+export async function executeOnAzurite(context: IActionContext, command: string, ...args: any[]): Promise<void> {
+  const azuriteExtension = extensions.getExtension(azuriteExtensionId);
+
+  if (azuriteExtension?.isActive) {
+    vscode.commands.executeCommand(command, {
+      ...args,
+    });
+  } else {
+    const message: string = localize('deactivatedAzuriteExt', 'Azurite extension is deactivated, make sure to activate it');
+    await context.ui.showWarningMessage(message);
+  }
+}
@@ -107,7 +107,7 @@ export class FunctionConfigFile extends AzureWizardPromptStep<IProjectWizardCont
       tasks: [
         {
           label: 'build',
-          command: 'dotnet',
+          command: '${config:azureLogicAppsStandard.dotnetBinaryPath}',
           type: 'process',
           args: ['build', '${workspaceFolder}'],
           group: {

@@ -29,6 +29,7 @@ export class ScriptProjectCreateStep extends ProjectCodeCreateStepBase {
     'local.settings.json',
     'test',
     '.debug',
+    'global.json',
   ];
   protected gitignore = '';
   protected supportsManagedDependencies = false;

@@ -118,37 +118,43 @@ export abstract class InitCodeProject extends AzureWizardExecuteStep<IProjectWiz
   public async overwriteTasksJson(context: IProjectWizardContext): Promise<void> {
     const tasksJsonPath: string = path.join(context.projectPath, '.vscode', 'Tasks.json');
     const tasksJsonContent = `{
-    "version": "2.0.0",
-    "tasks": [
-      {
-        "label": "generateDebugSymbols",
-        "command": "dotnet",
-        "args": [
-          "\${input:getDebugSymbolDll}"
+        "version": "2.0.0",
+        "tasks": [
+          {
+            "label": "generateDebugSymbols",
+            "command": '\${config:azureLogicAppsStandard.dotnetBinaryPath}',
+            "args": [
+              "\${input:getDebugSymbolDll}"
+            ],
+            "type": "process",
+            "problemMatcher": "$msCompile"
+          },
+          {
+            "type": "shell",
+            "command":"\${config:azureLogicAppsStandard.funcCoreToolsBinaryPath}",
+            "args" : ["host", "start"],
+            "options": {
+              "env": {
+                "PATH": "\${config:azureLogicAppsStandard.autoRuntimeDependenciesPath}\\\\NodeJs;\${config:azureLogicAppsStandard.autoRuntimeDependenciesPath}\\\\DotNetSDK;$env:PATH"
+              }
+            },
+            "problemMatcher": "$func-watch",
+            "isBackground": true,
+            "label": "func: host start",
+            "group": {
+              "kind": "build",
+              "isDefault": true
+            }
+          }
         ],
-        "type": "process",
-        "problemMatcher": "$msCompile"
-      },
-      {
-        "type": "func",
-        "command": "host start",
-        "problemMatcher": "$func-watch",
-        "isBackground": true,
-        "label": "func: host start",
-        "group": {
-          "kind": "build",
-          "isDefault": true
-        }
-      }
-    ],
-    "inputs": [
-      {
-        "id": "getDebugSymbolDll",
-        "type": "command",
-        "command": "azureLogicAppsStandard.getDebugSymbolDll"
-      }
-    ]
-  }`;
+        "inputs": [
+          {
+            "id": "getDebugSymbolDll",
+            "type": "command",
+            "command": "azureLogicAppsStandard.getDebugSymbolDll"
+          }
+        ]
+      }`;
 
     if (await confirmOverwriteFile(context, tasksJsonPath)) {
       await fse.writeFile(tasksJsonPath, tasksJsonContent);

@@ -2,7 +2,8 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { extInstallTaskName, func, funcWatchProblemMatcher, hostStartCommand } from '../../../../../../constants';
+import { binariesExist } from '../../../../../../app/utils/binaries';
+import { extInstallTaskName, func, funcDependencyName, funcWatchProblemMatcher, hostStartCommand } from '../../../../../../constants';
 import { getLocalFuncCoreToolsVersion } from '../../../../../utils/funcCoreTools/funcVersion';
 import { InitCodeProject } from './InitCodeProject';
 import type { IProjectWizardContext } from '@microsoft/vscode-extension';
@@ -19,10 +20,23 @@ export class ScriptInit extends InitCodeProject {
   protected useFuncExtensionsInstall = false;
 
   protected getTasks(): TaskDefinition[] {
+    const funcBinariesExist = binariesExist(funcDependencyName);
+    const binariesOptions = funcBinariesExist
+      ? {
+          options: {
+            env: {
+              PATH: '${config:azureLogicAppsStandard.autoRuntimeDependenciesPath}\\NodeJs;${config:azureLogicAppsStandard.autoRuntimeDependenciesPath}\\DotNetSDK;$env:PATH',
+            },
+          },
+        }
+      : {};
     return [
       {
-        type: func,
-        command: hostStartCommand,
+        label: 'func: host start',
+        type: funcBinariesExist ? 'shell' : func,
+        command: funcBinariesExist ? '${config:azureLogicAppsStandard.funcCoreToolsBinaryPath}' : hostStartCommand,
+        args: funcBinariesExist ? ['host', 'start'] : undefined,
+        ...binariesOptions,
         problemMatcher: funcWatchProblemMatcher,
         dependsOn: this.useFuncExtensionsInstall ? extInstallTaskName : undefined,
         isBackground: true,

@@ -2,7 +2,8 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { extensionCommand, func, funcWatchProblemMatcher, hostStartCommand } from '../../../../../../constants';
+import { binariesExist } from '../../../../../../app/utils/binaries';
+import { extensionCommand, func, funcDependencyName, funcWatchProblemMatcher, hostStartCommand } from '../../../../../../constants';
 import { ScriptInit } from './ScriptInit';
 import type { IProjectWizardContext, ITaskInputs, ISettingToAdd } from '@microsoft/vscode-extension';
 import type { TaskDefinition } from 'vscode';
@@ -13,17 +14,29 @@ export class WorkflowInitCodeProject extends ScriptInit {
   }
 
   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: 'dotnet',
+        command: '${config:azureLogicAppsStandard.dotnetBinaryPath}',
         args: ['${input:getDebugSymbolDll}'],
         type: 'process',
         problemMatcher: '$msCompile',
       },
       {
-        type: func,
-        command: hostStartCommand,
+        type: funcBinariesExist ? 'shell' : func,
+        command: funcBinariesExist ? '${config:azureLogicAppsStandard.funcCoreToolsBinaryPath}' : hostStartCommand,
+        args: funcBinariesExist ? ['host', 'start'] : undefined,
+        ...binariesOptions,
         problemMatcher: funcWatchProblemMatcher,
         isBackground: true,
         label: 'func: host start',

@@ -0,0 +1,21 @@
+/*------------------p---------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import { autoRuntimeDependenciesPathSettingKey, dotnetDependencyName } from '../../../constants';
+import { ext } from '../../../extensionVariables';
+import { downloadAndExtractBinaries, getDotNetBinariesReleaseUrl } from '../../utils/binaries';
+import { getGlobalSetting } from '../../utils/vsCodeConfig/settings';
+import type { IActionContext } from '@microsoft/vscode-azext-utils';
+
+export async function installDotNet(context: IActionContext, majorVersion?: string): Promise<void> {
+  ext.outputChannel.show();
+  context.telemetry.properties.majorVersion = majorVersion;
+  const targetDirectory = getGlobalSetting<string>(autoRuntimeDependenciesPathSettingKey);
+
+  context.telemetry.properties.lastStep = 'getDotNetBinariesReleaseUrl';
+  const scriptUrl = getDotNetBinariesReleaseUrl();
+
+  context.telemetry.properties.lastStep = 'downloadAndExtractBinaries';
+  await downloadAndExtractBinaries(scriptUrl, targetDirectory, dotnetDependencyName, majorVersion);
+}
@@ -0,0 +1,75 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import { validateDotNetSDKSetting } from '../../../constants';
+import { localize } from '../../../localize';
+import { getDotNetCommand } from '../../utils/dotnet/dotnet';
+import { executeCommand } from '../../utils/funcCoreTools/cpUtils';
+import { getWorkspaceSetting } from '../../utils/vsCodeConfig/settings';
+import { installDotNet } from './installDotNet';
+import { callWithTelemetryAndErrorHandling, DialogResponses, openUrl } from '@microsoft/vscode-azext-utils';
+import type { IActionContext } from '@microsoft/vscode-azext-utils';
+import type { MessageItem } from 'vscode';
+
+/**
+ * Checks if dotnet 6 is installed, and installs it if needed.
+ * @param {IActionContext} context - Workflow file path.
+ * @param {string} message - Message for warning.
+ * @param {string} fsPath - Workspace file system path.
+ * @returns {Promise<boolean>} Returns true if it is installed or was sucessfully installed, otherwise returns false.
+ */
+export async function validateDotNetIsInstalled(context: IActionContext, message: string, fsPath: string): Promise<boolean> {
+  let input: MessageItem | undefined;
+  let installed = false;
+  const install: MessageItem = { title: localize('install', 'Install') };
+
+  await callWithTelemetryAndErrorHandling('azureLogicAppsStandard.validateDotNetIsInstalled', async (innerContext: IActionContext) => {
+    innerContext.errorHandling.suppressDisplay = true;
+
+    if (!getWorkspaceSetting<boolean>(validateDotNetSDKSetting, fsPath)) {
+      innerContext.telemetry.properties.validateDotNet = 'false';
+      installed = true;
+    } else if (await isDotNetInstalled()) {
+      installed = true;
+    } else {
+      const items: MessageItem[] = [install, DialogResponses.learnMore];
+      input = await innerContext.ui.showWarningMessage(message, { modal: true }, ...items);
+      innerContext.telemetry.properties.dialogResult = input.title;
+
+      if (input === install) {
+        await installDotNet(innerContext);
+        installed = true;
+      } else if (input === DialogResponses.learnMore) {
+        await openUrl('https://dotnet.microsoft.com/download/dotnet/6.0');
+      }
+    }
+  });
+
+  // validate that DotNet was installed only if user confirmed
+  if (input === install && !installed) {
+    if (
+      (await context.ui.showWarningMessage(
+        localize('failedInstallDotNet', 'The .NET SDK installation failed. Please manually install instead.'),
+        DialogResponses.learnMore
+      )) === DialogResponses.learnMore
+    ) {
+      await openUrl('https://dotnet.microsoft.com/download/dotnet/6.0');
+    }
+  }
+
+  return installed;
+}
+
+/**
+ * Check is dotnet is installed.
+ * @returns {Promise<boolean>} Returns true if installed, otherwise returns false.
+ */
+export async function isDotNetInstalled(): Promise<boolean> {
+  try {
+    await executeCommand(undefined, undefined, getDotNetCommand(), '--version');
+    return true;
+  } catch (error) {
+    return false;
+  }
+}
@@ -0,0 +1,60 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import { dotnetDependencyName } from '../../../constants';
+import { localize } from '../../../localize';
+import { binariesExist, getLatestDotNetVersion } from '../../utils/binaries';
+import { getDotNetCommand, getLocalDotNetVersionFromBinaries } from '../../utils/dotnet/dotnet';
+import { getWorkspaceSetting, updateGlobalSetting } from '../../utils/vsCodeConfig/settings';
+import { installDotNet } from './installDotNet';
+import { callWithTelemetryAndErrorHandling, DialogResponses, openUrl } from '@microsoft/vscode-azext-utils';
+import type { IActionContext } from '@microsoft/vscode-azext-utils';
+import * as semver from 'semver';
+import type { MessageItem } from 'vscode';
+
+export async function validateDotNetIsLatest(majorVersion?: string): Promise<void> {
+  await callWithTelemetryAndErrorHandling('azureLogicAppsStandard.validateDotNetIsLatest', async (context: IActionContext) => {
+    context.errorHandling.suppressDisplay = true;
+    context.telemetry.properties.isActivationEvent = 'true';
+
+    const showDotNetWarningKey = 'showDotNetWarning';
+    const showDotNetWarning = !!getWorkspaceSetting<boolean>(showDotNetWarningKey);
+    const binaries = binariesExist(dotnetDependencyName);
+    context.telemetry.properties.binariesExist = `${binaries}`;
+
+    if (!binaries) {
+      await installDotNet(context, majorVersion);
+      context.telemetry.properties.binaryCommand = `${getDotNetCommand()}`;
+    } else if (showDotNetWarning) {
+      context.telemetry.properties.binaryCommand = `${getDotNetCommand()}`;
+      const localVersion: string | null = await getLocalDotNetVersionFromBinaries();
+      context.telemetry.properties.localVersion = localVersion;
+      const newestVersion: string | undefined = await getLatestDotNetVersion(context, majorVersion);
+      if (semver.major(newestVersion) === semver.major(localVersion) && semver.gt(newestVersion, localVersion)) {
+        context.telemetry.properties.outOfDateDotNet = 'true';
+        const message: string = localize(
+          'outdatedDotNetRuntime',
+          'Update your local .NET SDK version ({0}) to the latest version ({1}) for the best experience.',
+          localVersion,
+          newestVersion
+        );
+        const update: MessageItem = { title: 'Update' };
+        let result: MessageItem;
+        do {
+          result =
+            newestVersion !== undefined
+              ? await context.ui.showWarningMessage(message, update, DialogResponses.learnMore, DialogResponses.dontWarnAgain)
+              : await context.ui.showWarningMessage(message, DialogResponses.learnMore, DialogResponses.dontWarnAgain);
+          if (result === DialogResponses.learnMore) {
+            await openUrl('https://dotnet.microsoft.com/en-us/download/dotnet/6.0');
+          } else if (result === update) {
+            await installDotNet(context, majorVersion);
+          } else if (result === DialogResponses.dontWarnAgain) {
+            await updateGlobalSetting(showDotNetWarningKey, false);
+          }
+        } while (result === DialogResponses.learnMore);
+      }
+    }
+  });
+}