diff --git a/CSharp/Blog-CustomChannelData/Azure_Bot_Generic_CSharp.csproj b/CSharp/Blog-CustomChannelData/Azure_Bot_Generic_CSharp.csproj index cf22f26f86..79f070e9ab 100644 --- a/CSharp/Blog-CustomChannelData/Azure_Bot_Generic_CSharp.csproj +++ b/CSharp/Blog-CustomChannelData/Azure_Bot_Generic_CSharp.csproj @@ -43,50 +43,55 @@ - ..\packages\Autofac.3.5.2\lib\net40\Autofac.dll + packages\Autofac.3.5.2\lib\net40\Autofac.dll True - ..\packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll + packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll True - - ..\packages\Microsoft.Bot.Builder.3.0.0\lib\net46\Microsoft.Bot.Builder.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll True - - ..\packages\Microsoft.Bot.Builder.3.0.0\lib\net46\Microsoft.Bot.Connector.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll + True + + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll True - - ..\packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.2.206221351\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll + + packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll True - - ..\packages\Microsoft.Rest.ClientRuntime.1.8.2\lib\net45\Microsoft.Rest.ClientRuntime.dll + + packages\Microsoft.Rest.ClientRuntime.2.3.2\lib\net45\Microsoft.Rest.ClientRuntime.dll True - ..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.1.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll + packages\Microsoft.WindowsAzure.ConfigurationManager.3.1.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll True - ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll + packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll True - - ..\packages\System.IdentityModel.Tokens.Jwt.4.0.2.206221351\lib\net45\System.IdentityModel.Tokens.Jwt.dll + + packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll True - ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll + packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll True + @@ -97,11 +102,11 @@ - ..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll + packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll True - ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll + packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll True @@ -120,6 +125,7 @@ + Global.asax @@ -131,7 +137,6 @@ - diff --git a/CSharp/Blog-CustomChannelData/Azure_Bot_Generic_CSharp.sln b/CSharp/Blog-CustomChannelData/Azure_Bot_Generic_CSharp.sln index b8b1d06dfe..141263845f 100644 --- a/CSharp/Blog-CustomChannelData/Azure_Bot_Generic_CSharp.sln +++ b/CSharp/Blog-CustomChannelData/Azure_Bot_Generic_CSharp.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25123.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure_Bot_Generic_CSharp", "Azure_Bot_Generic_CSharp\Azure_Bot_Generic_CSharp.csproj", "{A8BA1066-5695-4D71-ABB4-65E5A5E0C3D4}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure_Bot_Generic_CSharp", "Azure_Bot_Generic_CSharp.csproj", "{A8BA1066-5695-4D71-ABB4-65E5A5E0C3D4}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/CSharp/Blog-CustomChannelData/Models/FacebookButtonTemplate.cs b/CSharp/Blog-CustomChannelData/Models/FacebookButtonTemplate.cs index 1c64dc357d..361fecd8d5 100644 --- a/CSharp/Blog-CustomChannelData/Models/FacebookButtonTemplate.cs +++ b/CSharp/Blog-CustomChannelData/Models/FacebookButtonTemplate.cs @@ -22,7 +22,7 @@ public FacebookButtonTemplate(string text) public string Text { get; set; } [JsonProperty("buttons")] - public FacebookButton[] Buttons { get; set; } + public FacebookPostbackButton[] Buttons { get; set; } public override string ToString() { diff --git a/CSharp/Blog-CustomChannelData/packages.config b/CSharp/Blog-CustomChannelData/packages.config index 9aa73aca2e..0648596f79 100644 --- a/CSharp/Blog-CustomChannelData/packages.config +++ b/CSharp/Blog-CustomChannelData/packages.config @@ -6,10 +6,10 @@ - - - + + + - + \ No newline at end of file diff --git a/CSharp/Blog-LUISActionBinding/LuisActions.Samples.Bot/LuisActions.Samples.Bot.csproj b/CSharp/Blog-LUISActionBinding/LuisActions.Samples.Bot/LuisActions.Samples.Bot.csproj index 20c69142ed..aabdc5f144 100644 --- a/CSharp/Blog-LUISActionBinding/LuisActions.Samples.Bot/LuisActions.Samples.Bot.csproj +++ b/CSharp/Blog-LUISActionBinding/LuisActions.Samples.Bot/LuisActions.Samples.Bot.csproj @@ -50,21 +50,21 @@ ..\packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll True - - ..\packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.dll + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll True - - ..\packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.Autofac.dll + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll True - - ..\packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Connector.dll + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll True - - ..\packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.402070948\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll + + ..\packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll True @@ -80,8 +80,8 @@ True - - ..\packages\System.IdentityModel.Tokens.Jwt.4.0.4.402070948\lib\net45\System.IdentityModel.Tokens.Jwt.dll + + ..\packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll True diff --git a/CSharp/Blog-LUISActionBinding/LuisActions.Samples.Bot/packages.config b/CSharp/Blog-LUISActionBinding/LuisActions.Samples.Bot/packages.config index 97d947fe7b..3c730b77b0 100644 --- a/CSharp/Blog-LUISActionBinding/LuisActions.Samples.Bot/packages.config +++ b/CSharp/Blog-LUISActionBinding/LuisActions.Samples.Bot/packages.config @@ -6,10 +6,10 @@ - - + + - + \ No newline at end of file diff --git a/CSharp/Blog-LUISActionBinding/LuisActions.Samples.Console/LuisActions.Samples.Console.csproj b/CSharp/Blog-LUISActionBinding/LuisActions.Samples.Console/LuisActions.Samples.Console.csproj index 4209b0af16..81f60fe4ce 100644 --- a/CSharp/Blog-LUISActionBinding/LuisActions.Samples.Console/LuisActions.Samples.Console.csproj +++ b/CSharp/Blog-LUISActionBinding/LuisActions.Samples.Console/LuisActions.Samples.Console.csproj @@ -42,20 +42,20 @@ ..\packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll True - - ..\packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.dll + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll True - - ..\packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.Autofac.dll + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll True - - ..\packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Connector.dll + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll True - - ..\packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.2.206221351\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll + + ..\packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll True @@ -70,8 +70,8 @@ - - ..\packages\System.IdentityModel.Tokens.Jwt.4.0.2.206221351\lib\net45\System.IdentityModel.Tokens.Jwt.dll + + ..\packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll True diff --git a/CSharp/Blog-LUISActionBinding/LuisActions.Samples.Console/packages.config b/CSharp/Blog-LUISActionBinding/LuisActions.Samples.Console/packages.config index 5693e431fc..31d44d7052 100644 --- a/CSharp/Blog-LUISActionBinding/LuisActions.Samples.Console/packages.config +++ b/CSharp/Blog-LUISActionBinding/LuisActions.Samples.Console/packages.config @@ -4,9 +4,9 @@ - - + + - + \ No newline at end of file diff --git a/CSharp/Blog-LUISActionBinding/LuisActions.Samples.Web/LuisActions.Samples.Web.csproj b/CSharp/Blog-LUISActionBinding/LuisActions.Samples.Web/LuisActions.Samples.Web.csproj index 9a7a272226..3ecb4eb5ec 100644 --- a/CSharp/Blog-LUISActionBinding/LuisActions.Samples.Web/LuisActions.Samples.Web.csproj +++ b/CSharp/Blog-LUISActionBinding/LuisActions.Samples.Web/LuisActions.Samples.Web.csproj @@ -46,17 +46,38 @@ 4 - - False - Bin\Microsoft.Bot.Builder.dll + + ..\packages\Autofac.3.5.2\lib\net40\Autofac.dll + True + + + ..\packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll + True + + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll + True + + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll + True + + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll + True ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.3\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll True - + + ..\packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll + True + + ..\packages\Microsoft.Rest.ClientRuntime.2.3.2\lib\net45\Microsoft.Rest.ClientRuntime.dll + True ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll @@ -66,6 +87,16 @@ + + ..\packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll + True + + + + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll + True + + @@ -73,6 +104,10 @@ + + ..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll + True + diff --git a/CSharp/Blog-LUISActionBinding/LuisActions.Samples.Web/Web.config b/CSharp/Blog-LUISActionBinding/LuisActions.Samples.Web/Web.config index fe443b33d0..139c86ccd2 100644 --- a/CSharp/Blog-LUISActionBinding/LuisActions.Samples.Web/Web.config +++ b/CSharp/Blog-LUISActionBinding/LuisActions.Samples.Web/Web.config @@ -53,11 +53,11 @@ - + - + @@ -67,4 +67,11 @@ - \ No newline at end of file + + + + + + + + \ No newline at end of file diff --git a/CSharp/Blog-LUISActionBinding/LuisActions.Samples.Web/packages.config b/CSharp/Blog-LUISActionBinding/LuisActions.Samples.Web/packages.config index 9da8d5ec2e..f26e802120 100644 --- a/CSharp/Blog-LUISActionBinding/LuisActions.Samples.Web/packages.config +++ b/CSharp/Blog-LUISActionBinding/LuisActions.Samples.Web/packages.config @@ -1,19 +1,27 @@  + + + + + + + + \ No newline at end of file diff --git a/CSharp/Blog-LUISActionBinding/Microsoft.Cognitive.LUIS.ActionBinding.Nuget/Microsoft.Cognitive.LUIS.ActionBinding.Nuget.csproj b/CSharp/Blog-LUISActionBinding/Microsoft.Cognitive.LUIS.ActionBinding.Nuget/Microsoft.Cognitive.LUIS.ActionBinding.Nuget.csproj index 1689a86de9..1ea37dabd8 100644 --- a/CSharp/Blog-LUISActionBinding/Microsoft.Cognitive.LUIS.ActionBinding.Nuget/Microsoft.Cognitive.LUIS.ActionBinding.Nuget.csproj +++ b/CSharp/Blog-LUISActionBinding/Microsoft.Cognitive.LUIS.ActionBinding.Nuget/Microsoft.Cognitive.LUIS.ActionBinding.Nuget.csproj @@ -44,6 +44,7 @@ + diff --git a/CSharp/Blog-LUISActionBinding/Microsoft.Cognitive.LUIS.ActionBinding.Nuget/Packaging/Microsoft.Cognitive.LUIS.ActionBinding.nuspec b/CSharp/Blog-LUISActionBinding/Microsoft.Cognitive.LUIS.ActionBinding.Nuget/Packaging/Microsoft.Cognitive.LUIS.ActionBinding.nuspec index 6332673d00..302819629b 100644 --- a/CSharp/Blog-LUISActionBinding/Microsoft.Cognitive.LUIS.ActionBinding.Nuget/Packaging/Microsoft.Cognitive.LUIS.ActionBinding.nuspec +++ b/CSharp/Blog-LUISActionBinding/Microsoft.Cognitive.LUIS.ActionBinding.Nuget/Packaging/Microsoft.Cognitive.LUIS.ActionBinding.nuspec @@ -10,7 +10,7 @@ Add 'Action Binding' capabilities to your LUIS app Copyright © 2017 - + \ No newline at end of file diff --git a/CSharp/Blog-LUISActionBinding/Microsoft.Cognitive.LUIS.ActionBinding.Nuget/app.config b/CSharp/Blog-LUISActionBinding/Microsoft.Cognitive.LUIS.ActionBinding.Nuget/app.config new file mode 100644 index 0000000000..8460dd432e --- /dev/null +++ b/CSharp/Blog-LUISActionBinding/Microsoft.Cognitive.LUIS.ActionBinding.Nuget/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/CSharp/Blog-LUISActionBinding/Microsoft.Cognitive.LUIS.ActionBinding/Microsoft.Cognitive.LUIS.ActionBinding.csproj b/CSharp/Blog-LUISActionBinding/Microsoft.Cognitive.LUIS.ActionBinding/Microsoft.Cognitive.LUIS.ActionBinding.csproj index 789ff6e153..b7adb66675 100644 --- a/CSharp/Blog-LUISActionBinding/Microsoft.Cognitive.LUIS.ActionBinding/Microsoft.Cognitive.LUIS.ActionBinding.csproj +++ b/CSharp/Blog-LUISActionBinding/Microsoft.Cognitive.LUIS.ActionBinding/Microsoft.Cognitive.LUIS.ActionBinding.csproj @@ -45,20 +45,20 @@ ..\packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll True - - ..\packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.dll + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll True - - ..\packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.Autofac.dll + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll True - - ..\packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Connector.dll + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll True - - ..\packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.2.206221351\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll + + ..\packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll True @@ -72,8 +72,8 @@ - - ..\packages\System.IdentityModel.Tokens.Jwt.4.0.2.206221351\lib\net45\System.IdentityModel.Tokens.Jwt.dll + + ..\packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll True @@ -113,6 +113,7 @@ + diff --git a/CSharp/Blog-LUISActionBinding/Microsoft.Cognitive.LUIS.ActionBinding/app.config b/CSharp/Blog-LUISActionBinding/Microsoft.Cognitive.LUIS.ActionBinding/app.config new file mode 100644 index 0000000000..8460dd432e --- /dev/null +++ b/CSharp/Blog-LUISActionBinding/Microsoft.Cognitive.LUIS.ActionBinding/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/CSharp/Blog-LUISActionBinding/Microsoft.Cognitive.LUIS.ActionBinding/packages.config b/CSharp/Blog-LUISActionBinding/Microsoft.Cognitive.LUIS.ActionBinding/packages.config index 5693e431fc..31d44d7052 100644 --- a/CSharp/Blog-LUISActionBinding/Microsoft.Cognitive.LUIS.ActionBinding/packages.config +++ b/CSharp/Blog-LUISActionBinding/Microsoft.Cognitive.LUIS.ActionBinding/packages.config @@ -4,9 +4,9 @@ - - + + - + \ No newline at end of file diff --git a/CSharp/capability-SimpleTaskAutomation/SimpleTaskAutomationBot.csproj b/CSharp/capability-SimpleTaskAutomation/SimpleTaskAutomationBot.csproj index 3dc2a7b826..69514f2ef0 100644 --- a/CSharp/capability-SimpleTaskAutomation/SimpleTaskAutomationBot.csproj +++ b/CSharp/capability-SimpleTaskAutomation/SimpleTaskAutomationBot.csproj @@ -50,21 +50,21 @@ packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.Autofac.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Connector.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll True - - packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.3.308261200\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll + + packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll True @@ -80,8 +80,8 @@ True - - packages\System.IdentityModel.Tokens.Jwt.4.0.3.308261200\lib\net45\System.IdentityModel.Tokens.Jwt.dll + + packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll True diff --git a/CSharp/capability-SimpleTaskAutomation/packages.config b/CSharp/capability-SimpleTaskAutomation/packages.config index 0d7029d0f0..5482566ea7 100644 --- a/CSharp/capability-SimpleTaskAutomation/packages.config +++ b/CSharp/capability-SimpleTaskAutomation/packages.config @@ -6,10 +6,10 @@ - - + + - + \ No newline at end of file diff --git a/CSharp/cards-CarouselCards/CarouselCardsBot.csproj b/CSharp/cards-CarouselCards/CarouselCardsBot.csproj index a3cd26c9ba..95063b817e 100644 --- a/CSharp/cards-CarouselCards/CarouselCardsBot.csproj +++ b/CSharp/cards-CarouselCards/CarouselCardsBot.csproj @@ -50,22 +50,18 @@ packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.dll - True + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.Autofac.dll - True + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Connector.dll - True + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll - - packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.3.308261200\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll - True + + packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll packages\Microsoft.Rest.ClientRuntime.2.3.4\lib\net45\Microsoft.Rest.ClientRuntime.dll @@ -80,9 +76,8 @@ True - - packages\System.IdentityModel.Tokens.Jwt.4.0.3.308261200\lib\net45\System.IdentityModel.Tokens.Jwt.dll - True + + packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll diff --git a/CSharp/cards-CarouselCards/packages.config b/CSharp/cards-CarouselCards/packages.config index 0d7029d0f0..5482566ea7 100644 --- a/CSharp/cards-CarouselCards/packages.config +++ b/CSharp/cards-CarouselCards/packages.config @@ -6,10 +6,10 @@ - - + + - + \ No newline at end of file diff --git a/CSharp/cards-RichCards/CardsBot.csproj b/CSharp/cards-RichCards/CardsBot.csproj index 747d9dd90d..206d5b03e2 100644 --- a/CSharp/cards-RichCards/CardsBot.csproj +++ b/CSharp/cards-RichCards/CardsBot.csproj @@ -50,22 +50,18 @@ packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.dll - True + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.Autofac.dll - True + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Connector.dll - True + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll - - packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.3.308261200\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll - True + + packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll packages\Microsoft.Rest.ClientRuntime.2.3.4\lib\net45\Microsoft.Rest.ClientRuntime.dll @@ -80,9 +76,8 @@ True - - packages\System.IdentityModel.Tokens.Jwt.4.0.3.308261200\lib\net45\System.IdentityModel.Tokens.Jwt.dll - True + + packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll diff --git a/CSharp/cards-RichCards/packages.config b/CSharp/cards-RichCards/packages.config index 0d7029d0f0..5482566ea7 100644 --- a/CSharp/cards-RichCards/packages.config +++ b/CSharp/cards-RichCards/packages.config @@ -6,10 +6,10 @@ - - + + - + \ No newline at end of file diff --git a/CSharp/core-AppInsights/AppInsightsBot.csproj b/CSharp/core-AppInsights/AppInsightsBot.csproj index c78a97f9d0..9567a24f33 100644 --- a/CSharp/core-AppInsights/AppInsightsBot.csproj +++ b/CSharp/core-AppInsights/AppInsightsBot.csproj @@ -78,21 +78,21 @@ packages\Microsoft.ApplicationInsights.2.2.0\lib\net46\Microsoft.ApplicationInsights.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.Autofac.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Connector.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll True - - packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.3.308261200\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll + + packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll True @@ -108,8 +108,8 @@ True - - packages\System.IdentityModel.Tokens.Jwt.4.0.3.308261200\lib\net45\System.IdentityModel.Tokens.Jwt.dll + + packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll True diff --git a/CSharp/core-AppInsights/packages.config b/CSharp/core-AppInsights/packages.config index 88bc215f82..bde71abbd9 100644 --- a/CSharp/core-AppInsights/packages.config +++ b/CSharp/core-AppInsights/packages.config @@ -14,10 +14,10 @@ - - + + - + \ No newline at end of file diff --git a/CSharp/core-BasicMultiDialog/BasicMultiDialogBot.csproj b/CSharp/core-BasicMultiDialog/BasicMultiDialogBot.csproj index 49b54cf306..32df824bc7 100644 --- a/CSharp/core-BasicMultiDialog/BasicMultiDialogBot.csproj +++ b/CSharp/core-BasicMultiDialog/BasicMultiDialogBot.csproj @@ -50,21 +50,21 @@ packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.Autofac.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Connector.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll True - - packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.2.206221351\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll + + packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll True @@ -80,8 +80,8 @@ True - - packages\System.IdentityModel.Tokens.Jwt.4.0.2.206221351\lib\net45\System.IdentityModel.Tokens.Jwt.dll + + packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll True diff --git a/CSharp/core-BasicMultiDialog/packages.config b/CSharp/core-BasicMultiDialog/packages.config index 814c459794..868311c17c 100644 --- a/CSharp/core-BasicMultiDialog/packages.config +++ b/CSharp/core-BasicMultiDialog/packages.config @@ -6,10 +6,10 @@ - - + + - + \ No newline at end of file diff --git a/CSharp/core-ChannelData/ChannelDataBot.csproj b/CSharp/core-ChannelData/ChannelDataBot.csproj index 0d618f6809..fa0331e2d2 100644 --- a/CSharp/core-ChannelData/ChannelDataBot.csproj +++ b/CSharp/core-ChannelData/ChannelDataBot.csproj @@ -50,22 +50,18 @@ packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.dll - True + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.Autofac.dll - True + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Connector.dll - True + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll - - packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.3.308261200\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll - True + + packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll packages\Microsoft.Rest.ClientRuntime.2.3.4\lib\net45\Microsoft.Rest.ClientRuntime.dll @@ -80,9 +76,8 @@ True - - packages\System.IdentityModel.Tokens.Jwt.4.0.3.308261200\lib\net45\System.IdentityModel.Tokens.Jwt.dll - True + + packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll diff --git a/CSharp/core-ChannelData/packages.config b/CSharp/core-ChannelData/packages.config index 0d7029d0f0..5482566ea7 100644 --- a/CSharp/core-ChannelData/packages.config +++ b/CSharp/core-ChannelData/packages.config @@ -6,10 +6,10 @@ - - + + - + \ No newline at end of file diff --git a/CSharp/core-CreateNewConversation/Controllers/MessagesController.cs b/CSharp/core-CreateNewConversation/Controllers/MessagesController.cs index fad6e193a3..9d0f381db5 100644 --- a/CSharp/core-CreateNewConversation/Controllers/MessagesController.cs +++ b/CSharp/core-CreateNewConversation/Controllers/MessagesController.cs @@ -1,17 +1,14 @@ namespace CreateNewConversationBot { - using System; using System.Net; using System.Net.Http; using System.Threading; using System.Threading.Tasks; using System.Web.Http; using Autofac; - using Microsoft.Bot.Builder.Dialogs; using Microsoft.Bot.Builder.Dialogs.Internals; using Microsoft.Bot.Builder.Internals.Fibers; using Microsoft.Bot.Connector; - using Microsoft.Rest; [BotAuthentication] public class MessagesController : ApiController diff --git a/CSharp/core-CreateNewConversation/CreateNewConversationBot.csproj b/CSharp/core-CreateNewConversation/CreateNewConversationBot.csproj index d8a022b890..44bb93d41e 100644 --- a/CSharp/core-CreateNewConversation/CreateNewConversationBot.csproj +++ b/CSharp/core-CreateNewConversation/CreateNewConversationBot.csproj @@ -54,21 +54,21 @@ packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.Autofac.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Connector.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll True - - packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.3.308261200\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll + + packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll True @@ -84,8 +84,8 @@ True - - packages\System.IdentityModel.Tokens.Jwt.4.0.3.308261200\lib\net45\System.IdentityModel.Tokens.Jwt.dll + + packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll True diff --git a/CSharp/core-CreateNewConversation/Global.asax.cs b/CSharp/core-CreateNewConversation/Global.asax.cs index e87115c274..249e06c31a 100644 --- a/CSharp/core-CreateNewConversation/Global.asax.cs +++ b/CSharp/core-CreateNewConversation/Global.asax.cs @@ -4,9 +4,8 @@ using System.Web.Http; using Autofac; using Autofac.Integration.WebApi; - using Microsoft.Bot.Builder.Dialogs; using Microsoft.Bot.Builder.Dialogs.Internals; - using Microsoft.Bot.Builder.Internals.Fibers; + using Microsoft.Bot.Connector; public class WebApiApplication : System.Web.HttpApplication { @@ -23,9 +22,6 @@ protected void Application_Start() var builder = new ContainerBuilder(); - // temporary registration until change in DialogModule currently in Dev branch that registers ResumptionCookie is released - builder.RegisterType().AsSelf().InstancePerMatchingLifetimeScope(DialogModule.LifetimeScopeTag); - builder.RegisterModule(new DialogModule()); builder.RegisterModule(new SurveyModule()); diff --git a/CSharp/core-CreateNewConversation/ISurveyScheduler.cs b/CSharp/core-CreateNewConversation/ISurveyScheduler.cs index b7d61ba2f7..bc886f49be 100644 --- a/CSharp/core-CreateNewConversation/ISurveyScheduler.cs +++ b/CSharp/core-CreateNewConversation/ISurveyScheduler.cs @@ -1,9 +1,9 @@ namespace CreateNewConversationBot { - using Microsoft.Bot.Builder.Dialogs; + using Microsoft.Bot.Connector; public interface ISurveyScheduler { - void Add(ResumptionCookie cookie); + void Add(ConversationReference conversationReference); } } \ No newline at end of file diff --git a/CSharp/core-CreateNewConversation/README.md b/CSharp/core-CreateNewConversation/README.md index 83048d46b5..fb00351ab4 100644 --- a/CSharp/core-CreateNewConversation/README.md +++ b/CSharp/core-CreateNewConversation/README.md @@ -18,18 +18,18 @@ The minimum prerequisites to run this sample are: Bot Builder uses dialogs to model a conversational process, the exchange of messages, between bot and user. Conversations are usually initiated by the user but sometimes it might be useful for the bot to proactively start a new dialog to interact with the user. In this sample starting a new dialog is a two steps process: First, creating the new conversation, and then, passing the control to the new dialog. -The `ResumptionCookie` contains information that can be used to resume a conversation with a user. In this case, we'll use the cookie to craft a new direct message to the user within a new conversation. +The `ConversationReference` contains information that can be used to resume a conversation with a user. In this case, we'll use the conversation reference to craft a new direct message to the user within a new conversation. -Check out the use of the `ConnectorClient.CreateDirectConversationAsync()` method in the [SurveyTriggerer.cs](SurveyTriggerer.cs#L14-L69) class to create a new Bot-to-User conversation and how the `cookie.GetMessage()` is used to find the proper dependencies to execute `stack.Call()` and initiate a new `SurveyDialog`. +Check out the use of the `ConnectorClient.CreateDirectConversationAsync()` method in the [SurveyTriggerer.cs](SurveyTriggerer.cs#L14-L69) class to create a new Bot-to-User conversation and how the `conversationReference.GetPostToBotMessage()` is used to find the proper dependencies to execute `stack.Call()` and initiate a new `SurveyDialog`. ````C# -public static async Task StartSurvey(ResumptionCookie cookie, CancellationToken token) +public static async Task StartSurvey(ConversationReference conversationReference, CancellationToken token) { var container = WebApiApplication.FindContainer(); - // the ResumptionCookie has the "key" necessary to resume the conversation - var message = cookie.GetMessage(); + // the ConversationReference has the "key" necessary to resume the conversation + var message = conversationReference.GetPostToBotMessage(); ConnectorClient client = new ConnectorClient(new Uri(message.ServiceUrl)); @@ -82,13 +82,13 @@ public static async Task StartSurvey(ResumptionCookie cookie, CancellationToken } ```` -Additionally, the sample includes some "plumbing" components mainly intended to make the `ResumptionCookie` dependency available to initiate the survey dialog. -For instance, check out the [SurveyService.cs](SurveyService.cs#L20-L23) which stores the `ResumptionCookie` in the [SurveyScheduler.cs](SurveyScheduler.cs). +Additionally, the sample includes some "plumbing" components mainly intended to make the `ConversationReference` dependency available to initiate the survey dialog. +For instance, check out the [SurveyService.cs](SurveyService.cs#L20-L23) which stores the `ConversationReference` in the [SurveyScheduler.cs](SurveyScheduler.cs). ````C# public async Task QueueSurveyAsync() { - this.surveyScheduler.Add(this.cookie); + this.surveyScheduler.Add(this.conversationReference); } ```` @@ -108,7 +108,7 @@ To get more information about how to get started in Bot Builder for .NET and Con * [Bot Builder for .NET](https://docs.botframework.com/en-us/csharp/builder/sdkreference/index.html) * [Starting a Conversation](https://docs.botframework.com/en-us/core-concepts/conversation/) * [Starting Conversations](https://docs.botframework.com/en-us/csharp/builder/sdkreference/routing.html#conversation) -* [ResumptionCookie class](https://docs.botframework.com/en-us/csharp/builder/sdkreference/dc/d2b/class_microsoft_1_1_bot_1_1_builder_1_1_dialogs_1_1_resumption_cookie.html) +* [ConversationReference class](https://docs.botframework.com/en-us/csharp/builder/sdkreference/d2/d10/class_microsoft_1_1_bot_1_1_connector_1_1_conversation_reference.html) > **Limitations** > The functionality provided by the Bot Framework Activity can be used across many channels. Moreover, some special channel features can be unleashed using the [ChannelData property](https://docs.botframework.com/en-us/csharp/builder/sdkreference/channels.html). diff --git a/CSharp/core-CreateNewConversation/SurveyModule.cs b/CSharp/core-CreateNewConversation/SurveyModule.cs index a6ed655995..684d83180b 100644 --- a/CSharp/core-CreateNewConversation/SurveyModule.cs +++ b/CSharp/core-CreateNewConversation/SurveyModule.cs @@ -4,6 +4,7 @@ using Microsoft.Bot.Builder.Dialogs; using Microsoft.Bot.Builder.Dialogs.Internals; using Microsoft.Bot.Builder.Internals.Fibers; + using Microsoft.Bot.Connector; public class SurveyModule : Module { @@ -16,7 +17,7 @@ protected override void Load(ContainerBuilder builder) builder.Register((c, p) => new SurveyDialog()).AsSelf().InstancePerDependency(); builder.RegisterType().Keyed(FiberModule.Key_DoNotSerialize).AsImplementedInterfaces().SingleInstance(); - builder.Register(c => new SurveyService(c.Resolve(), c.Resolve())).Keyed(FiberModule.Key_DoNotSerialize).AsImplementedInterfaces().InstancePerMatchingLifetimeScope(DialogModule.LifetimeScopeTag); + builder.Register(c => new SurveyService(c.Resolve(), c.Resolve())).Keyed(FiberModule.Key_DoNotSerialize).AsImplementedInterfaces().InstancePerMatchingLifetimeScope(DialogModule.LifetimeScopeTag); } } } \ No newline at end of file diff --git a/CSharp/core-CreateNewConversation/SurveyScheduler.cs b/CSharp/core-CreateNewConversation/SurveyScheduler.cs index 6b5298bc09..40c3047312 100644 --- a/CSharp/core-CreateNewConversation/SurveyScheduler.cs +++ b/CSharp/core-CreateNewConversation/SurveyScheduler.cs @@ -2,18 +2,15 @@ { using System; using System.Collections.Concurrent; - using System.Collections.Generic; - using System.Collections.ObjectModel; - using System.Linq; - using System.Threading; using System.Threading.Tasks; using System.Web.Hosting; using Microsoft.Bot.Builder.Dialogs; + using Microsoft.Bot.Connector; [Serializable] public sealed class SurveyScheduler : ISurveyScheduler { - private readonly ConcurrentQueue surveyRequests = new ConcurrentQueue(); + private readonly ConcurrentQueue surveyRequests = new ConcurrentQueue(); public SurveyScheduler() { @@ -25,7 +22,7 @@ public SurveyScheduler() while (surveyRequests.Count > 0) { - ResumptionCookie surveyRequest = null; + ConversationReference surveyRequest = null; if (surveyRequests.TryDequeue(out surveyRequest)) { @@ -39,9 +36,9 @@ public SurveyScheduler() }); } - public void Add(ResumptionCookie cookie) + public void Add(ConversationReference conversationReference) { - this.surveyRequests.Enqueue(cookie); + this.surveyRequests.Enqueue(conversationReference); } } } diff --git a/CSharp/core-CreateNewConversation/SurveyService.cs b/CSharp/core-CreateNewConversation/SurveyService.cs index 251b95239b..932c97ed84 100644 --- a/CSharp/core-CreateNewConversation/SurveyService.cs +++ b/CSharp/core-CreateNewConversation/SurveyService.cs @@ -2,24 +2,24 @@ { using System; using System.Threading.Tasks; - using Microsoft.Bot.Builder.Dialogs; using Microsoft.Bot.Builder.Internals.Fibers; + using Microsoft.Bot.Connector; [Serializable] public class SurveyService : ISurveyService { private readonly ISurveyScheduler surveyScheduler; - private readonly ResumptionCookie cookie; + private readonly ConversationReference conversationReference; - public SurveyService(ISurveyScheduler surveyScheduler, ResumptionCookie cookie) + public SurveyService(ISurveyScheduler surveyScheduler, ConversationReference conversationReference) { SetField.NotNull(out this.surveyScheduler, nameof(surveyScheduler), surveyScheduler); - SetField.NotNull(out this.cookie, nameof(cookie), cookie); + SetField.NotNull(out this.conversationReference, nameof(conversationReference), conversationReference); } public async Task QueueSurveyAsync() { - this.surveyScheduler.Add(this.cookie); + this.surveyScheduler.Add(this.conversationReference); } } } diff --git a/CSharp/core-CreateNewConversation/SurveyTriggerer.cs b/CSharp/core-CreateNewConversation/SurveyTriggerer.cs index 63c8f28fdb..ab60abb7d2 100644 --- a/CSharp/core-CreateNewConversation/SurveyTriggerer.cs +++ b/CSharp/core-CreateNewConversation/SurveyTriggerer.cs @@ -11,12 +11,12 @@ public static class SurveyTriggerer { - public static async Task StartSurvey(ResumptionCookie cookie, CancellationToken token) + public static async Task StartSurvey(ConversationReference conversationReference, CancellationToken token) { var container = WebApiApplication.FindContainer(); - // the ResumptionCookie has the "key" necessary to resume the conversation - var message = cookie.GetMessage(); + // the ConversationReference has the "key" necessary to resume the conversation + var message = conversationReference.GetPostToBotMessage(); ConnectorClient client = new ConnectorClient(new Uri(message.ServiceUrl)); diff --git a/CSharp/core-CreateNewConversation/packages.config b/CSharp/core-CreateNewConversation/packages.config index b2cf8e987f..ee7ddb03fc 100644 --- a/CSharp/core-CreateNewConversation/packages.config +++ b/CSharp/core-CreateNewConversation/packages.config @@ -7,10 +7,10 @@ - - + + - + \ No newline at end of file diff --git a/CSharp/core-CustomState/CustomStateBot.csproj b/CSharp/core-CustomState/CustomStateBot.csproj index a67d5d15ff..174d9d8da5 100644 --- a/CSharp/core-CustomState/CustomStateBot.csproj +++ b/CSharp/core-CustomState/CustomStateBot.csproj @@ -58,24 +58,24 @@ packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll True - - packages\Microsoft.Bot.Builder.3.5.5\lib\net46\Microsoft.Bot.Builder.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll True - - packages\Microsoft.Bot.Builder.3.5.5\lib\net46\Microsoft.Bot.Builder.Autofac.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll True - - packages\Microsoft.Bot.Builder.Azure.3.2.1\lib\net46\Microsoft.Bot.Builder.Azure.dll + + packages\Microsoft.Bot.Builder.Azure.3.2.2\lib\net46\Microsoft.Bot.Builder.Azure.dll True - - packages\Microsoft.Bot.Builder.History.3.0.3\lib\net46\Microsoft.Bot.Builder.History.dll + + packages\Microsoft.Bot.Builder.History.3.0.4\lib\net46\Microsoft.Bot.Builder.History.dll True - - packages\Microsoft.Bot.Builder.3.5.5\lib\net46\Microsoft.Bot.Connector.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll True @@ -91,8 +91,8 @@ packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll True - - packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.3.308261200\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll + + packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll True @@ -112,8 +112,8 @@ True - - packages\System.IdentityModel.Tokens.Jwt.4.0.3.308261200\lib\net45\System.IdentityModel.Tokens.Jwt.dll + + packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll True diff --git a/CSharp/core-CustomState/StateDialog.cs b/CSharp/core-CustomState/StateDialog.cs index 44695cbdb2..7abba35fe4 100644 --- a/CSharp/core-CustomState/StateDialog.cs +++ b/CSharp/core-CustomState/StateDialog.cs @@ -51,7 +51,7 @@ public virtual async Task MessageReceivedAsync(IDialogContext context, IAwaitabl { string userCity; - var city = context.ConversationData.Get(ContextConstants.CityKey); + var city = context.ConversationData.GetValue(ContextConstants.CityKey); if (context.PrivateConversationData.TryGetValue(ContextConstants.CityKey, out userCity)) { @@ -82,7 +82,7 @@ public virtual async Task MessageReceivedAsync(IDialogContext context, IAwaitabl if (!context.PrivateConversationData.TryGetValue(ContextConstants.CityKey, out city)) { - city = context.ConversationData.Get(ContextConstants.CityKey); + city = context.ConversationData.GetValue(ContextConstants.CityKey); } await context.PostAsync($"{userName}, wait a few seconds. Searching for '{message.Text}' in '{city}'..."); diff --git a/CSharp/core-CustomState/packages.config b/CSharp/core-CustomState/packages.config index 16766b113d..5addfae116 100644 --- a/CSharp/core-CustomState/packages.config +++ b/CSharp/core-CustomState/packages.config @@ -8,17 +8,17 @@ - - - + + + - + - + \ No newline at end of file diff --git a/CSharp/core-DirectLine/DirectLineBot/DirectLineBot.csproj b/CSharp/core-DirectLine/DirectLineBot/DirectLineBot.csproj index 16a65e6661..5c5bbad0f3 100644 --- a/CSharp/core-DirectLine/DirectLineBot/DirectLineBot.csproj +++ b/CSharp/core-DirectLine/DirectLineBot/DirectLineBot.csproj @@ -50,22 +50,18 @@ ..\packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll True - - ..\packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.dll - True + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll - - ..\packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.Autofac.dll - True + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll - - ..\packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Connector.dll - True + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll - - ..\packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.3.308261200\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll - True + + ..\packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll ..\packages\Microsoft.Rest.ClientRuntime.2.3.4\lib\net45\Microsoft.Rest.ClientRuntime.dll @@ -80,9 +76,8 @@ True - - ..\packages\System.IdentityModel.Tokens.Jwt.4.0.3.308261200\lib\net45\System.IdentityModel.Tokens.Jwt.dll - True + + ..\packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll diff --git a/CSharp/core-DirectLine/DirectLineBot/packages.config b/CSharp/core-DirectLine/DirectLineBot/packages.config index 0d7029d0f0..5482566ea7 100644 --- a/CSharp/core-DirectLine/DirectLineBot/packages.config +++ b/CSharp/core-DirectLine/DirectLineBot/packages.config @@ -6,10 +6,10 @@ - - + + - + \ No newline at end of file diff --git a/CSharp/core-DirectLine/DirectLineClient/DirectLineSampleClient.csproj b/CSharp/core-DirectLine/DirectLineClient/DirectLineSampleClient.csproj index 3cc0c81eed..2c5290fa23 100644 --- a/CSharp/core-DirectLine/DirectLineClient/DirectLineSampleClient.csproj +++ b/CSharp/core-DirectLine/DirectLineClient/DirectLineSampleClient.csproj @@ -33,9 +33,8 @@ 4 - - ..\packages\Microsoft.Bot.Connector.DirectLine.3.0.0\lib\net45\Microsoft.Bot.Connector.DirectLine.dll - True + + ..\packages\Microsoft.Bot.Connector.DirectLine.3.0.1\lib\net45\Microsoft.Bot.Connector.DirectLine.dll ..\packages\Microsoft.Rest.ClientRuntime.2.3.4\lib\net45\Microsoft.Rest.ClientRuntime.dll diff --git a/CSharp/core-DirectLine/DirectLineClient/packages.config b/CSharp/core-DirectLine/DirectLineClient/packages.config index a7c08d7f15..b0c218778e 100644 --- a/CSharp/core-DirectLine/DirectLineClient/packages.config +++ b/CSharp/core-DirectLine/DirectLineClient/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/CSharp/core-DirectLineWebSockets/DirectLineBot/DirectLineBot.csproj b/CSharp/core-DirectLineWebSockets/DirectLineBot/DirectLineBot.csproj index 72397f4fe3..55d909bc25 100644 --- a/CSharp/core-DirectLineWebSockets/DirectLineBot/DirectLineBot.csproj +++ b/CSharp/core-DirectLineWebSockets/DirectLineBot/DirectLineBot.csproj @@ -50,21 +50,21 @@ ..\packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll True - - ..\packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.dll + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll True - - ..\packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.Autofac.dll + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll True - - ..\packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Connector.dll + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll True - - ..\packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.3.308261200\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll + + ..\packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll True @@ -80,8 +80,8 @@ True - - ..\packages\System.IdentityModel.Tokens.Jwt.4.0.3.308261200\lib\net45\System.IdentityModel.Tokens.Jwt.dll + + ..\packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll True diff --git a/CSharp/core-DirectLineWebSockets/DirectLineBot/packages.config b/CSharp/core-DirectLineWebSockets/DirectLineBot/packages.config index a089af8edd..226ed6a1a4 100644 --- a/CSharp/core-DirectLineWebSockets/DirectLineBot/packages.config +++ b/CSharp/core-DirectLineWebSockets/DirectLineBot/packages.config @@ -6,10 +6,10 @@ - - + + - + \ No newline at end of file diff --git a/CSharp/core-DirectLineWebSockets/DirectLineClient/DirectLineSampleClient.csproj b/CSharp/core-DirectLineWebSockets/DirectLineClient/DirectLineSampleClient.csproj index f1932fe0be..2d93aad582 100644 --- a/CSharp/core-DirectLineWebSockets/DirectLineClient/DirectLineSampleClient.csproj +++ b/CSharp/core-DirectLineWebSockets/DirectLineClient/DirectLineSampleClient.csproj @@ -33,8 +33,8 @@ 4 - - ..\packages\Microsoft.Bot.Connector.DirectLine.3.0.0\lib\net45\Microsoft.Bot.Connector.DirectLine.dll + + ..\packages\Microsoft.Bot.Connector.DirectLine.3.0.1\lib\net45\Microsoft.Bot.Connector.DirectLine.dll True diff --git a/CSharp/core-DirectLineWebSockets/DirectLineClient/packages.config b/CSharp/core-DirectLineWebSockets/DirectLineClient/packages.config index 4c77123c86..5e06a03ad4 100644 --- a/CSharp/core-DirectLineWebSockets/DirectLineClient/packages.config +++ b/CSharp/core-DirectLineWebSockets/DirectLineClient/packages.config @@ -1,6 +1,6 @@  - + diff --git a/CSharp/core-GetConversationMembers/GetConversationMembersBot.csproj b/CSharp/core-GetConversationMembers/GetConversationMembersBot.csproj index d5d1e5e637..1ce7059e93 100644 --- a/CSharp/core-GetConversationMembers/GetConversationMembersBot.csproj +++ b/CSharp/core-GetConversationMembers/GetConversationMembersBot.csproj @@ -50,22 +50,18 @@ packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.dll - True + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.Autofac.dll - True + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Connector.dll - True + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll - - packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.3.308261200\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll - True + + packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll packages\Microsoft.Rest.ClientRuntime.2.3.4\lib\net45\Microsoft.Rest.ClientRuntime.dll @@ -80,9 +76,8 @@ True - - packages\System.IdentityModel.Tokens.Jwt.4.0.3.308261200\lib\net45\System.IdentityModel.Tokens.Jwt.dll - True + + packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll diff --git a/CSharp/core-GetConversationMembers/packages.config b/CSharp/core-GetConversationMembers/packages.config index 0d7029d0f0..5482566ea7 100644 --- a/CSharp/core-GetConversationMembers/packages.config +++ b/CSharp/core-GetConversationMembers/packages.config @@ -6,10 +6,10 @@ - - + + - + \ No newline at end of file diff --git a/CSharp/core-GlobalMessageHandlers/GlobalMessageHandlersBot.csproj b/CSharp/core-GlobalMessageHandlers/GlobalMessageHandlersBot.csproj index a3630ec66f..149f32d67c 100644 --- a/CSharp/core-GlobalMessageHandlers/GlobalMessageHandlersBot.csproj +++ b/CSharp/core-GlobalMessageHandlers/GlobalMessageHandlersBot.csproj @@ -50,21 +50,21 @@ packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.Autofac.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Connector.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll True - - packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.2.206221351\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll + + packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll True @@ -80,8 +80,8 @@ True - - packages\System.IdentityModel.Tokens.Jwt.4.0.2.206221351\lib\net45\System.IdentityModel.Tokens.Jwt.dll + + packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll True diff --git a/CSharp/core-GlobalMessageHandlers/packages.config b/CSharp/core-GlobalMessageHandlers/packages.config index 156b91c865..0648596f79 100644 --- a/CSharp/core-GlobalMessageHandlers/packages.config +++ b/CSharp/core-GlobalMessageHandlers/packages.config @@ -6,10 +6,10 @@ - - + + - + \ No newline at end of file diff --git a/CSharp/core-Middleware/MiddlewareBot.csproj b/CSharp/core-Middleware/MiddlewareBot.csproj index fa3540d156..8da41c36eb 100644 --- a/CSharp/core-Middleware/MiddlewareBot.csproj +++ b/CSharp/core-Middleware/MiddlewareBot.csproj @@ -50,21 +50,21 @@ packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.Autofac.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Connector.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll True - - packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.3.308261200\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll + + packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll True @@ -80,8 +80,8 @@ True - - packages\System.IdentityModel.Tokens.Jwt.4.0.3.308261200\lib\net45\System.IdentityModel.Tokens.Jwt.dll + + packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll True diff --git a/CSharp/core-Middleware/packages.config b/CSharp/core-Middleware/packages.config index c165fedbc0..48bb6c5b11 100644 --- a/CSharp/core-Middleware/packages.config +++ b/CSharp/core-Middleware/packages.config @@ -6,10 +6,10 @@ - - + + - + \ No newline at end of file diff --git a/CSharp/core-MultiDialogs/MultiDialogsBot.csproj b/CSharp/core-MultiDialogs/MultiDialogsBot.csproj index 86a3955bcd..85c33756b0 100644 --- a/CSharp/core-MultiDialogs/MultiDialogsBot.csproj +++ b/CSharp/core-MultiDialogs/MultiDialogsBot.csproj @@ -50,22 +50,18 @@ packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.dll - True + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.Autofac.dll - True + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Connector.dll - True + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll - - packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.3.308261200\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll - True + + packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll packages\Microsoft.Rest.ClientRuntime.2.3.4\lib\net45\Microsoft.Rest.ClientRuntime.dll @@ -80,9 +76,8 @@ True - - packages\System.IdentityModel.Tokens.Jwt.4.0.3.308261200\lib\net45\System.IdentityModel.Tokens.Jwt.dll - True + + packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll diff --git a/CSharp/core-MultiDialogs/packages.config b/CSharp/core-MultiDialogs/packages.config index 0d7029d0f0..5482566ea7 100644 --- a/CSharp/core-MultiDialogs/packages.config +++ b/CSharp/core-MultiDialogs/packages.config @@ -6,10 +6,10 @@ - - + + - + \ No newline at end of file diff --git a/CSharp/core-ReceiveAttachment/ReceiveAttachmentBot.csproj b/CSharp/core-ReceiveAttachment/ReceiveAttachmentBot.csproj index 5fe117bcbb..2260fc254e 100644 --- a/CSharp/core-ReceiveAttachment/ReceiveAttachmentBot.csproj +++ b/CSharp/core-ReceiveAttachment/ReceiveAttachmentBot.csproj @@ -50,22 +50,18 @@ packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.dll - True + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.Autofac.dll - True + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Connector.dll - True + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll - - packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.3.308261200\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll - True + + packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll packages\Microsoft.Rest.ClientRuntime.2.3.4\lib\net45\Microsoft.Rest.ClientRuntime.dll @@ -80,9 +76,8 @@ True - - packages\System.IdentityModel.Tokens.Jwt.4.0.3.308261200\lib\net45\System.IdentityModel.Tokens.Jwt.dll - True + + packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll diff --git a/CSharp/core-ReceiveAttachment/packages.config b/CSharp/core-ReceiveAttachment/packages.config index 0d7029d0f0..5482566ea7 100644 --- a/CSharp/core-ReceiveAttachment/packages.config +++ b/CSharp/core-ReceiveAttachment/packages.config @@ -6,10 +6,10 @@ - - + + - + \ No newline at end of file diff --git a/CSharp/core-SendAttachment/SendAttachmentBot.csproj b/CSharp/core-SendAttachment/SendAttachmentBot.csproj index 1ba93848b6..6057b454a4 100644 --- a/CSharp/core-SendAttachment/SendAttachmentBot.csproj +++ b/CSharp/core-SendAttachment/SendAttachmentBot.csproj @@ -50,22 +50,18 @@ packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.dll - True + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.Autofac.dll - True + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Connector.dll - True + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll - - packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.3.308261200\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll - True + + packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll packages\Microsoft.Rest.ClientRuntime.2.3.4\lib\net45\Microsoft.Rest.ClientRuntime.dll @@ -80,9 +76,8 @@ True - - packages\System.IdentityModel.Tokens.Jwt.4.0.3.308261200\lib\net45\System.IdentityModel.Tokens.Jwt.dll - True + + packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll diff --git a/CSharp/core-SendAttachment/packages.config b/CSharp/core-SendAttachment/packages.config index 0d7029d0f0..5482566ea7 100644 --- a/CSharp/core-SendAttachment/packages.config +++ b/CSharp/core-SendAttachment/packages.config @@ -6,10 +6,10 @@ - - + + - + \ No newline at end of file diff --git a/CSharp/core-State/StateBot.csproj b/CSharp/core-State/StateBot.csproj index cbb32448e9..5a30c84550 100644 --- a/CSharp/core-State/StateBot.csproj +++ b/CSharp/core-State/StateBot.csproj @@ -50,22 +50,18 @@ packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.dll - True + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.Autofac.dll - True + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Connector.dll - True + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll - - packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.3.308261200\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll - True + + packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll packages\Microsoft.Rest.ClientRuntime.2.3.4\lib\net45\Microsoft.Rest.ClientRuntime.dll @@ -80,9 +76,8 @@ True - - packages\System.IdentityModel.Tokens.Jwt.4.0.3.308261200\lib\net45\System.IdentityModel.Tokens.Jwt.dll - True + + packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll diff --git a/CSharp/core-State/StateDialog.cs b/CSharp/core-State/StateDialog.cs index d0d08a7416..c4354d9f8b 100644 --- a/CSharp/core-State/StateDialog.cs +++ b/CSharp/core-State/StateDialog.cs @@ -51,7 +51,7 @@ public virtual async Task MessageReceivedAsync(IDialogContext context, IAwaitabl { string userCity; - var city = context.ConversationData.Get(ContextConstants.CityKey); + var city = context.ConversationData.GetValue(ContextConstants.CityKey); if (context.PrivateConversationData.TryGetValue(ContextConstants.CityKey, out userCity)) { @@ -82,7 +82,7 @@ public virtual async Task MessageReceivedAsync(IDialogContext context, IAwaitabl if (!context.PrivateConversationData.TryGetValue(ContextConstants.CityKey, out city)) { - city = context.ConversationData.Get(ContextConstants.CityKey); + city = context.ConversationData.GetValue(ContextConstants.CityKey); } await context.PostAsync($"{userName}, wait a few seconds. Searching for '{message.Text}' in '{city}'..."); diff --git a/CSharp/core-State/packages.config b/CSharp/core-State/packages.config index 0d7029d0f0..5482566ea7 100644 --- a/CSharp/core-State/packages.config +++ b/CSharp/core-State/packages.config @@ -6,10 +6,10 @@ - - + + - + \ No newline at end of file diff --git a/CSharp/core-proactiveMessages/simpleSendMessage/packages.config b/CSharp/core-proactiveMessages/simpleSendMessage/packages.config index bc4a0fe09a..eaa16f768e 100644 --- a/CSharp/core-proactiveMessages/simpleSendMessage/packages.config +++ b/CSharp/core-proactiveMessages/simpleSendMessage/packages.config @@ -7,12 +7,12 @@ - + - + - + \ No newline at end of file diff --git a/CSharp/core-proactiveMessages/simpleSendMessage/simpleSendMessage.csproj b/CSharp/core-proactiveMessages/simpleSendMessage/simpleSendMessage.csproj index b5505cd30e..eb5f1cf078 100644 --- a/CSharp/core-proactiveMessages/simpleSendMessage/simpleSendMessage.csproj +++ b/CSharp/core-proactiveMessages/simpleSendMessage/simpleSendMessage.csproj @@ -57,16 +57,16 @@ .\packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.Autofac.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Connector.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll True @@ -74,8 +74,8 @@ .\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.28\lib\net46\Microsoft.Diagnostics.Tracing.EventSource.dll True - - .\packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.2.206221351\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll + + packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll True @@ -91,8 +91,8 @@ True - - .\packages\System.IdentityModel.Tokens.Jwt.4.0.2.206221351\lib\net45\System.IdentityModel.Tokens.Jwt.dll + + packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll True diff --git a/CSharp/core-proactiveMessages/startNewDialog/packages.config b/CSharp/core-proactiveMessages/startNewDialog/packages.config index bc4a0fe09a..eaa16f768e 100644 --- a/CSharp/core-proactiveMessages/startNewDialog/packages.config +++ b/CSharp/core-proactiveMessages/startNewDialog/packages.config @@ -7,12 +7,12 @@ - + - + - + \ No newline at end of file diff --git a/CSharp/core-proactiveMessages/startNewDialog/startNewDialog.csproj b/CSharp/core-proactiveMessages/startNewDialog/startNewDialog.csproj index 071d1a3527..9863f731e2 100644 --- a/CSharp/core-proactiveMessages/startNewDialog/startNewDialog.csproj +++ b/CSharp/core-proactiveMessages/startNewDialog/startNewDialog.csproj @@ -57,16 +57,16 @@ .\packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.Autofac.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Connector.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll True @@ -74,8 +74,8 @@ .\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.28\lib\net46\Microsoft.Diagnostics.Tracing.EventSource.dll True - - .\packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.2.206221351\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll + + packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll True @@ -91,8 +91,8 @@ True - - .\packages\System.IdentityModel.Tokens.Jwt.4.0.2.206221351\lib\net45\System.IdentityModel.Tokens.Jwt.dll + + packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll True diff --git a/CSharp/core-proactiveMessages/startNewDialogWithPrompt/packages.config b/CSharp/core-proactiveMessages/startNewDialogWithPrompt/packages.config index bc4a0fe09a..eaa16f768e 100644 --- a/CSharp/core-proactiveMessages/startNewDialogWithPrompt/packages.config +++ b/CSharp/core-proactiveMessages/startNewDialogWithPrompt/packages.config @@ -7,12 +7,12 @@ - + - + - + \ No newline at end of file diff --git a/CSharp/core-proactiveMessages/startNewDialogWithPrompt/startNewDialogWithPrompt.csproj b/CSharp/core-proactiveMessages/startNewDialogWithPrompt/startNewDialogWithPrompt.csproj index 3213e04072..6a4cff5430 100644 --- a/CSharp/core-proactiveMessages/startNewDialogWithPrompt/startNewDialogWithPrompt.csproj +++ b/CSharp/core-proactiveMessages/startNewDialogWithPrompt/startNewDialogWithPrompt.csproj @@ -57,16 +57,16 @@ .\packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.Autofac.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Connector.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll True @@ -74,8 +74,8 @@ .\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.28\lib\net46\Microsoft.Diagnostics.Tracing.EventSource.dll True - - .\packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.2.206221351\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll + + packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll True @@ -91,8 +91,8 @@ True - - .\packages\System.IdentityModel.Tokens.Jwt.4.0.2.206221351\lib\net45\System.IdentityModel.Tokens.Jwt.dll + + packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll True diff --git a/CSharp/demo-CardsAttachments/public-TestBot/TestBot.csproj b/CSharp/demo-CardsAttachments/public-TestBot/TestBot.csproj index 11a98e71c4..82a0b37794 100644 --- a/CSharp/demo-CardsAttachments/public-TestBot/TestBot.csproj +++ b/CSharp/demo-CardsAttachments/public-TestBot/TestBot.csproj @@ -50,21 +50,21 @@ ..\packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll True - - ..\packages\Microsoft.Bot.Builder.3.5.1\lib\net46\Microsoft.Bot.Builder.dll + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll True - - ..\packages\Microsoft.Bot.Builder.3.5.1\lib\net46\Microsoft.Bot.Builder.Autofac.dll + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll True - - ..\packages\Microsoft.Bot.Builder.3.5.1\lib\net46\Microsoft.Bot.Connector.dll + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll True - - ..\packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.3.308261200\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll + + ..\packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll True @@ -84,8 +84,8 @@ True - - ..\packages\System.IdentityModel.Tokens.Jwt.4.0.3.308261200\lib\net45\System.IdentityModel.Tokens.Jwt.dll + + ..\packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll True diff --git a/CSharp/demo-CardsAttachments/public-TestBot/packages.config b/CSharp/demo-CardsAttachments/public-TestBot/packages.config index 8e78494fe6..898bc20efa 100644 --- a/CSharp/demo-CardsAttachments/public-TestBot/packages.config +++ b/CSharp/demo-CardsAttachments/public-TestBot/packages.config @@ -9,11 +9,11 @@ - - + + - + \ No newline at end of file diff --git a/CSharp/demo-Search/JobListingBot/Dialogs/JobsDialog.cs b/CSharp/demo-Search/JobListingBot/Dialogs/JobsDialog.cs index 86f4f0a658..c4213e28d1 100644 --- a/CSharp/demo-Search/JobListingBot/Dialogs/JobsDialog.cs +++ b/CSharp/demo-Search/JobListingBot/Dialogs/JobsDialog.cs @@ -26,7 +26,7 @@ protected override string[] GetTopRefiners() [Serializable] public class JobStyler : PromptStyler { - public override void Apply(ref IMessageActivity message, string prompt, IReadOnlyList options, IReadOnlyList descriptions = null) + public override void Apply(ref IMessageActivity message, string prompt, IReadOnlyList options, IReadOnlyList descriptions = null, string speak = null) { var hits = (IList)options; @@ -40,6 +40,7 @@ public override void Apply(ref IMessageActivity message, string prompt, IRead message.AttachmentLayout = AttachmentLayoutTypes.Carousel; message.Attachments = cards.Select(c => c.ToAttachment()).ToList(); message.Text = prompt; + message.Speak = speak; } } } diff --git a/CSharp/demo-Search/JobListingBot/JobListingBot.csproj b/CSharp/demo-Search/JobListingBot/JobListingBot.csproj index 4316cc8326..04829a264a 100644 --- a/CSharp/demo-Search/JobListingBot/JobListingBot.csproj +++ b/CSharp/demo-Search/JobListingBot/JobListingBot.csproj @@ -55,22 +55,18 @@ ..\packages\Microsoft.Azure.Search.3.0.1\lib\net45\Microsoft.Azure.Search.dll True - - ..\packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.dll - True + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll - - ..\packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.Autofac.dll - True + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll - - ..\packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Connector.dll - True + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll - - ..\packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.3.308261200\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll - True + + ..\packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll ..\packages\Microsoft.Rest.ClientRuntime.2.3.4\lib\net45\Microsoft.Rest.ClientRuntime.dll @@ -93,9 +89,8 @@ True - - ..\packages\System.IdentityModel.Tokens.Jwt.4.0.3.308261200\lib\net45\System.IdentityModel.Tokens.Jwt.dll - True + + ..\packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll diff --git a/CSharp/demo-Search/JobListingBot/packages.config b/CSharp/demo-Search/JobListingBot/packages.config index 526fdd2239..3d9c179702 100644 --- a/CSharp/demo-Search/JobListingBot/packages.config +++ b/CSharp/demo-Search/JobListingBot/packages.config @@ -7,12 +7,12 @@ - - + + - + \ No newline at end of file diff --git a/CSharp/demo-Search/RealEstateBot/RealEstateBot.csproj b/CSharp/demo-Search/RealEstateBot/RealEstateBot.csproj index 64d4067238..f242f46ab9 100644 --- a/CSharp/demo-Search/RealEstateBot/RealEstateBot.csproj +++ b/CSharp/demo-Search/RealEstateBot/RealEstateBot.csproj @@ -54,22 +54,18 @@ ..\packages\Microsoft.Azure.Search.3.0.1\lib\net45\Microsoft.Azure.Search.dll True - - ..\packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.dll - True + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll - - ..\packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.Autofac.dll - True + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll - - ..\packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Connector.dll - True + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll - - ..\packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.3.308261200\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll - True + + ..\packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll ..\packages\Microsoft.Rest.ClientRuntime.2.3.4\lib\net45\Microsoft.Rest.ClientRuntime.dll @@ -92,9 +88,8 @@ True - - ..\packages\System.IdentityModel.Tokens.Jwt.4.0.3.308261200\lib\net45\System.IdentityModel.Tokens.Jwt.dll - True + + ..\packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll diff --git a/CSharp/demo-Search/RealEstateBot/packages.config b/CSharp/demo-Search/RealEstateBot/packages.config index 526fdd2239..3d9c179702 100644 --- a/CSharp/demo-Search/RealEstateBot/packages.config +++ b/CSharp/demo-Search/RealEstateBot/packages.config @@ -7,12 +7,12 @@ - - + + - + \ No newline at end of file diff --git a/CSharp/demo-Search/Search.Dialogs/CancelablePromptChoice.cs b/CSharp/demo-Search/Search.Dialogs/CancelablePromptChoice.cs index 31edb78ef9..f0c91dd663 100644 --- a/CSharp/demo-Search/Search.Dialogs/CancelablePromptChoice.cs +++ b/CSharp/demo-Search/Search.Dialogs/CancelablePromptChoice.cs @@ -51,10 +51,10 @@ protected override bool TryParse(IMessageActivity message, out T result) return base.TryParse(message, out result); } - protected override IMessageActivity MakePrompt(IDialogContext context, string prompt, IReadOnlyList options = null, IReadOnlyList descriptions = null) + protected override IMessageActivity MakePrompt(IDialogContext context, string prompt, IReadOnlyList options = null, IReadOnlyList descriptions = null, string speak = null) { prompt += Environment.NewLine + (this.PromptOptions.CancelPrompt ?? this.PromptOptions.DefaultCancelPrompt); - return base.MakePrompt(context, prompt, options, descriptions); + return base.MakePrompt(context, prompt, options, descriptions, speak); } } } \ No newline at end of file diff --git a/CSharp/demo-Search/Search.Dialogs/Search.Dialogs.csproj b/CSharp/demo-Search/Search.Dialogs/Search.Dialogs.csproj index 239cbdd04c..e4947315ca 100644 --- a/CSharp/demo-Search/Search.Dialogs/Search.Dialogs.csproj +++ b/CSharp/demo-Search/Search.Dialogs/Search.Dialogs.csproj @@ -39,21 +39,17 @@ ..\packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll True - - ..\packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.dll - True + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll - - ..\packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.Autofac.dll - True + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll - - ..\packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Connector.dll - True + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll - - ..\packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.3.308261200\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll - True + + ..\packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll ..\packages\Microsoft.Rest.ClientRuntime.2.3.4\lib\net45\Microsoft.Rest.ClientRuntime.dll @@ -65,9 +61,8 @@ - - ..\packages\System.IdentityModel.Tokens.Jwt.4.0.3.308261200\lib\net45\System.IdentityModel.Tokens.Jwt.dll - True + + ..\packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll diff --git a/CSharp/demo-Search/Search.Dialogs/SearchHitStyler.cs b/CSharp/demo-Search/Search.Dialogs/SearchHitStyler.cs index eb8f4932dc..439caba255 100644 --- a/CSharp/demo-Search/Search.Dialogs/SearchHitStyler.cs +++ b/CSharp/demo-Search/Search.Dialogs/SearchHitStyler.cs @@ -10,7 +10,7 @@ [Serializable] public class SearchHitStyler : PromptStyler { - public override void Apply(ref IMessageActivity message, string prompt, IReadOnlyList options, IReadOnlyList descriptions = null) + public override void Apply(ref IMessageActivity message, string prompt, IReadOnlyList options, IReadOnlyList descriptions = null, string speak = null) { var hits = options as IList; if (hits != null) @@ -26,10 +26,11 @@ public override void Apply(ref IMessageActivity message, string prompt, IRead message.AttachmentLayout = AttachmentLayoutTypes.Carousel; message.Attachments = cards.Select(c => c.ToAttachment()).ToList(); message.Text = prompt; + message.Speak = speak; } else { - base.Apply(ref message, prompt, options, descriptions); + base.Apply(ref message, prompt, options, descriptions, speak); } } } diff --git a/CSharp/demo-Search/Search.Dialogs/packages.config b/CSharp/demo-Search/Search.Dialogs/packages.config index 2652ee95c9..0e7f54336f 100644 --- a/CSharp/demo-Search/Search.Dialogs/packages.config +++ b/CSharp/demo-Search/Search.Dialogs/packages.config @@ -4,9 +4,9 @@ - - + + - + \ No newline at end of file diff --git a/CSharp/intelligence-LUIS/Dialogs/RootLuisDialog.cs b/CSharp/intelligence-LUIS/Dialogs/RootLuisDialog.cs index eb2608e2b7..1ba25d7cec 100644 --- a/CSharp/intelligence-LUIS/Dialogs/RootLuisDialog.cs +++ b/CSharp/intelligence-LUIS/Dialogs/RootLuisDialog.cs @@ -12,6 +12,7 @@ using Microsoft.Bot.Connector; [LuisModel("YourModelId", "YourSubscriptionKey")] + [Serializable] public class RootLuisDialog : LuisDialog { private const string EntityGeographyCity = "builtin.geography.city"; diff --git a/CSharp/intelligence-LUIS/LuisBot.csproj b/CSharp/intelligence-LUIS/LuisBot.csproj index b8c267f13c..86ae00bf0a 100644 --- a/CSharp/intelligence-LUIS/LuisBot.csproj +++ b/CSharp/intelligence-LUIS/LuisBot.csproj @@ -50,22 +50,18 @@ packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.dll - True + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.Autofac.dll - True + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Connector.dll - True + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll - - packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.3.308261200\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll - True + + packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll packages\Microsoft.Rest.ClientRuntime.2.3.4\lib\net45\Microsoft.Rest.ClientRuntime.dll @@ -80,9 +76,8 @@ True - - packages\System.IdentityModel.Tokens.Jwt.4.0.3.308261200\lib\net45\System.IdentityModel.Tokens.Jwt.dll - True + + packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll diff --git a/CSharp/intelligence-LUIS/packages.config b/CSharp/intelligence-LUIS/packages.config index 0d7029d0f0..5482566ea7 100644 --- a/CSharp/intelligence-LUIS/packages.config +++ b/CSharp/intelligence-LUIS/packages.config @@ -6,10 +6,10 @@ - - + + - + \ No newline at end of file diff --git a/CSharp/intelligence-SimilarProducts/SimilarProducts.csproj b/CSharp/intelligence-SimilarProducts/SimilarProducts.csproj index 1415f9ded9..d99f611512 100644 --- a/CSharp/intelligence-SimilarProducts/SimilarProducts.csproj +++ b/CSharp/intelligence-SimilarProducts/SimilarProducts.csproj @@ -50,21 +50,21 @@ packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.Autofac.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Connector.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll True - - packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.3.308261200\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll + + packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll True @@ -80,8 +80,8 @@ True - - packages\System.IdentityModel.Tokens.Jwt.4.0.3.308261200\lib\net45\System.IdentityModel.Tokens.Jwt.dll + + packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll True diff --git a/CSharp/intelligence-SimilarProducts/packages.config b/CSharp/intelligence-SimilarProducts/packages.config index 2a7f738ae6..668b461dd2 100644 --- a/CSharp/intelligence-SimilarProducts/packages.config +++ b/CSharp/intelligence-SimilarProducts/packages.config @@ -6,10 +6,10 @@ - - + + - + \ No newline at end of file diff --git a/CSharp/intelligence-Zummer/Zummer.csproj b/CSharp/intelligence-Zummer/Zummer.csproj index 159dfd8003..9a3a9f6990 100644 --- a/CSharp/intelligence-Zummer/Zummer.csproj +++ b/CSharp/intelligence-Zummer/Zummer.csproj @@ -54,17 +54,21 @@ packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll True - - packages\Microsoft.Bot.Builder.3.4.0\lib\net46\Microsoft.Bot.Builder.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll True - - packages\Microsoft.Bot.Builder.3.4.0\lib\net46\Microsoft.Bot.Connector.dll + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll + True + + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll True - - packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.2.206221351\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll + + packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll True @@ -80,8 +84,8 @@ True - - packages\System.IdentityModel.Tokens.Jwt.4.0.2.206221351\lib\net45\System.IdentityModel.Tokens.Jwt.dll + + packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll True @@ -179,7 +183,7 @@ True 3979 / - http://localhost:3980/ + http://localhost:3979/ False False diff --git a/CSharp/intelligence-Zummer/Zummer.sln b/CSharp/intelligence-Zummer/Zummer.sln index f7e0ed81c2..844c498c83 100644 --- a/CSharp/intelligence-Zummer/Zummer.sln +++ b/CSharp/intelligence-Zummer/Zummer.sln @@ -5,6 +5,11 @@ VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Zummer", "Zummer.csproj", "{A8BA1066-5695-4D71-ABB4-65E5A5E0C3D4}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "README", "README", "{6E1075DC-737B-48E5-96AE-ED26FD23004C}" + ProjectSection(SolutionItems) = preProject + README.md = README.md + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/CSharp/intelligence-Zummer/packages.config b/CSharp/intelligence-Zummer/packages.config index d3933d1b1b..247540daa1 100644 --- a/CSharp/intelligence-Zummer/packages.config +++ b/CSharp/intelligence-Zummer/packages.config @@ -7,10 +7,10 @@ - - + + - + \ No newline at end of file diff --git a/CSharp/sample-KnowledgeBot/AzureSearchBot/AzureSearchBot.csproj b/CSharp/sample-KnowledgeBot/AzureSearchBot/AzureSearchBot.csproj index 3ea45191c0..a83e1bc47f 100644 --- a/CSharp/sample-KnowledgeBot/AzureSearchBot/AzureSearchBot.csproj +++ b/CSharp/sample-KnowledgeBot/AzureSearchBot/AzureSearchBot.csproj @@ -50,21 +50,21 @@ ..\packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll True - - ..\packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.dll + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll True - - ..\packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.Autofac.dll + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll True - - ..\packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Connector.dll + + ..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll True - - ..\packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.3.308261200\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll + + ..\packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll True @@ -80,8 +80,8 @@ True - - ..\packages\System.IdentityModel.Tokens.Jwt.4.0.3.308261200\lib\net45\System.IdentityModel.Tokens.Jwt.dll + + ..\packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll True diff --git a/CSharp/sample-KnowledgeBot/AzureSearchBot/Dialogs/MusicianExplorerDialog.cs b/CSharp/sample-KnowledgeBot/AzureSearchBot/Dialogs/MusicianExplorerDialog.cs index eb48a408b8..c431964c4b 100644 --- a/CSharp/sample-KnowledgeBot/AzureSearchBot/Dialogs/MusicianExplorerDialog.cs +++ b/CSharp/sample-KnowledgeBot/AzureSearchBot/Dialogs/MusicianExplorerDialog.cs @@ -36,6 +36,7 @@ public async Task StartAsync(IDialogContext context) catch (Exception e) { Debug.WriteLine($"Error when faceting by era: {e}"); + context.Done (null); } } @@ -49,7 +50,7 @@ private async Task AfterMenuSelection(IDialogContext context, IAwaitable SearchResult searchResult = await searchService.SearchByEra(selectedEra); if(searchResult.value.Length != 0) { - CardUtil.showHeroCard((IMessageActivity)context.Activity, searchResult); + CardUtil.ShowHeroCard((IMessageActivity)context.Activity, searchResult); } else { diff --git a/CSharp/sample-KnowledgeBot/AzureSearchBot/Dialogs/MusicianSearchDialog.cs b/CSharp/sample-KnowledgeBot/AzureSearchBot/Dialogs/MusicianSearchDialog.cs index bab27c976a..0fd63a47ad 100644 --- a/CSharp/sample-KnowledgeBot/AzureSearchBot/Dialogs/MusicianSearchDialog.cs +++ b/CSharp/sample-KnowledgeBot/AzureSearchBot/Dialogs/MusicianSearchDialog.cs @@ -27,7 +27,7 @@ public virtual async Task MessageRecievedAsync(IDialogContext context, IAwaitabl SearchResult searchResult = await searchService.SearchByName(message.Text); if(searchResult.value.Length != 0) { - CardUtil.showHeroCard(message, searchResult); + CardUtil.ShowHeroCard(message, searchResult); } else{ await context.PostAsync($"No musicians by the name {message.Text} found"); diff --git a/CSharp/sample-KnowledgeBot/AzureSearchBot/Dialogs/PromptButtonsDialog.cs b/CSharp/sample-KnowledgeBot/AzureSearchBot/Dialogs/PromptButtonsDialog.cs index 0ac985f8bc..ad6629156e 100644 --- a/CSharp/sample-KnowledgeBot/AzureSearchBot/Dialogs/PromptButtonsDialog.cs +++ b/CSharp/sample-KnowledgeBot/AzureSearchBot/Dialogs/PromptButtonsDialog.cs @@ -15,10 +15,10 @@ public class PromptButtonsDialog : IDialog public async Task StartAsync(IDialogContext context) { - context.Wait(this.MessageRecievedAsync); + context.Wait(this.MessageReceivedAsync); } - public virtual async Task MessageRecievedAsync(IDialogContext context, IAwaitable result) + public virtual async Task MessageReceivedAsync(IDialogContext context, IAwaitable result) { //Show options whatever users chat PromptDialog.Choice(context, this.AfterMenuSelection, new List() {ExplorerOption , SearchOption}, "How would you like to explore the classical music bot?"); @@ -41,10 +41,10 @@ private async Task AfterMenuSelection(IDialogContext context, IAwaitable } //This function is called after each dialog process is done - private async Task ResumeAfterOptionDialog(IDialogContext context,IAwaitable result) + private async Task ResumeAfterOptionDialog(IDialogContext context, IAwaitable result) { //This means MessageRecievedAsync function of this dialog (PromptButtonsDialog) will receive users' messeges - context.Wait(MessageRecievedAsync); + context.Wait(MessageReceivedAsync); } } } \ No newline at end of file diff --git a/CSharp/sample-KnowledgeBot/AzureSearchBot/Services/AzureSearchService.cs b/CSharp/sample-KnowledgeBot/AzureSearchBot/Services/AzureSearchService.cs index c47a0959bb..07df1cee1b 100644 --- a/CSharp/sample-KnowledgeBot/AzureSearchBot/Services/AzureSearchService.cs +++ b/CSharp/sample-KnowledgeBot/AzureSearchBot/Services/AzureSearchService.cs @@ -16,8 +16,8 @@ public async Task SearchByName(string name) { using (var httpClient = new HttpClient()) { - string nameQuey = $"{QueryString}search={name}"; - string response = await httpClient.GetStringAsync(nameQuey); + string nameQuery = $"{QueryString}search={name}"; + string response = await httpClient.GetStringAsync(nameQuery); return JsonConvert.DeserializeObject(response); } } @@ -26,8 +26,8 @@ public async Task FetchFacets() { using (var httpClient = new HttpClient()) { - string facetQuey = $"{QueryString}facet=Era"; - string response = await httpClient.GetStringAsync(facetQuey); + string facetQuery = $"{QueryString}facet=Era"; + string response = await httpClient.GetStringAsync(facetQuery); return JsonConvert.DeserializeObject(response); } } @@ -36,8 +36,8 @@ public async Task SearchByEra(string era) { using (var httpClient = new HttpClient()) { - string nameQuey = $"{QueryString}$filter=Era eq '{era}'"; - string response = await httpClient.GetStringAsync(nameQuey); + string nameQuery = $"{QueryString}$filter=Era eq '{era}'"; + string response = await httpClient.GetStringAsync(nameQuery); return JsonConvert.DeserializeObject(response); } } diff --git a/CSharp/sample-KnowledgeBot/AzureSearchBot/Util/CardUtil.cs b/CSharp/sample-KnowledgeBot/AzureSearchBot/Util/CardUtil.cs index b794557bbf..1a80a97313 100644 --- a/CSharp/sample-KnowledgeBot/AzureSearchBot/Util/CardUtil.cs +++ b/CSharp/sample-KnowledgeBot/AzureSearchBot/Util/CardUtil.cs @@ -7,7 +7,7 @@ namespace AzureSearchBot.Util { public static class CardUtil { - public static async void showHeroCard(IMessageActivity message, SearchResult searchResult) + public static async void ShowHeroCard(IMessageActivity message, SearchResult searchResult) { //Make reply activity and set layout Activity reply = ((Activity)message).CreateReply(); diff --git a/CSharp/sample-KnowledgeBot/AzureSearchBot/packages.config b/CSharp/sample-KnowledgeBot/AzureSearchBot/packages.config index 0214174bae..3ed5f2569b 100644 --- a/CSharp/sample-KnowledgeBot/AzureSearchBot/packages.config +++ b/CSharp/sample-KnowledgeBot/AzureSearchBot/packages.config @@ -6,10 +6,10 @@ - - + + - + \ No newline at end of file diff --git a/CSharp/skype-CallingBot/EmergencyServicesBot.csproj b/CSharp/skype-CallingBot/EmergencyServicesBot.csproj index e7a5ddf2cc..b1af3b1b91 100644 --- a/CSharp/skype-CallingBot/EmergencyServicesBot.csproj +++ b/CSharp/skype-CallingBot/EmergencyServicesBot.csproj @@ -79,28 +79,23 @@ packages\Microsoft.Bing.Speech.2.0.2\lib\net45\Microsoft.Bing.Speech.dll True - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.dll - True + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Builder.Autofac.dll - True + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll - - packages\Microsoft.Bot.Builder.Calling.3.0.1\lib\net46\Microsoft.Bot.Builder.Calling.dll - True + + packages\Microsoft.Bot.Builder.Calling.3.0.2\lib\net46\Microsoft.Bot.Builder.Calling.dll - - packages\Microsoft.Bot.Builder.3.5.3\lib\net46\Microsoft.Bot.Connector.dll - True + + packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll True - - packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.2.206221351\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll - True + + packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll packages\Microsoft.Rest.ClientRuntime.2.3.5\lib\net45\Microsoft.Rest.ClientRuntime.dll @@ -125,9 +120,8 @@ True - - packages\System.IdentityModel.Tokens.Jwt.4.0.2.206221351\lib\net45\System.IdentityModel.Tokens.Jwt.dll - True + + packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll True diff --git a/CSharp/skype-CallingBot/Web.config b/CSharp/skype-CallingBot/Web.config index fb99b9f25f..62d6108d2c 100644 --- a/CSharp/skype-CallingBot/Web.config +++ b/CSharp/skype-CallingBot/Web.config @@ -78,7 +78,7 @@ - + diff --git a/CSharp/skype-CallingBot/packages.config b/CSharp/skype-CallingBot/packages.config index c67d8ee518..c822e7b27a 100644 --- a/CSharp/skype-CallingBot/packages.config +++ b/CSharp/skype-CallingBot/packages.config @@ -10,13 +10,13 @@ - - - + + + - + \ No newline at end of file