Merge remote-tracking branch 'upstream/main' into southworks/update/r…

…emove-ms-rest
microsoft · Aug 18, 2023 · 8d08ee6 · 8d08ee6
2 parents 1304bcb + 59e5d96
commit 8d08ee6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/generators/generator-botbuilder/generators/app/templates/echo/package.json.js b/generators/generator-botbuilder/generators/app/templates/echo/package.json.js
@@ -18,7 +18,7 @@
     "dependencies": {
         "botbuilder": "~4.15.0",
         "dotenv": "~8.2.0",
-        "restify": "~10.0.0"
+        "restify": "~11.1.0"
     },
     "devDependencies": {
         "eslint": "^7.0.0",

diff --git a/libraries/adaptive-expressions/src/parser/expressionParser.ts b/libraries/adaptive-expressions/src/parser/expressionParser.ts
@@ -27,7 +27,7 @@ export class ExpressionParser implements ExpressionParserInterface {
      */
     readonly EvaluatorLookup: EvaluatorLookup;
 
-    private static expressionDict: Map<string, ParseTree> = new Map<string, ParseTree>();
+    private static expressionDict: WeakMap<any, ParseTree> = new WeakMap<any, ParseTree>();
 
     private readonly ExpressionTransformer = class
         extends AbstractParseTreeVisitor<Expression>
@@ -279,8 +279,8 @@ export class ExpressionParser implements ExpressionParserInterface {
      * @returns A ParseTree.
      */
     protected static antlrParse(expression: string): ParseTree {
-        if (ExpressionParser.expressionDict.has(expression)) {
-            return ExpressionParser.expressionDict.get(expression);
+        if (ExpressionParser.expressionDict.has({ key: expression })) {
+            return ExpressionParser.expressionDict.get({ key: expression });
         }
 
         const inputStream: ANTLRInputStream = new ANTLRInputStream(expression);
@@ -297,7 +297,7 @@ export class ExpressionParser implements ExpressionParserInterface {
         if (file !== undefined) {
             expressionContext = file.expression();
         }
-        ExpressionParser.expressionDict.set(expression, expressionContext);
+        ExpressionParser.expressionDict.set({ key: expression }, expressionContext);
 
         return expressionContext;
     }

diff --git a/libraries/botbuilder-dialogs-adaptive/src/languageGeneratorExtensions.ts b/libraries/botbuilder-dialogs-adaptive/src/languageGeneratorExtensions.ts
@@ -36,7 +36,7 @@ export const languagePolicyKey = Symbol('LanguagePolicy');
  * Extension methods for language generator.
  */
 export class LanguageGeneratorExtensions {
-    private static readonly _languageGeneratorManagers = new Map<ResourceExplorer, LanguageGeneratorManager>();
+    private static readonly _languageGeneratorManagers = new WeakMap<ResourceExplorer, LanguageGeneratorManager>();
 
     /**
      * Register default LG file or a language generator as default language generator.

diff --git a/tools/resourceManagement/lib/resource/resourceManagementClient.js b/tools/resourceManagement/lib/resource/resourceManagementClient.js
@@ -92,7 +92,6 @@ class ResourceManagementClient extends ServiceClient {
     });
   };
 
-
   addUserAgentInfo(additionalUserAgentInfo) {
     if (this.userAgentInfo.value.indexOf(additionalUserAgentInfo) === -1) {
       this.userAgentInfo.value.push(additionalUserAgentInfo);
@@ -140,7 +139,6 @@ class ResourceManagementClient extends ServiceClient {
 
     return packageJsonInfo;
   }
-
 }
 
 module.exports = ResourceManagementClient;