use Handoff instead of EndOfConversation to signal completion of skill dialog (#2244)

lzc850612 · web-flow · commit 499c273f6518 · 2019-08-28T13:16:25.000-07:00
diff --git a/lib/csharp/microsoft.bot.builder.skills/Microsoft.Bot.Builder.Skills/SkillCallingRequestHandler.cs b/lib/csharp/microsoft.bot.builder.skills/Microsoft.Bot.Builder.Skills/SkillCallingRequestHandler.cs
@@ -75,7 +75,7 @@ public SkillCallingRequestHandler(
                                             throw new ArgumentNullException("FallbackRequestHandler", "Skill is asking for fallback but there is no handler on the calling side!");
                                         }
                                     }
-                                    else if (activity.Type == ActivityTypes.EndOfConversation)
+                                    else if (activity.Type == ActivityTypes.Handoff)
                                     {
                                         var result = await _turnContext.SendActivityAsync(activity).ConfigureAwait(false);
                                         if (_handoffActivityHandler != null)
diff --git a/lib/csharp/microsoft.bot.builder.skills/Microsoft.Bot.Builder.Skills/SkillDialog.cs b/lib/csharp/microsoft.bot.builder.skills/Microsoft.Bot.Builder.Skills/SkillDialog.cs
@@ -318,12 +318,12 @@ private async Task<DialogTurnResult> ForwardToSkillAsync(DialogContext innerDc,
         {
             try
             {
-                var endOfConversationActivity = await _skillTransport.ForwardToSkillAsync(_skillManifest, _serviceClientCredentials, innerDc.Context, activity, GetTokenRequestCallback(innerDc), GetFallbackCallback(innerDc));
+                var handoffActivity = await _skillTransport.ForwardToSkillAsync(_skillManifest, _serviceClientCredentials, innerDc.Context, activity, GetTokenRequestCallback(innerDc), GetFallbackCallback(innerDc));
 
-                if (endOfConversationActivity != null)
+                if (handoffActivity != null)
                 {
                     await innerDc.Context.SendActivityAsync(new Activity(type: ActivityTypes.Trace, text: $"<--Ending the skill conversation with the {_skillManifest.Name} Skill and handing off to Parent Bot."));
-                    return await innerDc.EndDialogAsync(endOfConversationActivity.SemanticAction?.Entities);
+                    return await innerDc.EndDialogAsync(handoffActivity.SemanticAction?.Entities);
                 }
                 else if (_authDialogCancelled)
                 {
diff --git a/lib/csharp/microsoft.bot.builder.skills/Microsoft.Bot.Builder.Skills/SkillWebSocketBotAdapter.cs b/lib/csharp/microsoft.bot.builder.skills/Microsoft.Bot.Builder.Skills/SkillWebSocketBotAdapter.cs
@@ -272,7 +272,7 @@ private void EnsureActivitySemanticAction(ITurnContext turnContext, Activity act
                     activity.SemanticAction = turnContext.Activity.SemanticAction;
                 }
 
-                if (activity.Type == ActivityTypes.EndOfConversation)
+                if (activity.Type == ActivityTypes.Handoff)
                 {
                     activity.SemanticAction.State = SkillConstants.SkillDone;
                 }
diff --git a/lib/csharp/microsoft.bot.builder.skills/Microsoft.Bot.Builder.Skills/SkillWebSocketTransport.cs b/lib/csharp/microsoft.bot.builder.skills/Microsoft.Bot.Builder.Skills/SkillWebSocketTransport.cs
@@ -19,7 +19,7 @@ public class SkillWebSocketTransport : ISkillTransport
     {
         private IStreamingTransportClient _streamingTransportClient;
         private readonly IBotTelemetryClient _botTelemetryClient;
-        private Activity endOfConversationActivity;
+        private Activity _handoffActivity;
 
         public SkillWebSocketTransport(
             IBotTelemetryClient botTelemetryClient,
@@ -85,7 +85,7 @@ public async Task<Activity> ForwardToSkillAsync(SkillManifest skillManifest, ISe
                     { "Latency", stopWatch.ElapsedMilliseconds },
                 });
 
-            return endOfConversationActivity;
+            return _handoffActivity;
         }
 
         public async Task CancelRemoteDialogsAsync(SkillManifest skillManifest, IServiceClientCredentials appCredentials, ITurnContext turnContext)
@@ -126,7 +126,7 @@ private Action<Activity> GetHandoffActivityCallback()
         {
             return (activity) =>
             {
-                endOfConversationActivity = activity;
+                _handoffActivity = activity;
             };
         }
 
diff --git a/skills/src/csharp/automotiveskill/automotiveskill/Dialogs/MainDialog.cs b/skills/src/csharp/automotiveskill/automotiveskill/Dialogs/MainDialog.cs
@@ -121,7 +121,7 @@ public MainDialog(
             if (dc.Context.Adapter is IRemoteUserTokenProvider remoteInvocationAdapter || Channel.GetChannelId(dc.Context) != Channels.Msteams)
             {
                 var response = dc.Context.Activity.CreateReply();
-                response.Type = ActivityTypes.EndOfConversation;
+                response.Type = ActivityTypes.Handoff;
 
                 await dc.Context.SendActivityAsync(response);
             }
diff --git a/skills/src/csharp/automotiveskill/automotiveskilltest/Flow/VehicleSettingsTests.cs b/skills/src/csharp/automotiveskill/automotiveskilltest/Flow/VehicleSettingsTests.cs
@@ -104,7 +104,7 @@ await this.GetTestFlow()
                     IsConfirmed = true,
                 }))
                 .AssertReply(this.CheckReply("Setting Lane Change Detection to Off."))
-                .AssertReply(this.CheckForEndOfConversation())
+                .AssertReply(this.CheckForHandoff())
                 .StartTestAsync();
         }
 
@@ -116,7 +116,7 @@ await this.GetTestFlow()
                 .AssertReply(this.CheckReply("So, you want to change Lane Change Detection to Off. Is that correct? (1) Yes or (2) No"))
                 .Send("no")
                 .AssertReply(this.CheckReply("Ok, not making any changes."))
-                .AssertReply(this.CheckForEndOfConversation())
+                .AssertReply(this.CheckForHandoff())
                 .StartTestAsync();
         }
 
@@ -332,12 +332,11 @@ private Action<IActivity> CheckForSettingEvent(SettingChange expectedChange)
             };
         }
 
-        private Action<IActivity> CheckForEndOfConversation()
+        private Action<IActivity> CheckForHandoff()
         {
             return activity =>
             {
-                var eventReceived = activity.AsEndOfConversationActivity();
-                Assert.IsNotNull(eventReceived, "End of Conversation Activity not received.");
+                Assert.AreEqual(activity.Type, ActivityTypes.Handoff, "End of Conversation Activity not received.");
             };
         }
 
diff --git a/skills/src/csharp/calendarskill/calendarskill/Dialogs/MainDialog.cs b/skills/src/csharp/calendarskill/calendarskill/Dialogs/MainDialog.cs
@@ -221,7 +221,7 @@ private async Task PopulateStateFromSemanticAction(ITurnContext context)
             if (dc.Context.Adapter is IRemoteUserTokenProvider remoteInvocationAdapter || Channel.GetChannelId(dc.Context) != Channels.Msteams)
             {
                 var response = dc.Context.Activity.CreateReply();
-                response.Type = ActivityTypes.EndOfConversation;
+                response.Type = ActivityTypes.Handoff;
 
                 await dc.Context.SendActivityAsync(response);
             }
@@ -244,7 +244,7 @@ private async Task PopulateStateFromSemanticAction(ITurnContext context)
                         if (result.Status != DialogTurnStatus.Waiting)
                         {
                             var response = dc.Context.Activity.CreateReply();
-                            response.Type = ActivityTypes.EndOfConversation;
+                            response.Type = ActivityTypes.Handoff;
 
                             await dc.Context.SendActivityAsync(response);
                         }
diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Flow/ConnectToMeetingFlowTests.cs b/skills/src/csharp/calendarskill/calendarskilltest/Flow/ConnectToMeetingFlowTests.cs
@@ -60,7 +60,7 @@ private Action<IActivity> ActionEndMessage()
         {
             return activity =>
             {
-                Assert.AreEqual(activity.Type, ActivityTypes.EndOfConversation);
+                Assert.AreEqual(activity.Type, ActivityTypes.Handoff);
             };
         }
     }
diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Flow/CreateCalendarFlowTests.cs b/skills/src/csharp/calendarskill/calendarskilltest/Flow/CreateCalendarFlowTests.cs
@@ -758,7 +758,7 @@ private Action<IActivity> ActionEndMessage()
         {
             return activity =>
             {
-                Assert.AreEqual(activity.Type, ActivityTypes.EndOfConversation);
+                Assert.AreEqual(activity.Type, ActivityTypes.Handoff);
             };
         }
 
diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Flow/DeleteCalendarFlowTests.cs b/skills/src/csharp/calendarskill/calendarskilltest/Flow/DeleteCalendarFlowTests.cs
@@ -151,7 +151,7 @@ private Action<IActivity> ActionEndMessage()
         {
             return activity =>
             {
-                Assert.AreEqual(activity.Type, ActivityTypes.EndOfConversation);
+                Assert.AreEqual(activity.Type, ActivityTypes.Handoff);
             };
         }
     }
diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Flow/NextCalendarFlowTests.cs b/skills/src/csharp/calendarskill/calendarskilltest/Flow/NextCalendarFlowTests.cs
@@ -190,7 +190,7 @@ private Action<IActivity> ActionEndMessage()
         {
             return activity =>
             {
-                Assert.AreEqual(activity.Type, ActivityTypes.EndOfConversation);
+                Assert.AreEqual(activity.Type, ActivityTypes.Handoff);
             };
         }
     }
diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Flow/SummaryCalendarFlowTests.cs b/skills/src/csharp/calendarskill/calendarskilltest/Flow/SummaryCalendarFlowTests.cs
@@ -187,7 +187,7 @@ private Action<IActivity> ActionEndMessage()
         {
             return activity =>
             {
-                Assert.AreEqual(activity.Type, ActivityTypes.EndOfConversation);
+                Assert.AreEqual(activity.Type, ActivityTypes.Handoff);
             };
         }
 
diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Flow/TimeRemainingFlowTests.cs b/skills/src/csharp/calendarskill/calendarskilltest/Flow/TimeRemainingFlowTests.cs
@@ -67,7 +67,7 @@ private Action<IActivity> ActionEndMessage()
         {
             return activity =>
             {
-                Assert.AreEqual(activity.Type, ActivityTypes.EndOfConversation);
+                Assert.AreEqual(activity.Type, ActivityTypes.Handoff);
             };
         }
     }
diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Flow/UpdateCalendarFlowTests.cs b/skills/src/csharp/calendarskill/calendarskilltest/Flow/UpdateCalendarFlowTests.cs
@@ -159,7 +159,7 @@ private Action<IActivity> ActionEndMessage()
         {
             return activity =>
             {
-                Assert.AreEqual(activity.Type, ActivityTypes.EndOfConversation);
+                Assert.AreEqual(activity.Type, ActivityTypes.Handoff);
             };
         }
     }
diff --git a/skills/src/csharp/emailskill/emailskill/Dialogs/MainDialog.cs b/skills/src/csharp/emailskill/emailskill/Dialogs/MainDialog.cs
@@ -197,7 +197,7 @@ private async Task PopulateStateFromSkillContext(ITurnContext context)
             if (dc.Context.Adapter is IRemoteUserTokenProvider remoteInvocationAdapter || Channel.GetChannelId(dc.Context) != Channels.Msteams)
             {
                 var response = dc.Context.Activity.CreateReply();
-                response.Type = ActivityTypes.EndOfConversation;
+                response.Type = ActivityTypes.Handoff;
 
                 await dc.Context.SendActivityAsync(response);
             }
@@ -220,7 +220,7 @@ private async Task PopulateStateFromSkillContext(ITurnContext context)
                         if (result.Status != DialogTurnStatus.Waiting)
                         {
                             var response = dc.Context.Activity.CreateReply();
-                            response.Type = ActivityTypes.EndOfConversation;
+                            response.Type = ActivityTypes.Handoff;
 
                             await dc.Context.SendActivityAsync(response);
                         }
diff --git a/skills/src/csharp/emailskill/emailskilltest/Flow/DeleteEmailFlowTests.cs b/skills/src/csharp/emailskill/emailskilltest/Flow/DeleteEmailFlowTests.cs
@@ -79,7 +79,7 @@ private Action<IActivity> ActionEndMessage()
         {
             return activity =>
             {
-                Assert.AreEqual(activity.Type, ActivityTypes.EndOfConversation);
+                Assert.AreEqual(activity.Type, ActivityTypes.Handoff);
             };
         }
 
diff --git a/skills/src/csharp/emailskill/emailskilltest/Flow/ForwardEmailFlowTests.cs b/skills/src/csharp/emailskill/emailskilltest/Flow/ForwardEmailFlowTests.cs
@@ -154,7 +154,7 @@ private Action<IActivity> ActionEndMessage()
         {
             return activity =>
             {
-                Assert.AreEqual(activity.Type, ActivityTypes.EndOfConversation);
+                Assert.AreEqual(activity.Type, ActivityTypes.Handoff);
             };
         }
 
diff --git a/skills/src/csharp/emailskill/emailskilltest/Flow/ReplyFlowTests.cs b/skills/src/csharp/emailskill/emailskilltest/Flow/ReplyFlowTests.cs
@@ -79,7 +79,7 @@ private Action<IActivity> ActionEndMessage()
         {
             return activity =>
             {
-                Assert.AreEqual(activity.Type, ActivityTypes.EndOfConversation);
+                Assert.AreEqual(activity.Type, ActivityTypes.Handoff);
             };
         }
 
diff --git a/skills/src/csharp/emailskill/emailskilltest/Flow/SendEmailFlowTests.cs b/skills/src/csharp/emailskill/emailskilltest/Flow/SendEmailFlowTests.cs
@@ -366,7 +366,7 @@ private Action<IActivity> ActionEndMessage()
         {
             return activity =>
             {
-                Assert.AreEqual(activity.Type, ActivityTypes.EndOfConversation);
+                Assert.AreEqual(activity.Type, ActivityTypes.Handoff);
             };
         }
 
diff --git a/skills/src/csharp/emailskill/emailskilltest/Flow/ShowEmailFlowTests.cs b/skills/src/csharp/emailskill/emailskilltest/Flow/ShowEmailFlowTests.cs
@@ -394,7 +394,7 @@ private Action<IActivity> ActionEndMessage()
         {
             return activity =>
             {
-                Assert.AreEqual(activity.Type, ActivityTypes.EndOfConversation);
+                Assert.AreEqual(activity.Type, ActivityTypes.Handoff);
             };
         }
 
diff --git a/skills/src/csharp/experimental/bingsearchskill/bingsearchskill/Dialogs/MainDialog.cs b/skills/src/csharp/experimental/bingsearchskill/bingsearchskill/Dialogs/MainDialog.cs
@@ -114,7 +114,7 @@ public MainDialog(
             if (dc.Context.Adapter is IRemoteUserTokenProvider remoteInvocationAdapter || Channel.GetChannelId(dc.Context) != Channels.Msteams)
             {
                 var response = dc.Context.Activity.CreateReply();
-                response.Type = ActivityTypes.EndOfConversation;
+                response.Type = ActivityTypes.Handoff;
 
                 await dc.Context.SendActivityAsync(response);
             }
@@ -147,7 +147,7 @@ public MainDialog(
                         if (result.Status != DialogTurnStatus.Waiting)
                         {
                             var response = dc.Context.Activity.CreateReply();
-                            response.Type = ActivityTypes.EndOfConversation;
+                            response.Type = ActivityTypes.Handoff;
 
                             await dc.Context.SendActivityAsync(response);
                         }
diff --git a/skills/src/csharp/experimental/eventskill/Dialogs/MainDialog.cs b/skills/src/csharp/experimental/eventskill/Dialogs/MainDialog.cs
@@ -115,7 +115,7 @@ public MainDialog(
         protected override async Task CompleteAsync(DialogContext dc, DialogTurnResult result = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             var response = dc.Context.Activity.CreateReply();
-            response.Type = ActivityTypes.EndOfConversation;
+            response.Type = ActivityTypes.Handoff;
             await dc.Context.SendActivityAsync(response);
             await dc.EndDialogAsync(result);
         }
@@ -133,7 +133,7 @@ public MainDialog(
                         if (result.Status != DialogTurnStatus.Waiting)
                         {
                             var response = dc.Context.Activity.CreateReply();
-                            response.Type = ActivityTypes.EndOfConversation;
+                            response.Type = ActivityTypes.Handoff;
 
                             await dc.Context.SendActivityAsync(response);
                         }
diff --git a/skills/src/csharp/experimental/hospitalityskill/Dialogs/MainDialog.cs b/skills/src/csharp/experimental/hospitalityskill/Dialogs/MainDialog.cs
@@ -162,7 +162,7 @@ public MainDialog(
         protected override async Task CompleteAsync(DialogContext dc, DialogTurnResult result = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             var response = dc.Context.Activity.CreateReply();
-            response.Type = ActivityTypes.EndOfConversation;
+            response.Type = ActivityTypes.Handoff;
             await dc.Context.SendActivityAsync(response);
             await dc.EndDialogAsync(result);
         }
@@ -180,7 +180,7 @@ public MainDialog(
                         if (result.Status != DialogTurnStatus.Waiting)
                         {
                             var response = dc.Context.Activity.CreateReply();
-                            response.Type = ActivityTypes.EndOfConversation;
+                            response.Type = ActivityTypes.Handoff;
 
                             await dc.Context.SendActivityAsync(response);
                         }
diff --git a/skills/src/csharp/experimental/musicskill/Dialogs/MainDialog.cs b/skills/src/csharp/experimental/musicskill/Dialogs/MainDialog.cs
@@ -116,7 +116,7 @@ public MainDialog(
         protected override async Task CompleteAsync(DialogContext dc, DialogTurnResult result = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             var response = dc.Context.Activity.CreateReply();
-            response.Type = ActivityTypes.EndOfConversation;
+            response.Type = ActivityTypes.Handoff;
             await dc.Context.SendActivityAsync(response);
             await dc.EndDialogAsync(result);
         }
@@ -134,7 +134,7 @@ public MainDialog(
                         if (result.Status != DialogTurnStatus.Waiting)
                         {
                             var response = dc.Context.Activity.CreateReply();
-                            response.Type = ActivityTypes.EndOfConversation;
+                            response.Type = ActivityTypes.Handoff;
 
                             await dc.Context.SendActivityAsync(response);
                         }
diff --git a/skills/src/csharp/experimental/newsskill/Dialogs/MainDialog.cs b/skills/src/csharp/experimental/newsskill/Dialogs/MainDialog.cs
@@ -133,7 +133,7 @@ public MainDialog(
             if (dc.Context.Adapter is IRemoteUserTokenProvider remoteInvocationAdapter || Channel.GetChannelId(dc.Context) != Channels.Msteams)
             {
                 var response = dc.Context.Activity.CreateReply();
-                response.Type = ActivityTypes.EndOfConversation;
+                response.Type = ActivityTypes.Handoff;
 
                 await dc.Context.SendActivityAsync(response);
             }
diff --git a/skills/src/csharp/experimental/restaurantbooking/Dialogs/MainDialog.cs b/skills/src/csharp/experimental/restaurantbooking/Dialogs/MainDialog.cs
@@ -121,7 +121,7 @@ public MainDialog(
             if (dc.Context.Adapter is IRemoteUserTokenProvider remoteInvocationAdapter || Channel.GetChannelId(dc.Context) != Channels.Msteams)
             {
                 var response = dc.Context.Activity.CreateReply();
-                response.Type = ActivityTypes.EndOfConversation;
+                response.Type = ActivityTypes.Handoff;
 
                 await dc.Context.SendActivityAsync(response);
             }
@@ -141,7 +141,7 @@ public MainDialog(
                         if (result.Status != DialogTurnStatus.Waiting)
                         {
                             var response = dc.Context.Activity.CreateReply();
-                            response.Type = ActivityTypes.EndOfConversation;
+                            response.Type = ActivityTypes.Handoff;
 
                             await dc.Context.SendActivityAsync(response);
                         }
diff --git a/skills/src/csharp/experimental/weatherskill/Dialogs/MainDialog.cs b/skills/src/csharp/experimental/weatherskill/Dialogs/MainDialog.cs
@@ -123,7 +123,7 @@ public MainDialog(
             if (dc.Context.Adapter is IRemoteUserTokenProvider remoteInvocationAdapter || Channel.GetChannelId(dc.Context) != Channels.Msteams)
             {
                 var response = dc.Context.Activity.CreateReply();
-                response.Type = ActivityTypes.EndOfConversation;
+                response.Type = ActivityTypes.Handoff;
 
                 await dc.Context.SendActivityAsync(response);
             }
@@ -156,7 +156,7 @@ public MainDialog(
                         if (result.Status != DialogTurnStatus.Waiting)
                         {
                             var response = dc.Context.Activity.CreateReply();
-                            response.Type = ActivityTypes.EndOfConversation;
+                            response.Type = ActivityTypes.Handoff;
 
                             await dc.Context.SendActivityAsync(response);
                         }
diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/MainDialog.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/MainDialog.cs
@@ -152,7 +152,7 @@ public MainDialog(
             if (dc.Context.Adapter is IRemoteUserTokenProvider remoteInvocationAdapter || Channel.GetChannelId(dc.Context) != Channels.Msteams)
             {
                 var response = dc.Context.Activity.CreateReply();
-                response.Type = ActivityTypes.EndOfConversation;
+                response.Type = ActivityTypes.Handoff;
 
                 await dc.Context.SendActivityAsync(response);
             }
diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/PointOfInterestDialogTests.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/PointOfInterestDialogTests.cs
diff --git a/skills/src/csharp/todoskill/todoskill/Dialogs/MainDialog.cs b/skills/src/csharp/todoskill/todoskill/Dialogs/MainDialog.cs

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public SkillCallingRequestHandler(`
`75`	`75`	`throw new ArgumentNullException("FallbackRequestHandler", "Skill is asking for fallback but there is no handler on the calling side!");`
`76`	`76`	`}`
`77`	`77`	`}`
`78`		`- else if (activity.Type == ActivityTypes.EndOfConversation)`
	`78`	`+ else if (activity.Type == ActivityTypes.Handoff)`
`79`	`79`	`{`
`80`	`80`	`var result = await _turnContext.SendActivityAsync(activity).ConfigureAwait(false);`
`81`	`81`	`if (_handoffActivityHandler != null)`
Original file line number	Diff line number	Diff line change
`@@ -318,12 +318,12 @@ private async Task<DialogTurnResult> ForwardToSkillAsync(DialogContext innerDc,`
`318`	`318`	`{`
`319`	`319`	`try`
`320`	`320`	`{`
`321`		`- var endOfConversationActivity = await _skillTransport.ForwardToSkillAsync(_skillManifest, _serviceClientCredentials, innerDc.Context, activity, GetTokenRequestCallback(innerDc), GetFallbackCallback(innerDc));`
	`321`	`+ var handoffActivity = await _skillTransport.ForwardToSkillAsync(_skillManifest, _serviceClientCredentials, innerDc.Context, activity, GetTokenRequestCallback(innerDc), GetFallbackCallback(innerDc));`
`322`	`322`
`323`		`- if (endOfConversationActivity != null)`
	`323`	`+ if (handoffActivity != null)`
`324`	`324`	`{`
`325`	`325`	`await innerDc.Context.SendActivityAsync(new Activity(type: ActivityTypes.Trace, text: $"<--Ending the skill conversation with the {_skillManifest.Name} Skill and handing off to Parent Bot."));`
`326`		`- return await innerDc.EndDialogAsync(endOfConversationActivity.SemanticAction?.Entities);`
	`326`	`+ return await innerDc.EndDialogAsync(handoffActivity.SemanticAction?.Entities);`
`327`	`327`	`}`
`328`	`328`	`else if (_authDialogCancelled)`
`329`	`329`	`{`
Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ private void EnsureActivitySemanticAction(ITurnContext turnContext, Activity act`
`272`	`272`	`activity.SemanticAction = turnContext.Activity.SemanticAction;`
`273`	`273`	`}`
`274`	`274`
`275`		`- if (activity.Type == ActivityTypes.EndOfConversation)`
	`275`	`+ if (activity.Type == ActivityTypes.Handoff)`
`276`	`276`	`{`
`277`	`277`	`activity.SemanticAction.State = SkillConstants.SkillDone;`
`278`	`278`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public class SkillWebSocketTransport : ISkillTransport`
`19`	`19`	`{`
`20`	`20`	`private IStreamingTransportClient _streamingTransportClient;`
`21`	`21`	`private readonly IBotTelemetryClient _botTelemetryClient;`
`22`		`- private Activity endOfConversationActivity;`
	`22`	`+ private Activity _handoffActivity;`
`23`	`23`
`24`	`24`	`public SkillWebSocketTransport(`
`25`	`25`	`IBotTelemetryClient botTelemetryClient,`
`@@ -85,7 +85,7 @@ public async Task<Activity> ForwardToSkillAsync(SkillManifest skillManifest, ISe`
`85`	`85`	`{ "Latency", stopWatch.ElapsedMilliseconds },`
`86`	`86`	`});`
`87`	`87`
`88`		`- return endOfConversationActivity;`
	`88`	`+ return _handoffActivity;`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`public async Task CancelRemoteDialogsAsync(SkillManifest skillManifest, IServiceClientCredentials appCredentials, ITurnContext turnContext)`
`@@ -126,7 +126,7 @@ private Action<Activity> GetHandoffActivityCallback()`
`126`	`126`	`{`
`127`	`127`	`return (activity) =>`
`128`	`128`	`{`
`129`		`- endOfConversationActivity = activity;`
	`129`	`+ _handoffActivity = activity;`
`130`	`130`	`};`
`131`	`131`	`}`
`132`	`132`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public MainDialog(`
`121`	`121`	`if (dc.Context.Adapter is IRemoteUserTokenProvider remoteInvocationAdapter \|\| Channel.GetChannelId(dc.Context) != Channels.Msteams)`
`122`	`122`	`{`
`123`	`123`	`var response = dc.Context.Activity.CreateReply();`
`124`		`- response.Type = ActivityTypes.EndOfConversation;`
	`124`	`+ response.Type = ActivityTypes.Handoff;`
`125`	`125`
`126`	`126`	`await dc.Context.SendActivityAsync(response);`
`127`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ await this.GetTestFlow()`
`104`	`104`	`IsConfirmed = true,`
`105`	`105`	`}))`
`106`	`106`	`.AssertReply(this.CheckReply("Setting Lane Change Detection to Off."))`
`107`		`- .AssertReply(this.CheckForEndOfConversation())`
	`107`	`+ .AssertReply(this.CheckForHandoff())`
`108`	`108`	`.StartTestAsync();`
`109`	`109`	`}`
`110`	`110`
`@@ -116,7 +116,7 @@ await this.GetTestFlow()`
`116`	`116`	`.AssertReply(this.CheckReply("So, you want to change Lane Change Detection to Off. Is that correct? (1) Yes or (2) No"))`
`117`	`117`	`.Send("no")`
`118`	`118`	`.AssertReply(this.CheckReply("Ok, not making any changes."))`
`119`		`- .AssertReply(this.CheckForEndOfConversation())`
	`119`	`+ .AssertReply(this.CheckForHandoff())`
`120`	`120`	`.StartTestAsync();`
`121`	`121`	`}`
`122`	`122`
`@@ -332,12 +332,11 @@ private Action<IActivity> CheckForSettingEvent(SettingChange expectedChange)`
`332`	`332`	`};`
`333`	`333`	`}`
`334`	`334`
`335`		`- private Action<IActivity> CheckForEndOfConversation()`
	`335`	`+ private Action<IActivity> CheckForHandoff()`
`336`	`336`	`{`
`337`	`337`	`return activity =>`
`338`	`338`	`{`
`339`		`- var eventReceived = activity.AsEndOfConversationActivity();`
`340`		`- Assert.IsNotNull(eventReceived, "End of Conversation Activity not received.");`
	`339`	`+ Assert.AreEqual(activity.Type, ActivityTypes.Handoff, "End of Conversation Activity not received.");`
`341`	`340`	`};`
`342`	`341`	`}`
`343`	`342`
Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ private async Task PopulateStateFromSemanticAction(ITurnContext context)`
`221`	`221`	`if (dc.Context.Adapter is IRemoteUserTokenProvider remoteInvocationAdapter \|\| Channel.GetChannelId(dc.Context) != Channels.Msteams)`
`222`	`222`	`{`
`223`	`223`	`var response = dc.Context.Activity.CreateReply();`
`224`		`- response.Type = ActivityTypes.EndOfConversation;`
	`224`	`+ response.Type = ActivityTypes.Handoff;`
`225`	`225`
`226`	`226`	`await dc.Context.SendActivityAsync(response);`
`227`	`227`	`}`
`@@ -244,7 +244,7 @@ private async Task PopulateStateFromSemanticAction(ITurnContext context)`
`244`	`244`	`if (result.Status != DialogTurnStatus.Waiting)`
`245`	`245`	`{`
`246`	`246`	`var response = dc.Context.Activity.CreateReply();`
`247`		`- response.Type = ActivityTypes.EndOfConversation;`
	`247`	`+ response.Type = ActivityTypes.Handoff;`
`248`	`248`
`249`	`249`	`await dc.Context.SendActivityAsync(response);`
`250`	`250`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ private Action<IActivity> ActionEndMessage()`
`60`	`60`	`{`
`61`	`61`	`return activity =>`
`62`	`62`	`{`
`63`		`- Assert.AreEqual(activity.Type, ActivityTypes.EndOfConversation);`
	`63`	`+ Assert.AreEqual(activity.Type, ActivityTypes.Handoff);`
`64`	`64`	`};`
`65`	`65`	`}`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -758,7 +758,7 @@ private Action<IActivity> ActionEndMessage()`
`758`	`758`	`{`
`759`	`759`	`return activity =>`
`760`	`760`	`{`
`761`		`- Assert.AreEqual(activity.Type, ActivityTypes.EndOfConversation);`
	`761`	`+ Assert.AreEqual(activity.Type, ActivityTypes.Handoff);`
`762`	`762`	`};`
`763`	`763`	`}`
`764`	`764`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ private Action<IActivity> ActionEndMessage()`
`151`	`151`	`{`
`152`	`152`	`return activity =>`
`153`	`153`	`{`
`154`		`- Assert.AreEqual(activity.Type, ActivityTypes.EndOfConversation);`
	`154`	`+ Assert.AreEqual(activity.Type, ActivityTypes.Handoff);`
`155`	`155`	`};`
`156`	`156`	`}`
`157`	`157`	`}`