Updated to latest Bot Builder nightly builds.

Author: garypretty

libraries/Bot.Builder.Community.Dialogs.DataTypeDisambiguation/Bot.Builder.Community.Dialogs.DataTypeDisambiguation.csproj

@@ -5,11 +5,9 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Bot.Builder" Version="4.0.0.38375" />
-    <PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.0.0.38375" />
-    <PackageReference Include="Microsoft.Recognizers.Text" Version="1.0.10" />
+    <PackageReference Include="Microsoft.Bot.Builder" Version="4.0.0.39259" />
+    <PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.0.0.39259" />
     <PackageReference Include="Microsoft.Recognizers.Text.DataTypes.TimexExpression" Version="1.0.10" />
-    <PackageReference Include="Microsoft.Recognizers.Text.DateTime" Version="1.0.10" />
   </ItemGroup>
 
 </Project>

libraries/Bot.Builder.Community.Dialogs.DataTypeDisambiguation/DisambiguateDateDialog.cs

@@ -17,12 +17,12 @@ private DisambiguateDateDialog() : base(Id)
 
             AddDialog(new WaterfallDialog(Id, new WaterfallStep[]
             {
-                async(dc, stepContext) =>
+                async(dc, cancellationToken) =>
                 {
                     await dc.Context.SendActivityAsync("What date?");
                     return EndOfTurn;
                 },
-                async (dc, stepContext) =>
+                async (dc, cancellationToken) =>
                 {
                     var stateWrapper = new DisambiguateDateDialogStateWrapper(dc.ActiveDialog.State);
 
@@ -56,10 +56,10 @@ private DisambiguateDateDialog() : base(Id)
                     stateWrapper.Date = value.FirstOrDefault().Date1.Value;
                     return await dc.EndAsync(dc.ActiveDialog.State);
                 },
-                async (dc, stepContext) =>
+                async (dc, cancellationToken) =>
                 {
                     var stateWrapper = new DisambiguateDateDialogStateWrapper(dc.ActiveDialog.State);
-                    var amOrPmChoice = ((FoundChoice)stepContext.Result).Value;
+                    var amOrPmChoice = ((FoundChoice)dc.Result).Value;
                     var availableTimes = stateWrapper.Resolutions.Select(x=>x.Date1.Value);
                     stateWrapper.Date = amOrPmChoice  == "AM" ? availableTimes.Min() : availableTimes.Max();
                     return await dc.EndAsync(dc.ActiveDialog.State);

libraries/Bot.Builder.Community.Dialogs.DataTypeDisambiguation/DisambiguateTimeDialog.cs

@@ -17,12 +17,12 @@ private DisambiguateTimeDialog() : base(Id)
 
             AddDialog(new WaterfallDialog(Id, new WaterfallStep[]
             {
-                async (dc, stepContext) =>
+                async (dc, cancellationToken) =>
                 {
                     await dc.Context.SendActivityAsync("What time?");
                     return EndOfTurn;
                 },
-                async (dc, stepContext) =>
+                async (dc, cancellationToken) =>
                 {
                     var stateWrapper = new DisambiguateTimeDialogStateWrapper(dc.ActiveDialog.State);
 
@@ -55,10 +55,10 @@ private DisambiguateTimeDialog() : base(Id)
                     stateWrapper.Time = value.FirstOrDefault().Time1.Value;
                     return await dc.EndAsync(dc.ActiveDialog.State);
                 },
-                async (dc, stepContext) =>
+                async (dc, cancellationToken) =>
                 {
                     var stateWrapper = new DisambiguateTimeDialogStateWrapper(dc.ActiveDialog.State);
-                    var amOrPmChoice = ((FoundChoice) stepContext.Result).Value;
+                    var amOrPmChoice = ((FoundChoice) dc.Result).Value;
                     var availableTimes = stateWrapper.Resolutions.Select(x => x.Time1.Value);
                     stateWrapper.Time = amOrPmChoice == "AM" ? availableTimes.Min() : availableTimes.Max();
                     return await dc.EndAsync(dc.ActiveDialog.State);

libraries/Bot.Builder.Community.Dialogs.Location/Bot.Builder.Community.Dialogs.Location.csproj

@@ -12,8 +12,8 @@
 
   <ItemGroup>
     <PackageReference Include="CoreCompat.System.Drawing" Version="1.0.0-beta006" />
-    <PackageReference Include="Microsoft.Bot.Builder" Version="4.0.0.38375" />
-    <PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.0.0.38375" />
+    <PackageReference Include="Microsoft.Bot.Builder" Version="4.0.0.39259" />
+    <PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.0.0.39259" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>
 

libraries/Bot.Builder.Community.Dialogs.Location/DialogOptions.cs

@@ -5,22 +5,22 @@
 
 namespace Bot.Builder.Community.Dialogs.Location
 {
-    public class SelectLocationDialogOptions : DialogOptions
+    public class SelectLocationDialogOptions
     {
         public List<Bing.Location> Locations { get; set; }
     }
 
-    public class CompleteMissingFieldsDialogOptions : DialogOptions
+    public class CompleteMissingFieldsDialogOptions
     {
         public Bing.Location Location { get; set; }
     }
 
-    public class ConfirmDeleteFavoriteDialogOptions : DialogOptions
+    public class ConfirmDeleteFavoriteDialogOptions
     {
         public FavoriteLocation Location { get; set; }
     }
 
-    public class AddToFavoritesDialogOptions : DialogOptions
+    public class AddToFavoritesDialogOptions
     {
         public Bing.Location Location { get; set; }
     }