[#591] Update dotnet bots to target net 6 - Add .NETCore3.1 bots to the pipelines (#595)

* Update bots to include echoSkill 3.1 * Add NetCore 3.1 bots to pipelines * Fix merging issues * Update .NET 3.1 to 6.0 docs * Fix "command 'gcc' failed: No such file or director" problem Co-authored-by: sw-joelmut <joel.mut@southworks.com>
2022-08-31 12:18:15 -03:00 · 2022-08-31 12:18:15 -03:00 · ebe4875692
--- a/Bots/DotNet/ComposerHostBotDotNet/settings/appsettings.json
+++ b/Bots/DotNet/ComposerHostBotDotNet/settings/appsettings.json
@ -5,6 +5,10 @@
      "endpointUrl": "http://localhost:35400/api/messages",
      "msAppId": "00000000-0000-0000-0000-000000000000"
    },
+    "echoSkillBotDotNet31": {
+      "endpointUrl": "http://localhost:35405/api/messages",
+      "msAppId": "00000000-0000-0000-0000-000000000000"
+    },
    "echoSkillBotDotNetV3": {
      "endpointUrl": "http://localhost:35407/api/messages",
      "msAppId": "00000000-0000-0000-0000-000000000000"
--- a/Bots/DotNet/SimpleHostBot/appsettings.json
+++ b/Bots/DotNet/SimpleHostBot/appsettings.json
@ -16,6 +16,11 @@
      "AppId": "",
      "SkillEndpoint": "http://localhost:35400/api/messages"
    },
+    {
+      "Id": "EchoSkillBotDotNet31",
+      "AppId": "",
+      "SkillEndpoint": "http://localhost:35405/api/messages"
+    },
    {
      "Id": "EchoSkillBotDotNetV3",
      "AppId": "",
--- a/Bots/DotNet/SimpleHostBotComposer/dialogs/CallEchoSkill/CallEchoSkill.dialog
+++ b/Bots/DotNet/SimpleHostBotComposer/dialogs/CallEchoSkill/CallEchoSkill.dialog
@ -62,6 +62,7 @@
          "choices": [
            "EchoSkillBotComposerDotNet",
            "EchoSkillBotDotNet",
+            "EchoSkillBotDotNet31",
            "EchoSkillBotDotNetV3",
            "EchoSkillBotJS",
            "EchoSkillBotJSV3",
@ -128,6 +129,25 @@
                }
              ]
            },
+            {
+              "value": "EchoSkillBotDotNet31",
+              "actions": [
+                {
+                  "$kind": "Microsoft.BeginSkill",
+                  "$designer": {
+                    "id": "ZqK525"
+                  },
+                  "activityProcessed": true,
+                  "botId": "=settings.MicrosoftAppId",
+                  "skillHostEndpoint": "=settings.skillHostEndpoint",
+                  "connectionName": "=settings.connectionName",
+                  "allowInterruptions": true,
+                  "skillEndpoint": "=settings.skill['echoSkillBotDotNet31'].endpointUrl",
+                  "skillAppId": "=settings.skill['echoSkillBotDotNet31'].msAppId",
+                  "activity": "${BeginSkill_Activity_ZqK525()}"
+                }
+              ]
+            },
            {
              "value": "EchoSkillBotDotNetV3",
              "actions": [
--- a/Bots/DotNet/SimpleHostBotComposer/dialogs/CallEchoSkill/language-generation/en-us/CallEchoSkill.en-us.lg
+++ b/Bots/DotNet/SimpleHostBotComposer/dialogs/CallEchoSkill/language-generation/en-us/CallEchoSkill.en-us.lg
@ -54,3 +54,11 @@
 [Activity
    Text = ${dialog.firstUtterance}
 ]
+
+# BeginSkill_Activity_ZqK525()
+[Activity
+    Text = ${BeginSkill_Activity_ZqK525_text()}
+]
+
+# BeginSkill_Activity_ZqK525_text()
+- ${dialog.firstUtterance}
--- a/Bots/DotNet/SimpleHostBotComposer/settings/appsettings.json
+++ b/Bots/DotNet/SimpleHostBotComposer/settings/appsettings.json
@ -85,6 +85,10 @@
      "endpointUrl": "http://localhost:35400/api/messages",
      "msAppId": "00000000-0000-0000-0000-000000000000"
    },
+    "echoSkillBotDotNet31": {
+      "endpointUrl": "http://localhost:35405/api/messages",
+      "msAppId": "00000000-0000-0000-0000-000000000000"
+    },
    "echoSkillBotDotNetV3": {
      "endpointUrl": "http://localhost:35407/api/messages",
      "msAppId": "00000000-0000-0000-0000-000000000000"
--- a/Bots/DotNet/WaterfallHostBot/appsettings.json
+++ b/Bots/DotNet/WaterfallHostBot/appsettings.json
@ -22,6 +22,12 @@
      "AppId": "",
      "SkillEndpoint": "http://localhost:35400/api/messages"
    },
+    {
+      "Id": "EchoSkillBotDotNet31",
+      "Group": "Echo",
+      "AppId": "",
+      "SkillEndpoint": "http://localhost:35405/api/messages"
+    },
    {
      "Id": "EchoSkillBotDotNetV3",
      "Group": "Echo",
--- a/Bots/Python/Dockerfile
+++ b/Bots/Python/Dockerfile
@ -10,6 +10,9 @@ ENV VIRTUAL_ENV=/app/venv
 RUN python3 -m venv $VIRTUAL_ENV
 ENV PATH="$VIRTUAL_ENV/bin:$PATH"

+RUN apt update
+RUN apt install gcc -y
+
 # Update pip
 RUN python -m pip install --upgrade pip

--- a/Docs/availableBotsList.md
+++ b/Docs/availableBotsList.md
@ -6,11 +6,13 @@ These are the bots currently available. This list will be expanded in the future
  - Consumers
    - BffnSimpleComposerHostBotDotNet
    - BffnSimpleHostBotDotNet
+    - BffnSimpleHostBotDotNet31
    - BffnWaterfallHostBotDotNet
    - BffnComposerHostBotDotNet
  - Skills
    - BffnEchoComposerSkillBotDotNet
    - BffnEchoSkillBotDotNet
+    - BffnEchoSkillBotDotNet31
    - BffnEchoSkillBotDotNetV3
    - BffnWaterfallSkillBotDotNet
    - BffnComposerSkillBotDotNet
--- a/Docs/media/CreateAppRegistrations.ps1
+++ b/Docs/media/CreateAppRegistrations.ps1
@ -2,7 +2,7 @@ Write-Host "You will be prompted to login into your Azure account to create App
 az login

 $defaultPrefix = "generic-app-registration"
-$defaultAmount = 18
+$defaultAmount = 20
 $appRegistrations = @()
 do {
    $prefix = Read-Host -Prompt "App Registrations prefix ('$defaultPrefix' by default)"
--- a/Tests/Functional/Skills/Common/HostBot.cs
+++ b/Tests/Functional/Skills/Common/HostBot.cs
@ -21,12 +21,17 @@ namespace Microsoft.Bot.Builder.Tests.Functional.Skills.Common
        SimpleHostBotDotNet,

        /// <summary>
-        /// Simple UserAssignedMSI host implemented using DotNet 3.1.
+        /// Simple host implemented using dotnet 3.1.
+        /// </summary>
+        SimpleHostBotDotNet31,
+
+        /// <summary>
+        /// Simple UserAssignedMSI host implemented using DotNet 6.0.
        /// </summary>
        SimpleHostBotDotNetMSI,

        /// <summary>
-        /// Simple SingleTenant host implemented using DotNet 3.1.
+        /// Simple SingleTenant host implemented using DotNet 6.0.
        /// </summary>
        SimpleHostBotDotNetST,

--- a/Tests/Functional/Skills/Common/SkillBot.cs
+++ b/Tests/Functional/Skills/Common/SkillBot.cs
@ -11,22 +11,27 @@ namespace Microsoft.Bot.Builder.Tests.Functional.Skills.Common
        EchoSkillBotComposerDotNet,

        /// <summary>
-        /// Echo MultiTenant skill implemented using DotNet 3.1.
+        /// Echo MultiTenant skill implemented using DotNet 6.0.
        /// </summary>
        EchoSkillBotDotNet,

        /// <summary>
-        /// Echo UserAssignedMSI skill implemented using DotNet 3.1.
+        /// Echo MultiTenant skill implemented using dotnet 3.1.
+        /// </summary>
+        EchoSkillBotDotNet31,
+
+        /// <summary>
+        /// Echo UserAssignedMSI skill implemented using DotNet 6.0.
        /// </summary>
        EchoSkillBotDotNetMSI,

        /// <summary>
-        /// Echo SingleTenant skill implemented using DotNet 3.1.
+        /// Echo SingleTenant skill implemented using DotNet 6.0.
        /// </summary>
        EchoSkillBotDotNetST,

        /// <summary>
-        /// Echo MultiTenant v3 skill implemented using DotNet 3.1.
+        /// Echo MultiTenant v3 skill implemented using DotNet 6.0.
        /// </summary>
        EchoSkillBotDotNetV3,

@ -56,7 +61,7 @@ namespace Microsoft.Bot.Builder.Tests.Functional.Skills.Common
        EchoSkillBotPython,

        /// <summary>
-        /// Waterfall MultiTenant skill implemented using DotNet 3.1.
+        /// Waterfall MultiTenant skill implemented using DotNet 6.0.
        /// </summary>
        WaterfallSkillBotDotNet,

--- a/Tests/Functional/Skills/Common/SkillsTestBase.cs
+++ b/Tests/Functional/Skills/Common/SkillsTestBase.cs
@ -26,6 +26,7 @@ namespace Microsoft.Bot.Builder.Tests.Functional.Skills.Common
        {
            HostBot.SimpleHostBotComposerDotNet,
            HostBot.SimpleHostBotDotNet,
+            HostBot.SimpleHostBotDotNet31,
            HostBot.SimpleHostBotJS,
            HostBot.SimpleHostBotPython,
        };
@ -54,6 +55,7 @@ namespace Microsoft.Bot.Builder.Tests.Functional.Skills.Common
        {
            SkillBot.EchoSkillBotComposerDotNet,
            SkillBot.EchoSkillBotDotNet,
+            SkillBot.EchoSkillBotDotNet31,
            SkillBot.EchoSkillBotDotNetV3,
            SkillBot.EchoSkillBotJS,
            SkillBot.EchoSkillBotJSV3,
--- a/Tests/Functional/appsettings.json
+++ b/Tests/Functional/appsettings.json
@ -22,6 +22,10 @@
      "BotId": "bffnsimplehostbotdotnet",
      "DirectLineSecret": ""
    },
+    "SimpleHostBotDotNet31": {
+      "BotId": "bffnsimplehostbotdotnet31",
+      "DirectLineSecret": ""
+    },
    "SimpleHostBotDotNetMSI": {
      "BotId": "bffnsimplehostbotdotnetmsi",
      "DirectLineSecret": ""
--- a/build/scripts/ConfigureConsumers.ps1
+++ b/build/scripts/ConfigureConsumers.ps1
@ -15,6 +15,8 @@ param (
  [Parameter(Mandatory = $false)]
  [string]$EchoSkillBotDotNetAppId,
  [Parameter(Mandatory = $false)]
+  [string]$EchoSkillBotDotNet31AppId,
+  [Parameter(Mandatory = $false)]
  [string]$EchoSkillBotDotNetSTAppId,
  [Parameter(Mandatory = $false)]
  [string]$EchoSkillBotDotNetV3AppId,
@ -407,6 +409,12 @@ $consumers = @(
    resourceGroup = $groups.DotNet
    configType    = $types.Appsettings
  }
+  @{
+    key           = "SimpleHostBotDotNet31"
+    botName       = "bffnsimplehostbotdotnet31"
+    resourceGroup = $groups.DotNet
+    configType    = $types.Appsettings
+  }
  @{
    key           = "SimpleHostBotDotNetMSI"
    botName       = "bffnsimplehostbotdotnetmsi"
@ -485,6 +493,15 @@ $skills = @(
    resourceGroup = $groups.DotNet
    group         = "Echo"
  }
+  @{
+    appType       = $appTypes.MultiTenant
+    key           = "EchoSkillBotDotNet31"
+    keyComposer   = "echoSkillBotDotNet31" 
+    botName       = "bffnechoskillbotdotnet31"
+    appId         = $EchoSkillBotDotNet31AppId
+    resourceGroup = $groups.DotNet
+    group         = "Echo"
+  }
  @{
    appType       = $appTypes.UserAssignedMSI
    key           = "EchoSkillBotDotNetMSI"
@ -610,12 +627,14 @@ $configurations = @(
    consumers = @(
      "SimpleHostBotComposerDotNet",
      "SimpleHostBotDotNet",
+      "SimpleHostBotDotNet31",
      "SimpleHostBotJS",
      "SimpleHostBotPython"
    );
    skills    = @(
      "EchoSkillBotComposerDotNet",
      "EchoSkillBotDotNet",
+      "EchoSkillBotDotNet31",
      "EchoSkillBotDotNetV3",
      "EchoSkillBotJS",
      "EchoSkillBotJSV3",
--- a/build/yaml/deployBotResources/deployBotResources.yml
+++ b/build/yaml/deployBotResources/deployBotResources.yml
@ -142,6 +142,8 @@ variables:
  # BffnEchoSkillBotComposerDotNetAppSecret: (optional) App Secret for BffnEchoSkillBotComposerDotNet bot.
  # BffnEchoSkillBotDotNetAppId: (optional) App Id for BffnEchoSkillBotDotNet bot.
  # BffnEchoSkillBotDotNetAppSecret: (optional) App Secret for BffnEchoSkillBotDotNet bot.
+  # BffnEchoSkillBotDotNet31AppId: (optional) App Id for BffnEchoSkillBotDotNet31 bot.
+  # BffnEchoSkillBotDotNet31AppSecret: (optional) App Secret for BffnEchoSkillBotDotNet31 bot.
  # BffnEchoSkillBotDotNetSTAppId: (optional) App Id for BffnEchoSkillBotDotNetST bot.
  # BffnEchoSkillBotDotNetSTAppSecret: (optional) App Secret for BffnEchoSkillBotDotNetST bot.
  # BffnEchoSkillBotDotNetV3AppId: (optional) App Id for BffnEchoSkillBotDotNetV3 bot.
@ -158,6 +160,8 @@ variables:
  # BffnSimpleHostBotComposerDotNetAppSecret: (optional) App Secret for BffnSimpleHostBotComposerDotNet bot.
  # BffnSimpleHostBotDotNetAppId: (optional) App Id for BffnSimpleHostBotDotNet bot.
  # BffnSimpleHostBotDotNetAppSecret: (optional) App Secret for BffnSimpleHostBotDotNet bot.
+  # BffnSimpleHostBotDotNet31AppId: (optional) App Id for BffnSimpleHostBotDotNet31 bot.
+  # BffnSimpleHostBotDotNet31AppSecret: (optional) App Secret for BffnSimpleHostBotDotNet31 bot.
  # BffnSimpleHostBotDotNetSTAppId: (optional) App Id for BffnSimpleHostBotDotNetST bot.
  # BffnSimpleHostBotDotNetSTAppSecret: (optional) App Secret for BffnSimpleHostBotDotNetST bot.
  # BffnSimpleHostBotJSAppId: (optional) App Id for BffnSimpleHostBotJS bot.
@ -252,6 +256,21 @@ stages:
            registry: ${{ parameters.dependenciesRegistryDotNetHosts }}
            version: ${{ parameters.dependenciesVersionDotNetHosts }}

+        - name: "bffnsimplehostbotdotnet31"
+          dependsOn: "Prepare_DotNetGroup"
+          type: "Host"
+          displayName: "DotNet Simple Host Bot 3.1"
+          appId: $(BFFNSIMPLEHOSTBOTDOTNET31APPID)
+          appSecret: $(BFFNSIMPLEHOSTBOTDOTNET31APPSECRET)
+          appType: "MultiTenant"
+          project:
+            directory: 'Bots/DotNet/SimpleHostBot-3.1'
+            name: "Microsoft.Bot.Builder.FunctionalTestsBots.SimpleHostBot31.csproj"
+            netCoreVersion: "3.1.x"
+          dependency:
+            registry: ${{ parameters.dependenciesRegistryDotNetHosts }}
+            version: ${{ parameters.dependenciesVersionDotNetHosts }}
+
        - name: "bffnechoskillbotdotnet"
          dependsOn: "Prepare_DotNetGroup"
          type: "Skill"
@ -267,6 +286,21 @@ stages:
            registry: ${{ parameters.dependenciesRegistryDotNetSkills }}
            version: ${{ parameters.dependenciesVersionDotNetSkills }}

+        - name: "bffnechoskillbotdotnet31"
+          dependsOn: "Prepare_DotNetGroup"
+          type: "Skill"
+          displayName: "DotNet Echo Skill Bot 3.1"
+          appId: $(BFFNECHOSKILLBOTDOTNET31APPID)
+          appSecret: $(BFFNECHOSKILLBOTDOTNET31APPSECRET)
+          appType: "MultiTenant"
+          project: 
+            directory: 'Bots/DotNet/EchoSkillBot-3.1'
+            name: "Microsoft.Bot.Builder.FunctionalTestsBots.EchoSkillBot31.csproj"
+            netCoreVersion: "3.1.x"
+          dependency:
+            registry: ${{ parameters.dependenciesRegistryDotNetSkills }}
+            version: ${{ parameters.dependenciesVersionDotNetSkills }}
+
        # DotNet V3 bots
        - name: "bffnechoskillbotdotnetv3"
          dependsOn: "Prepare_DotNetGroup"
@ -283,7 +317,7 @@ stages:
            version: ${{ parameters.dependenciesVersionDotNetSkillsV3 }}

        - name: "bffnwaterfallhostbotdotnet"
-          dependsOn: "Prepare_DotNetGroup"
+          dependsOn: "Deploy_bffnsimplehostbotdotnet"
          type: "Host"
          displayName: "DotNet Waterfall Host Bot"
          appId: $(BFFNWATERFALLHOSTBOTDOTNETAPPID)
@ -298,7 +332,7 @@ stages:
            version: ${{ parameters.dependenciesVersionDotNetHosts }}

        - name: "bffnwaterfallskillbotdotnet"
-          dependsOn: "Prepare_DotNetGroup"
+          dependsOn: "Deploy_bffnsimplehostbotdotnet31"
          type: "Skill"
          displayName: "DotNet Waterfall Skill Bot"
          appId: $(BFFNWATERFALLSKILLBOTDOTNETAPPID)
@ -314,7 +348,7 @@ stages:

        # DotNet Composer bots
        - name: "bffnsimplehostbotcomposerdotnet"
-          dependsOn: "Deploy_bffnsimplehostbotdotnet"
+          dependsOn: "Deploy_bffnechoskillbotdotnet"
          type: "ComposerHost"
          displayName: "DotNet Simple Composer Host Bot"
          appId: $(BFFNSIMPLEHOSTBOTCOMPOSERDOTNETAPPID)
@ -329,7 +363,7 @@ stages:
            version: ${{ parameters.dependenciesVersionDotNetHosts }}

        - name: "bffnechoskillbotcomposerdotnet"
-          dependsOn: "Deploy_bffnechoskillbotdotnet"
+          dependsOn: "Deploy_bffnechoskillbotdotnet31"
          type: "ComposerSkill"
          displayName: "DotNet Echo Composer Skill Bot"
          appId: $(BFFNECHOSKILLBOTCOMPOSERDOTNETAPPID)
@ -384,7 +418,7 @@ stages:
          project:
            directory: 'Bots/DotNet/SimpleHostBot'
            name: "Microsoft.Bot.Builder.FunctionalTestsBots.SimpleHostBot.csproj"
-            netCoreVersion: "3.1.x"
+            netCoreVersion: "6.0.x"
          dependency:
            registry: ${{ parameters.dependenciesRegistryDotNetHosts }}
            version: ${{ parameters.dependenciesVersionDotNetHosts }}
@ -399,7 +433,7 @@ stages:
          project: 
            directory: 'Bots/DotNet/EchoSkillBot'
            name: "Microsoft.Bot.Builder.FunctionalTestsBots.EchoSkillBot.csproj"
-            netCoreVersion: "3.1.x"
+            netCoreVersion: "6.0.x"
          dependency:
            registry: ${{ parameters.dependenciesRegistryDotNetSkills }}
            version: ${{ parameters.dependenciesVersionDotNetSkills }}
@ -413,7 +447,7 @@ stages:
          project:
            directory: 'Bots/DotNet/SimpleHostBot'
            name: "Microsoft.Bot.Builder.FunctionalTestsBots.SimpleHostBot.csproj"
-            netCoreVersion: "3.1.x"
+            netCoreVersion: "6.0.x"
          dependency:
            registry: ${{ parameters.dependenciesRegistryDotNetHosts }}
            version: ${{ parameters.dependenciesVersionDotNetHosts }}
@ -426,7 +460,7 @@ stages:
          project: 
            directory: 'Bots/DotNet/EchoSkillBot'
            name: "Microsoft.Bot.Builder.FunctionalTestsBots.EchoSkillBot.csproj"
-            netCoreVersion: "3.1.x"
+            netCoreVersion: "6.0.x"
          dependency:
            registry: ${{ parameters.dependenciesRegistryDotNetSkills }}
            version: ${{ parameters.dependenciesVersionDotNetSkills }}
--- a/build/yaml/dotnetBotsBuild-CI.yml
+++ b/build/yaml/dotnetBotsBuild-CI.yml
@ -17,6 +17,11 @@ steps:
  inputs:
    version: 6.0.x

+- task: UseDotNet@2
+  displayName: "Use .Net Core sdk 3.1.x"
+  inputs:
+    version: 3.1.x
+
 - task: NuGetToolInstaller@1
  displayName: "Use NuGet"

--- a/build/yaml/sharedResources/createAppRegistrations.yml
+++ b/build/yaml/sharedResources/createAppRegistrations.yml
@ -101,7 +101,9 @@ steps:

        $bots = @(
          @{ appName = "bffnsimplehostbotdotnet"; variables = @{ appId = "BffnSimpleHostBotDotNetAppId"; appSecret = "BffnSimpleHostBotDotNetAppSecret"; objectId = "BffnSimpleHostBotDotNetAppObjectId" }},
+          @{ appName = "bffnsimplehostbotdotnet31"; variables = @{ appId = "BffnSimpleHostBotDotNet31AppId"; appSecret = "BffnSimpleHostBotDotNet31AppSecret"; objectId = "BffnSimpleHostBotDotNet31AppObjectId" }},
          @{ appName = "bffnechoskillbotdotnet"; variables = @{ appId = "BffnEchoSkillBotDotNetAppId"; appSecret = "BffnEchoSkillBotDotNetAppSecret"; objectId = "BffnEchoSkillBotDotNetAppObjectId" }},
+          @{ appName = "bffnechoskillbotdotnet31"; variables = @{ appId = "BffnEchoSkillBotDotNet31AppId"; appSecret = "BffnEchoSkillBotDotNet31AppSecret"; objectId = "BffnEchoSkillBotDotNet31AppObjectId" }},
          @{ appName = "bffnechoskillbotdotnetv3"; variables = @{ appId = "BffnEchoSkillBotDotNetV3AppId"; appSecret = "BffnEchoSkillBotDotNetV3AppSecret"; objectId = "BffnEchoSkillBotDotNetV3AppObjectId" }},
          @{ appName = "bffnsimplehostbotcomposerdotnet"; variables = @{ appId = "BffnSimpleHostBotComposerDotNetAppId"; appSecret = "BffnSimpleHostBotComposerDotNetAppSecret"; objectId = "BffnSimpleHostBotComposerDotNetAppObjectId" }},
          @{ appName = "bffnechoskillbotcomposerdotnet"; variables = @{ appId = "BffnEchoSkillBotComposerDotNetAppId"; appSecret = "BffnEchoSkillBotComposerDotNetAppSecret"; objectId = "BffnEchoSkillBotComposerDotNetAppObjectId" }},
--- a/build/yaml/testScenarios/configureConsumers.yml
+++ b/build/yaml/testScenarios/configureConsumers.yml
@ -6,6 +6,7 @@ parameters:
    ComposerSkillBotDotNet: ""
    EchoSkillBotComposerDotNet: ""
    EchoSkillBotDotNet: ""
+    EchoSkillBotDotNet31: ""
    EchoSkillBotDotNetST: ""
    EchoSkillBotDotNetV3: ""
    EchoSkillBotJS: ""
@ -58,6 +59,7 @@ steps:
        -ComposerSkillBotDotNetAppId "${{ parameters.appIds.ComposerSkillBotDotNet }}"
        -EchoSkillBotComposerDotNetAppId "${{ parameters.appIds.EchoSkillBotComposerDotNet }}"
        -EchoSkillBotDotNetAppId "${{ parameters.appIds.EchoSkillBotDotNet }}"
+        -EchoSkillBotDotNet31AppId "${{ parameters.appIds.EchoSkillBotDotNet31 }}"
        -EchoSkillBotDotNetSTAppId "${{ parameters.appIds.EchoSkillBotDotNetST }}"
        -EchoSkillBotDotNetV3AppId "${{ parameters.appIds.EchoSkillBotDotNetV3 }}"
        -EchoSkillBotJSAppId "${{ parameters.appIds.EchoSkillBotJS }}"
--- a/build/yaml/testScenarios/functional.yml
+++ b/build/yaml/testScenarios/functional.yml
@ -6,6 +6,7 @@ parameters:
      ComposerSkillBotDotNet: ""
      EchoSkillBotComposerDotNet: ""
      EchoSkillBotDotNet: ""
+      EchoSkillBotDotNet31: ""
      EchoSkillBotDotNetST: ""
      EchoSkillBotDotNetV3: ""
      EchoSkillBotJS: ""
--- a/build/yaml/testScenarios/runTestScenarios.yml
+++ b/build/yaml/testScenarios/runTestScenarios.yml
@ -43,6 +43,7 @@ variables:
  # BffnComposerSkillBotDotNetAppId: (optional) App Id for BffnComposerSkillBotDotNet bot.
  # BffnEchoSkillBotComposerDotNetAppId: (optional) App Id for BffnEchoSkillBotComposerDotNet bot.
  # BffnEchoSkillBotDotNetAppId: (optional) App Id for BffnEchoSkillBotDotNet bot.
+  # BffnEchoSkillBotDotNet31AppId: (optional) App Id for BffnEchoSkillBotDotNet31 bot.
  # BffnEchoSkillBotDotNetSTAppId: (optional) App Id for BffnEchoSkillBotDotNetST bot.
  # BffnEchoSkillBotDotNetV3AppId: (optional) App Id for BffnEchoSkillBotDotNetV3 bot.
  # BffnEchoSkillBotJSAppId: (optional) App Id for BffnEchoSkillBotJS bot.
@ -74,6 +75,7 @@ stages:
        ComposerSkillBotDotNet: "$(BFFNCOMPOSERSKILLBOTDOTNETAPPID)"
        EchoSkillBotComposerDotNet: "$(BFFNECHOSKILLBOTCOMPOSERDOTNETAPPID)"
        EchoSkillBotDotNet: "$(BFFNECHOSKILLBOTDOTNETAPPID)"
+        EchoSkillBotDotNet31: "$(BFFNECHOSKILLBOTDOTNET31APPID)"
        EchoSkillBotDotNetST: "$(BFFNECHOSKILLBOTDOTNETSTAPPID)"
        EchoSkillBotDotNetV3: "$(BFFNECHOSKILLBOTDOTNETV3APPID)"
        EchoSkillBotJS: "$(BFFNECHOSKILLBOTJSAPPID)"