Merge pull request #1 from Microsoft/master

Merging changes back to master.
microsoft · Feb 16, 2018 · fce5c60 · fce5c60
2 parents 1ca112a + e96813d
commit fce5c60
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/samples/AlarmBot-Cards/DateTimeRecognizerExtensions.cs b/samples/AlarmBot-Cards/DateTimeRecognizerExtensions.cs
@@ -29,7 +29,7 @@ public static IList<DateTime> GetDateTimes(this BotContext context)
                 return results.Where(result =>
                 {
                     var subType = result.TypeName.Split('.').Last();
-                    return subType.Contains("time") && !subType.Contains("range");
+                    return (subType.Contains("date") || subType.Contains("time")) && !subType.Contains("range");
                 })
                 .Select(result =>
                 {

diff --git a/samples/AlarmBot/DateTimeRecognizerExtensions.cs b/samples/AlarmBot/DateTimeRecognizerExtensions.cs
@@ -28,7 +28,7 @@ public static IList<DateTime> GetDateTimes(this BotContext context)
                 return results.Where(result =>
                 {
                     var subType = result.TypeName.Split('.').Last();
-                    return subType.Contains("time") && !subType.Contains("range");
+                    return (subType.Contains("date") || subType.Contains("time")) && !subType.Contains("range");
                 })
                 .Select(result =>
                 {

diff --git a/tests/Microsoft.Bot.Builder.Tests/ContextExtensionTests.cs b/tests/Microsoft.Bot.Builder.Tests/ContextExtensionTests.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.Bot.Builder.Adapters;
-using Microsoft.Bot.Builder.ContextExtensions;
+using Microsoft.Bot.Builder;
 using Microsoft.Bot.Schema;
 using Microsoft.VisualStudio.TestTools.UnitTesting;