Merge 554db41 into a4fc943

microsoft · Mar 7, 2024 · 59c1c82 · 59c1c82
2 parents a4fc943 + 554db41
commit 59c1c82
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/SetProperties.cs b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/SetProperties.cs
@@ -85,9 +85,6 @@ public override async Task<DialogTurnResult> BeginDialogAsync(DialogContext dc,
                 dc.State.SetValue(propValue.Property.GetValue(dc.State), value);
             }
 
-            // save all state scopes to their respective botState locations.
-            await dc.Context.TurnState.Get<DialogStateManager>().SaveAllChangesAsync(cancellationToken).ConfigureAwait(false);
-
             return await dc.EndDialogAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 

diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/SetProperty.cs b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/SetProperty.cs
@@ -89,9 +89,6 @@ public override async Task<DialogTurnResult> BeginDialogAsync(DialogContext dc,
 
             dc.State.SetValue(this.Property.GetValue(dc.State), value);
 
-            // save all state scopes to their respective botState locations.
-            await dc.Context.TurnState.Get<DialogStateManager>().SaveAllChangesAsync(cancellationToken).ConfigureAwait(false);
-
             return await dc.EndDialogAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 

diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Input/OAuthInput.cs b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Input/OAuthInput.cs
@@ -8,6 +8,7 @@
 using System.Threading.Tasks;
 using AdaptiveExpressions.Properties;
 using Microsoft.Bot.Builder.Dialogs.Adaptive.Conditions;
+using Microsoft.Bot.Builder.Dialogs.Memory;
 using Microsoft.Bot.Schema;
 using Newtonsoft.Json;
 
@@ -312,7 +313,7 @@ private async Task SendOAuthCardAsync(DialogContext dc, IMessageActivity prompt,
             // Save state prior to sending OAuthCard: the invoke response for a token exchange from the root bot could come in
             // before this method ends or could land in another instance in scale-out scenarios, which means that if the state is not saved, 
             // the OAuthInput would not be at the top of the stack, and the token exchange invoke would get discarded.
-            await dc.Context.TurnState.Get<ConversationState>().SaveChangesAsync(dc.Context, false, cancellationToken).ConfigureAwait(false);
+            await dc.Context.TurnState.Get<DialogStateManager>().SaveAllChangesAsync(cancellationToken).ConfigureAwait(false);
 
             // Prepare OAuthCard
             var title = Title == null ? null : await Title.GetValueAsync(dc, cancellationToken).ConfigureAwait(false);