updated skill template

Author: lauren-mills

templates/csharp/Skill/Skill.Tests/SkillTestBase.cs

@@ -129,7 +129,7 @@ public string[] GetTemplates(string name, object data = null)
                        Path.Combine(".", "Responses", $"AllResponses.lg") :
                        Path.Combine(".", "Responses", $"AllResponses.{CultureInfo.CurrentUICulture.Name.ToLower()}.lg");
 
-            return Templates.ParseFile(path).ExpandTemplate(name, data).ToArray();
+            return Templates.ParseFile(path).ExpandTemplate(name, data).Cast<string>().ToArray();
         }
     }
 }

templates/csharp/Skill/Skill/Bots/DefaultActivityHandler.cs

@@ -7,6 +7,7 @@
 using System.Threading.Tasks;
 using Microsoft.Bot.Builder;
 using Microsoft.Bot.Builder.Dialogs;
+using Microsoft.Bot.Connector;
 using Microsoft.Bot.Schema;
 using Microsoft.Bot.Solutions.Responses;
 using Microsoft.Extensions.DependencyInjection;
@@ -49,6 +50,13 @@ protected override async Task OnMembersAddedAsync(IList<ChannelAccount> membersA
 
         protected override Task OnMessageActivityAsync(ITurnContext<IMessageActivity> turnContext, CancellationToken cancellationToken)
         {
+            // directline speech occasionally sends empty message activities that should be ignored
+            var activity = turnContext.Activity;
+            if (activity.ChannelId == Channels.DirectlineSpeech && activity.Type == ActivityTypes.Message && string.IsNullOrEmpty(activity.Text))
+            {
+                return Task.CompletedTask;
+            }
+
             return _dialog.RunAsync(turnContext, _dialogStateAccessor, cancellationToken);
         }
 

templates/csharp/Skill/Skill/Deployment/Scripts/deploy.ps1

@@ -234,7 +234,7 @@ if ($parametersFile) {
         --parameters name=$name microsoftAppId=$appId microsoftAppPassword="`"$($appPassword)`"" luisAuthoringLocation=$armLuisAuthoringRegion useLuisAuthoring=$createLuisAuthoring `
         --output json `
         2>&1 `
-        | Tee-Object -FilePath $logFile -OutVariable validation
+        | Tee-Object -FilePath $logFile -OutVariable validation `
         | Out-Null
 
     # OutVariable always outputs the contents of the piped output stream as System.Collections.ArrayList, so now let's parse into
@@ -279,7 +279,7 @@ else {
         --parameters name=$name microsoftAppId=$appId microsoftAppPassword="`"$($appPassword)`"" luisAuthoringLocation=$armLuisAuthoringRegion useLuisAuthoring=$createLuisAuthoring `
         --output json `
         2>&1 `
-        | Tee-Object -FilePath $logFile -OutVariable validation
+        | Tee-Object -FilePath $logFile -OutVariable validation `
         | Out-Null
 
     # OutVariable always outputs the contents of the piped output stream as System.Collections.ArrayList, so now let's parse into

templates/csharp/Skill/Skill/Dialogs/MainDialog.cs

@@ -215,12 +215,12 @@ private async Task<DialogTurnResult> RouteStepAsync(WaterfallStepContext stepCon
 
                     switch (intent)
                     {
-                    case $safeprojectname$Luis.Intent.Sample:
+                        case $safeprojectname$Luis.Intent.Sample:
                             {
-                            return await stepContext.BeginDialogAsync(_sampleDialog.Id, cancellationToken: cancellationToken);
+                                return await stepContext.BeginDialogAsync(_sampleDialog.Id, cancellationToken: cancellationToken);
                             }
 
-                    case $safeprojectname$Luis.Intent.None:
+                        case $safeprojectname$Luis.Intent.None:
                         default:
                             {
                                 // intent was identified but not yet implemented

templates/csharp/Skill/Skill/Responses/MainResponses.lg

@@ -62,6 +62,7 @@
 [HeroCard 
     title= ${HelpTitle()}
     subtitle= ${HelpSubtitle()}
+    speak = ${HelpSubtitle()}
 ]
 
 

templates/csharp/Skill/Skill/Skill.csproj

@@ -9,12 +9,12 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
     <PackageReference Include="Microsoft.Azure.CognitiveServices.ContentModerator" Version="2.0.0" />
     <PackageReference Include="Microsoft.Azure.CognitiveServices.Language" Version="1.0.1-preview" />
-    <PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.8.1" />
-    <PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.8.1" />
-    <PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.8.1" />
-    <PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.8.1" />
-    <PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.8.1" />
-    <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.8.1" />
+    <PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.9.1" />
+    <PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.9.1" />
+    <PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.9.1" />
+    <PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.9.1" />
+    <PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.9.1" />
+    <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.9.1" />
     <PackageReference Include="Microsoft.Bot.Solutions" Version="1.0.0" />
   </ItemGroup>