[#495] Part 2 - Remove DotNet 2.1 from bots' references, pipelines and functional tests (#510)

* Remove DotNet 2.1 references from other bots * Remove DotNet 2.1 from pipelines * Remove DotNet 2.1 from functional tests Co-authored-by: Gabo Gilabert <gabog@users.noreply.github.com>
2021-12-09 11:19:36 -03:00 · 2021-12-09 11:19:36 -03:00 · f53af1eae6
--- a/Bots/DotNet/Consumers/CodeFirst/SimpleHostBot/appsettings.json
+++ b/Bots/DotNet/Consumers/CodeFirst/SimpleHostBot/appsettings.json
@ -14,11 +14,6 @@
      "AppId": "",
      "SkillEndpoint": "http://localhost:35400/api/messages"
    },
-    {
-      "Id": "EchoSkillBotDotNet21",
-      "AppId": "",
-      "SkillEndpoint": "http://localhost:35405/api/messages"
-    },
    {
      "Id": "EchoSkillBotDotNetV3",
      "AppId": "",
--- a/Bots/DotNet/Consumers/CodeFirst/WaterfallHostBot/appsettings.json
+++ b/Bots/DotNet/Consumers/CodeFirst/WaterfallHostBot/appsettings.json
@ -20,12 +20,6 @@
      "AppId": "",
      "SkillEndpoint": "http://localhost:35400/api/messages"
    },
-    {
-      "Id": "EchoSkillBotDotNet21",
-      "Group": "Echo",
-      "AppId": "",
-      "SkillEndpoint": "http://localhost:35405/api/messages"
-    },
    {
      "Id": "EchoSkillBotDotNetV3",
      "Group": "Echo",
--- a/Bots/DotNet/Consumers/Composer/SimpleHostBotComposer/SimpleHostBotComposer.botproj
+++ b/Bots/DotNet/Consumers/Composer/SimpleHostBotComposer/SimpleHostBotComposer.botproj
@ -12,11 +12,6 @@
      "remote": true,
      "endpointName": "default"
    },
-    "echoSkillBotDotNet21": {
-      "manifest": "http://localhost:35405/manifests/echoskillbot-manifest-1.0.json",
-      "remote": true,
-      "endpointName": "default"
-    },
    "echoSkillBotDotNetV3": {
      "manifest": "http://localhost:35407/manifests/echoskillbotv3-manifest-1.0.json",
      "remote": true,
--- a/Bots/DotNet/Consumers/Composer/SimpleHostBotComposer/dialogs/CallEchoSkill/CallEchoSkill.dialog
+++ b/Bots/DotNet/Consumers/Composer/SimpleHostBotComposer/dialogs/CallEchoSkill/CallEchoSkill.dialog
@ -62,7 +62,6 @@
          "choices": [
            "EchoSkillBotComposerDotNet",
            "EchoSkillBotDotNet",
-            "EchoSkillBotDotNet21",
            "EchoSkillBotDotNetV3",
            "EchoSkillBotJS",
            "EchoSkillBotJSV3",
@ -129,25 +128,6 @@
                }
              ]
            },
-            {
-              "value": "EchoSkillBotDotNet21",
-              "actions": [
-                {
-                  "$kind": "Microsoft.BeginSkill",
-                  "$designer": {
-                    "id": "9zIod8"
-                  },
-                  "activityProcessed": true,
-                  "botId": "=settings.MicrosoftAppId",
-                  "skillHostEndpoint": "=settings.skillHostEndpoint",
-                  "connectionName": "=settings.connectionName",
-                  "allowInterruptions": true,
-                  "skillEndpoint": "=settings.skill['echoSkillBotDotNet21'].endpointUrl",
-                  "skillAppId": "=settings.skill['echoSkillBotDotNet21'].msAppId",
-                  "activity": "${BeginSkill_Activity_9zIod8()}"
-                }
-              ]
-            },
            {
              "value": "EchoSkillBotDotNetV3",
              "actions": [
--- a/Bots/DotNet/Consumers/Composer/SimpleHostBotComposer/settings/appsettings.json
+++ b/Bots/DotNet/Consumers/Composer/SimpleHostBotComposer/settings/appsettings.json
@ -85,10 +85,6 @@
      "endpointUrl": "http://localhost:35400/api/messages",
      "msAppId": "00000000-0000-0000-0000-000000000000"
    },
-    "echoSkillBotDotNet21": {
-      "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/JavaScript/Consumers/CodeFirst/SimpleHostBot/.env
+++ b/Bots/JavaScript/Consumers/CodeFirst/SimpleHostBot/.env
@ -8,9 +8,6 @@ skill_EchoSkillBotComposerDotNet_endpoint=http://localhost:35410/api/messages
 skill_EchoSkillBotDotNet_appId=
 skill_EchoSkillBotDotNet_endpoint=http://localhost:35400/api/messages

-skill_EchoSkillBotDotNet21_appId=
-skill_EchoSkillBotDotNet21_endpoint=http://localhost:35405/api/messages
-
 skill_EchoSkillBotDotNetV3_appId=
 skill_EchoSkillBotDotNetV3_endpoint=http://localhost:35407/api/messages

--- a/Bots/JavaScript/Consumers/CodeFirst/WaterfallHostBot/.env
+++ b/Bots/JavaScript/Consumers/CodeFirst/WaterfallHostBot/.env
@ -7,10 +7,6 @@ skill_EchoSkillBotDotNet_group=Echo
 skill_EchoSkillBotDotNet_appId=
 skill_EchoSkillBotDotNet_endpoint=http://localhost:35400/api/messages

-skill_EchoSkillBotDotNet21_group=Echo
-skill_EchoSkillBotDotNet21_appId=
-skill_EchoSkillBotDotNet21_endpoint=http://localhost:35405/api/messages
-
 skill_EchoSkillBotDotNetV3_group=Echo
 skill_EchoSkillBotDotNetV3_appId=
 skill_EchoSkillBotDotNetV3_endpoint=http://localhost:35407/api/messages
--- a/Bots/Python/Consumers/CodeFirst/SimpleHostBot/.env
+++ b/Bots/Python/Consumers/CodeFirst/SimpleHostBot/.env
@ -8,9 +8,6 @@ skill_EchoSkillBotComposerDotNet_endpoint=http://localhost:35410/api/messages
 skill_EchoSkillBotDotNet_appId=
 skill_EchoSkillBotDotNet_endpoint=http://localhost:35400/api/messages

-skill_EchoSkillBotDotNet21_appId=
-skill_EchoSkillBotDotNet21_endpoint=http://localhost:35405/api/messages
-
 skill_EchoSkillBotDotNetV3_appId=
 skill_EchoSkillBotDotNetV3_endpoint=http://localhost:35407/api/messages

--- a/Bots/Python/Consumers/CodeFirst/WaterfallHostBot/.env
+++ b/Bots/Python/Consumers/CodeFirst/WaterfallHostBot/.env
@ -8,10 +8,6 @@ skill_EchoSkillBotDotNet_group=Echo
 skill_EchoSkillBotDotNet_appId=
 skill_EchoSkillBotDotNet_endpoint=http://localhost:35400/api/messages

-skill_EchoSkillBotDotNet21_group=Echo
-skill_EchoSkillBotDotNet21_appId=
-skill_EchoSkillBotDotNet21_endpoint=http://localhost:35405/api/messages
-
 skill_EchoSkillBotDotNetV3_group=Echo
 skill_EchoSkillBotDotNetV3_appId=
 skill_EchoSkillBotDotNetV3_endpoint=http://localhost:35407/api/messages
--- a/Bots/SimpleHostBotDotNet21.bot
+++ b/Bots/SimpleHostBotDotNet21.bot
@ -1,17 +0,0 @@
-{
-    "name": "SimpleHostBotDotNet21",
-    "description": "",
-    "services": [
-        {
-            "type": "endpoint",
-            "appId": "",
-            "appPassword": "",
-            "endpoint": "http://localhost:35005/api/messages",
-            "id": "eefb3b80-6250-11eb-9298-2763eb2fc29e",
-            "name": "http://localhost:35005/api/messages"
-        }
-    ],
-    "padlock": "",
-    "version": "2.0",
-    "overrides": null
-}
--- a/Docs/availableBotsList.md
+++ b/Docs/availableBotsList.md
@ -6,12 +6,10 @@ These are the bots currently available. This list will be expanded in the future
  - Consumers
    - BffnSimpleComposerHostBotDotNet
    - BffnSimpleHostBotDotNet
-    - BffnSimpleHostBotDotNet21
    - BffnWaterfallHostBotDotNet
  - Skills
    - BffnEchoComposerSkillBotDotNet
    - BffnEchoSkillBotDotNet
-    - BffnEchoSkillBotDotNet21
    - BffnEchoSkillBotDotNetV3
    - BffnWaterfallSkillBotDotNet

--- a/Tests/SkillFunctionalTests/Common/HostBot.cs
+++ b/Tests/SkillFunctionalTests/Common/HostBot.cs
@ -15,11 +15,6 @@ namespace SkillFunctionalTests.Common
        /// </summary>
        SimpleHostBotDotNet,

-        /// <summary>
-        /// Simple host implemented using dotnet 2.1.
-        /// </summary>
-        SimpleHostBotDotNet21,
-
        /// <summary>
        /// Simple host implemented using JS.
        /// </summary>
--- a/Tests/SkillFunctionalTests/Common/SkillBotNames.cs
+++ b/Tests/SkillFunctionalTests/Common/SkillBotNames.cs
@ -7,7 +7,6 @@ namespace SkillFunctionalTests.Common
    {
        public const string EchoSkillBotComposerDotNet = "EchoSkillBotComposerDotNet";
        public const string EchoSkillBotDotNet = "EchoSkillBotDotNet";
-        public const string EchoSkillBotDotNet21 = "EchoSkillBotDotNet21";
        public const string EchoSkillBotDotNetV3 = "EchoSkillBotDotNetV3";
        public const string EchoSkillBotJS = "EchoSkillBotJS";
        public const string EchoSkillBotJSV3 = "EchoSkillBotJSV3";
--- a/Tests/SkillFunctionalTests/SingleTurn/EchoTests.cs
+++ b/Tests/SkillFunctionalTests/SingleTurn/EchoTests.cs
@ -39,7 +39,6 @@ namespace SkillFunctionalTests.SingleTurn
            {
                HostBot.SimpleHostBotComposerDotNet,
                HostBot.SimpleHostBotDotNet,
-                HostBot.SimpleHostBotDotNet21,
                HostBot.SimpleHostBotJS,
                HostBot.SimpleHostBotPython,
            };
@ -48,7 +47,6 @@ namespace SkillFunctionalTests.SingleTurn
            {
                SkillBotNames.EchoSkillBotComposerDotNet,
                SkillBotNames.EchoSkillBotDotNet,
-                SkillBotNames.EchoSkillBotDotNet21,
                SkillBotNames.EchoSkillBotDotNetV3,
                SkillBotNames.EchoSkillBotJS,
                SkillBotNames.EchoSkillBotJSV3,
--- a/Tests/SkillFunctionalTests/SingleTurn/TestScripts/EchoMultiSkill.transcript
+++ b/Tests/SkillFunctionalTests/SingleTurn/TestScripts/EchoMultiSkill.transcript
@ -194,11 +194,6 @@
          "title": "EchoSkillBotDotNet",
          "value": "EchoSkillBotDotNet"
        },
-        {
-          "type": "imBack",
-          "title": "EchoSkillBotDotNet21",
-          "value": "EchoSkillBotDotNet21"
-        },
        {
          "type": "imBack",
          "title": "EchoSkillBotDotNetV3",
--- a/Tests/SkillFunctionalTests/appsettings.json
+++ b/Tests/SkillFunctionalTests/appsettings.json
@ -18,10 +18,6 @@
      "BotId": "bffnsimplehostbotdotnet",
      "DirectLineSecret": ""
    },
-    "SimpleHostBotDotNet21": {
-      "BotId": "bffnsimplehostbotdotnet21",
-      "DirectLineSecret": ""
-    },
    "SimpleHostBotJS": {
      "BotId": "bffnsimplehostbotjs",
      "DirectLineSecret": ""
--- a/build/yaml/deployBotResources/deployBotResources.yml
+++ b/build/yaml/deployBotResources/deployBotResources.yml
@ -136,8 +136,6 @@ variables:
  ## Bots Configuration (Define these variables in Azure)
  # BffnEchoSkillBotComposerDotNetAppId: (optional) App Id for BffnEchoSkillBotComposerDotNet bot.
  # BffnEchoSkillBotComposerDotNetAppSecret: (optional) App Secret for BffnEchoSkillBotComposerDotNet bot.
-  # BffnEchoSkillBotDotNet21AppId: (optional) App Id for BffnEchoSkillBotDotNet21 bot.
-  # BffnEchoSkillBotDotNet21AppSecret: (optional) App Secret for BffnEchoSkillBotDotNet21 bot.
  # BffnEchoSkillBotDotNetAppId: (optional) App Id for BffnEchoSkillBotDotNet bot.
  # BffnEchoSkillBotDotNetAppSecret: (optional) App Secret for BffnEchoSkillBotDotNet bot.
  # BffnEchoSkillBotDotNetV3AppId: (optional) App Id for BffnEchoSkillBotDotNetV3 bot.
@ -150,8 +148,6 @@ variables:
  # BffnEchoSkillBotPythonAppSecret: (optional) App Secret for BffnEchoSkillBotPython bot.
  # BffnSimpleHostBotComposerDotNetAppId: (optional) App Id for BffnSimpleHostBotComposerDotNet bot.
  # BffnSimpleHostBotComposerDotNetAppSecret: (optional) App Secret for BffnSimpleHostBotComposerDotNet bot.
-  # BffnSimpleHostBotDotNet21AppId: (optional) App Id for BffnSimpleHostBotDotNet21 bot.
-  # BffnSimpleHostBotDotNet21AppSecret: (optional) App Secret for BffnSimpleHostBotDotNet21 bot.
  # BffnSimpleHostBotDotNetAppId: (optional) App Id for BffnSimpleHostBotDotNet bot.
  # BffnSimpleHostBotDotNetAppSecret: (optional) App Secret for BffnSimpleHostBotDotNet bot.
  # BffnSimpleHostBotJSAppId: (optional) App Id for BffnSimpleHostBotJS bot.
@ -243,20 +239,6 @@ stages:
            registry: ${{ parameters.dependenciesRegistryDotNetHosts }}
            version: ${{ parameters.dependenciesVersionDotNetHosts }}

-        - name: "bffnsimplehostbotdotnet21"
-          dependsOn: "Prepare_DotNetGroup"
-          type: "Host"
-          displayName: "DotNet Simple Host Bot 2.1"
-          appId: $(BFFNSIMPLEHOSTBOTDOTNET21APPID)
-          appSecret: $(BFFNSIMPLEHOSTBOTDOTNET21APPSECRET)
-          project: 
-            directory: 'Bots/DotNet/Consumers/CodeFirst/SimpleHostBot-2.1'
-            name: "SimpleHostBot-2.1.csproj"
-            netCoreVersion: "2.1.x"
-          dependency:
-            registry: ${{ parameters.dependenciesRegistryDotNetHosts }}
-            version: ${{ parameters.dependenciesVersionDotNetHosts }}
-
        - name: "bffnechoskillbotdotnet"
          dependsOn: "Prepare_DotNetGroup"
          type: "Skill"
@ -271,20 +253,6 @@ stages:
            registry: ${{ parameters.dependenciesRegistryDotNetSkills }}
            version: ${{ parameters.dependenciesVersionDotNetSkills }}

-        - name: "bffnechoskillbotdotnet21"
-          dependsOn: "Prepare_DotNetGroup"
-          type: "Skill"
-          displayName: "DotNet Echo Skill Bot 2.1"
-          appId: $(BFFNECHOSKILLBOTDOTNET21APPID)
-          appSecret: $(BFFNECHOSKILLBOTDOTNET21APPSECRET)
-          project: 
-            directory: 'Bots/DotNet/Skills/CodeFirst/EchoSkillBot-2.1'
-            name: "EchoSkillBot-2.1.csproj"
-            netCoreVersion: "2.1.x"
-          dependency:
-            registry: ${{ parameters.dependenciesRegistryDotNetSkills }}
-            version: ${{ parameters.dependenciesVersionDotNetSkills }}
-
        # DotNet V3 bots
        - name: "bffnechoskillbotdotnetv3"
          dependsOn: "Prepare_DotNetGroup"
@ -300,7 +268,7 @@ stages:
            version: ${{ parameters.dependenciesVersionDotNetSkillsV3 }}

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

        - name: "bffnwaterfallskillbotdotnet"
-          dependsOn: "Deploy_bffnsimplehostbotdotnet21"
+          dependsOn: "Prepare_DotNetGroup"
          type: "Skill"
          displayName: "DotNet Waterfall Skill Bot"
          appId: $(BFFNWATERFALLSKILLBOTDOTNETAPPID)
@ -329,7 +297,7 @@ stages:

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

        - name: "bffnechoskillbotcomposerdotnet"
-          dependsOn: "Deploy_bffnechoskillbotdotnet21"
+          dependsOn: "Deploy_bffnechoskillbotdotnet"
          type: "ComposerSkill"
          displayName: "DotNet Echo Composer Skill Bot"
          appId: $(BFFNECHOSKILLBOTCOMPOSERDOTNETAPPID)
--- a/build/yaml/sharedResources/createAppRegistrations.yml
+++ b/build/yaml/sharedResources/createAppRegistrations.yml
@ -91,9 +91,7 @@ steps:

        $bots = @(
          @{ appName = "bffnsimplehostbotdotnet"; variables = @{ appId = "BffnSimpleHostBotDotNetAppId"; appSecret = "BffnSimpleHostBotDotNetAppSecret"; objectId = "BffnSimpleHostBotDotNetAppObjectId" }},
-          @{ appName = "bffnsimplehostbotdotnet21"; variables = @{ appId = "BffnSimpleHostBotDotNet21AppId"; appSecret = "BffnSimpleHostBotDotNet21AppSecret"; objectId = "BffnSimpleHostBotDotNet21AppObjectId" }},
          @{ appName = "bffnechoskillbotdotnet"; variables = @{ appId = "BffnEchoSkillBotDotNetAppId"; appSecret = "BffnEchoSkillBotDotNetAppSecret"; objectId = "BffnEchoSkillBotDotNetAppObjectId" }},
-          @{ appName = "bffnechoskillbotdotnet21"; variables = @{ appId = "BffnEchoSkillBotDotNet21AppId"; appSecret = "BffnEchoSkillBotDotNet21AppSecret"; objectId = "BffnEchoSkillBotDotNet21AppObjectId" }},
          @{ 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
@ -5,7 +5,6 @@ parameters:
  default:
    EchoSkillBotComposerDotNet: ""
    EchoSkillBotDotNet: ""
-    EchoSkillBotDotNet21: ""
    EchoSkillBotDotNetV3: ""
    EchoSkillBotJS: ""
    EchoSkillBotJSV3: ""
@ -417,12 +416,6 @@ steps:
            resourceGroup = $groups.DotNet
            configType    = $types.Appsettings
          }
-          @{
-            key           = "SimpleHostBotDotNet21"
-            botName       = "bffnsimplehostbotdotnet21"
-            resourceGroup = $groups.DotNet
-            configType    = $types.Appsettings
-          }
          @{
            key           = "SimpleHostBotComposerDotNet"
            botName       = "bffnsimplehostbotcomposerdotnet"
@ -470,14 +463,6 @@ steps:
            resourceGroup = $groups.DotNet
            group         = "Echo"
          }
-          @{
-            key           = "EchoSkillBotDotNet21"
-            keyComposer   = "echoSkillBotDotNet21" 
-            botName       = "bffnechoskillbotdotnet21"
-            appId         = "${{ parameters.appIds.EchoSkillBotDotNet21 }}"
-            resourceGroup = $groups.DotNet
-            group         = "Echo"
-          }
          @{
            key           = "EchoSkillBotDotNetV3"
            keyComposer   = "echoSkillBotDotNetV3" 
@ -551,14 +536,12 @@ steps:
            consumers = @(
              "SimpleHostBotComposerDotNet",
              "SimpleHostBotDotNet",
-              "SimpleHostBotDotNet21",
              "SimpleHostBotJS",
              "SimpleHostBotPython"
            );
            skills    = @(
              "EchoSkillBotComposerDotNet",
              "EchoSkillBotDotNet",
-              "EchoSkillBotDotNet21",
              "EchoSkillBotDotNetV3",
              "EchoSkillBotJS",
              "EchoSkillBotJSV3",
--- a/build/yaml/testScenarios/runScenario.yml
+++ b/build/yaml/testScenarios/runScenario.yml
@ -5,7 +5,6 @@ parameters:
  default:
    EchoSkillBotComposerDotNet: ""
    EchoSkillBotDotNet: ""
-    EchoSkillBotDotNet21: ""
    EchoSkillBotDotNetV3: ""
    EchoSkillBotJS: ""
    EchoSkillBotJSV3: ""
--- a/build/yaml/testScenarios/runTestScenarios.yml
+++ b/build/yaml/testScenarios/runTestScenarios.yml
@ -17,7 +17,6 @@ variables:

  ## Bots Configuration (Define these variables in Azure)
  # BffnEchoSkillBotComposerDotNetAppId: (optional) App Id for BffnEchoSkillBotComposerDotNet bot.
-  # BffnEchoSkillBotDotNet21AppId: (optional) App Id for BffnEchoSkillBotDotNet21 bot.
  # BffnEchoSkillBotDotNetAppId: (optional) App Id for BffnEchoSkillBotDotNet bot.
  # BffnEchoSkillBotDotNetV3AppId: (optional) App Id for BffnEchoSkillBotDotNetV3 bot.
  # BffnEchoSkillBotJSAppId: (optional) App Id for BffnEchoSkillBotJS bot.
@ -73,7 +72,6 @@ stages:
      appIds:
        EchoSkillBotComposerDotNet: "$(BFFNECHOSKILLBOTCOMPOSERDOTNETAPPID)"
        EchoSkillBotDotNet: "$(BFFNECHOSKILLBOTDOTNETAPPID)"
-        EchoSkillBotDotNet21: "$(BFFNECHOSKILLBOTDOTNET21APPID)"
        EchoSkillBotDotNetV3: "$(BFFNECHOSKILLBOTDOTNETV3APPID)"
        EchoSkillBotJS: "$(BFFNECHOSKILLBOTJSAPPID)"
        EchoSkillBotJSV3: "$(BFFNECHOSKILLBOTJSV3APPID)"