add AttemptCount to Activity and OAuth prompts

libraries/Microsoft.Bot.Builder.Dialogs/Prompts/ActivityPrompt.cs

@@ -62,7 +62,10 @@ public ActivityPrompt(string dialogId, PromptValidator<Activity> validator)
             // Initialize prompt state
             var state = dc.ActiveDialog.State;
             state[PersistedOptions] = opt;
-            state[PersistedState] = new Dictionary<string, object>();
+            state[PersistedState] = new Dictionary<string, object>
+            {
+                { Prompt<int>.AttemptCountKey, 0 },
+            };
 
             // Send initial prompt
             await OnPromptAsync(dc.Context, (IDictionary<string, object>)state[PersistedState], (PromptOptions)state[PersistedOptions], cancellationToken).ConfigureAwait(false);
@@ -82,9 +85,21 @@ public ActivityPrompt(string dialogId, PromptValidator<Activity> validator)
             var options = (PromptOptions)instance.State[PersistedOptions];
             var recognized = await OnRecognizeAsync(dc.Context, state, options, cancellationToken).ConfigureAwait(false);
 
+            // Increment attempt count
+            // Convert.ToInt32 For issue https://github.com/Microsoft/botbuilder-dotnet/issues/1859
+            state[Prompt<int>.AttemptCountKey] = Convert.ToInt32(state[Prompt<int>.AttemptCountKey]) + 1;
+
             // Validate the return value
-            var promptContext = new PromptValidatorContext<Activity>(dc.Context, recognized, state, options);
-            var isValid = await _validator(promptContext, cancellationToken).ConfigureAwait(false);
+            var isValid = false;
+            if (_validator != null)
+            {
+                var promptContext = new PromptValidatorContext<Activity>(dc.Context, recognized, state, options);
+                isValid = await _validator(promptContext, cancellationToken).ConfigureAwait(false);
+            }
+            else if (recognized.Succeeded)
+            {
+                isValid = true;
+            }
 
             // Return recognized value or re-prompt
             if (isValid)

libraries/Microsoft.Bot.Builder.Dialogs/Prompts/OAuthPrompt.cs

@@ -103,7 +103,11 @@ public OAuthPrompt(string dialogId, OAuthPromptSettings settings, PromptValidato
             var timeout = _settings.Timeout ?? DefaultPromptTimeout;
             var state = dc.ActiveDialog.State;
             state[PersistedOptions] = opt;
-            state[PersistedState] = new Dictionary<string, object>();
+            state[PersistedState] = new Dictionary<string, object>
+            {
+                { Prompt<int>.AttemptCountKey, 0 },
+            };
+
             state[PersistedExpires] = DateTime.Now.AddMilliseconds(timeout);
 
             // Attempt to get the users token
@@ -152,6 +156,10 @@ public OAuthPrompt(string dialogId, OAuthPromptSettings settings, PromptValidato
                 var promptState = (IDictionary<string, object>)state[PersistedState];
                 var promptOptions = (PromptOptions)state[PersistedOptions];
 
+                // Increment attempt count
+                // Convert.ToInt32 For issue https://github.com/Microsoft/botbuilder-dotnet/issues/1859
+                promptState[Prompt<int>.AttemptCountKey] = Convert.ToInt32(promptState[Prompt<int>.AttemptCountKey]) + 1;
+
                 // Validate the return value
                 var isValid = false;
                 if (_validator != null)

libraries/Microsoft.Bot.Builder.Dialogs/Prompts/PromptValidatorContext.cs

@@ -28,6 +28,17 @@ internal PromptValidatorContext(ITurnContext turnContext, PromptRecognizerResult
         /// Gets the number of times the prompt has been executed.
         /// </summary>
         /// <value>A number indicating how many times the prompt was invoked (starting at 1 for the first time it was called).</value>
-        public int AttemptCount => Convert.ToInt32(State[Prompt<T>.AttemptCountKey]);
+        public int AttemptCount
+        {
+            get
+            {
+                if (!State.ContainsKey(Prompt<T>.AttemptCountKey))
+                {
+                    return 0;
+                }
+
+                return Convert.ToInt32(State[Prompt<T>.AttemptCountKey]);
+            }
+        }
     }
 }

tests/Microsoft.Bot.Builder.Dialogs.Tests/ActivityPromptTests.cs

@@ -215,6 +215,8 @@ public async Task ActivityPromptResumeDialogShouldReturnDialogEndOfTurn()
 
         private async Task<bool> Validator(PromptValidatorContext<Activity> promptContext, CancellationToken cancellationToken)
         {
+            Assert.IsTrue(promptContext.AttemptCount > 0);
+
             var activity = promptContext.Recognized.Value;
             if (activity.Type == ActivityTypes.Event)
             {