Skip to content

Commit 788e3b9

Browse files
garyprettydaltskinmartinossdependabot[bot]iamloghin
authored
Release/06022020 (#268)
* Master (#252) * Fix for Zoom adapter throwing on no channel ID (#245) * Adding RingCentral adapter (#215) * Adding RingCentral adapter * Updating documentation #wip * Adding packaging details * Addressing warnings Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Adding sample RingCentral Adapter bot (#221) * Adding RingCentral adapter * Updating documentation #wip * Adding packaging details * Addressing warnings * Adding RingCentral Adapter sample and updating documentation * Fix up unit tests * Adding RingCentral reference to main doc * Fix up git ignore Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Update README.md * Update README.md * Add GitHub link to profile (#223) * Updated sample package references. Added ring central sample. (#224) * Updated sample package references. Added ring central sample. * Update dotnet pack yaml config * Further update to dotnet pack yaml to fix no matching projects build pipeline error. * Bump Microsoft.AspNetCore.All in /samples/Form Flow Sample (#225) Bumps [Microsoft.AspNetCore.All](https://github.com/aspnet/Universe) from 2.1.1 to 2.1.4. - [Release notes](https://github.com/aspnet/Universe/releases) - [Changelog](https://github.com/aspnet/Universe/blob/master/docs/CrossRepoBreakingChanges.md) - [Commits](https://github.com/aspnet/Universe/compare/2.1.1...2.1.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump Microsoft.AspNetCore.All in /samples/Google Adapter Sample (#228) Bumps [Microsoft.AspNetCore.All](https://github.com/aspnet/Universe) from 2.1.1 to 2.1.4. - [Release notes](https://github.com/aspnet/Universe/releases) - [Changelog](https://github.com/aspnet/Universe/blob/master/docs/CrossRepoBreakingChanges.md) - [Commits](https://github.com/aspnet/Universe/compare/2.1.1...2.1.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump Microsoft.AspNetCore.All in /samples/BestMatch Middleware Sample (#226) Bumps [Microsoft.AspNetCore.All](https://github.com/aspnet/Universe) from 2.1.1 to 2.1.4. - [Release notes](https://github.com/aspnet/Universe/releases) - [Changelog](https://github.com/aspnet/Universe/blob/master/docs/CrossRepoBreakingChanges.md) - [Commits](https://github.com/aspnet/Universe/compare/2.1.1...2.1.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump Microsoft.AspNetCore.All in /samples/Alexa Adapter Sample (#227) Bumps [Microsoft.AspNetCore.All](https://github.com/aspnet/Universe) from 2.1.1 to 2.1.4. - [Release notes](https://github.com/aspnet/Universe/releases) - [Changelog](https://github.com/aspnet/Universe/blob/master/docs/CrossRepoBreakingChanges.md) - [Commits](https://github.com/aspnet/Universe/compare/2.1.1...2.1.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Update adaptor to use current elastic 7.x (#233) * Update adaptor to use current elastic 7.x * Update ElasticsearchStorage.cs * Ported the BestMatch Middleware Sample to MVC. (#200) Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Refactor of Alexa adapter (#179) * - Initial Alexa adapter refactor to adopt Alexa.Net - Moved towards deprecating the AlexaHttpAdapter (kept for backwards compat) * - Updated Directory Build Props to include StyleCop package - Enable warnings as errors for Alexa project * - Added attachment types for directives / cards etc. - Updated content extension methods to use Alexa.NET and attachments model - Updated some core adapter logic * - Added support for Directives - Updated logic to use attachments as opposed to TurnState - Further adapter logic updates * Update GitVersion tag for feature branches * - Moved method for stylecop * Update GitVersion to attempt to ensure package names are incremented correctly on each build. * Updated package dependencies for Alexa adapter * Updated Alexa Sample * Update readme for preview package * Amended middleware and adaper for skills support * Updates following PR feedback * Removed ContinueConversationAsync overload not available until SDK 4.7. Will be re-added later for skills support. * Add LaunchRequest -> ConversationUpdate logic to middleware as per @pavolum's idea. * Added message activity concat and suggested actions conversion to google adapter * Adding configurable flag which will inform the adapter if it should concat multiple text activities in one turn * minor clean up * removing google adapter changes, renaming functions, removing suggested action conversion * Remove unused option * - Some naming tweaks - Added policy for handling multiple outgoing activities. - Added ContinueConversationAsync method * Move multiple activity policy enum out of options class * Naming tweak for outgoing activity policy * Update docs and add automatic end of session when no outgoing activities are sent * Readme update * Change default concat policy. Update readme. * Changes following code review (#195) * Move the activities list to within the turn context * Update adapter to make activity processing method virtual and remove multiple activity policy. Improved concat logic. * Fix speak concat bug * Add first Alexa tests * Update README.md * Update Bot Builder NuGet references * Updates to Alexa Adapter to pull out core package with request / activity transform logic, attachment types and context extension methods. * Fix failing test * Updates to move middleware into adapter. Rename helper to AlexaRequestMapper * Further refinements of mapper * Update AlexaRequestMapperOptions.cs * Updates to mapper / options * Add Alexa Auth Handler. (#204) * Rename some methods on Alexa Mapper. Update NuGet packages to 4.8. * Rename auth handler class name * Removing old Alexa auth handler * Fix test project dependencies * Update Alexa Core project file * Amend pipeline to try and resolve dotnet pack issue * Remvoed and re-added Alexa projects to SLN * Attempt to address issue with GitVersion env vars no longer shared across pipeline tasks * Update pipeline * Update Auth Handler (#205) * Add Alexa Auth Handler. * Fix crazyness in merge. * again. * Add Alexa Skill Id validation check. * Tabs to spaces * Add a couple tests. * Separate skill id check. * Set ExpectReplies and add more tests. * Dont NRE when activities is null. * Release/4.8.0 (#206) * Google Adapter: Google Content Type not set to UTF-8 * Alexa Adapter: Add person to alexasystem to support Alexa voiceprint to know the ID of the speaker (#198) - Thanks @jamesemann * TwitterAdapter: Added unit tests (#197) - Thanks @matiasroldan6 @santgr11 * DevOps: Azure DevOps Pipelines GitVersion issue * Dependencies: Update to Bot Framework SDK 4.8 * Fix bug with not handling built in StopIntent * Add virtual to auth methods (#209) * Add Alexa Auth Handler. * Fix crazyness in merge. * again. * Add Alexa Skill Id validation check. * Tabs to spaces * Add a couple tests. * Separate skill id check. * Set ExpectReplies and add more tests. * Dont NRE when activities is null. * Make methods virutal for mocking * Add check for Request being null so we don't throw NRE on bad requests from Alexa. Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Add fallback support for Alexa request types => EventActivity * Add a simple markdown to plain text converter (#210) * Add Alexa Auth Handler. * Fix crazyness in merge. * again. * Add Alexa Skill Id validation check. * Tabs to spaces * Add a couple tests. * Separate skill id check. * Set ExpectReplies and add more tests. * Dont NRE when activities is null. * Make methods virutal for mocking * Add check for Request being null so we don't throw NRE on bad requests from Alexa. * Add simple markdown formatter Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Update attachment implementation (#213) * Update attachment implementation to align with BF SDK and work correctly with ABS. * Added tests for new attachment implementation * Moved text normalization logic earlier and amended markdown handling (#212) * Moved logic for text normalization earlier in the pipeline into the MergeActivities method. * Modified markdown renderer to use period instead of new line. Amended list rendering. Added tests. Changed default to markdown. * Convert Alexa attachment types to their strong type if needed. (#214) * Update utility naming to helpers (aligns with SDK / other adapters). (#216) * Merge attachments in activities so they are available in the last message (#217) * Merge attachments in activities so they are available in the last message. * Fix attachments. * Fix for attachment null property handling * Update attachment tests * Remove test for missing attachment properties. Attachments / directives have optional properties, so not all properties will always be present. * Fix tests failing with equality of ref types * Project file with additional NuGet dependency Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Update Alexa sample to use latest preview package. Fix assembly name causing Azure deployment issue. Updated sample attachment config. * Added the Alexa Adapter Sample to the Solution (#220) The project was missing from the solution so I have now added it as a part of solution. * Remove conversation type per Activity docs (#229) * Update Alexa Sample * Update README.md * Update readme * Attempt to resolve NuGet dependency between Alexa packages * Update project file ref for local NuGet package * Force alexa project to generate local package * More... * Update for nupack * Fix pipelines pack command Co-authored-by: Patrick Volum <pavolum@microsoft.com> Co-authored-by: Nick Ericson <nick.ericson@hotmail.com> Co-authored-by: Arafat Tehsin <arafattehsin@hotmail.com> * Feature/adopt alexadotnet (#235) * - Initial Alexa adapter refactor to adopt Alexa.Net - Moved towards deprecating the AlexaHttpAdapter (kept for backwards compat) * - Updated Directory Build Props to include StyleCop package - Enable warnings as errors for Alexa project * - Added attachment types for directives / cards etc. - Updated content extension methods to use Alexa.NET and attachments model - Updated some core adapter logic * - Added support for Directives - Updated logic to use attachments as opposed to TurnState - Further adapter logic updates * Update GitVersion tag for feature branches * - Moved method for stylecop * Update GitVersion to attempt to ensure package names are incremented correctly on each build. * Updated package dependencies for Alexa adapter * Updated Alexa Sample * Update readme for preview package * Amended middleware and adaper for skills support * Updates following PR feedback * Removed ContinueConversationAsync overload not available until SDK 4.7. Will be re-added later for skills support. * Add LaunchRequest -> ConversationUpdate logic to middleware as per @pavolum's idea. * Added message activity concat and suggested actions conversion to google adapter * Adding configurable flag which will inform the adapter if it should concat multiple text activities in one turn * minor clean up * removing google adapter changes, renaming functions, removing suggested action conversion * Remove unused option * - Some naming tweaks - Added policy for handling multiple outgoing activities. - Added ContinueConversationAsync method * Move multiple activity policy enum out of options class * Naming tweak for outgoing activity policy * Update docs and add automatic end of session when no outgoing activities are sent * Readme update * Change default concat policy. Update readme. * Changes following code review (#195) * Move the activities list to within the turn context * Update adapter to make activity processing method virtual and remove multiple activity policy. Improved concat logic. * Fix speak concat bug * Add first Alexa tests * Update README.md * Update Bot Builder NuGet references * Updates to Alexa Adapter to pull out core package with request / activity transform logic, attachment types and context extension methods. * Fix failing test * Updates to move middleware into adapter. Rename helper to AlexaRequestMapper * Further refinements of mapper * Update AlexaRequestMapperOptions.cs * Updates to mapper / options * Add Alexa Auth Handler. (#204) * Rename some methods on Alexa Mapper. Update NuGet packages to 4.8. * Rename auth handler class name * Removing old Alexa auth handler * Fix test project dependencies * Update Alexa Core project file * Amend pipeline to try and resolve dotnet pack issue * Remvoed and re-added Alexa projects to SLN * Attempt to address issue with GitVersion env vars no longer shared across pipeline tasks * Update pipeline * Update Auth Handler (#205) * Add Alexa Auth Handler. * Fix crazyness in merge. * again. * Add Alexa Skill Id validation check. * Tabs to spaces * Add a couple tests. * Separate skill id check. * Set ExpectReplies and add more tests. * Dont NRE when activities is null. * Release/4.8.0 (#206) * Google Adapter: Google Content Type not set to UTF-8 * Alexa Adapter: Add person to alexasystem to support Alexa voiceprint to know the ID of the speaker (#198) - Thanks @jamesemann * TwitterAdapter: Added unit tests (#197) - Thanks @matiasroldan6 @santgr11 * DevOps: Azure DevOps Pipelines GitVersion issue * Dependencies: Update to Bot Framework SDK 4.8 * Fix bug with not handling built in StopIntent * Add virtual to auth methods (#209) * Add Alexa Auth Handler. * Fix crazyness in merge. * again. * Add Alexa Skill Id validation check. * Tabs to spaces * Add a couple tests. * Separate skill id check. * Set ExpectReplies and add more tests. * Dont NRE when activities is null. * Make methods virutal for mocking * Add check for Request being null so we don't throw NRE on bad requests from Alexa. Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Add fallback support for Alexa request types => EventActivity * Add a simple markdown to plain text converter (#210) * Add Alexa Auth Handler. * Fix crazyness in merge. * again. * Add Alexa Skill Id validation check. * Tabs to spaces * Add a couple tests. * Separate skill id check. * Set ExpectReplies and add more tests. * Dont NRE when activities is null. * Make methods virutal for mocking * Add check for Request being null so we don't throw NRE on bad requests from Alexa. * Add simple markdown formatter Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Update attachment implementation (#213) * Update attachment implementation to align with BF SDK and work correctly with ABS. * Added tests for new attachment implementation * Moved text normalization logic earlier and amended markdown handling (#212) * Moved logic for text normalization earlier in the pipeline into the MergeActivities method. * Modified markdown renderer to use period instead of new line. Amended list rendering. Added tests. Changed default to markdown. * Convert Alexa attachment types to their strong type if needed. (#214) * Update utility naming to helpers (aligns with SDK / other adapters). (#216) * Merge attachments in activities so they are available in the last message (#217) * Merge attachments in activities so they are available in the last message. * Fix attachments. * Fix for attachment null property handling * Update attachment tests * Remove test for missing attachment properties. Attachments / directives have optional properties, so not all properties will always be present. * Fix tests failing with equality of ref types * Project file with additional NuGet dependency Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Update Alexa sample to use latest preview package. Fix assembly name causing Azure deployment issue. Updated sample attachment config. * Added the Alexa Adapter Sample to the Solution (#220) The project was missing from the solution so I have now added it as a part of solution. * Remove conversation type per Activity docs (#229) * Update Alexa Sample * Update README.md * Update readme * Attempt to resolve NuGet dependency between Alexa packages * Update project file ref for local NuGet package * Force alexa project to generate local package * More... * Update for nupack * Fix pipelines pack command * Convert other attachments to their strong type (#234) Co-authored-by: Patrick Volum <pavolum@microsoft.com> Co-authored-by: Nick Ericson <nick.ericson@hotmail.com> Co-authored-by: Arafat Tehsin <arafattehsin@hotmail.com> Co-authored-by: Nick Ericson <nericson@microsoft.com> * Update README.md * Update README.md * Update README.md * Update README.md Remove preview label for Alexa adapter * Change Alexa md renderer to remove trailing periods. Added more tests. (#237) * Change Alexa md renderer to remove trailing periods. Added more tests. * Fix link and quote md rendering Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Zoom Adapter (#240) * Add Zoom adapter project * Working Zoom adapter including message templates. * Updated Zoom Readme and made some refactorings to solution * Update README.md * Update README.md * Update README.md * Zoom adapter request verification (#241) * Add Zoom adapter project * Working Zoom adapter including message templates. * Updated Zoom Readme and made some refactorings to solution * Fixed Zoom request verification * Don't escape Text (#238) * Update project URLs for packages * Added the class attribute (#242) ..to remain consistent with other adapters. * Update readmes for Alexa / Zoom to update NuGet instructions * Update repo readme * Update README.md * Update README.md * Added channel ID to outgoing Zoom activity mapping Co-authored-by: Jamie D <daltskin@hotmail.com> Co-authored-by: martinoss <ossmartin@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alex ln <logalex96@gmail.com> Co-authored-by: Arafat Tehsin <arafattehsin@hotmail.com> Co-authored-by: Patrick Volum <pavolum@microsoft.com> Co-authored-by: Nick Ericson <nick.ericson@hotmail.com> Co-authored-by: Nick Ericson <nericson@microsoft.com> * Release 05/15/2020 (#250) * Adding RingCentral adapter (#215) * Adding RingCentral adapter * Updating documentation #wip * Adding packaging details * Addressing warnings Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Adding sample RingCentral Adapter bot (#221) * Adding RingCentral adapter * Updating documentation #wip * Adding packaging details * Addressing warnings * Adding RingCentral Adapter sample and updating documentation * Fix up unit tests * Adding RingCentral reference to main doc * Fix up git ignore Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Update README.md * Update README.md * Add GitHub link to profile (#223) * Updated sample package references. Added ring central sample. (#224) * Updated sample package references. Added ring central sample. * Update dotnet pack yaml config * Further update to dotnet pack yaml to fix no matching projects build pipeline error. * Bump Microsoft.AspNetCore.All in /samples/Form Flow Sample (#225) Bumps [Microsoft.AspNetCore.All](https://github.com/aspnet/Universe) from 2.1.1 to 2.1.4. - [Release notes](https://github.com/aspnet/Universe/releases) - [Changelog](https://github.com/aspnet/Universe/blob/master/docs/CrossRepoBreakingChanges.md) - [Commits](https://github.com/aspnet/Universe/compare/2.1.1...2.1.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump Microsoft.AspNetCore.All in /samples/Google Adapter Sample (#228) Bumps [Microsoft.AspNetCore.All](https://github.com/aspnet/Universe) from 2.1.1 to 2.1.4. - [Release notes](https://github.com/aspnet/Universe/releases) - [Changelog](https://github.com/aspnet/Universe/blob/master/docs/CrossRepoBreakingChanges.md) - [Commits](https://github.com/aspnet/Universe/compare/2.1.1...2.1.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump Microsoft.AspNetCore.All in /samples/BestMatch Middleware Sample (#226) Bumps [Microsoft.AspNetCore.All](https://github.com/aspnet/Universe) from 2.1.1 to 2.1.4. - [Release notes](https://github.com/aspnet/Universe/releases) - [Changelog](https://github.com/aspnet/Universe/blob/master/docs/CrossRepoBreakingChanges.md) - [Commits](https://github.com/aspnet/Universe/compare/2.1.1...2.1.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump Microsoft.AspNetCore.All in /samples/Alexa Adapter Sample (#227) Bumps [Microsoft.AspNetCore.All](https://github.com/aspnet/Universe) from 2.1.1 to 2.1.4. - [Release notes](https://github.com/aspnet/Universe/releases) - [Changelog](https://github.com/aspnet/Universe/blob/master/docs/CrossRepoBreakingChanges.md) - [Commits](https://github.com/aspnet/Universe/compare/2.1.1...2.1.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Update adaptor to use current elastic 7.x (#233) * Update adaptor to use current elastic 7.x * Update ElasticsearchStorage.cs * Ported the BestMatch Middleware Sample to MVC. (#200) Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Refactor of Alexa adapter (#179) * - Initial Alexa adapter refactor to adopt Alexa.Net - Moved towards deprecating the AlexaHttpAdapter (kept for backwards compat) * - Updated Directory Build Props to include StyleCop package - Enable warnings as errors for Alexa project * - Added attachment types for directives / cards etc. - Updated content extension methods to use Alexa.NET and attachments model - Updated some core adapter logic * - Added support for Directives - Updated logic to use attachments as opposed to TurnState - Further adapter logic updates * Update GitVersion tag for feature branches * - Moved method for stylecop * Update GitVersion to attempt to ensure package names are incremented correctly on each build. * Updated package dependencies for Alexa adapter * Updated Alexa Sample * Update readme for preview package * Amended middleware and adaper for skills support * Updates following PR feedback * Removed ContinueConversationAsync overload not available until SDK 4.7. Will be re-added later for skills support. * Add LaunchRequest -> ConversationUpdate logic to middleware as per @pavolum's idea. * Added message activity concat and suggested actions conversion to google adapter * Adding configurable flag which will inform the adapter if it should concat multiple text activities in one turn * minor clean up * removing google adapter changes, renaming functions, removing suggested action conversion * Remove unused option * - Some naming tweaks - Added policy for handling multiple outgoing activities. - Added ContinueConversationAsync method * Move multiple activity policy enum out of options class * Naming tweak for outgoing activity policy * Update docs and add automatic end of session when no outgoing activities are sent * Readme update * Change default concat policy. Update readme. * Changes following code review (#195) * Move the activities list to within the turn context * Update adapter to make activity processing method virtual and remove multiple activity policy. Improved concat logic. * Fix speak concat bug * Add first Alexa tests * Update README.md * Update Bot Builder NuGet references * Updates to Alexa Adapter to pull out core package with request / activity transform logic, attachment types and context extension methods. * Fix failing test * Updates to move middleware into adapter. Rename helper to AlexaRequestMapper * Further refinements of mapper * Update AlexaRequestMapperOptions.cs * Updates to mapper / options * Add Alexa Auth Handler. (#204) * Rename some methods on Alexa Mapper. Update NuGet packages to 4.8. * Rename auth handler class name * Removing old Alexa auth handler * Fix test project dependencies * Update Alexa Core project file * Amend pipeline to try and resolve dotnet pack issue * Remvoed and re-added Alexa projects to SLN * Attempt to address issue with GitVersion env vars no longer shared across pipeline tasks * Update pipeline * Update Auth Handler (#205) * Add Alexa Auth Handler. * Fix crazyness in merge. * again. * Add Alexa Skill Id validation check. * Tabs to spaces * Add a couple tests. * Separate skill id check. * Set ExpectReplies and add more tests. * Dont NRE when activities is null. * Release/4.8.0 (#206) * Google Adapter: Google Content Type not set to UTF-8 * Alexa Adapter: Add person to alexasystem to support Alexa voiceprint to know the ID of the speaker (#198) - Thanks @jamesemann * TwitterAdapter: Added unit tests (#197) - Thanks @matiasroldan6 @santgr11 * DevOps: Azure DevOps Pipelines GitVersion issue * Dependencies: Update to Bot Framework SDK 4.8 * Fix bug with not handling built in StopIntent * Add virtual to auth methods (#209) * Add Alexa Auth Handler. * Fix crazyness in merge. * again. * Add Alexa Skill Id validation check. * Tabs to spaces * Add a couple tests. * Separate skill id check. * Set ExpectReplies and add more tests. * Dont NRE when activities is null. * Make methods virutal for mocking * Add check for Request being null so we don't throw NRE on bad requests from Alexa. Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Add fallback support for Alexa request types => EventActivity * Add a simple markdown to plain text converter (#210) * Add Alexa Auth Handler. * Fix crazyness in merge. * again. * Add Alexa Skill Id validation check. * Tabs to spaces * Add a couple tests. * Separate skill id check. * Set ExpectReplies and add more tests. * Dont NRE when activities is null. * Make methods virutal for mocking * Add check for Request being null so we don't throw NRE on bad requests from Alexa. * Add simple markdown formatter Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Update attachment implementation (#213) * Update attachment implementation to align with BF SDK and work correctly with ABS. * Added tests for new attachment implementation * Moved text normalization logic earlier and amended markdown handling (#212) * Moved logic for text normalization earlier in the pipeline into the MergeActivities method. * Modified markdown renderer to use period instead of new line. Amended list rendering. Added tests. Changed default to markdown. * Convert Alexa attachment types to their strong type if needed. (#214) * Update utility naming to helpers (aligns with SDK / other adapters). (#216) * Merge attachments in activities so they are available in the last message (#217) * Merge attachments in activities so they are available in the last message. * Fix attachments. * Fix for attachment null property handling * Update attachment tests * Remove test for missing attachment properties. Attachments / directives have optional properties, so not all properties will always be present. * Fix tests failing with equality of ref types * Project file with additional NuGet dependency Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Update Alexa sample to use latest preview package. Fix assembly name causing Azure deployment issue. Updated sample attachment config. * Added the Alexa Adapter Sample to the Solution (#220) The project was missing from the solution so I have now added it as a part of solution. * Remove conversation type per Activity docs (#229) * Update Alexa Sample * Update README.md * Update readme * Attempt to resolve NuGet dependency between Alexa packages * Update project file ref for local NuGet package * Force alexa project to generate local package * More... * Update for nupack * Fix pipelines pack command Co-authored-by: Patrick Volum <pavolum@microsoft.com> Co-authored-by: Nick Ericson <nick.ericson@hotmail.com> Co-authored-by: Arafat Tehsin <arafattehsin@hotmail.com> * Feature/adopt alexadotnet (#235) * - Initial Alexa adapter refactor to adopt Alexa.Net - Moved towards deprecating the AlexaHttpAdapter (kept for backwards compat) * - Updated Directory Build Props to include StyleCop package - Enable warnings as errors for Alexa project * - Added attachment types for directives / cards etc. - Updated content extension methods to use Alexa.NET and attachments model - Updated some core adapter logic * - Added support for Directives - Updated logic to use attachments as opposed to TurnState - Further adapter logic updates * Update GitVersion tag for feature branches * - Moved method for stylecop * Update GitVersion to attempt to ensure package names are incremented correctly on each build. * Updated package dependencies for Alexa adapter * Updated Alexa Sample * Update readme for preview package * Amended middleware and adaper for skills support * Updates following PR feedback * Removed ContinueConversationAsync overload not available until SDK 4.7. Will be re-added later for skills support. * Add LaunchRequest -> ConversationUpdate logic to middleware as per @pavolum's idea. * Added message activity concat and suggested actions conversion to google adapter * Adding configurable flag which will inform the adapter if it should concat multiple text activities in one turn * minor clean up * removing google adapter changes, renaming functions, removing suggested action conversion * Remove unused option * - Some naming tweaks - Added policy for handling multiple outgoing activities. - Added ContinueConversationAsync method * Move multiple activity policy enum out of options class * Naming tweak for outgoing activity policy * Update docs and add automatic end of session when no outgoing activities are sent * Readme update * Change default concat policy. Update readme. * Changes following code review (#195) * Move the activities list to within the turn context * Update adapter to make activity processing method virtual and remove multiple activity policy. Improved concat logic. * Fix speak concat bug * Add first Alexa tests * Update README.md * Update Bot Builder NuGet references * Updates to Alexa Adapter to pull out core package with request / activity transform logic, attachment types and context extension methods. * Fix failing test * Updates to move middleware into adapter. Rename helper to AlexaRequestMapper * Further refinements of mapper * Update AlexaRequestMapperOptions.cs * Updates to mapper / options * Add Alexa Auth Handler. (#204) * Rename some methods on Alexa Mapper. Update NuGet packages to 4.8. * Rename auth handler class name * Removing old Alexa auth handler * Fix test project dependencies * Update Alexa Core project file * Amend pipeline to try and resolve dotnet pack issue * Remvoed and re-added Alexa projects to SLN * Attempt to address issue with GitVersion env vars no longer shared across pipeline tasks * Update pipeline * Update Auth Handler (#205) * Add Alexa Auth Handler. * Fix crazyness in merge. * again. * Add Alexa Skill Id validation check. * Tabs to spaces * Add a couple tests. * Separate skill id check. * Set ExpectReplies and add more tests. * Dont NRE when activities is null. * Release/4.8.0 (#206) * Google Adapter: Google Content Type not set to UTF-8 * Alexa Adapter: Add person to alexasystem to support Alexa voiceprint to know the ID of the speaker (#198) - Thanks @jamesemann * TwitterAdapter: Added unit tests (#197) - Thanks @matiasroldan6 @santgr11 * DevOps: Azure DevOps Pipelines GitVersion issue * Dependencies: Update to Bot Framework SDK 4.8 * Fix bug with not handling built in StopIntent * Add virtual to auth methods (#209) * Add Alexa Auth Handler. * Fix crazyness in merge. * again. * Add Alexa Skill Id validation check. * Tabs to spaces * Add a couple tests. * Separate skill id check. * Set ExpectReplies and add more tests. * Dont NRE when activities is null. * Make methods virutal for mocking * Add check for Request being null so we don't throw NRE on bad requests from Alexa. Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Add fallback support for Alexa request types => EventActivity * Add a simple markdown to plain text converter (#210) * Add Alexa Auth Handler. * Fix crazyness in merge. * again. * Add Alexa Skill Id validation check. * Tabs to spaces * Add a couple tests. * Separate skill id check. * Set ExpectReplies and add more tests. * Dont NRE when activities is null. * Make methods virutal for mocking * Add check for Request being null so we don't throw NRE on bad requests from Alexa. * Add simple markdown formatter Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Update attachment implementation (#213) * Update attachment implementation to align with BF SDK and work correctly with ABS. * Added tests for new attachment implementation * Moved text normalization logic earlier and amended markdown handling (#212) * Moved logic for text normalization earlier in the pipeline into the MergeActivities method. * Modified markdown renderer to use period instead of new line. Amended list rendering. Added tests. Changed default to markdown. * Convert Alexa attachment types to their strong type if needed. (#214) * Update utility naming to helpers (aligns with SDK / other adapters). (#216) * Merge attachments in activities so they are available in the last message (#217) * Merge attachments in activities so they are available in the last message. * Fix attachments. * Fix for attachment null property handling * Update attachment tests * Remove test for missing attachment properties. Attachments / directives have optional properties, so not all properties will always be present. * Fix tests failing with equality of ref types * Project file with additional NuGet dependency Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Update Alexa sample to use latest preview package. Fix assembly name causing Azure deployment issue. Updated sample attachment config. * Added the Alexa Adapter Sample to the Solution (#220) The project was missing from the solution so I have now added it as a part of solution. * Remove conversation type per Activity docs (#229) * Update Alexa Sample * Update README.md * Update readme * Attempt to resolve NuGet dependency between Alexa packages * Update project file ref for local NuGet package * Force alexa project to generate local package * More... * Update for nupack * Fix pipelines pack command * Convert other attachments to their strong type (#234) Co-authored-by: Patrick Volum <pavolum@microsoft.com> Co-authored-by: Nick Ericson <nick.ericson@hotmail.com> Co-authored-by: Arafat Tehsin <arafattehsin@hotmail.com> Co-authored-by: Nick Ericson <nericson@microsoft.com> * Update README.md * Update README.md * Update README.md * Update README.md Remove preview label for Alexa adapter * Change Alexa md renderer to remove trailing periods. Added more tests. (#237) * Change Alexa md renderer to remove trailing periods. Added more tests. * Fix link and quote md rendering Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Zoom Adapter (#240) * Add Zoom adapter project * Working Zoom adapter including message templates. * Updated Zoom Readme and made some refactorings to solution * Update README.md * Update README.md * Update README.md * Zoom adapter request verification (#241) * Add Zoom adapter project * Working Zoom adapter including message templates. * Updated Zoom Readme and made some refactorings to solution * Fixed Zoom request verification * Don't escape Text (#238) * Update project URLs for packages * Added the class attribute (#242) ..to remain consistent with other adapters. * Update readmes for Alexa / Zoom to update NuGet instructions * Update repo readme * Update README.md * Update README.md * Added channel ID to outgoing Zoom activity mapping * convert to csharp (#246) * Refactor of Google Adapter (#190) * - Initial Alexa adapter refactor to adopt Alexa.Net - Moved towards deprecating the AlexaHttpAdapter (kept for backwards compat) * - Updated Directory Build Props to include StyleCop package - Enable warnings as errors for Alexa project * - Added attachment types for directives / cards etc. - Updated content extension methods to use Alexa.NET and attachments model - Updated some core adapter logic * - Added support for Directives - Updated logic to use attachments as opposed to TurnState - Further adapter logic updates * Update GitVersion tag for feature branches * - Moved method for stylecop * Update GitVersion to attempt to ensure package names are incremented correctly on each build. * Updated package dependencies for Alexa adapter * Updated Alexa Sample * Update readme for preview package * Amended middleware and adaper for skills support * Updates following PR feedback * Removed ContinueConversationAsync overload not available until SDK 4.7. Will be re-added later for skills support. * Add LaunchRequest -> ConversationUpdate logic to middleware as per @pavolum's idea. * Added message activity concat and suggested actions conversion to google adapter * Adding configurable flag which will inform the adapter if it should concat multiple text activities in one turn * minor clean up * removing google adapter changes, renaming functions, removing suggested action conversion * Remove unused option * - Some naming tweaks - Added policy for handling multiple outgoing activities. - Added ContinueConversationAsync method * Move multiple activity policy enum out of options class * Naming tweak for outgoing activity policy * First iteration on Google refactor * Refactor of Google Adapter * Update samples for Alexa / Google * Update Google Adapter Sample * Update Google adapter to send conversation update activity when user initiates conversation without intent. * Updated readme and sample to use latest preview * Fix image links in readme. * Another attempt to fix images * Further image link fix * Update README.md * Update README.md * Update README.md * Image extension case fix * Update README.md * Updated response content type * Update Startup.cs * Update docs and add automatic end of session when no outgoing activities are sent * Readme update * Change default concat policy. Update readme. * Changes following code review (#195) * Move the activities list to within the turn context * Update adapter to make activity processing method virtual and remove multiple activity policy. Improved concat logic. * Update Google adapter with latest changes to mirror the Alexa adapter * Fix speak concat bug * Fix speak concat issue * Add first Alexa tests * Update README.md * Update README.md * Update Bot Builder NuGet references * Updates to Alexa Adapter to pull out core package with request / activity transform logic, attachment types and context extension methods. * Fix failing test * Updates to move middleware into adapter. Rename helper to AlexaRequestMapper * Further refinements of mapper * Update AlexaRequestMapperOptions.cs * Updates to mapper / options * Add Alexa Auth Handler. (#204) * Rename some methods on Alexa Mapper. Update NuGet packages to 4.8. * Rename auth handler class name * Removing old Alexa auth handler * Fix test project dependencies * Update Alexa Core project file * Amend pipeline to try and resolve dotnet pack issue * Remvoed and re-added Alexa projects to SLN * Attempt to address issue with GitVersion env vars no longer shared across pipeline tasks * Update pipeline * Update Auth Handler (#205) * Add Alexa Auth Handler. * Fix crazyness in merge. * again. * Add Alexa Skill Id validation check. * Tabs to spaces * Add a couple tests. * Separate skill id check. * Set ExpectReplies and add more tests. * Dont NRE when activities is null. * Fix bug with not handling built in StopIntent * Add virtual to auth methods (#209) * Add Alexa Auth Handler. * Fix crazyness in merge. * again. * Add Alexa Skill Id validation check. * Tabs to spaces * Add a couple tests. * Separate skill id check. * Set ExpectReplies and add more tests. * Dont NRE when activities is null. * Make methods virutal for mocking * Add check for Request being null so we don't throw NRE on bad requests from Alexa. Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Add fallback support for Alexa request types => EventActivity * Add a simple markdown to plain text converter (#210) * Add Alexa Auth Handler. * Fix crazyness in merge. * again. * Add Alexa Skill Id validation check. * Tabs to spaces * Add a couple tests. * Separate skill id check. * Set ExpectReplies and add more tests. * Dont NRE when activities is null. * Make methods virutal for mocking * Add check for Request being null so we don't throw NRE on bad requests from Alexa. * Add simple markdown formatter Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Update attachment implementation (#213) * Update attachment implementation to align with BF SDK and work correctly with ABS. * Added tests for new attachment implementation * Moved text normalization logic earlier and amended markdown handling (#212) * Moved logic for text normalization earlier in the pipeline into the MergeActivities method. * Modified markdown renderer to use period instead of new line. Amended list rendering. Added tests. Changed default to markdown. * Convert Alexa attachment types to their strong type if needed. (#214) * Update utility naming to helpers (aligns with SDK / other adapters). (#216) * Merge attachments in activities so they are available in the last message (#217) * Merge attachments in activities so they are available in the last message. * Fix attachments. * Fix for attachment null property handling * Update attachment tests * Remove test for missing attachment properties. Attachments / directives have optional properties, so not all properties will always be present. * Fix tests failing with equality of ref types * Project file with additional NuGet dependency Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Updated the media files (#218) As Action SDK has been changed to Assistant SDK therefore I have updated them * Fixed typo & added .json to package file (#219) * Update Alexa sample to use latest preview package. Fix assembly name causing Azure deployment issue. Updated sample attachment config. * WIP on Google sync with current Alexa approach * Sync google with current alexa approach WIP * Further project factoring * Further refactoring. Split out conversations / dialogflow into separate request mappers. * Update to Google adapter WIP - addressing anonymous user id and removing attachment processing temporarily. * WIP * Significant updates to include Google specific attachment types for system intents and cards * Refactor RequestToActivity and add card / intent factories * Align DialogFlow mapper with Conversation Webhook - derive both from new abstract base class. * Implemented feedback following review Co-authored-by: Patrick Volum <pavolum@microsoft.com> Co-authored-by: Nick Ericson <nick.ericson@hotmail.com> Co-authored-by: Arafat Tehsin <arafattehsin@hotmail.com> * [AdaptiveDialogs] Add Rest actions (#232) * Add Adaptive Rest action * Add nuget metadata * Add Readme * Fix readme * Fix documentation * Fix sln * Fix merge sln Co-authored-by: Sébastien BIAUDET <sebastien.biaudet@sikim.fr> * Add Infobip Adapter (#247) * Add Infobip Adapter * Updated readme to nuget vs myget. * Update readme * Switch to xunit * autoformat all files. * Sln file merge Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Doc updates for Google Adapter (#249) * - Initial Alexa adapter refactor to adopt Alexa.Net - Moved towards deprecating the AlexaHttpAdapter (kept for backwards compat) * - Updated Directory Build Props to include StyleCop package - Enable warnings as errors for Alexa project * - Added attachment types for directives / cards etc. - Updated content extension methods to use Alexa.NET and attachments model - Updated some core adapter logic * - Added support for Directives - Updated logic to use attachments as opposed to TurnState - Further adapter logic updates * Update GitVersion tag for feature branches * - Moved method for stylecop * Update GitVersion to attempt to ensure package names are incremented correctly on each build. * Updated package dependencies for Alexa adapter * Updated Alexa Sample * Update readme for preview package * Amended middleware and adaper for skills support * Updates following PR feedback * Removed ContinueConversationAsync overload not available until SDK 4.7. Will be re-added later for skills support. * Add LaunchRequest -> ConversationUpdate logic to middleware as per @pavolum's idea. * Added message activity concat and suggested actions conversion to google adapter * Adding configurable flag which will inform the adapter if it should concat multiple text activities in one turn * minor clean up * removing google adapter changes, renaming functions, removing suggested action conversion * Remove unused option * - Some naming tweaks - Added policy for handling multiple outgoing activities. - Added ContinueConversationAsync method * Move multiple activity policy enum out of options class * Naming tweak for outgoing activity policy * First iteration on Google refactor * Refactor of Google Adapter * Update samples for Alexa / Google * Update Google Adapter Sample * Update Google adapter to send conversation update activity when user initiates conversation without intent. * Updated readme and sample to use latest preview * Fix image links in readme. * Another attempt to fix images * Further image link fix * Update README.md * Update README.md * Update README.md * Image extension case fix * Update README.md * Updated response content type * Update Startup.cs * Update docs and add automatic end of session when no outgoing activities are sent * Readme update * Change default concat policy. Update readme. * Changes following code review (#195) * Move the activities list to within the turn context * Update adapter to make activity processing method virtual and remove multiple activity policy. Improved concat logic. * Update Google adapter with latest changes to mirror the Alexa adapter * Fix speak concat bug * Fix speak concat issue * Add first Alexa tests * Update README.md * Update README.md * Update Bot Builder NuGet references * Updates to Alexa Adapter to pull out core package with request / activity transform logic, attachment types and context extension methods. * Fix failing test * Updates to move middleware into adapter. Rename helper to AlexaRequestMapper * Further refinements of mapper * Update AlexaRequestMapperOptions.cs * Updates to mapper / options * Add Alexa Auth Handler. (#204) * Rename some methods on Alexa Mapper. Update NuGet packages to 4.8. * Rename auth handler class name * Removing old Alexa auth handler * Fix test project dependencies * Update Alexa Core project file * Amend pipeline to try and resolve dotnet pack issue * Remvoed and re-added Alexa projects to SLN * Attempt to address issue with GitVersion env vars no longer shared across pipeline tasks * Update pipeline * Update Auth Handler (#205) * Add Alexa Auth Handler. * Fix crazyness in merge. * again. * Add Alexa Skill Id validation check. * Tabs to spaces * Add a couple tests. * Separate skill id check. * Set ExpectReplies and add more tests. * Dont NRE when activities is null. * Fix bug with not handling built in StopIntent * Add virtual to auth methods (#209) * Add Alexa Auth Handler. * Fix crazyness in merge. * again. * Add Alexa Skill Id validation check. * Tabs to spaces * Add a couple tests. * Separate skill id check. * Set ExpectReplies and add more tests. * Dont NRE when activities is null. * Make methods virutal for mocking * Add check for Request being null so we don't throw NRE on bad requests from Alexa. Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Add fallback support for Alexa request types => EventActivity * Add a simple markdown to plain text converter (#210) * Add Alexa Auth Handler. * Fix crazyness in merge. * again. * Add Alexa Skill Id validation check. * Tabs to spaces * Add a couple tests. * Separate skill id check. * Set ExpectReplies and add more tests. * Dont NRE when activities is null. * Make methods virutal for mocking * Add check for Request being null so we don't throw NRE on bad requests from Alexa. * Add simple markdown formatter Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Update attachment implementation (#213) * Update attachment implementation to align with BF SDK and work correctly with ABS. * Added tests for new attachment implementation * Moved text normalization logic earlier and amended markdown handling (#212) * Moved logic for text normalization earlier in the pipeline into the MergeActivities method. * Modified markdown renderer to use period instead of new line. Amended list rendering. Added tests. Changed default to markdown. * Convert Alexa attachment types to their strong type if needed. (#214) * Update utility naming to helpers (aligns with SDK / other adapters). (#216) * Merge attachments in activities so they are available in the last message (#217) * Merge attachments in activities so they are available in the last message. * Fix attachments. * Fix for attachment null property handling * Update attachment tests * Remove test for missing attachment properties. Attachments / directives have optional properties, so not all properties will always be present. * Fix tests failing with equality of ref types * Project file with additional NuGet dependency Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Updated the media files (#218) As Action SDK has been changed to Assistant SDK therefore I have updated them * Fixed typo & added .json to package file (#219) * Update Alexa sample to use latest preview package. Fix assembly name causing Azure deployment issue. Updated sample attachment config. * WIP on Google sync with current Alexa approach * Sync google with current alexa approach WIP * Further project factoring * Further refactoring. Split out conversations / dialogflow into separate request mappers. * Update to Google adapter WIP - addressing anonymous user id and removing attachment processing temporarily. * WIP * Significant updates to include Google specific attachment types for system intents and cards * Refactor RequestToActivity and add card / intent factories * Align DialogFlow mapper with Conversation Webhook - derive both from new abstract base class. * Implemented feedback following review * Updated Google Adapter Readme. Co-authored-by: Patrick Volum <pavolum@microsoft.com> Co-authored-by: Nick Ericson <nick.ericson@hotmail.com> Co-authored-by: Arafat Tehsin <arafattehsin@hotmail.com> * Update README.md Co-authored-by: Jamie D <daltskin@hotmail.com> Co-authored-by: martinoss <ossmartin@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alex ln <logalex96@gmail.com> Co-authored-by: Arafat Tehsin <arafattehsin@hotmail.com> Co-authored-by: Patrick Volum <pavolum@microsoft.com> Co-authored-by: Nick Ericson <nick.ericson@hotmail.com> Co-authored-by: Nick Ericson <nericson@microsoft.com> Co-authored-by: Michael Richardson <40401643+mdrichardson@users.noreply.github.com> Co-authored-by: Sébastien BIAUDET <sebastien.biaudet@gmail.com> Co-authored-by: Sébastien BIAUDET <sebastien.biaudet@sikim.fr> Co-authored-by: Jamie D <daltskin@hotmail.com> Co-authored-by: martinoss <ossmartin@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alex ln <logalex96@gmail.com> Co-authored-by: Arafat Tehsin <arafattehsin@hotmail.com> Co-authored-by: Patrick Volum <pavolum@microsoft.com> Co-authored-by: Nick Ericson <nick.ericson@hotmail.com> Co-authored-by: Nick Ericson <nericson@microsoft.com> Co-authored-by: Michael Richardson <40401643+mdrichardson@users.noreply.github.com> Co-authored-by: Sébastien BIAUDET <sebastien.biaudet@gmail.com> Co-authored-by: Sébastien BIAUDET <sebastien.biaudet@sikim.fr> * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Fixed a small typo * Fix for Google validation which prevented a user from disabling checks (#253) * Further google request validation fix (#255) * Fix for Google validation which prevented a user from disabling checks * Further fix for Google request validation * Update README.md * Fix casing for Infobip in readme. (#262) * Add bot sample for Infobip Whatsapp adapter (#259) * added bot sample for infobip whatsapp adapter * adapter readme.md file correction * Readme.md file corrections Co-authored-by: iursic <iursic@infobip.com> Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Add Infobip sample link to readme (#265) * Added more properties to BasicCardContent to support Rich Content (#258) * Added the class attribute ..to remain consistent with other adapters. * Updated the references to use the latest middleware with ML.NET support * Added more properties to support Rich Card content in GoogleCardFactory. * Replaced the existing media to address the Authorization part and fixed a typo. Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Update Alexa.NET version to pull in fix for deserialization issue (#264) Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Updated Suggested Actions conversion logic (#266) * Updated Suggested Actions conversion logic to only use IMBack and MessageBack types. Add LinkOutSuggestion conversion. * Update Google Sample to use NuGet package instead of project reference. * Fixed missing project reference * Update NuGet packages for libs and samples (#267) * Update NuGet packages for libs to SDK 4.9 and fix a couple of breaking changes in adaptive lib. Update samples NuGet for Bot Builder Community packages to 4.8. * Update Adaptive Rest unit test to add Adaptive component registration Co-authored-by: Jamie D <daltskin@hotmail.com> Co-authored-by: martinoss <ossmartin@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alex ln <logalex96@gmail.com> Co-authored-by: Arafat Tehsin <arafattehsin@hotmail.com> Co-authored-by: Patrick Volum <pavolum@microsoft.com> Co-authored-by: Nick Ericson <nick.ericson@hotmail.com> Co-authored-by: Nick Ericson <nericson@microsoft.com> Co-authored-by: Michael Richardson <40401643+mdrichardson@users.noreply.github.com> Co-authored-by: Sébastien BIAUDET <sebastien.biaudet@gmail.com> Co-authored-by: Sébastien BIAUDET <sebastien.biaudet@sikim.fr> Co-authored-by: ivanursic-infobip <64965551+ivanursic-infobip@users.noreply.github.com> Co-authored-by: iursic <iursic@infobip.com>
1 parent 6723796 commit 788e3b9

72 files changed

Lines changed: 1428 additions & 137 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Bot.Builder.Community.Samples.sln‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Google Adapter Sample", "sa
2626
EndProject
2727
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Zoom Adapter Sample", "samples\Zoom Adapter Sample\Zoom Adapter Sample.csproj", "{D5F5BFB0-CDEC-4980-9EBB-864724B6B2B6}"
2828
EndProject
29+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Infobip Adapter Sample", "samples\Infobip Adapter Sample\Infobip Adapter Sample.csproj", "{BC01A8C4-3FEB-46E8-AE39-D71F5CB7602F}"
30+
EndProject
2931
Global
3032
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3133
Debug|Any CPU = Debug|Any CPU
3234
Release|Any CPU = Release|Any CPU
3335
EndGlobalSection
3436
GlobalSection(ProjectConfigurationPlatforms) = postSolution
35-
{7927A7EE-C327-4403-A5F4-B5E2C0BF4D47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
36-
{7927A7EE-C327-4403-A5F4-B5E2C0BF4D47}.Debug|Any CPU.Build.0 = Debug|Any CPU
37-
{7927A7EE-C327-4403-A5F4-B5E2C0BF4D47}.Release|Any CPU.ActiveCfg = Release|Any CPU
38-
{7927A7EE-C327-4403-A5F4-B5E2C0BF4D47}.Release|Any CPU.Build.0 = Release|Any CPU
3937
{10BEDE11-C9DE-4B67-9467-4E48272229C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4038
{10BEDE11-C9DE-4B67-9467-4E48272229C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
4139
{10BEDE11-C9DE-4B67-9467-4E48272229C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -60,14 +58,6 @@ Global
6058
{55F863F1-9EC8-420C-9099-BD8378D72F18}.Debug|Any CPU.Build.0 = Debug|Any CPU
6159
{55F863F1-9EC8-420C-9099-BD8378D72F18}.Release|Any CPU.ActiveCfg = Release|Any CPU
6260
{55F863F1-9EC8-420C-9099-BD8378D72F18}.Release|Any CPU.Build.0 = Release|Any CPU
63-
{37ED6FBD-12B5-40CF-837F-6F75ACC65484}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
64-
{37ED6FBD-12B5-40CF-837F-6F75ACC65484}.Debug|Any CPU.Build.0 = Debug|Any CPU
65-
{37ED6FBD-12B5-40CF-837F-6F75ACC65484}.Release|Any CPU.ActiveCfg = Release|Any CPU
66-
{37ED6FBD-12B5-40CF-837F-6F75ACC65484}.Release|Any CPU.Build.0 = Release|Any CPU
67-
{89A6903F-2911-4A27-B178-EA28D697D46B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
68-
{89A6903F-2911-4A27-B178-EA28D697D46B}.Debug|Any CPU.Build.0 = Debug|Any CPU
69-
{89A6903F-2911-4A27-B178-EA28D697D46B}.Release|Any CPU.ActiveCfg = Release|Any CPU
70-
{89A6903F-2911-4A27-B178-EA28D697D46B}.Release|Any CPU.Build.0 = Release|Any CPU
7161
{D1C3490D-477A-4D79-A41C-4D15CA9DC183}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7262
{D1C3490D-477A-4D79-A41C-4D15CA9DC183}.Debug|Any CPU.Build.0 = Debug|Any CPU
7363
{D1C3490D-477A-4D79-A41C-4D15CA9DC183}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -84,10 +74,18 @@ Global
8474
{53BCE929-C57D-4AF9-91C9-FCA5C7E2CE41}.Debug|Any CPU.Build.0 = Debug|Any CPU
8575
{53BCE929-C57D-4AF9-91C9-FCA5C7E2CE41}.Release|Any CPU.ActiveCfg = Release|Any CPU
8676
{53BCE929-C57D-4AF9-91C9-FCA5C7E2CE41}.Release|Any CPU.Build.0 = Release|Any CPU
77+
{89A6903F-2911-4A27-B178-EA28D697D46B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
78+
{89A6903F-2911-4A27-B178-EA28D697D46B}.Debug|Any CPU.Build.0 = Debug|Any CPU
79+
{89A6903F-2911-4A27-B178-EA28D697D46B}.Release|Any CPU.ActiveCfg = Release|Any CPU
80+
{89A6903F-2911-4A27-B178-EA28D697D46B}.Release|Any CPU.Build.0 = Release|Any CPU
8781
{D5F5BFB0-CDEC-4980-9EBB-864724B6B2B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8882
{D5F5BFB0-CDEC-4980-9EBB-864724B6B2B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
8983
{D5F5BFB0-CDEC-4980-9EBB-864724B6B2B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
9084
{D5F5BFB0-CDEC-4980-9EBB-864724B6B2B6}.Release|Any CPU.Build.0 = Release|Any CPU
85+
{BC01A8C4-3FEB-46E8-AE39-D71F5CB7602F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
86+
{BC01A8C4-3FEB-46E8-AE39-D71F5CB7602F}.Debug|Any CPU.Build.0 = Debug|Any CPU
87+
{BC01A8C4-3FEB-46E8-AE39-D71F5CB7602F}.Release|Any CPU.ActiveCfg = Release|Any CPU
88+
{BC01A8C4-3FEB-46E8-AE39-D71F5CB7602F}.Release|Any CPU.Build.0 = Release|Any CPU
9189
EndGlobalSection
9290
GlobalSection(SolutionProperties) = preSolution
9391
HideSolutionNode = FALSE

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ The following adapters can be used to expose your bot on additional channels not
3434
| [Google Adapter](libraries/Bot.Builder.Community.Adapters.Google) | An adapter to allow for Google Actions to be built using the Bot Builder SDK. Includes broad support for Google Actions capabilities, including Cards and suggestion chips | [Sample](https://github.com/BotBuilderCommunity/botbuilder-community-dotnet/tree/master/samples/Google%20Adapter%20Sample) | [![NuGet version](https://img.shields.io/badge/NuGet-blue.svg)](https://www.nuget.org/packages/Bot.Builder.Community.Adapters.Google/) |
3535
| [Twitter Adapter](libraries/Bot.Builder.Community.Adapters.Twitter) | An adapter that integrates Twitter Direct Messages with the Bot Builder. The adapter sets up the required webhooks and responds to CRC requests. The webhooks code is based on the work by Tweety with modifications to support the Premium tier of the Account Activity API. | [Sample](https://github.com/BotBuilderCommunity/botbuilder-community-dotnet/tree/master/samples/Twitter%20Adapter%20Sample) | [![NuGet version](https://img.shields.io/badge/NuGet-blue.svg)](https://www.nuget.org/packages/Bot.Builder.Community.Adapters.Twitter/) |
3636
| [RingCentral Adapter](libraries/Bot.Builder.Community.Adapters.RingCentral) | An adapter that integrates the RingCentral Platform API with the Bot Builder. The adapter sets up the required webhooks and endpoints to RingCentral requests. Supporting features such as human handoff, activity publishing and WhatsApp support. | [Sample](https://github.com/BotBuilderCommunity/botbuilder-community-dotnet/tree/master/samples/RingCentral%20Adapter%20Sample) | [![NuGet version](https://img.shields.io/badge/NuGet-blue.svg)](https://www.nuget.org/packages/Bot.Builder.Community.Adapters.RingCentral/) |
37-
| [Zoom Adapter](libraries/Bot.Builder.Community.Adapters.Zoom) | An adapter that accepts and hanldes Zoom app requests. Specifically developed to handle Zoom chatbot app requests and allow for the sending of messages using Zoom Message Templates. The adapter will also receieve any event subscribed to via Zoom, even those not chatbot related. | [Sample](https://github.com/BotBuilderCommunity/botbuilder-community-dotnet/tree/develop/samples/Zoom%20Adapter%20Sample) | [![NuGet version](https://img.shields.io/badge/NuGet-blue.svg)](https://www.nuget.org/packages/Bot.Builder.Community.Adapters.Zoom/) |
38-
| [InfoBip WhatsApp Adapter](libraries/Bot.Builder.Community.Adapters.InfoBip) | An adapter that accepts and hanldes WhatsApp app requests via InfoBip, including support for various message and template types. | | [![NuGet version](https://img.shields.io/badge/NuGet-blue.svg)](https://github.com/BotBuilderCommunity/botbuilder-community-dotnet/tree/develop/libraries/Bot.Builder.Community.Adapters.Infobip/) |
37+
| [Zoom Adapter](libraries/Bot.Builder.Community.Adapters.Zoom) | An adapter that accepts and handles Zoom app requests. Specifically developed to handle Zoom chatbot app requests and allow for the sending of messages using Zoom Message Templates. The adapter will also receieve any event subscribed to via Zoom, even those not chatbot related. | [Sample](https://github.com/BotBuilderCommunity/botbuilder-community-dotnet/tree/develop/samples/Zoom%20Adapter%20Sample) | [![NuGet version](https://img.shields.io/badge/NuGet-blue.svg)](https://www.nuget.org/packages/Bot.Builder.Community.Adapters.Zoom/) |
38+
| [Infobip WhatsApp Adapter](libraries/Bot.Builder.Community.Adapters.Infobip) | An adapter that accepts and hanldes WhatsApp app requests via Infobip, including support for various message and template types. | [Sample](https://github.com/BotBuilderCommunity/botbuilder-community-dotnet/tree/develop/samples/Infobip%20Adapter%20Sample) | [![NuGet version](https://img.shields.io/badge/NuGet-blue.svg)](https://github.com/BotBuilderCommunity/botbuilder-community-dotnet/tree/develop/libraries/Bot.Builder.Community.Adapters.Infobip/) |
3939

4040
## Dialogs and Prompts
4141

‎libraries/Bot.Builder.Community.Adapters.Alexa.Core/Bot.Builder.Community.Adapters.Alexa.Core.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919

2020

2121
<ItemGroup>
22-
<PackageReference Include="Alexa.NET" Version="1.13.0" />
22+
<PackageReference Include="Alexa.NET" Version="1.13.3" />
2323
<PackageReference Include="Alexa.NET.CustomerProfile" Version="2.1.1" />
2424
<PackageReference Include="Microsoft.MarkedNet" Version="1.0.13" />
25-
<PackageReference Include="Microsoft.Bot.Builder" Version="4.8.0" />
26-
<PackageReference Include="Microsoft.Bot.Schema" Version="4.8.0" />
25+
<PackageReference Include="Microsoft.Bot.Builder" Version="4.9.2" />
26+
<PackageReference Include="Microsoft.Bot.Schema" Version="4.9.2" />
2727
</ItemGroup>
2828

2929
</Project>

‎libraries/Bot.Builder.Community.Adapters.Alexa/Bot.Builder.Community.Adapters.Alexa.csproj‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@
2020
</PropertyGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="Alexa.NET" Version="1.13.0" />
24-
<PackageReference Include="Alexa.NET.CustomerProfile" Version="2.1.1" />
25-
<PackageReference Include="Microsoft.Bot.Builder" Version="4.8.0" />
26-
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.8.0" />
23+
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.9.2" />
2724
<PackageReference Include="Microsoft.Net.Http.Headers" Version="2.1.1" />
2825
</ItemGroup>
2926

‎libraries/Bot.Builder.Community.Adapters.Google.Core/Bot.Builder.Community.Adapters.Google.Core.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<ItemGroup>
88
<PackageReference Include="JWT" Version="5.0.1" />
99
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.1" />
10-
<PackageReference Include="Microsoft.Bot.Schema" Version="4.8.0" />
10+
<PackageReference Include="Microsoft.Bot.Schema" Version="4.9.2" />
1111
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.0" />
1212
<PackageReference Include="Microsoft.MarkedNet" Version="1.0.13" />
1313
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.21" />

‎libraries/Bot.Builder.Community.Adapters.Google.Core/ConversationRequestMapper.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,8 @@ public ConversationWebhookResponse ActivityToResponse(Activity activity, Convers
160160
}
161161
}
162162
};
163-
response.ExpectedInputs.First().InputPrompt.RichInitialPrompt.Suggestions = ConvertSuggestedActionsToSuggestionChips(activity)?.ToArray();
163+
response.ExpectedInputs.First().InputPrompt.RichInitialPrompt.Suggestions = ConvertIMAndMessageBackSuggestedActionsToSuggestionChips(activity)?.ToArray();
164+
response.ExpectedInputs.First().InputPrompt.RichInitialPrompt.LinkOutSuggestion = GetLinkOutSuggestionFromActivity(activity);
164165
break;
165166
}
166167

‎libraries/Bot.Builder.Community.Adapters.Google.Core/DialogFlowRequestMapper.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@ public DialogFlowResponse ActivityToResponse(Activity activity, DialogFlowReques
125125

126126
response.Payload.Google.RichResponse = new RichResponse()
127127
{
128-
Items = responseItems.ToArray()
128+
Items = responseItems.ToArray(),
129+
LinkOutSuggestion = GetLinkOutSuggestionFromActivity(activity)
129130
};
130131

131132
// ensure InputHint is set as required for response
@@ -144,7 +145,7 @@ public DialogFlowResponse ActivityToResponse(Activity activity, DialogFlowReques
144145
case InputHints.ExpectingInput:
145146
response.Payload.Google.ExpectUserResponse = true;
146147

147-
var suggestionChips = ConvertSuggestedActionsToSuggestionChips(activity);
148+
var suggestionChips = ConvertIMAndMessageBackSuggestedActionsToSuggestionChips(activity);
148149
if (suggestionChips.Any())
149150
{
150151
response.Payload.Google.RichResponse.Suggestions = suggestionChips.ToArray();

‎libraries/Bot.Builder.Community.Adapters.Google.Core/GoogleRequestMapperBase.cs‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,19 +202,42 @@ public string StripInvocation(string query, string invocationName)
202202
return query;
203203
}
204204

205-
public static List<Suggestion> ConvertSuggestedActionsToSuggestionChips(Activity activity)
205+
public static List<Suggestion> ConvertIMAndMessageBackSuggestedActionsToSuggestionChips(Activity activity)
206206
{
207207
var suggestions = new List<Suggestion>();
208208

209209
if (activity.SuggestedActions != null && activity.SuggestedActions.Actions != null && activity.SuggestedActions.Actions.Any())
210210
{
211211
foreach (var suggestion in activity.SuggestedActions.Actions)
212212
{
213-
suggestions.Add(new Suggestion { Title = suggestion.Title });
213+
if (suggestion.Type == ActionTypes.ImBack || suggestion.Type == ActionTypes.MessageBack)
214+
{
215+
suggestions.Add(new Suggestion { Title = suggestion.Title });
216+
}
214217
}
215218
}
216219

217220
return suggestions;
218221
}
222+
223+
public static LinkOutSuggestion GetLinkOutSuggestionFromActivity(Activity activity)
224+
{
225+
var openUrlSuggestedAction = activity.SuggestedActions?.Actions?.Where(a => a.Type == ActionTypes.OpenUrl).FirstOrDefault();
226+
227+
if(openUrlSuggestedAction == null)
228+
{
229+
return null;
230+
}
231+
232+
return new LinkOutSuggestion()
233+
{
234+
DestinationName = openUrlSuggestedAction.Title,
235+
OpenUrlAction = new OpenUrlAction()
236+
{
237+
Url = openUrlSuggestedAction.Value?.ToString(),
238+
UrlTypeHint = UrlTypeHint.URL_TYPE_HINT_UNSPECIFIED
239+
}
240+
};
241+
}
219242
}
220243
}

‎libraries/Bot.Builder.Community.Adapters.Google.Core/Helpers/GoogleCardFactory.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace Bot.Builder.Community.Adapters.Google.Core.Helpers
88
{
99
public static class GoogleCardFactory
1010
{
11-
public static BasicCard CreateBasicCard(string title, string subtitle, string formattedText)
11+
public static BasicCard CreateBasicCard(string title, string subtitle, string formattedText, List<Button> buttons = null, Image image = null, ImageDisplayOptions? displayOptions = null)
1212
{
1313
return new BasicCard()
1414
{
@@ -17,7 +17,10 @@ public static BasicCard CreateBasicCard(string title, string subtitle, string fo
1717

1818
Title = title,
1919
Subtitle = subtitle,
20-
FormattedText = formattedText
20+
FormattedText = formattedText,
21+
Buttons = buttons.ToArray(),
22+
Image = image,
23+
Display = displayOptions
2124
}
2225
};
2326
}

‎libraries/Bot.Builder.Community.Adapters.Google/Bot.Builder.Community.Adapters.Google.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
<ItemGroup>
1818
<PackageReference Include="JWT" Version="5.0.1" />
19-
<PackageReference Include="Microsoft.Bot.Builder" Version="4.8.0" />
20-
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.8.0" />
19+
<PackageReference Include="Microsoft.Bot.Builder" Version="4.9.2" />
20+
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.9.2" />
2121
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.1" />
2222
<PackageReference Include="Microsoft.Extensions.Options" Version="2.1.1" />
2323
<PackageReference Include="Microsoft.Net.Http.Headers" Version="2.1.1" />

0 commit comments

Comments
 (0)