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"