chore: Merge 4.14.1 JS SDK to main

.gitignore

@@ -388,6 +388,9 @@ experimental/generator-dotnet-yeoman/node_modules
 # Allow the packages directory under tests
 !/tests/unit/[Pp]ackages/*
 
+# Allow the packages directory under tests
+!/tests/unit/[Pp]ackages/*
+
 # Ignore correct yarn files (no zero install support)
 .yarn/*
 !.yarn/patches

build/yaml/templates/nuget-versioning-steps.yml

@@ -9,8 +9,17 @@ steps:
       $componentType = "$env:COMPONENTTYPE";
       "Component Type = $componentType";
 
-      if ($deploymentRingOverride) {
-        $deploymentRing = $deploymentRingOverride;
+    if ($deploymentRingOverride) {
+      $deploymentRing = $deploymentRingOverride;
+    }
+
+    if (($deploymentRing.ToLowerInvariant() -eq "rc") -or ($deploymentRing.ToLowerInvariant() -eq "preview")) {
+      $releaseCandidateNumber = "$env:RELEASECANDIDATENUMBER";
+      "Release Candidate Number = $releaseCandidateNumber";
+
+      if (-not $releaseCandidateNumber) {
+        Write-Host "Release Candidate Number not defined"
+        exit 1
       }
 
       if (($deploymentRing.ToLowerInvariant() -eq "rc") -or ($deploymentRing.ToLowerInvariant() -eq "preview")) {

generators/generator-bot-adaptive/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/generator-bot-adaptive",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Yeoman generator for creating a base bot built on the Azure Bot Framework and the Adaptive stack.",
   "keywords": [
     "microsoft",

generators/generator-bot-adaptive/platforms.js

@@ -8,7 +8,7 @@ const dotnet = {
 
 const js = {
   name: 'js',
-  defaultSdkVersion: '4.14.0-preview',
+  defaultSdkVersion: '4.14.1-preview',
 };
 
 module.exports = { dotnet, js };

generators/generator-bot-adaptive/test/js-functions.test.js

@@ -107,10 +107,10 @@ describe(`generator-bot-adaptive --platform ${platform} --integration ${integrat
       },
       dependencies: {
         'cross-env': 'latest',
-        'botbuilder-ai-luis': '4.14.0-preview',
-        'botbuilder-ai-qna': '4.14.0-preview',
+        'botbuilder-ai-luis': '4.14.1-preview',
+        'botbuilder-ai-qna': '4.14.1-preview',
         'botbuilder-dialogs-adaptive-runtime-integration-azure-functions':
-          '4.14.0-preview',
+          '4.14.1-preview',
       },
     };
 

generators/generator-bot-adaptive/test/js-webapp.test.js

@@ -86,10 +86,10 @@ describe(`generator-bot-adaptive --platform ${platform} --integration ${integrat
       },
       dependencies: {
         'cross-env': 'latest',
-        'botbuilder-ai-luis': '4.14.0-preview',
-        'botbuilder-ai-qna': '4.14.0-preview',
+        'botbuilder-ai-luis': '4.14.1-preview',
+        'botbuilder-ai-qna': '4.14.1-preview',
         'botbuilder-dialogs-adaptive-runtime-integration-express':
-          '4.14.0-preview',
+          '4.14.1-preview',
       },
     };
 

generators/generator-bot-core-assistant/generators/app/index.js

@@ -12,7 +12,7 @@ const packageReferences = {
   [platforms.dotnet.name]: [
     {
       name: 'Microsoft.Bot.Components.HelpAndCancel',
-      version: '1.1.1',
+      version: '1.1.2',
     },
   ],
   [platforms.js.name]: [

generators/generator-bot-core-assistant/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/generator-bot-core-assistant",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Yeoman generator for creating an assistant-style bot with NLP built on the Azure Bot Framework.",
   "keywords": [
     "microsoft",
@@ -24,7 +24,7 @@
     "lint": "eslint -c ../../.eslintrc.json ."
   },
   "dependencies": {
-    "@microsoft/generator-bot-adaptive": "workspace:^1.1.1",
+    "@microsoft/generator-bot-adaptive": "workspace:^1.1.2",
     "yeoman-generator": "^2.0.5",
     "yeoman-test": "^1.9.1"
   },

generators/generator-bot-core-language/generators/app/index.js

@@ -12,11 +12,11 @@ const packageReferences = {
   [platforms.dotnet.name]: [
     {
       name: 'Microsoft.Bot.Components.HelpAndCancel',
-      version: '1.1.1',
+      version: '1.1.2',
     },
     {
       name: 'Microsoft.Bot.Components.Welcome',
-      version: '1.1.1',
+      version: '1.1.2',
     },
   ],
   [platforms.js.name]: [

generators/generator-bot-core-language/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/generator-bot-core-language",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Yeoman generator for creating a simple conversational bot with NLP built on the Azure Bot Framework.",
   "keywords": [
     "microsoft",
@@ -26,7 +26,7 @@
     "lint": "eslint -c ../../.eslintrc.json ."
   },
   "dependencies": {
-    "@microsoft/generator-bot-adaptive": "workspace:^1.1.1",
+    "@microsoft/generator-bot-adaptive": "workspace:^1.1.2",
     "yeoman-generator": "^2.0.5",
     "yeoman-test": "^1.9.1"
   },

generators/generator-bot-core-qna/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/generator-bot-core-qna",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Yeoman generator for creating a bot and connecting to a QnA Maker knowledge base.",
   "keywords": [
     "microsoft",
@@ -23,7 +23,7 @@
     "lint": "eslint -c ../../.eslintrc.json ."
   },
   "dependencies": {
-    "@microsoft/generator-bot-adaptive": "workspace:^1.1.1",
+    "@microsoft/generator-bot-adaptive": "workspace:^1.1.2",
     "yeoman-generator": "^2.0.5",
     "yeoman-test": "^1.9.1"
   },

generators/generator-bot-empty/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/generator-bot-empty",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Yeoman generator for creating an empty bot built on the Azure Bot Framework.",
   "keywords": [
     "microsoft",
@@ -26,7 +26,7 @@
     "lint": "eslint -c ../../.eslintrc.json ."
   },
   "dependencies": {
-    "@microsoft/generator-bot-adaptive": "workspace:^1.1.1",
+    "@microsoft/generator-bot-adaptive": "workspace:^1.1.2",
     "yeoman-generator": "^2.0.5",
     "yeoman-test": "^1.9.1"
   },

generators/generator-bot-enterprise-assistant/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/generator-bot-enterprise-assistant",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Yeoman generator for creating an enterprise assistant, with a root bot and two skills built on the Azure Bot Framework.",
   "keywords": [
     "microsoft",
@@ -25,9 +25,9 @@
     "lint": "eslint -c ../../.eslintrc.json ."
   },
   "dependencies": {
-    "@microsoft/generator-bot-adaptive": "workspace:^1.1.1",
-    "@microsoft/generator-bot-enterprise-calendar": "workspace:^1.1.1",
-    "@microsoft/generator-bot-enterprise-people": "workspace:^1.1.1",
+    "@microsoft/generator-bot-adaptive": "workspace:^1.1.2",
+    "@microsoft/generator-bot-enterprise-calendar": "workspace:^1.1.2",
+    "@microsoft/generator-bot-enterprise-people": "workspace:^1.1.2",
     "uuid": "^8.3.2",
     "yeoman-generator": "^2.0.5",
     "yeoman-test": "^1.9.1"

generators/generator-bot-enterprise-calendar/generators/app/index.js

@@ -16,7 +16,7 @@ module.exports = class extends BaseGenerator {
           {
             isPlugin: true,
             name: 'Microsoft.Bot.Components.Graph',
-            version: '1.1.1',
+            version: '1.1.2',
           },
         ],
         modifyApplicationSettings: (appSettings) => {

generators/generator-bot-enterprise-calendar/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/generator-bot-enterprise-calendar",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Yeoman generator for creating an Adaptive bot built on the Azure Bot Framework using the Calendar template.",
   "keywords": [
     "microsoft",
@@ -24,7 +24,7 @@
     "lint": "eslint ."
   },
   "dependencies": {
-    "@microsoft/generator-bot-adaptive": "workspace:^1.1.1",
+    "@microsoft/generator-bot-adaptive": "workspace:^1.1.2",
     "yeoman-generator": "^2.0.5",
     "yeoman-test": "^1.9.1"
   },

generators/generator-bot-enterprise-people/generators/app/index.js

@@ -16,7 +16,7 @@ module.exports = class extends BaseGenerator {
           {
             isPlugin: true,
             name: 'Microsoft.Bot.Components.Graph',
-            version: '1.1.1',
+            version: '1.1.2',
           },
         ],
         modifyApplicationSettings: (appSettings) => {

generators/generator-bot-enterprise-people/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/generator-bot-enterprise-people",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Yeoman generator for creating an Adaptive bot built on the Azure Bot Framework using the People template.",
   "keywords": [
     "microsoft",
@@ -24,7 +24,7 @@
     "lint": "eslint -c ../../.eslintrc.json ."
   },
   "dependencies": {
-    "@microsoft/generator-bot-adaptive": "workspace:^1.1.1",
+    "@microsoft/generator-bot-adaptive": "workspace:^1.1.2",
     "yeoman-generator": "^2.0.5",
     "yeoman-test": "^1.9.1"
   },

packages/AdaptiveCards/Microsoft.Bot.Components.AdaptiveCards.csproj

@@ -8,7 +8,7 @@
   <PropertyGroup>
     <PackageId>Microsoft.Bot.Components.AdaptiveCards</PackageId>
     <PackageProjectUrl>https://github.com/microsoft/botframework-components/tree/main/packages/AdaptiveCards</PackageProjectUrl>
-    <VersionPrefix>1.1.1</VersionPrefix>
+    <VersionPrefix>1.1.2</VersionPrefix>
     <Description>Composer triggers and actions for working with Adaptive Cards.</Description>
     <Summary>Composer triggers and actions for working with Adaptive Cards.</Summary>
     <SignAssembly>true</SignAssembly>

packages/Directory.Build.props

@@ -18,6 +18,7 @@
     <RepositoryType />
     <NeutralLanguage>en-US</NeutralLanguage>
     <RepositoryUrl>https://github.com/Microsoft/botframework-components</RepositoryUrl>
+    <NoWarn>$(NoWarn);NU5048</NoWarn>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>

packages/Graph/Microsoft.Bot.Components.Graph.csproj

@@ -7,7 +7,7 @@
 
   <PropertyGroup>
     <PackageId>Microsoft.Bot.Components.Graph</PackageId>
-    <VersionPrefix>1.1.1</VersionPrefix>
+    <VersionPrefix>1.1.2</VersionPrefix>
     <Description>Custom actions for the MS Graph API for Bot Framework bots.</Description>
     <Summary>A set of custom actions for working with the Microsoft Graph API from Bot Framework Composer.</Summary>
     <PackageProjectUrl>https://github.com/Microsoft/botframework-components/tree/main/packages/Graph</PackageProjectUrl>

packages/HelpAndCancel/Microsoft.Bot.Components.HelpAndCancel.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Microsoft.Bot.Components.HelpAndCancel</id>
-        <version>1.1.1</version>
+        <version>1.1.2</version>
         <authors>Microsoft</authors>
         <owners>Microsoft</owners>
         <copyright>© Microsoft Corporation. All rights reserved.</copyright>

packages/HelpAndCancel/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/bot-components-helpandcancel",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Contains Adaptive Dialog assets to support Help and Cancel conversational flows in a bot built on the Azure Bot Framework.",
   "keywords": [
     "microsoft",

packages/Teams/dotnet/Microsoft.Bot.Components.Teams.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <PackageId>Microsoft.Bot.Components.Teams</PackageId>
-    <VersionPrefix>1.1.1</VersionPrefix>
+    <VersionPrefix>1.1.2</VersionPrefix>
     <Description>This library implements .NET support for adaptive dialogs with Microsoft Teams</Description>
     <Summary>This library implements .NET support for adaptive dialogs with Microsoft Teams</Summary>
     <PackageProjectUrl>https://github.com/Microsoft/botframework-components/tree/main/packages/Teams/dotnet</PackageProjectUrl>

packages/Teams/js/package.json

@@ -2,7 +2,7 @@
   "name": "@microsoft/bot-components-teams",
   "author": "Microsoft Corp.",
   "description": "Rule system for the Microsoft BotBuilder adaptive dialog system, with integration specific to Microsoft Teams.",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "license": "MIT",
   "keywords": [
     "msbot-component",
@@ -29,29 +29,29 @@
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "peerDependencies": {
-    "adaptive-expressions": "~4.14.0",
-    "botbuilder": "~4.14.0",
-    "botbuilder-dialogs": "~4.14.0",
-    "botbuilder-dialogs-adaptive": "~4.14.0-preview",
-    "botbuilder-dialogs-adaptive-runtime-core": "~4.14.0-preview",
-    "botbuilder-dialogs-declarative": "~4.14.0-preview",
-    "botbuilder-stdlib": "~4.14.0-internal",
-    "botframework-connector": "~4.14.0",
+    "adaptive-expressions": "~4.14.1",
+    "botbuilder": "~4.14.1",
+    "botbuilder-dialogs": "~4.14.1",
+    "botbuilder-dialogs-adaptive": "~4.14.1-preview",
+    "botbuilder-dialogs-adaptive-runtime-core": "~4.14.1-preview",
+    "botbuilder-dialogs-declarative": "~4.14.1-preview",
+    "botbuilder-stdlib": "~4.14.1-internal",
+    "botframework-connector": "~4.14.1",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
     "@tsconfig/recommended": "^1.0.1",
     "@types/lodash": "^4.14.168",
     "@typescript-eslint/eslint-plugin": "^4.28.2",
     "@typescript-eslint/parser": "^4.28.2",
-    "adaptive-expressions": "4.14.0",
-    "botbuilder": "4.14.0",
-    "botbuilder-dialogs": "4.14.0",
-    "botbuilder-dialogs-adaptive": "4.14.0-preview",
-    "botbuilder-dialogs-adaptive-runtime-core": "4.14.0-preview",
-    "botbuilder-dialogs-declarative": "4.14.0-preview",
-    "botbuilder-stdlib": "4.14.0-internal",
-    "botframework-connector": "4.14.0",
+    "adaptive-expressions": "4.14.1",
+    "botbuilder": "4.14.1",
+    "botbuilder-dialogs": "4.14.1",
+    "botbuilder-dialogs-adaptive": "4.14.1-preview",
+    "botbuilder-dialogs-adaptive-runtime-core": "4.14.1-preview",
+    "botbuilder-dialogs-declarative": "4.14.1-preview",
+    "botbuilder-stdlib": "4.14.1-internal",
+    "botframework-connector": "4.14.1",
     "eslint": "^7.30.0",
     "eslint-plugin-prettier": "latest",
     "lodash": "^4.17.21",

packages/Welcome/Microsoft.Bot.Components.Welcome.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Microsoft.Bot.Components.Welcome</id>
-        <version>1.1.1</version>
+        <version>1.1.2</version>
         <authors>Microsoft</authors>
         <owners>Microsoft</owners>
         <copyright>© Microsoft Corporation. All rights reserved.</copyright>

packages/Welcome/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/bot-components-welcome",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "An Adaptive Dialog for greeting new and returning users on first interaction with your bot built on the Azure Bot Framework.",
   "keywords": [
     "microsoft",

tests/unit/packages/Teams/js/package.json

@@ -9,10 +9,10 @@
   "dependencies": {
     "@microsoft/bot-components-teams": "workspace:packages/Teams/js",
     "@types/mocha": "^8.2.2",
-    "botbuilder": "4.14.0",
-    "botbuilder-dialogs-adaptive": "4.14.0-preview",
-    "botbuilder-dialogs-adaptive-testing": "4.14.0-preview",
-    "botframework-connector": "4.14.0",
+    "botbuilder": "4.14.1",
+    "botbuilder-dialogs-adaptive": "4.14.1-preview",
+    "botbuilder-dialogs-adaptive-testing": "4.14.1-preview",
+    "botframework-connector": "4.14.1",
     "mocha": "^9.0.2",
     "nock": "^13.1.1",
     "ts-node": "^10.0.0"