From fdfd63f7b75126aac941f492cf09c22820547a40 Mon Sep 17 00:00:00 2001
From: Lauren Mills <lamil@microsoft.com>
Date: Tue, 11 May 2021 10:10:15 -0700
Subject: [PATCH 1/3] fix skill interrupting itself

---
 .../generators/app/templates/botName.dialog   | 29 +++++++++++++++++--
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/generators/generator-bot-enterprise-assistant/generators/app/templates/botName.dialog b/generators/generator-bot-enterprise-assistant/generators/app/templates/botName.dialog
index 043088a8b9..363d2dccf0 100644
--- a/generators/generator-bot-enterprise-assistant/generators/app/templates/botName.dialog
+++ b/generators/generator-bot-enterprise-assistant/generators/app/templates/botName.dialog
@@ -496,7 +496,7 @@
           "eventValue": "Calendar"
         }
       ],
-      "condition": "=turn.recognized.score > 0.8"
+      "condition": "=turn.recognized.score > 0.8 && conversation.activeSkill != 'Calendar'"
     },
     {
       "$kind": "Microsoft.OnIntent",
@@ -522,7 +522,7 @@
           "eventValue": "People"
         }
       ],
-      "condition": "=turn.recognized.score > 0.8"
+      "condition": "=turn.recognized.score > 0.8 && conversation.activeSkill != 'People'"
     },
     {
       "$kind": "Microsoft.OnDialogEvent",
@@ -557,6 +557,14 @@
             {
               "value": "Calendar",
               "actions": [
+                {
+                  "$kind": "Microsoft.SetProperty",
+                  "$designer": {
+                    "id": "Fvjb09"
+                  },
+                  "property": "conversation.activeSkill",
+                  "value": "Calendar"
+                },
                 {
                   "$kind": "Microsoft.BeginSkill",
                   "$designer": {
@@ -576,6 +584,14 @@
             {
               "value": "People",
               "actions": [
+                {
+                  "$kind": "Microsoft.SetProperty",
+                  "$designer": {
+                    "id": "cx0OI0"
+                  },
+                  "property": "conversation.activeSkill",
+                  "value": "People"
+                },
                 {
                   "$kind": "Microsoft.BeginSkill",
                   "$designer": {
@@ -601,6 +617,13 @@
           },
           "condition": "exists($skillHandled) && $skillHandled == false",
           "actions": [
+            {
+              "$kind": "Microsoft.DeleteProperty",
+              "$designer": {
+                "id": "mnt9MF"
+              },
+              "property": "conversation.activeSkill"
+            },
             {
               "$kind": "Microsoft.TraceActivity",
               "$designer": {
@@ -625,4 +648,4 @@
   "generator": "<%= botName %>.lg",
   "id": "<%= botName %>",
   "recognizer": "<%= botName %>.lu.qna"
-}
+}
\ No newline at end of file

From 9b1d989e69e24be6686e56b4c255c9d1fa7707fd Mon Sep 17 00:00:00 2001
From: Lauren Mills <lamil@microsoft.com>
Date: Tue, 11 May 2021 10:39:09 -0700
Subject: [PATCH 2/3] lg fix

---
 .../language-generation/en-us/CreateEventDialog.en-us.lg        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/CreateEventDialog/language-generation/en-us/CreateEventDialog.en-us.lg b/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/CreateEventDialog/language-generation/en-us/CreateEventDialog.en-us.lg
index 589d648dfc..92d6821237 100644
--- a/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/CreateEventDialog/language-generation/en-us/CreateEventDialog.en-us.lg
+++ b/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/CreateEventDialog/language-generation/en-us/CreateEventDialog.en-us.lg
@@ -43,7 +43,7 @@
 
 # CreateConfirmNotUnderstood()
 [Activity
-    text = Sorry, I didn't understand that. ${CreateConfirmPrompt()}
+    text = Sorry, I didn't understand that. ${CreateConfirmText()}
     attachments = ${json(EventDetailEditCard($event))}
 ]
 

From 8fcb622a96b008ea8d997d9385c4d2a428f65e82 Mon Sep 17 00:00:00 2001
From: Lauren Mills <lamil@microsoft.com>
Date: Tue, 11 May 2021 11:34:52 -0700
Subject: [PATCH 3/3] clean up active skill property

---
 .../generators/app/templates/botName.dialog   | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/generators/generator-bot-enterprise-assistant/generators/app/templates/botName.dialog b/generators/generator-bot-enterprise-assistant/generators/app/templates/botName.dialog
index 363d2dccf0..73c92e6802 100644
--- a/generators/generator-bot-enterprise-assistant/generators/app/templates/botName.dialog
+++ b/generators/generator-bot-enterprise-assistant/generators/app/templates/botName.dialog
@@ -139,6 +139,13 @@
           },
           "activity": "${SendActivity_bGYBta()}"
         },
+        {
+          "$kind": "Microsoft.DeleteProperty",
+          "$designer": {
+            "id": "JoL99F"
+          },
+          "property": "conversation.activeSkill"
+        },
         {
           "$kind": "Microsoft.CancelAllDialogs",
           "$designer": {
@@ -610,6 +617,13 @@
             }
           ]
         },
+        {
+          "$kind": "Microsoft.DeleteProperty",
+          "$designer": {
+            "id": "2rIt4u"
+          },
+          "property": "conversation.activeSkill"
+        },
         {
           "$kind": "Microsoft.IfCondition",
           "$designer": {
@@ -617,13 +631,6 @@
           },
           "condition": "exists($skillHandled) && $skillHandled == false",
           "actions": [
-            {
-              "$kind": "Microsoft.DeleteProperty",
-              "$designer": {
-                "id": "mnt9MF"
-              },
-              "property": "conversation.activeSkill"
-            },
             {
               "$kind": "Microsoft.TraceActivity",
               "$designer": {