BotBuilderCommunity
diff --git a/‎Bot.Builder.Community.sln
+403-398 b/‎Bot.Builder.Community.sln
+403-398
diff --git a/‎CommonTargets/library.shared.targets
+7 b/‎CommonTargets/library.shared.targets
+7
diff --git a/‎README.md
+1-1 b/‎README.md
+1-1
diff --git a/‎libraries/Bot.Builder.Community.Adapters.Alexa.Core/AlexaRequestMapper.cs
+80-33 b/‎libraries/Bot.Builder.Community.Adapters.Alexa.Core/AlexaRequestMapper.cs
+80-33
diff --git a/‎libraries/Bot.Builder.Community.Adapters.Alexa.Core/Bot.Builder.Community.Adapters.Alexa.Core.csproj
+2-2 b/‎libraries/Bot.Builder.Community.Adapters.Alexa.Core/Bot.Builder.Community.Adapters.Alexa.Core.csproj
+2-2
diff --git a/‎libraries/Bot.Builder.Community.Adapters.Alexa.Core/MergedActivityResult.cs
+20 b/‎libraries/Bot.Builder.Community.Adapters.Alexa.Core/MergedActivityResult.cs
+20
diff --git a/‎libraries/Bot.Builder.Community.Adapters.Alexa/AlexaAdapter.cs
+1-1 b/‎libraries/Bot.Builder.Community.Adapters.Alexa/AlexaAdapter.cs
+1-1
diff --git a/‎libraries/Bot.Builder.Community.Adapters.Alexa/Bot.Builder.Community.Adapters.Alexa.csproj
+2-1 b/‎libraries/Bot.Builder.Community.Adapters.Alexa/Bot.Builder.Community.Adapters.Alexa.csproj
+2-1
diff --git a/‎libraries/Bot.Builder.Community.Adapters.Google.Core/Attachments/AttachmentHelper.cs
+9 b/‎libraries/Bot.Builder.Community.Adapters.Google.Core/Attachments/AttachmentHelper.cs
+9
diff --git a/‎libraries/Bot.Builder.Community.Adapters.Google.Core/Attachments/Extensions.cs
+4 b/‎libraries/Bot.Builder.Community.Adapters.Google.Core/Attachments/Extensions.cs
+4
diff --git a/‎libraries/Bot.Builder.Community.Adapters.Google.Core/Attachments/GoogleAttachmentContentTypes.cs
+2 b/‎libraries/Bot.Builder.Community.Adapters.Google.Core/Attachments/GoogleAttachmentContentTypes.cs
+2
diff --git a/‎libraries/Bot.Builder.Community.Adapters.Google.Core/Bot.Builder.Community.Adapters.Google.Core.csproj
+2-1 b/‎libraries/Bot.Builder.Community.Adapters.Google.Core/Bot.Builder.Community.Adapters.Google.Core.csproj
+2-1
diff --git a/‎libraries/Bot.Builder.Community.Adapters.Google.Core/GoogleRequestMapperBase.cs
+16 b/‎libraries/Bot.Builder.Community.Adapters.Google.Core/GoogleRequestMapperBase.cs
+16
diff --git a/‎libraries/Bot.Builder.Community.Adapters.Google.Core/Helpers/GoogleCardFactory.cs
+1-1 b/‎libraries/Bot.Builder.Community.Adapters.Google.Core/Helpers/GoogleCardFactory.cs
+1-1
diff --git a/‎libraries/Bot.Builder.Community.Adapters.Google.Core/Model/Request/ConversationWebhookRequestSchema.cs
+6 b/‎libraries/Bot.Builder.Community.Adapters.Google.Core/Model/Request/ConversationWebhookRequestSchema.cs
+6
@@ -0,0 +1,7 @@
+<Project>
+
+  <PropertyGroup>
+    <Bot_Builder_Version>4.9.2</Bot_Builder_Version>
+  </PropertyGroup>
+
+</Project>
@@ -1,6 +1,6 @@
 [![Build Status](https://dev.azure.com/BotBuilder-Community/dotnet/_apis/build/status/BotBuilderCommunity.botbuilder-community-dotnet?branchName=master)](https://dev.azure.com/BotBuilder-Community/dotnet/_build/latest?definitionId=1&branchName=master) [![Bot Builder Community NuGet](https://img.shields.io/badge/NuGet-blue.svg)](https://www.nuget.org/profiles/BotBuilderCommunity)
 
-**Latest release: v4.8.6 (15/04/2020) - [Release Notes](https://github.com/BotBuilderCommunity/botbuilder-community-dotnet/releases/tag/v4.8.6)**
+**Latest release: v4.9 (02/06/2020) - [Release Notes](https://github.com/BotBuilderCommunity/botbuilder-community-dotnet/releases/tag/v4.9)**
 
 # Bot Builder Community - .NET Extensions
 
 
@@ -67,22 +67,24 @@ public Activity RequestToActivity(SkillRequest skillRequest)
                     return RequestToEventActivity(skillRequest);
             }
         }
-        
+
         /// <summary>
         /// Creates a SkillResponse based on an Activity and original SkillRequest. 
         /// </summary>
-        /// <param name="activity">The Activity to use to create the SkillResponse</param>
+        /// <param name="mergedActivityResult">The Merged Activity Result to use to create the SkillResponse</param>
         /// <param name="alexaRequest">Original SkillRequest received from Alexa Skills service. This is used
         /// to check if the original request was a SessionEndedRequest which should not return a response.</param>
         /// <returns>SkillResponse</returns>
-        public SkillResponse ActivityToResponse(Activity activity, SkillRequest alexaRequest)
+        public SkillResponse ActivityToResponse(MergedActivityResult mergedActivityResult, SkillRequest alexaRequest)
         {
             var response = new SkillResponse()
             {
                 Version = "1.0",
                 Response = new ResponseBody()
             };
 
+            var activity = mergedActivityResult?.MergedActivity;
+
             if (activity == null || activity.Type != ActivityTypes.Message || alexaRequest.Request is SessionEndedRequest)
             {
                 response.Response.ShouldEndSession = true;
@@ -106,18 +108,26 @@ public SkillResponse ActivityToResponse(Activity activity, SkillRequest alexaReq
 
             if (ShouldSetEndSession(response))
             {
-                switch (activity.InputHint)
+                // If end of conversation was flagged use that, othwerwise look at the InputHint.
+                if (mergedActivityResult.EndOfConversationFlagged)
                 {
-                    case InputHints.IgnoringInput:
-                        response.Response.ShouldEndSession = true;
-                        break;
-                    case InputHints.ExpectingInput:
-                        response.Response.ShouldEndSession = false;
-                        response.Response.Reprompt = new Reprompt(activity.Text);
-                        break;
-                    default:
-                        response.Response.ShouldEndSession = _options.ShouldEndSessionByDefault;
-                        break;
+                    response.Response.ShouldEndSession = true;
+                }
+                else
+                {
+                    switch (activity.InputHint)
+                    {
+                        case InputHints.IgnoringInput:
+                            response.Response.ShouldEndSession = true;
+                            break;
+                        case InputHints.ExpectingInput:
+                            response.Response.ShouldEndSession = false;
+                            response.Response.Reprompt = new Reprompt(activity.Text);
+                            break;
+                        default:
+                            response.Response.ShouldEndSession = _options.ShouldEndSessionByDefault;
+                            break;
+                    }
                 }
             }
 
@@ -133,36 +143,73 @@ public SkillResponse ActivityToResponse(Activity activity, SkillRequest alexaReq
         /// https://developer.amazon.com/en-US/docs/alexa/custom-skills/speech-synthesis-markup-language-ssml-reference.html#break
         /// </summary>
         /// <param name="activities">The list of one or more outgoing activities</param>
-        /// <returns>Activity</returns>
-        public Activity MergeActivities(IList<Activity> activities)
+        /// <returns>MergedActivityResult</returns>
+        public MergedActivityResult MergeActivities(IList<Activity> activities)
         {
-            var messageActivities = activities?.Where(a => a.Type == ActivityTypes.Message).ToList();
-
-            if (messageActivities == null || messageActivities.Count == 0)
+            if (activities == null || activities.Count == 0)
             {
                 return null;
             }
 
-            var activity = messageActivities.Last();
+            var mergedActivityResult = new MergedActivityResult();
 
-            if (messageActivities.Any(a => !string.IsNullOrEmpty(a.Speak)))
+            bool hasSpeakField = false;
+            var speakFields = new List<string>();
+            var textFields = new List<string>();
+            var attachments = new List<Attachment>();
+            foreach (var activity in activities)
             {
-                var speakText = string.Join("<break strength=\"strong\"/>", messageActivities
-                    .Select(a => !string.IsNullOrEmpty(a.Speak) ? StripSpeakTag(a.Speak) : NormalizeActivityText(a.TextFormat, a.Text, forSsml: true))
-                    .Where(s => !string.IsNullOrEmpty(s))
-                    .Select(s => s));
+                if (activity == null)
+                {
+                    continue;
+                }
+
+                switch (activity.Type)
+                {
+                    case ActivityTypes.Message:
+                        mergedActivityResult.MergedActivity = activity;
+                        if (!string.IsNullOrEmpty(activity.Speak))
+                        {
+                            hasSpeakField = true;
+                            speakFields.Add(StripSpeakTag(activity.Speak));
+                        }
+                        else if (!string.IsNullOrEmpty(activity.Text))
+                        {
+                            speakFields.Add(NormalizeActivityText(activity.TextFormat, activity.Text, forSsml: true));
+                        }
+
+                        if (!string.IsNullOrEmpty(activity.Text))
+                        {
+                            var text = NormalizeActivityText(activity.TextFormat, activity.Text, forSsml: false);
+                            if (!string.IsNullOrEmpty(text))
+                            {
+                                textFields.Add(text.Trim(new char[] { ' ', '.' }));
+                            }
+                        }
 
-                activity.Speak = $"<speak>{speakText}</speak>";
+                        if (activity.Attachments != null && activity.Attachments.Count > 0)
+                        {
+                            attachments.AddRange(activity.Attachments);
+                        }
+                        break;
+                    case ActivityTypes.EndOfConversation:
+                        mergedActivityResult.EndOfConversationFlagged = true;
+                        break;
+                }
             }
 
-            activity.Text = string.Join(". ", messageActivities
-                .Select(a => NormalizeActivityText(a.TextFormat, a.Text, forSsml: false))
-                .Where(s => !string.IsNullOrEmpty(s))
-                .Select(s => s.Trim(new char[] { ' ', '.' })));
+            if (mergedActivityResult.MergedActivity != null)
+            {
+                if (hasSpeakField)
+                {
+                    mergedActivityResult.MergedActivity.Speak = $"<speak>{string.Join("<break strength=\"strong\"/>", speakFields)}</speak>";
+                }
 
-            activity.Attachments = messageActivities.Where(x => x.Attachments != null).SelectMany(x => x.Attachments).ToList();
+                mergedActivityResult.MergedActivity.Text = string.Join(". ", textFields);
+                mergedActivityResult.MergedActivity.Attachments = attachments;
+            }
 
-            return activity;
+            return mergedActivityResult;
         }
 
         private Activity RequestToEndOfConversationActivity(SkillRequest skillRequest)
@@ -185,7 +232,6 @@ private Activity RequestToMessageActivity(SkillRequest skillRequest, IntentReque
             var activity = Activity.CreateMessageActivity() as Activity;
             activity = SetGeneralActivityProperties(activity, skillRequest);
             activity.Text = intentRequest.Intent.Slots[_options.DefaultIntentSlotName].Value;
-            activity.Locale = intentRequest.Locale;
             return activity;
         }
 
@@ -249,6 +295,7 @@ private Activity SetGeneralActivityProperties(Activity activity, SkillRequest sk
             activity.Conversation = new ConversationAccount(isGroup: false, id: skillRequest.Session?.SessionId ?? skillRequest.Request.RequestId);
             activity.Timestamp = skillRequest.Request.Timestamp.ToUniversalTime();
             activity.ChannelData = skillRequest;
+            activity.Locale = skillRequest.Request.Locale;
 
             return activity;
         }
 
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)../', 'Bot.Builder.Community.sln'))\CommonTargets\library.shared.targets" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -22,8 +23,7 @@
     <PackageReference Include="Alexa.NET" Version="1.13.3" />
     <PackageReference Include="Alexa.NET.CustomerProfile" Version="2.1.1" />
     <PackageReference Include="Microsoft.MarkedNet" Version="1.0.13" />
-    <PackageReference Include="Microsoft.Bot.Builder" Version="4.9.2" />
-    <PackageReference Include="Microsoft.Bot.Schema" Version="4.9.2" />
+    <PackageReference Include="Microsoft.Bot.Builder" Version="$(Bot_Builder_Version)" />
   </ItemGroup>
 
 </Project>
@@ -0,0 +1,20 @@
+using Microsoft.Bot.Schema;
+
+namespace Bot.Builder.Community.Adapters.Alexa.Core
+{
+    /// <summary>
+    /// The result of merging a collection of Activities.
+    /// </summary>
+    public class MergedActivityResult
+    {
+        /// <summary>
+        /// The merged activity
+        /// </summary>
+        public Activity MergedActivity;
+
+        /// <summary>
+        /// Is end of conversation flagged (outside of the properties in the merged activity itself)
+        /// </summary>
+        public bool EndOfConversationFlagged;
+    }
+}
@@ -155,7 +155,7 @@ private async Task<SkillResponse> ProcessAlexaRequestAsync(SkillRequest alexaReq
             return response;
         }
 
-        public virtual Activity ProcessOutgoingActivities(List<Activity> activities)
+        public virtual MergedActivityResult ProcessOutgoingActivities(List<Activity> activities)
         {
             return _requestMapper.MergeActivities(activities);
         }
 
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)../', 'Bot.Builder.Community.sln'))\CommonTargets\library.shared.targets" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -20,7 +21,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.9.2" />
+    <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="$(Bot_Builder_Version)" />
     <PackageReference Include="Microsoft.Net.Http.Headers" Version="2.1.1" />
   </ItemGroup>
 
 
@@ -41,6 +41,9 @@ public static void ConvertAttachmentContent(this Activity activity)
                     case GoogleAttachmentContentTypes.TableCard:
                         Convert<TableCard>(attachment);
                         break;
+                    case GoogleAttachmentContentTypes.BrowsingCarousel:
+                        Convert<BrowsingCarousel>(attachment);
+                        break;
                     case GoogleAttachmentContentTypes.CarouselIntent:
                         Convert<CarouselIntent>(attachment);
                         break;
@@ -59,6 +62,12 @@ public static void ConvertAttachmentContent(this Activity activity)
                     case GoogleAttachmentContentTypes.ConfirmationIntent:
                         Convert<ConfirmationIntent>(attachment);
                         break;
+                    case GoogleAttachmentContentTypes.NewSurfaceIntent:
+                        Convert<NewSurfaceIntent>(attachment);
+                        break;
+                    case GoogleAttachmentContentTypes.SigninIntent:
+                        Convert<SigninIntent>(attachment);
+                        break;
                 }
             }
         }
 
@@ -22,6 +22,8 @@ public static Attachment ToAttachment(this ResponseItem responseItem)
                     return CreateAttachment(mediaResponse, GoogleAttachmentContentTypes.MediaResponse);
                 case BasicCard basicCard:
                     return CreateAttachment(basicCard, GoogleAttachmentContentTypes.BasicCard);
+                case BrowsingCarousel browsingCarousel:
+                    return CreateAttachment(browsingCarousel, GoogleAttachmentContentTypes.BrowsingCarousel);
                 default:
                     return null;
             }
@@ -43,6 +45,8 @@ public static Attachment ToAttachment(this SystemIntent intent)
                     return CreateAttachment(permissionsIntent, GoogleAttachmentContentTypes.PermissionsIntent);
                 case PlaceLocationIntent placeLocationIntent:
                     return CreateAttachment(placeLocationIntent, GoogleAttachmentContentTypes.PlaceLocationIntent);
+                case NewSurfaceIntent newSurfaceIntent:
+                    return CreateAttachment(newSurfaceIntent, GoogleAttachmentContentTypes.NewSurfaceIntent);
                 default:
                     return null;
             }
 
@@ -16,5 +16,7 @@ public static class GoogleAttachmentContentTypes
         public const string CarouselIntent = "application/vhd.bfgoogle.carousel";
         public const string DateTimeIntent = "application/vhd.bfgoogle.datetime";
         public const string ConfirmationIntent = "application/vhd.bfgoogle.confirm";
+        public const string NewSurfaceIntent = "application/vhd.bfgoogle.newsurface";
+        public const string BrowsingCarousel = "application/vhd.bfgoogle.browsingcarousel";
     }
 }
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)../', 'Bot.Builder.Community.sln'))\CommonTargets\library.shared.targets" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -7,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="JWT" Version="5.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Bot.Schema" Version="4.9.2" />
+    <PackageReference Include="Microsoft.Bot.Schema" Version="$(Bot_Builder_Version)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.0" />
     <PackageReference Include="Microsoft.MarkedNet" Version="1.0.13" />
     <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.21" />
 
@@ -144,6 +144,18 @@ public ProcessHelperIntentAttachmentsResult ProcessHelperIntentAttachments(Activ
                 };
             }
 
+            if (activity?.Attachments?.FirstOrDefault(a =>
+                    a.ContentType == GoogleAttachmentContentTypes.NewSurfaceIntent) != null)
+            {
+                return new ProcessHelperIntentAttachmentsResult()
+                {
+                    Intent = ProcessSystemIntentAttachment<NewSurfaceIntent>(
+                        GoogleAttachmentContentTypes.NewSurfaceIntent,
+                        activity),
+                    AllowAdditionalInputPrompt = true
+                };
+            }
+
             return new ProcessHelperIntentAttachmentsResult()
             {
                 Intent = null
@@ -182,6 +194,10 @@ public List<ResponseItem> GetResponseItemsFromActivityAttachments(Activity activ
             if (mediaItem != null)
                 responseItems.Add(mediaItem);
 
+            var browsingCarousel = ProcessResponseItemAttachment<BrowsingCarousel>(GoogleAttachmentContentTypes.BrowsingCarousel, activity);
+            if (browsingCarousel != null)
+                responseItems.Add(browsingCarousel);
+
             return responseItems;
         }
 
 
@@ -18,7 +18,7 @@ public static BasicCard CreateBasicCard(string title, string subtitle, string fo
                     Title = title,
                     Subtitle = subtitle,
                     FormattedText = formattedText,
-                    Buttons = buttons.ToArray(),
+                    Buttons = buttons?.ToArray(),
                     Image = image,
                     Display = displayOptions
                 }
 
@@ -10,10 +10,16 @@ public class ConversationRequest
         public Surface Surface { get; set; }
         public Input[] Inputs { get; set; }
         public User User { get; set; }
+        public Device Device { get; set; }
         public Conversation Conversation { get; set; }
         public AvailableSurface[] AvailableSurfaces { get; set; }
     }
 
+    public class Device
+    {
+        public Location Location { get; set; }
+    }
+
     public class Surface
     {
         public Capability[] Capabilities { get; set; }
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ private async Task<SkillResponse> ProcessAlexaRequestAsync(SkillRequest alexaReq`
`155`	`155`	`return response;`
`156`	`156`	`}`
`157`	`157`
`158`		`- public virtual Activity ProcessOutgoingActivities(List<Activity> activities)`
	`158`	`+ public virtual MergedActivityResult ProcessOutgoingActivities(List<Activity> activities)`
`159`	`159`	`{`
`160`	`160`	`return _requestMapper.MergeActivities(activities);`
`161`	`161`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,7 @@ public static class GoogleAttachmentContentTypes`
`16`	`16`	`public const string CarouselIntent = "application/vhd.bfgoogle.carousel";`
`17`	`17`	`public const string DateTimeIntent = "application/vhd.bfgoogle.datetime";`
`18`	`18`	`public const string ConfirmationIntent = "application/vhd.bfgoogle.confirm";`
	`19`	`+ public const string NewSurfaceIntent = "application/vhd.bfgoogle.newsurface";`
	`20`	`+ public const string BrowsingCarousel = "application/vhd.bfgoogle.browsingcarousel";`
`19`	`21`	`}`
`20`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public static BasicCard CreateBasicCard(string title, string subtitle, string fo`
`18`	`18`	`Title = title,`
`19`	`19`	`Subtitle = subtitle,`
`20`	`20`	`FormattedText = formattedText,`
`21`		`- Buttons = buttons.ToArray(),`
	`21`	`+ Buttons = buttons?.ToArray(),`
`22`	`22`	`Image = image,`
`23`	`23`	`Display = displayOptions`
`24`	`24`	`}`