[Lib] Fallback lib change (#1976)

* simplify lib change

* fix as comments

* fix as comments

* fix as comments

Author: DingmaomaoBJTU

lib/csharp/microsoft.bot.builder.skills/Microsoft.Bot.Builder.Skills/Dialogs/DispatchDialog.cs

@@ -6,11 +6,11 @@
 using Microsoft.Bot.Builder.Dialogs;
 using Microsoft.Bot.Builder.Dialogs.Choices;
 using Microsoft.Bot.Builder.Skills.Auth;
-using Microsoft.Bot.Builder.Skills.Dialogs;
 using Microsoft.Bot.Builder.Skills.Models;
 using Microsoft.Bot.Builder.Skills.Models.Manifest;
 using Microsoft.Bot.Builder.Solutions;
 using Microsoft.Bot.Builder.Solutions.Authentication;
+using Microsoft.Bot.Builder.Solutions.Dialogs;
 using Microsoft.Bot.Builder.Solutions.Resources;
 using Microsoft.Bot.Schema;
 using Microsoft.Recognizers.Text;
@@ -76,8 +76,8 @@ public SkillDialog(
                 AddDialog(authDialog);
             }
 
-            AddDialog(new WaterfallDialog(DialogIds.ConfirmFlow, intentSwitching));
-            AddDialog(new ConfirmPrompt(DialogIds.CancelPrompt));
+            AddDialog(new WaterfallDialog(DialogIds.ConfirmSkillSwitchFlow, intentSwitching));
+            AddDialog(new ConfirmPrompt(DialogIds.ConfirmSkillSwitchPrompt));
         }
 
         public async Task<DialogTurnResult> ConfirmIntentSwitch(WaterfallStepContext sc, CancellationToken cancellationToken)
@@ -86,7 +86,7 @@ public async Task<DialogTurnResult> ConfirmIntentSwitch(WaterfallStepContext sc,
             {
                 var newIntentName = skillSwitchConfirmOption.TargetIntent;
                 var intentResponse = string.Format(CommonStrings.ConfirmSkillSwitch, newIntentName);
-                return await sc.PromptAsync(DialogIds.CancelPrompt, new PromptOptions()
+                return await sc.PromptAsync(DialogIds.ConfirmSkillSwitchPrompt, new PromptOptions()
                 {
                     Prompt = new Activity(type: ActivityTypes.Message, text: intentResponse, speak: intentResponse),
                 });
@@ -109,12 +109,8 @@ public async Task<DialogTurnResult> FinishIntentSwitch(WaterfallStepContext sc,
                     sc.Context.Activity.Text = skillSwitchConfirmOption.UserInputActivity.Text;
                     sc.Context.Activity.Speak = skillSwitchConfirmOption.UserInputActivity.Speak;
 
-                    // 3) End dialog with target intent
-                    var intent = new DispatchIntent()
-                    {
-                        Intent = skillSwitchConfirmOption.TargetIntent,
-                    };
-                    return await sc.EndDialogAsync(intent);
+                    // 3) End dialog
+                    return await sc.EndDialogAsync(true);
                 }
 
                 // Cancel skill switching
@@ -239,7 +235,7 @@ enabling the Skill to perform it's own action identification. */
                 }
             }
 
-            if (innerDc.ActiveDialog != null)
+            if (innerDc.ActiveDialog?.Id == DialogIds.ConfirmSkillSwitchPrompt)
             {
                 var result = await base.OnContinueDialogAsync(innerDc, cancellationToken);
 
@@ -250,8 +246,14 @@ enabling the Skill to perform it's own action identification. */
                 else
                 {
                     // SkillDialog only truely end when confirm skill switch.
+                    if (result.Result is bool dispatchResult && dispatchResult)
+                    {
+                        // Restart and redispatch
+                        result.Result = new RouterDialogTurnResult(RouterDialogTurnStatus.Restart);
+                    }
+
                     // If confirm dialog is ended without skill switch, means previous activity has been resent and SkillDialog can continue to work
-                    if (!(result.Result is DispatchIntent))
+                    else
                     {
                         result.Status = DialogTurnStatus.Waiting;
                     }
@@ -346,7 +348,7 @@ private async Task<DialogTurnResult> ForwardToSkillAsync(DialogContext innerDc,
                                             UserInputActivity = innerDc.Context.Activity,
                                         };
 
-                                        return await innerDc.BeginDialogAsync(DialogIds.ConfirmFlow, options);
+                                        return await innerDc.BeginDialogAsync(DialogIds.ConfirmSkillSwitchFlow, options);
                                     }
 
                                     await _skillTransport.CancelRemoteDialogsAsync(innerDc.Context);
@@ -414,8 +416,8 @@ private Action<Activity> GetFallbackCallback(DialogContext dialogContext)
 
         private class DialogIds
         {
-            public const string CancelPrompt = "cancelPrompt";
-            public const string ConfirmFlow = "confirmFlow";
+            public const string ConfirmSkillSwitchPrompt = "confirmSkillSwitchPrompt";
+            public const string ConfirmSkillSwitchFlow = "confirmSkillSwitchFlow";
         }
     }
 }

lib/csharp/microsoft.bot.builder.skills/Microsoft.Bot.Builder.Skills/Models/DispatchIntent.cs

@@ -66,6 +66,12 @@ public RouterDialog(string dialogId, IBotTelemetryClient telemetryClient)
 
                                     case DialogTurnStatus.Complete:
                                         {
+                                            if (result.Result is RouterDialogTurnResult routerDialogTurnResult && routerDialogTurnResult.Status == RouterDialogTurnStatus.Restart)
+                                            {
+                                                await RouteAsync(innerDc).ConfigureAwait(false);
+                                                break;
+                                            }
+
                                             await CompleteAsync(innerDc).ConfigureAwait(false);
 
                                             // End active dialog

lib/csharp/microsoft.bot.builder.skills/Microsoft.Bot.Builder.Skills/SkillDialog.cs

@@ -0,0 +1,15 @@
+namespace Microsoft.Bot.Builder.Solutions.Dialogs
+{
+    /// <summary>
+    /// Define router dialog turn result.
+    /// </summary>
+    public class RouterDialogTurnResult
+    {
+        public RouterDialogTurnResult(RouterDialogTurnStatus status)
+        {
+            this.Status = status;
+        }
+
+        public RouterDialogTurnStatus Status { get; set; }
+    }
+}

lib/csharp/microsoft.bot.builder.solutions/microsoft.bot.builder.solutions/Dialogs/RouterDialog.cs

@@ -0,0 +1,10 @@
+namespace Microsoft.Bot.Builder.Solutions.Dialogs
+{
+    /// <summary>
+    /// Define router dialog turn status.
+    /// </summary>
+    public enum RouterDialogTurnStatus
+    {
+        Restart = 0,
+    }
+}