port: JS Teams Tests

.eslintrc.json

@@ -8,6 +8,7 @@
   "plugins": ["prettier"],
   "rules": {
     "prettier/prettier": "error"
-  }
+  },
+  "root": true
 }
 

.gitignore

@@ -384,6 +384,9 @@ experimental/generator-dotnet-yeoman/node_modules
 # Allow the root-level /packages/ directory or it gets confused with NuGet directories
 !/[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/component-template.yml

@@ -31,7 +31,6 @@ stages:
       - job: build_test_dotnet
         displayName: Build and test .csproj with dotnet
         steps:
-        - template: dotnet-install-sdk-steps.yml
         - template: dotnet-build-test-steps.yml
 
   - stage: stage_package_nuget
@@ -44,7 +43,6 @@ stages:
         condition: eq(variables.ComponentType, 'codeExtension')
         steps:
         - template: nuget-versioning-steps.yml
-        - template: dotnet-install-sdk-steps.yml
         - template: dotnet-package-steps.yml
         - template: nuget-signing-steps.yml
       - job: job_pack_nuspec

build/yaml/templates/dotnet-build-test-steps.yml

@@ -1,4 +1,14 @@
 steps:
+- task: UseDotNet@2
+  displayName: 'Use .Net Core sdk 2.1.x'
+  inputs:
+    version: 2.1.x
+
+- task: UseDotNet@2
+  displayName: 'Use .Net Core sdk 3.1.x'
+  inputs:
+    version: 3.1.x
+
 - task: DotNetCoreCLI@2
   displayName: 'Run `dotnet restore`'
   inputs:

build/yaml/templates/dotnet-package-steps.yml

@@ -1,4 +1,9 @@
 steps:  
+- task: UseDotNet@2
+  displayName: 'Use .Net Core sdk 2.1.x'
+  inputs:
+    version: 2.1.x
+
 - task: DotNetCoreCLI@2
   displayName: 'Run `dotnet publish`'
   inputs:

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

@@ -13,7 +13,7 @@ steps:
       $deploymentRing = $deploymentRingOverride;
     }
 
-    if ($deploymentRing.ToLowerInvariant() -eq "rc") {
+    if (($deploymentRing.ToLowerInvariant() -eq "rc") -or ($deploymentRing.ToLowerInvariant() -eq "preview")) {
       $releaseCandidateNumber = "$env:RELEASECANDIDATENUMBER";
       "Release Candidate Number = $releaseCandidateNumber";
 

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

@@ -2,11 +2,6 @@
 # Extra steps are required to sign the binaries of the code extensions.
 
 steps:
-- task: UseDotNet@2
-  displayName: 'Use .Net Core sdk 2.1.x'
-  inputs:
-    version: 2.1.x
-
 - task: CopyFiles@2
   displayName: 'Copy packages to Signing'
   inputs:

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

@@ -13,7 +13,7 @@ steps:
       $deploymentRing = $deploymentRingOverride;
     }
 
-    if ($deploymentRing.ToLowerInvariant() -eq "rc") {
+    if (($deploymentRing.ToLowerInvariant() -eq "rc") -or ($deploymentRing.ToLowerInvariant() -eq "preview")) {
       $releaseCandidateNumber = "$env:RELEASECANDIDATENUMBER";
       "Release Candidate Number = $releaseCandidateNumber";
 

generators/generator-bot-adaptive/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/generator-bot-adaptive",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "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

@@ -3,12 +3,12 @@
 
 const dotnet = {
   name: 'dotnet',
-  defaultSdkVersion: '4.13.2',
+  defaultSdkVersion: '4.14.0',
 };
 
 const js = {
   name: 'js',
-  defaultSdkVersion: '4.13.4-preview',
+  defaultSdkVersion: '4.14.0-preview.rc1',
 };
 
 module.exports = { dotnet, js };

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

@@ -125,7 +125,7 @@ describe(`generator-bot-adaptive --platform ${platform} --integration ${integrat
       {
         botName,
         packageReferences: '',
-        sdkVersion: '4.13.2',
+        sdkVersion: '4.14.0',
       }
     );
 

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

@@ -106,7 +106,7 @@ describe(`generator-bot-adaptive --platform ${platform} --integration ${integrat
       {
         botName,
         packageReferences: '',
-        sdkVersion: '4.13.2',
+        sdkVersion: '4.14.0',
       }
     );
 

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.13.4-preview',
-        'botbuilder-ai-qna': '4.13.4-preview',
+        'botbuilder-ai-luis': '4.14.0-preview.rc1',
+        'botbuilder-ai-qna': '4.14.0-preview.rc1',
         'botbuilder-dialogs-adaptive-runtime-integration-azure-functions':
-          '4.13.4-preview',
+          '4.14.0-preview.rc1',
       },
     };
 

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.13.4-preview',
-        'botbuilder-ai-qna': '4.13.4-preview',
+        'botbuilder-ai-luis': '4.14.0-preview.rc1',
+        'botbuilder-ai-qna': '4.14.0-preview.rc1',
         'botbuilder-dialogs-adaptive-runtime-integration-express':
-          '4.13.4-preview',
+          '4.14.0-preview.rc1',
       },
     };
 

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

@@ -12,11 +12,11 @@ const packageReferences = {
   [platforms.dotnet.name]: [
     {
       name: 'Microsoft.Bot.Components.HelpAndCancel',
-      version: '1.0.0',
+      version: '1.1.0-preview.0',
     },
   ],
   [platforms.js.name]: [
-    { name: '@microsoft/bot-components-helpandcancel', version: 'latest' },
+    { name: '@microsoft/bot-components-helpandcancel', version: 'next' },
   ],
 };
 

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

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/generator-bot-core-assistant",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "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.0.0",
+    "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.0",
     "yeoman-generator": "^2.0.5",
     "yeoman-test": "^1.9.1"
   },

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

@@ -12,16 +12,16 @@ const packageReferences = {
   [platforms.dotnet.name]: [
     {
       name: 'Microsoft.Bot.Components.HelpAndCancel',
-      version: '1.0.0',
+      version: '1.1.0-preview.0',
     },
     {
       name: 'Microsoft.Bot.Components.Welcome',
-      version: '1.0.0',
+      version: '1.1.0-preview.0',
     },
   ],
   [platforms.js.name]: [
-    { name: '@microsoft/bot-components-helpandcancel', version: 'latest' },
-    { name: '@microsoft/bot-components-welcome', version: 'latest' },
+    { name: '@microsoft/bot-components-helpandcancel', version: 'next' },
+    { name: '@microsoft/bot-components-welcome', version: 'next' },
   ],
 };
 

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

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/generator-bot-core-language",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "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.0.0",
+    "@microsoft/generator-bot-adaptive": "workspace:^1.1.0",
     "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.0.0",
+  "version": "1.1.0",
   "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.0.0",
+    "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.0",
     "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.0.0",
+  "version": "1.1.0",
   "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.0.0",
+    "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.0",
     "yeoman-generator": "^2.0.5",
     "yeoman-test": "^1.9.1"
   },

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

@@ -36,7 +36,7 @@ module.exports = class extends BaseGenerator {
           {
             isPlugin: true,
             name: 'Microsoft.Bot.Builder.AI.Orchestrator',
-            version: '4.13.2',
+            version: '4.14.0',
           },
         ],
         modifyApplicationSettings: (appSettings) => {

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

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/generator-bot-enterprise-assistant",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "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.0.0",
-    "@microsoft/generator-bot-enterprise-calendar": "workspace:^1.0.0",
-    "@microsoft/generator-bot-enterprise-people": "workspace:^1.0.0",
+    "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.0",
+    "@microsoft/generator-bot-enterprise-calendar": "workspace:^1.1.0-preview.0",
+    "@microsoft/generator-bot-enterprise-people": "workspace:^1.1.0-preview.0",
     "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.0.0',
+            version: '1.1.0-preview.0',
           },
         ],
         modifyApplicationSettings: (appSettings) => {

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

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/generator-bot-enterprise-calendar",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "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.0.0",
+    "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.0",
     "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.0.0',
+            version: '1.1.0-preview.0',
           },
         ],
         modifyApplicationSettings: (appSettings) => {

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

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/generator-bot-enterprise-people",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "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.0.0",
+    "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.0",
     "yeoman-generator": "^2.0.5",
     "yeoman-test": "^1.9.1"
   },

package.json

@@ -6,7 +6,8 @@
     "packages/*",
     "packages/*/js",
     "skills/declarative/*",
-    "testing/*"
+    "tests/**/js",
+    "!tests/functional"
   ],
   "scripts": {
     "lint": "yarn workspaces foreach run lint"

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.0.0</VersionPrefix>
+    <VersionPrefix>1.1.0</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>
@@ -20,7 +20,7 @@
 
   <ItemGroup>
     <PackageReference Include="AdaptiveCards.Templating" Version="1.2.1" />
-    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime" Version="4.13.2" />
+    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime" Version="4.14.0" />
   </ItemGroup>
 
   <ItemGroup>