For fixing assembly difference issue

microsoft · Jun 2, 2020 · fdfcbe0 · fdfcbe0
1 parent 6fe9d33
commit fdfcbe0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/Microsoft.Bot.Builder.sln b/Microsoft.Bot.Builder.sln
@@ -176,6 +176,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Parent", "tests\Skills\Pare
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Child", "tests\Skills\Child\Child.csproj", "{1958FBA4-BF2D-48D9-A5DB-8915F553EBD3}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QnABotAllFeatures", "..\..\BotBuilder-Samples\BotBuilder-Samples\samples\csharp_dotnetcore\49.qnamaker-all-features\QnABotAllFeatures.csproj", "{B03AF5FE-5E8F-4F1C-A24F-FAAFC4BCF7A8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -736,6 +738,14 @@ Global
 		{1958FBA4-BF2D-48D9-A5DB-8915F553EBD3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1958FBA4-BF2D-48D9-A5DB-8915F553EBD3}.Release-Windows|Any CPU.ActiveCfg = Release|Any CPU
 		{1958FBA4-BF2D-48D9-A5DB-8915F553EBD3}.Release-Windows|Any CPU.Build.0 = Release|Any CPU
+		{B03AF5FE-5E8F-4F1C-A24F-FAAFC4BCF7A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B03AF5FE-5E8F-4F1C-A24F-FAAFC4BCF7A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B03AF5FE-5E8F-4F1C-A24F-FAAFC4BCF7A8}.Debug-Windows|Any CPU.ActiveCfg = Debug|Any CPU
+		{B03AF5FE-5E8F-4F1C-A24F-FAAFC4BCF7A8}.Debug-Windows|Any CPU.Build.0 = Debug|Any CPU
+		{B03AF5FE-5E8F-4F1C-A24F-FAAFC4BCF7A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B03AF5FE-5E8F-4F1C-A24F-FAAFC4BCF7A8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B03AF5FE-5E8F-4F1C-A24F-FAAFC4BCF7A8}.Release-Windows|Any CPU.ActiveCfg = Release|Any CPU
+		{B03AF5FE-5E8F-4F1C-A24F-FAAFC4BCF7A8}.Release-Windows|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/libraries/Microsoft.Bot.Builder.AI.QnA/Utils/QnACardBuilder.cs b/libraries/Microsoft.Bot.Builder.AI.QnA/Utils/QnACardBuilder.cs
@@ -77,6 +77,17 @@ public static IMessageActivity GetSuggestionsCard(List<string> suggestionsList,
             return chatActivity;
         }
 
+        /// <summary>
+        /// Get Card for MultiTurn scenario. (Can be deprecated from 4.10.0 release of sdk).
+        /// </summary>
+        /// <param name="result">Result to be displayed as prompts.</param>
+        /// <param name="cardNoMatchText">No match text.</param>
+        /// <returns>IMessageActivity.</returns>
+        public static IMessageActivity GetQnAPromptsCard(QueryResult result, string cardNoMatchText)
+        {
+            return GetQnADefaultResponse(result, true, CancellationToken.None);
+        }
+
         /// <summary>
         /// Get Card for MultiTurn scenario. (Can be deprecated from 4.10.0 release of sdk).
         /// </summary>