chore: Merge latest main into feature/telephony

.eslintrc.json

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

.gitignore

@@ -385,6 +385,9 @@ experimental/generator-dotnet-yeoman/node_modules
 !/[Pp]ackages/*
 !/tests/[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

@@ -33,7 +33,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
@@ -46,7 +45,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/command-line-instructions.md

@@ -1,6 +1,6 @@
 # Command line instructions
 
-Our templates can also be used from the command-line. First, install [Yeoman][yeoman] using [npm][npm] (we assume you have pre-installed [node.js][nodejs]):
+Our templates can also be used from the command-line. First, install [Yeoman](https://yeoman.io) using [npm](https://npmjs.com) (we assume you have pre-installed [node.js](https://nodejs.org/)):
 
 ```bash
 npm install -g yo
@@ -17,13 +17,13 @@ Next, identify the template you would like to use from the table below:
 | [Enterprise People Bot](/generator-bot-enterprise-people) | [@microsoft/generator-bot-enterprise-people](https://www.npmjs.com/package/@microsoft/generator-bot-enterprise-people) | [![npm version](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-enterprise-people.svg)](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-enterprise-people) | dotnet | webapp, functions |
 | [Adaptive](/generator-bot-adaptive) | [@microsoft/generator-bot-adaptive](https://www.npmjs.com/package/@microsoft/generator-bot-adaptive) | [![npm version](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-adaptive.svg)](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-adaptive) | dotnet, js | webapp, functions |
 
-Once you have identified the template you would like to use, install it using [npm][npm]. For example, to install the Empty Bot template:
+Once you have identified the template you would like to use, install it using [npm](https://npmjs.com). For example, to install the Empty Bot template:
 
 ```bash
 npm install -g @microsoft/generator-bot-empty
 ```
 
-Finally, generate your new project using [Yeoman][yeoman], taking note of the following:
+Finally, generate your new project using [Yeoman](https://yeoman.io), taking note of the following:
 
 - Remove `generator` from the package name, e.g. `@microsoft/generator-bot-empty` becomes `@microsoft/bot-empty`.
 - `--platform` and `--integration` match one of the listed values from template's platforms and integrations.
@@ -33,7 +33,3 @@ Finally, generate your new project using [Yeoman][yeoman], taking note of the fo
 ```bash
 yo @microsoft/bot-empty '{BOT_NAME}' --platform '{dotnet|js}' --integration '{webapp|functions}'
 ```
-
-[yeoman]: https://yeoman.io
-[npm]: https://npmjs.com
-[nodejs]: https://nodejs.org/

generators/generator-bot-adaptive/README.md

@@ -1,4 +1,4 @@
-# @microsoft/generator-bot-adaptive [![NPM version][npm-image]][npm-url]
+# @microsoft/generator-bot-adaptive [![NPM version](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-adaptive.svg)](https://www.npmjs.com/package/@microsoft/generator-bot-adaptive)
 
 This generator is for creating an Azure Bot Framework bot using the Adaptive Dialog stack. This generator is designed to be used as a base for other more purpose-specific generators, and is responsible for scaffolding:
 
@@ -28,6 +28,3 @@ This template can also be installed from the [command line](https://github.com/m
 ## License
 
 [MIT License](https://github.com/microsoft/botframework-components/blob/main/LICENSE)
-
-[npm-image]: https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-adaptive.svg
-[npm-url]: https://www.npmjs.com/package/@microsoft/generator-bot-adaptive