Merge branch 'main' into releases/4.22

# Conflicts:
#	libraries/botbuilder-core/package.json
#	libraries/botbuilder/package.json
#	libraries/botframework-connector/package.json
#	yarn.lock

Author: Tracy Boehrer

generators/generator-botbuilder/generators/app/templates/core/bots/dialogAndWelcomeBot.js

@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
 const { CardFactory } = require('botbuilder-core');
 const { DialogBot } = require('./dialogBot');
 const WelcomeCard = require('../resources/welcomeCard.json');

generators/generator-botbuilder/generators/app/templates/core/bots/dialogAndWelcomeBot.ts

@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
 import { BotState, CardFactory } from 'botbuilder';
 import { Dialog, DialogState } from 'botbuilder-dialogs';
 import { MainDialog } from '../dialogs/mainDialog';

generators/generator-botbuilder/generators/app/templates/core/bots/dialogBot.js

@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
 const { ActivityHandler } = require('botbuilder');
 
 class DialogBot extends ActivityHandler {

generators/generator-botbuilder/generators/app/templates/core/bots/dialogBot.ts

@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
 import { ActivityHandler, BotState, ConversationState, StatePropertyAccessor, UserState } from 'botbuilder';
 import { Dialog, DialogState } from 'botbuilder-dialogs';
 import { MainDialog } from '../dialogs/mainDialog';

generators/generator-botbuilder/generators/app/templates/core/index.js

@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
 // index.js is used to setup and configure your bot
 
 // Import required packages

generators/generator-botbuilder/generators/app/templates/core/index.ts

@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
 import { config } from 'dotenv';
 import * as path from 'path';
 

generators/generator-botbuilder/generators/app/templates/core/package-with-tests.json.js

@@ -17,10 +17,10 @@
     },
     "dependencies": {
         "@microsoft/recognizers-text-data-types-timex-expression": "1.1.4",
-        "botbuilder": "~4.20.0",
-        "botbuilder-ai": "~4.20.0",
-        "botbuilder-dialogs": "~4.20.0",
-        "botbuilder-testing": "~4.20.0",
+        "botbuilder": "~4.22.1",
+        "botbuilder-ai": "~4.22.1",
+        "botbuilder-dialogs": "~4.22.1",
+        "botbuilder-testing": "~4.22.1",
         "dotenv": "^8.2.0",
         "restify": "^11.1.0"
     },

generators/generator-botbuilder/generators/app/templates/core/package-with-tests.json.ts

@@ -38,10 +38,10 @@
     },
     "dependencies": {
       "@microsoft/recognizers-text-data-types-timex-expression": "1.1.4",
-      "botbuilder": "~4.20.0",
-      "botbuilder-ai": "~4.20.0",
-      "botbuilder-dialogs": "~4.20.0",
-      "botbuilder-testing": "~4.20.0",
+      "botbuilder": "~4.22.1",
+      "botbuilder-ai": "~4.22.1",
+      "botbuilder-dialogs": "~4.22.1",
+      "botbuilder-testing": "~4.22.1",
       "dotenv": "^8.2.0",
       "replace": "~1.2.0",
       "restify": "~11.1.0"

generators/generator-botbuilder/generators/app/templates/core/package.json.js

@@ -17,9 +17,9 @@
     },
     "dependencies": {
         "@microsoft/recognizers-text-data-types-timex-expression": "1.1.4",
-        "botbuilder": "~4.20.0",
-        "botbuilder-ai": "~4.20.0",
-        "botbuilder-dialogs": "~4.20.0",
+        "botbuilder": "~4.22.1,
+        "botbuilder-ai": "~4.22.1",
+        "botbuilder-dialogs": "~4.22.1",
         "dotenv": "~8.2.0",
         "restify": "~11.1.0"
     },

generators/generator-botbuilder/generators/app/templates/core/package.json.ts

@@ -19,9 +19,9 @@
     },
     "dependencies": {
         "@microsoft/recognizers-text-data-types-timex-expression": "1.1.4",
-        "botbuilder": "~4.20.0",
-        "botbuilder-ai": "~4.20.0",
-        "botbuilder-dialogs": "~4.20.0",
+        "botbuilder": "~4.22.1",
+        "botbuilder-ai": "~4.22.1",
+        "botbuilder-dialogs": "~4.22.1",
         "dotenv": "~8.2.0",
         "replace": "~1.2.0",
         "restify": "~11.1.0"

generators/generator-botbuilder/generators/app/templates/core/tests/bots/dialogAndWelcomeBot.test.js

@@ -1,8 +1,3 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License.
- */
-
 /* eslint-env node, mocha */
 const { TestAdapter, ActivityTypes, TurnContext, ConversationState, MemoryStorage, UserState } = require('botbuilder');
 const { DialogSet, DialogTurnStatus, Dialog } = require('botbuilder-dialogs');

generators/generator-botbuilder/generators/app/templates/core/tests/bots/dialogAndWelcomeBot.test.ts

@@ -1,7 +1,3 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License.
- */
 import { ActivityTypes, ConversationState, MemoryStorage, TestAdapter, TurnContext, UserState } from 'botbuilder';
 import { Dialog, DialogSet, DialogTurnStatus } from 'botbuilder-dialogs';
 import { DialogAndWelcomeBot } from '../../bots/dialogAndWelcomeBot';

generators/generator-botbuilder/generators/app/templates/echo/bot.js

@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
 const { ActivityHandler, MessageFactory } = require('botbuilder');
 
 class EchoBot extends ActivityHandler {

generators/generator-botbuilder/generators/app/templates/echo/bot.ts

@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
 import { ActivityHandler, MessageFactory } from 'botbuilder';
 
 export class EchoBot extends ActivityHandler {

generators/generator-botbuilder/generators/app/templates/echo/index.js

@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
 const path = require('path');
 
 const dotenv = require('dotenv');

generators/generator-botbuilder/generators/app/templates/echo/index.ts

@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
 import * as path from 'path';
 
 import { config } from 'dotenv';

generators/generator-botbuilder/generators/app/templates/echo/package.json.js

@@ -16,7 +16,7 @@
         "url": "https://github.com"
     },
     "dependencies": {
-        "botbuilder": "~4.20.0",
+        "botbuilder": "~4.22.1",
         "dotenv": "~8.2.0",
         "restify": "~11.1.0"
     },

generators/generator-botbuilder/generators/app/templates/echo/package.json.ts

@@ -18,7 +18,7 @@
         "url": "https://github.com"
     },
     "dependencies": {
-        "botbuilder": "~4.20.0",
+        "botbuilder": "~4.22.1",
         "dotenv": "~8.2.0",
         "replace": "~1.2.0",
         "restify": "~11.1.0"

generators/generator-botbuilder/generators/app/templates/empty/bot.js

@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
 const { ActivityHandler } = require('botbuilder');
 
 class EmptyBot extends ActivityHandler {

generators/generator-botbuilder/generators/app/templates/empty/bot.ts

@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
 import { ActivityHandler } from 'botbuilder';
 
 export class EmptyBot extends ActivityHandler {

generators/generator-botbuilder/generators/app/templates/empty/index.js

@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
 const restify = require('restify');
 
 // Import required bot services.

generators/generator-botbuilder/generators/app/templates/empty/index.ts

@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
 import * as restify from 'restify';
 
 // Import required bot services.

generators/generator-botbuilder/generators/app/templates/empty/package.json.js

@@ -16,7 +16,7 @@
         "url": "https://github.com"
     },
     "dependencies": {
-        "botbuilder": "~4.20.0",
+        "botbuilder": "~4.22.1",
         "restify": "~11.1.0"
     },
     "devDependencies": {

generators/generator-botbuilder/generators/app/templates/empty/package.json.ts

@@ -18,7 +18,7 @@
         "url": "https://github.com"
     },
     "dependencies": {
-        "botbuilder": "~4.20.0",
+        "botbuilder": "~4.22.1",
         "replace": "~1.2.0",
         "restify": "~11.1.0"
     },

libraries/botbuilder-ai-orchestrator/package.json

@@ -47,7 +47,8 @@
     "lint": "eslint . --ext .js,.ts",
     "postbuild": "downlevel-dts lib _ts3.4/lib --checksum",
     "test": "yarn build && nyc mocha tests/",
-    "test:compat": "api-extractor run --verbose"
+    "test:compat": "api-extractor run --verbose",
+    "postinstall": "npx rimraf node_modules/@microsoft/orchestrator-core/node_modules/@babel/traverse"
   },
   "files": [
     "_ts3.4",

libraries/botbuilder-ai/etc/botbuilder-ai.api.md

@@ -23,12 +23,12 @@ import { DialogTurnResult } from 'botbuilder-dialogs';
 import { EnumExpression } from 'adaptive-expressions';
 import { Expression } from 'adaptive-expressions';
 import { IntExpression } from 'adaptive-expressions';
-import * as msRest from '@azure/ms-rest-js';
 import { NumberExpression } from 'adaptive-expressions';
 import { ObjectExpression } from 'adaptive-expressions';
 import { Recognizer } from 'botbuilder-dialogs';
 import { RecognizerConfiguration } from 'botbuilder-dialogs';
 import { RecognizerResult } from 'botbuilder-core';
+import { RequestOptionsBase } from '@azure/core-http';
 import { ServiceCollection } from 'botbuilder-dialogs-adaptive-runtime-core';
 import { StringExpression } from 'adaptive-expressions';
 import { TemplateInterface } from 'botbuilder-dialogs';
@@ -290,7 +290,7 @@ export class LuisComponentRegistration extends ComponentRegistration {
 }
 
 // @public
-export interface LuisPredictionOptions extends msRest.RequestOptionsBase {
+export interface LuisPredictionOptions extends RequestOptionsBase {
     bingSpellCheckSubscriptionKey?: string;
     includeAllIntents?: boolean;
     includeInstanceData?: boolean;

libraries/botbuilder-ai/package.json

@@ -27,20 +27,20 @@
     }
   },
   "dependencies": {
-    "@azure/cognitiveservices-luis-runtime": "^4.0.0",
-    "@azure/ms-rest-js": "^2.7.0",
+    "@azure/core-http": "^3.0.2",
     "adaptive-expressions": "4.1.6",
     "botbuilder-core": "4.1.6",
     "botbuilder-dialogs": "4.1.6",
     "botbuilder-dialogs-adaptive-runtime-core": "4.1.6",
     "botbuilder-dialogs-declarative": "4.1.6",
+    "botframework-connector": "4.1.6",
     "lodash": "^4.17.21",
     "node-fetch": "^2.6.7",
     "url-parse": "^1.5.9",
     "zod": "^3.22.4"
   },
   "resolutions": {
-    "follow-redirects": "1.14.7"
+    "follow-redirects": "^1.14.8"
   },
   "devDependencies": {
     "@types/node-fetch": "^2.5.7",

libraries/botbuilder-ai/src/luisRecognizer.ts

@@ -5,7 +5,7 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-import * as msRest from '@azure/ms-rest-js';
+import { RequestOptionsBase } from '@azure/core-http';
 
 import Url from 'url-parse';
 import { BotTelemetryClient, NullTelemetryClient, RecognizerResult, TurnContext } from 'botbuilder-core';
@@ -41,7 +41,7 @@ export interface LuisApplication {
  *
  * Options per LUIS prediction.
  */
-export interface LuisPredictionOptions extends msRest.RequestOptionsBase {
+export interface LuisPredictionOptions extends RequestOptionsBase {
     /**
      * If true, return all intents instead of just the top scoring intent.
      */

libraries/botbuilder-ai/src/luisRecognizerOptionsV2.ts

@@ -6,7 +6,7 @@
  * Licensed under the MIT License.
  */
 
-import * as msRest from '@azure/ms-rest-js';
+import { TokenCredentials } from 'botframework-connector';
 import * as os from 'os';
 import { LuisApplication, LuisRecognizerOptionsV2 } from './luisRecognizer';
 import { CompositeChildModel, CompositeEntityModel, EntityModel, LuisResult } from './luisV2-models/luisResult';
@@ -50,7 +50,7 @@ export class LuisRecognizerV2 extends LuisRecognizerInternal {
         // - We have to cast "creds as any" to avoid a build break relating to different versions
         //   of autorest being used by our various components.  This is just a build issue and
         //   shouldn't effect production bots.
-        const creds = new msRest.TokenCredentials(application.endpointKey);
+        const creds = new TokenCredentials(application.endpointKey);
         const baseUri = application.endpoint || 'https://westus.api.cognitive.microsoft.com';
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         this.luisClient = new LuisClient(creds as any, baseUri);

libraries/botbuilder-ai/src/luisRuntimeClientContext.ts

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ */
+
+import { ServiceClient, ServiceClientCredentials, ServiceClientOptions } from '@azure/core-http';
+
+/**
+ * Client for LUIS context
+ */
+export class LUISRuntimeClientContext extends ServiceClient {
+    endpoint: string;
+    credentials: ServiceClientCredentials;
+
+    /**
+     * Initializes a new instance of the LUISRuntimeClientContext class.
+     *
+     * @param credentials Subscription credentials which uniquely identify client subscription.
+     * @param endpoint Supported Cognitive Services endpoints (protocol and hostname, for example:
+     * https://westus.api.cognitive.microsoft.com).
+     * @param [options] The parameter options
+     */
+    constructor(credentials: ServiceClientCredentials, endpoint: string, options?: ServiceClientOptions) {
+        if (endpoint == undefined) {
+            throw new Error("'endpoint' cannot be null.");
+        }
+        if (credentials == undefined) {
+            throw new Error("'credentials' cannot be null.");
+        }
+
+        if (!options) {
+            options = {};
+        }
+
+        super(credentials, options);
+
+        this.baseUri = '{Endpoint}/luis/v3.0-preview';
+        this.requestContentType = 'application/json; charset=utf-8';
+        this.endpoint = endpoint;
+        this.credentials = credentials;
+    }
+}