Merge branch 'main' into users/cdgolmar/connector-credentials

Azure · Nov 30, 2023 · 89cb06c · 89cb06c
2 parents 4293bb6 + 1698066
commit 89cb06c
Show file tree

Hide file tree

Showing 16 changed files with 52 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,13 @@
 # Logic Apps Designer
+## [2.88.0](https://github.com/Azure/LogicAppsUX/compare/v2.87.0...v2.88.0) (2023-11-30)
+
+
+### Bug Fixes
+
+* **designer:** Custom Code Workspace fix empty lib folder ([#3769](https://github.com/Azure/LogicAppsUX/issues/3769)) ([549f800](https://github.com/Azure/LogicAppsUX/commit/549f8002324b881fb9ae1d284ba4d0981dda129e))
+* **designer:** Inconsistency in IGatewayService interface ([#3774](https://github.com/Azure/LogicAppsUX/issues/3774)) ([dbcdec2](https://github.com/Azure/LogicAppsUX/commit/dbcdec28472a9857872016f1026d59fcac60c146))
+* **Designer:** Standalone - Errors command bar button now behaves as it does in portal ([#3771](https://github.com/Azure/LogicAppsUX/issues/3771)) ([83f155c](https://github.com/Azure/LogicAppsUX/commit/83f155c2f2fbd31b540de0f0a4b61c7fa36b108a))
+
 ## [2.87.0](https://github.com/Azure/LogicAppsUX/compare/v2.86.0...v2.87.0) (2023-11-29)
 
 

diff --git a/apps/vs-code-designer/src/app/commands/binaries/validateAndInstallBinaries.ts b/apps/vs-code-designer/src/app/commands/binaries/validateAndInstallBinaries.ts
@@ -76,7 +76,7 @@ export async function validateAndInstallBinaries(context: IActionContext) {
         await runWithDurationTelemetry(context, 'azureLogicAppsStandard.validateDotNetIsLatest', async () => {
           progress.report({ increment: 20, message: `.NET SDK` });
           await timeout(validateDotNetIsLatest, dependencyTimeout, dependenciesVersions?.dotnet);
-          await setDotNetCommand();
+          await setDotNetCommand(context);
         });
         ext.outputChannel.appendLog(
           localize(

diff --git a/apps/vs-code-designer/src/app/utils/dotnet/dotnet.ts b/apps/vs-code-designer/src/app/utils/dotnet/dotnet.ts
@@ -14,8 +14,9 @@ import { ext } from '../../../extensionVariables';
 import { localize } from '../../../localize';
 import { executeCommand } from '../funcCoreTools/cpUtils';
 import { runWithDurationTelemetry } from '../telemetry';
-import { getGlobalSetting, updateGlobalSetting } from '../vsCodeConfig/settings';
-import { findFiles } from '../workspace';
+import { tryGetFunctionProjectRoot } from '../verifyIsProject';
+import { getGlobalSetting, updateGlobalSetting, updateWorkspaceSetting } from '../vsCodeConfig/settings';
+import { findFiles, getWorkspaceFolder } from '../workspace';
 import type { IActionContext } from '@microsoft/vscode-azext-utils';
 import { AzExtFsExtra } from '@microsoft/vscode-azext-utils';
 import type { IWorkerRuntime } from '@microsoft/vscode-extension';
@@ -220,7 +221,7 @@ export function getDotNetCommand(): string {
   return command;
 }
 
-export async function setDotNetCommand(): Promise<void> {
+export async function setDotNetCommand(context: IActionContext): Promise<void> {
   const binariesLocation = getGlobalSetting<string>(autoRuntimeDependenciesPathSettingKey);
   const dotNetBinariesPath = path.join(binariesLocation, dotnetDependencyName);
   const binariesExist = fs.existsSync(dotNetBinariesPath);
@@ -235,31 +236,36 @@ export async function setDotNetCommand(): Promise<void> {
     fs.chmodSync(dotNetBinariesPath, 0o777);
 
     try {
-      const terminalConfig = vscode.workspace.getConfiguration();
-      const pathEnv = {
-        PATH: newPath,
-      };
+      if (vscode.workspace.workspaceFolders && vscode.workspace.workspaceFolders.length > 0) {
+        const workspaceFolder = await getWorkspaceFolder(context);
+        const projectPath = await tryGetFunctionProjectRoot(context, workspaceFolder);
 
-      // Required for dotnet cli in VSCode Terminal
-      switch (process.platform) {
-        case Platform.windows: {
-          terminalConfig.update('terminal.integrated.env.windows', pathEnv, vscode.ConfigurationTarget.Workspace);
-          break;
-        }
+        if (projectPath) {
+          const pathEnv = {
+            PATH: newPath,
+          };
 
-        case Platform.linux: {
-          terminalConfig.update('terminal.integrated.env.linux', pathEnv, vscode.ConfigurationTarget.Workspace);
-          break;
-        }
+          // Required for dotnet cli in VSCode Terminal
+          switch (process.platform) {
+            case Platform.windows: {
+              await updateWorkspaceSetting('integrated.env.windows', pathEnv, projectPath, 'terminal');
+              break;
+            }
 
-        case Platform.mac: {
-          terminalConfig.update('terminal.integrated.env.osx', pathEnv, vscode.ConfigurationTarget.Workspace);
-          break;
+            case Platform.linux: {
+              await updateWorkspaceSetting('integrated.env.linux', pathEnv, projectPath, 'terminal');
+              break;
+            }
+
+            case Platform.mac: {
+              await updateWorkspaceSetting('integrated.env.osx', pathEnv, projectPath, 'terminal');
+              break;
+            }
+          }
+          // Required for CoreClr
+          await updateWorkspaceSetting('dotNetCliPaths', [dotNetBinariesPath], projectPath, 'omnisharp');
         }
       }
-
-      // Required for CoreClr
-      terminalConfig.update('omnisharp.dotNetCliPaths', [dotNetBinariesPath], vscode.ConfigurationTarget.Workspace);
     } catch (error) {
       console.log(error);
     }

diff --git a/apps/vs-code-designer/src/package.json b/apps/vs-code-designer/src/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vscode-azurelogicapps",
   "displayName": "Azure Logic Apps (Standard)",
-  "version": "2.87.0",
+  "version": "2.88.0",
   "aiKey": "setInGitHubBuild",
   "repository": "https://github.com/Azure/LogicAppsUX",
   "main": "main.js",

diff --git a/libs/chatbot/package.json b/libs/chatbot/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/logic-apps-chatbot",
-  "version": "2.87.0",
+  "version": "2.88.0",
   "scripts": {
     "yalcpush": "yalc push ../../dist/libs/chatbot"
   },

diff --git a/libs/data-mapper/package.json b/libs/data-mapper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/logic-apps-data-mapper",
-  "version": "2.87.0",
+  "version": "2.88.0",
   "scripts": {
     "yalcpush": "yalc push ../../dist/libs/data-mapper"
   }

diff --git a/libs/designer-ui/package.json b/libs/designer-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/designer-ui",
-  "version": "2.87.0",
+  "version": "2.88.0",
   "scripts": {
     "yalcpush": "yalc push ../../dist/libs/designer-ui"
   },

diff --git a/libs/designer-ui/src/lib/panel/recommendationpanel/operationSearchCard/index.tsx b/libs/designer-ui/src/lib/panel/recommendationpanel/operationSearchCard/index.tsx
@@ -38,7 +38,7 @@ export const OperationSearchCard = (props: OperationSearchCardProps) => {
       className="msla-op-search-card-container"
       onClick={() => onCardClick()}
       style={style}
-      data-automation-id={`msla-op-search-result-${convertUIElementNameToAutomationId(title)}`}
+      data-automation-id={`msla-op-search-result-${convertUIElementNameToAutomationId(operationActionData.id)}`}
       aria-label={`${title} ${description}`}
     >
       <div className="msla-op-search-card-color-line" style={{ background: brandColor }} />

diff --git a/libs/designer/package.json b/libs/designer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/logic-apps-designer",
-  "version": "2.87.0",
+  "version": "2.88.0",
   "scripts": {
     "yalcpush": "yalc push ../../dist/libs/designer"
   },

diff --git a/libs/parsers/package.json b/libs/parsers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/parsers-logic-apps",
-  "version": "2.87.0",
+  "version": "2.88.0",
   "scripts": {
     "yalcpush": "yalc push ../../dist/libs/parsers"
   }

diff --git a/libs/services/designer-client-services/package.json b/libs/services/designer-client-services/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/designer-client-services-logic-apps",
-  "version": "2.87.0",
+  "version": "2.88.0",
   "scripts": {
     "yalcpush": "yalc push ../../../dist/libs/services/designer-client-services"
   }

diff --git a/libs/services/designer-client-services/src/lib/gateway.ts b/libs/services/designer-client-services/src/lib/gateway.ts
@@ -16,7 +16,7 @@ export interface IGatewayService {
   /**
    * Gets configuration values for GatewayService.
    */
-  getConfig?(): Promise<GatewayServiceConfig>;
+  getConfig?(): GatewayServiceConfig;
 }
 
 export interface GatewayServiceConfig {

diff --git a/libs/services/intl/package.json b/libs/services/intl/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/intl-logic-apps",
-  "version": "2.87.0",
+  "version": "2.88.0",
   "scripts": {
     "yalcpush": "yalc push ../../../dist/libs/services/intl"
   }

diff --git a/libs/utils/package.json b/libs/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/utils-logic-apps",
-  "version": "2.87.0",
+  "version": "2.88.0",
   "scripts": {
     "yalcpush": "yalc push ../../dist/libs/utils"
   }

diff --git a/libs/vscode-extension/package.json b/libs/vscode-extension/package.json
@@ -1,4 +1,4 @@
 {
   "name": "@microsoft/vscode-extension-logic-apps",
-  "version": "2.87.0"
+  "version": "2.88.0"
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/logicappsux",
-  "version": "2.87.0",
+  "version": "2.88.0",
   "license": "MIT",
   "scripts": {
     "start": "nx serve",