Граф коммитов

124 Коммитов

Автор SHA1 Сообщение Дата
Joel Mut b11f04894a
Update Twilio package (#6839) 2024-08-21 11:32:56 -05:00
Joel Mut dd28f3a273
Update packages to latest version that support .NET 6 (#6840) 2024-08-12 17:04:50 -05:00
Jhonatan Sandoval Velasco 51263f75e4
fix: [#6825]Update old packages (#6830)
* update old packages

* revert incompatible packages updates

* remove Backup csproj files
2024-08-01 15:34:57 -05:00
tracyboehrer 3a59c0bbf4
Corrected Authority in MsalServiceClientCredentialsFactory (#6802)
* MsalServiceClientCredentialsFactory correction for Authority

* Added BotFrameworkHttpAdapter obsolete annotation

* Bumped Microsoft.NET.Test.Sdk (for compliance)

* Removed test projects from solution

---------

Co-authored-by: Tracy Boehrer <trboehre@microsoft.com>
2024-06-19 09:43:01 -05:00
Cecilia Avila 4519cf7049
[#6741] Update projects to .Net 8 (#6760)
* Update test projects to .NET8

* Update test bots to .NET8

* Update CI yamls to .NET8

* Apply feedback

* keep support for netcoreapp3.1

* fix pipeline task name

* separate target framework conditionals

* add missing task to pipeline

---------

Co-authored-by: JhontSouth <jhonatan.sandoval@southworks.com>
2024-05-16 08:40:30 -05:00
Cecilia Avila 91e2905123
[#6518] CodeQL alert SM02200: Weak hmacs in microsoft/microsoft/botbuilder-dotnet/botbuilder-dotnet (#6535)
* Replace HMAC for SHA2 in FacebookClientWrapper

* Update Facebook Functional Tests
2022-10-27 13:31:33 -05:00
Cecilia Avila 8d6454634a
[#5977] Update projects to .Net 6 (#6332)
* Update test projects to target .net6

* Update test bots to target .net6

* Update CI pipelines to target .net6

* Remove old vmImage from comments & fix Webex test

* Remove multitarget from FunctionalTests project

* Change target framework in FunctionalTests project

* Apply feedback for NET6 exceptions and tests

* Fix Serialization error in LogActivityAsync
2022-06-09 15:26:12 -04:00
BruceHaley d3ee49b2f8
Fix sku values in ARM template (#6309) 2022-04-27 10:20:51 -05:00
Joel Mut 6e536279d7
[#6173] Remove dotnet 2.1 support from 4.16 (#6187)
* Remove TestBot.NetCore21 project

* Remove netcoreapp2.1 build target from test projects

* Update pipelines' yamls

* Remove netcoreapp2.1 in remaining projects

* Remove tests NETCOREAPP2_1 conditions

* Update 2.1 assemblies

Co-authored-by: CeciliaAvila <cecilia.avila@southworks.com>
2022-02-15 14:26:22 -08:00
BruceHaley 16c11e8321
Fix test SendDirectLineMessage() (#6014) 2021-12-06 16:18:48 -08:00
BruceHaley ada2477674
Add functional test pipeline for Facebook secondary test bot (#5949)
* Add pipeline for secondary FB test bot.

* Switch to using primary ARM templates.

* Fix test to accept "Echo Secondary"

* Improve test message

* Test message tweak

* Add Sleep 1 minute to test secondary

* Tweak display names

* Cleanup

* Cleanup 2
2021-11-08 15:25:56 -08:00
BruceHaley 65c30cce68
Facebook functional test fixes (#5931)
* Enable triggers in FB test

* Add "Clear the message queue" to test
2021-11-01 14:38:31 -07:00
Carlos Castro 001a8a19ba
Authentication: Add opt-in support for MSAL to acquire tokens (#5736)
* Authentication: Add opt-in support for MSAL to acquire tokens

* MsalAppCredentials: move comment

* MSAL: add logger and update visibility

* Authentication bot: add back removed line.

* msal tests: reuse app id as token audience, given that we don't need 2

* Msal app credentials: fix outdated / unclear comment
2021-06-24 12:14:01 -07:00
Carlos Castro b05ca115aa
Security: Do not use compromised cert (#5179) 2021-02-09 16:21:40 -08:00
Ashley Finafrock 183166160e
Added tags to RGs in pipelines for slack, webex, and windows functional tests (#5093) 2021-01-21 22:22:01 -08:00
Cecilia Avila 82c9e825ad
[#4022] Throwing Generic Exceptions - Adaptive Expressions (#4951)
* Replace generic exceptions

* Fix TestFlow exception

* Fix TestFlow exceptions

* Fix TestFlow exception assert

* Replace multiple calls to Context.Text() using var

Co-authored-by: Santiago Grangetto <santiago.grangetto@southworks.com>
2020-11-18 09:39:58 -08:00
Gabo Gilabert 91dc72afd8
Removes Skills functional tests projects (#4840)
Removed the skills functional tests, I was the only one using them and decided to remove them to avoid clutter.
New versions of these test projects will be eventually in https://github.com/microsoft/BotFramework-FunctionalTests
For the time being, these projects can be found in this fork if anyone needs them: https://github.com/gabogorg/botbuilder-dotnet
2020-10-22 10:24:18 -07:00
Gabo Gilabert 569f6a523e
Adds check to TranscriptLoggerMiddleware doesn't log continue conversation event activities (#4797)
* Adds check to TranscriptLoggerMiddleware doesn't log contine conversation event activities.

Changes include:
- Added check in TranscriptLoggerMiddleware to filter incoming ContinueConversation events.
- Introduced EventActivityNames class with constant strings for ContinueConversation so we don't have those strings hardcoded.
- Added also CreateConversation to the EventActivityNames helper (not related to this issue but saw it and decided to add it since it is better to have constants).
- Refactored ConversationReferenceEx to use the new constant (and use more straightforward code to create the event).
- Added tests for new logic in TranscriptLoggerMiddleware.
- Updated Skills testing projects to use the new constant

* Renamed EventActivityNames to ActivityEventNames

* Updated a couple of files that I missed after the rename.
2020-10-19 15:31:19 -07:00
BruceHaley 540fadc443
Change Assert.Inconclusive() to Assert.Fail() in tests (#4754)
* Change Assert.Inconclusive() to Assert.Fail()

* Add #if !AUTOMATEDBUILD

* Add var TESTAPPID

* Move env vars to dotnet test task

* Change env var name to TestPassword

* Add TestAppId: $(LinuxTestBotAppId)
2020-10-06 16:01:50 -07:00
BruceHaley 9735e041e2
Make missing test environment vars cause a functional test build to fail (#4719)
* Add AUTOMATEDBUILD precompiler directive, change Assert.Inconclusive() to Assert.Fail

* Fix DefineConstants in Microsoft.Bot.Builder.FunctionalTests.csproj

* Fix environment vars for dotnet test

* Set twilio env vars

* Fix linux yaml
2020-09-30 15:13:31 -07:00
Monica Rivera 41298fce01
Disable build warning CS8002 in Microsoft.Bot.Builder.FunctionalTests (#4668)
The following third party libraries that do not have strong names:
NAudio
Twilio
Thrzn41.WebexTeams
2020-09-25 12:59:30 -04:00
BruceHaley d4861b8b7c
Fix facebook and webex functional test pipelines (#4583)
* Squashed commit of the following:

commit aea05ac535
Merge: 640594afc 1a49139d3
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Thu Sep 3 16:16:41 2020 -0700

    Merge branch 'main' into v-bruhal/functestfixes8-13

commit 640594afc7
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Wed Sep 2 17:30:11 2020 -0700

    Improve RefreshAccessToken error handling

commit 829892026c
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Wed Sep 2 16:36:21 2020 -0700

    Fix unit test SendMessageAsyncShouldThrowAnExceptionWithWrongPath

commit cf3800f8a7
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Wed Sep 2 11:47:43 2020 -0700

    Cleanup

commit 598d6f4286
Author: BruceHaley <v-bruhal@microsoft.com>
Date:   Wed Sep 2 11:13:39 2020 -0700

    Update appsettings.json

commit 550947f72d
Author: BruceHaley <v-bruhal@microsoft.com>
Date:   Wed Sep 2 11:12:00 2020 -0700

    Delete tasks.json

commit d947a59ceb
Author: BruceHaley <v-bruhal@microsoft.com>
Date:   Wed Sep 2 11:11:01 2020 -0700

    Delete launch.json

commit 93a9b8bf3a
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Wed Sep 2 10:55:43 2020 -0700

    Remove task 'Set values in appsettings.json file'

commit f3b8ed5cb3
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Tue Sep 1 16:37:16 2020 -0700

    Switch to --mode Incremental

commit e5a5e6c168
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Tue Sep 1 16:35:14 2020 -0700

    Fix call az deployment parameters

commit b7c75da8ee
Merge: 9305dde8c c2069949d
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Tue Sep 1 14:41:55 2020 -0700

    Merge branch 'v-bruhal/functestfixes8-13' of https://github.com/microsoft/botbuilder-dotnet into v-bruhal/functestfixes8-13

commit 9305dde8ca
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Tue Sep 1 14:39:17 2020 -0700

    Set deployment --mode Complete

commit c2069949d8
Author: BruceHaley <v-bruhal@microsoft.com>
Date:   Tue Sep 1 10:45:36 2020 -0700

    Update WebexClientTest.cs

commit dfea1e894f
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Tue Sep 1 10:40:23 2020 -0700

    Capture inner exception

commit f13d522c68
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Tue Sep 1 10:10:11 2020 -0700

    Clean up line 51

commit bb5d9f22cb
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Tue Sep 1 09:33:33 2020 -0700

    Add comment

commit 5e1406caf9
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Tue Sep 1 09:24:33 2020 -0700

    Change to HttpRequestException

commit 5bf5f278a4
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Mon Aug 31 12:22:44 2020 -0700

    Fix exception format

commit c9553d8e84
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Mon Aug 31 11:47:52 2020 -0700

    Have SendMessageAsync() throw an exception on error.

commit 97c1e5101f
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Fri Aug 28 14:47:13 2020 -0700

    Add diagnostics to FacebookClientWrapper.cs

commit f0033d6489
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Tue Aug 25 17:40:21 2020 -0700

    Drop 'Tag build if DeleteResourceGroup is false'

commit 7250141698
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Mon Aug 24 16:27:23 2020 -0700

    Create resources doing double. Comment out option 1.

commit c2daddce75
Merge: 666324ffc 84cdba58c
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Mon Aug 24 10:45:54 2020 -0700

    Merge branch 'main' into v-bruhal/functestfixes8-13

commit 666324ffc9
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Fri Aug 21 16:23:28 2020 -0700

    Add tag build

commit cd488d6472
Merge: d6ca63036 c83869c81
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Fri Aug 21 14:17:44 2020 -0700

    Merge branch 'main' into v-bruhal/functestfixes8-13

commit d6ca63036d
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Wed Aug 19 16:04:13 2020 -0700

    Add Dir workspace

commit 539525908c
Merge: 7aec78cce 2bef3d44d
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Wed Aug 19 10:24:13 2020 -0700

    Merge from master

commit 7aec78ccec
Merge: 522d591ec 54cc02627
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Tue Aug 18 15:59:51 2020 -0700

    Merge branch 'master' into v-bruhal/functestfixes8-13

commit 522d591ecf
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Tue Aug 18 10:11:34 2020 -0700

    Add dir workspace

commit 5b875c4f48
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Mon Aug 17 18:52:02 2020 -0700

    Try option 2 of "Create Azure Resources"

commit 96c21f53c3
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Mon Aug 17 18:49:51 2020 -0700

    Delete redundant task "Zip Deploy Bot"

commit 4c21c4d49c
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Mon Aug 17 18:36:35 2020 -0700

    Add comment

commit 5a40996a0c
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Mon Aug 17 12:04:42 2020 -0700

    Add try-catch for better RefreshAccessToken() error logging.

commit 7ca6d50e3a
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Fri Aug 14 10:44:07 2020 -0700

    Tweak env var for facebook

commit d2ef88404d
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Fri Aug 14 10:41:14 2020 -0700

    Set up env vars for facebook tests

commit 2e652bee50
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Thu Aug 13 19:28:44 2020 -0700

    Put conditional aon Tag build

commit b8492c69d6
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Thu Aug 13 19:16:03 2020 -0700

    Replace Assert.Inconclusive with Assert.Fail in FacebookChatTersts.cs

commit 45ea7ed24e
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Thu Aug 13 19:02:24 2020 -0700

    Change Assert.Inconclusinve to Assert.Fail in WebexCleintTest.cs

commit a1a849939c
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Thu Aug 13 18:39:51 2020 -0700

    Revert WebexClientTest.cs

commit 26d3df3416
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Thu Aug 13 18:14:29 2020 -0700

    Add WebexTestBotWebexRoomId and others to dotnet test env vars

commit 94e51da184
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Thu Aug 13 17:26:36 2020 -0700

    Change Assert.Inconclusive to Assert.Fail in WebexClientTest.cs

commit 0fae5edc56
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Thu Aug 13 16:54:42 2020 -0700

    Remove var ReleasePackageVersion from builds

commit ef572d8552
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Thu Aug 13 16:12:44 2020 -0700

    Fix webex typo

commit de8b485815
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Thu Aug 13 16:06:46 2020 -0700

    Done with tests windows

commit e991fad421
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Thu Aug 13 15:15:10 2020 -0700

    Webex done.

commit 48c763305a
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Thu Aug 13 14:03:40 2020 -0700

    Webex test .yml partly done.

commit 38b38fe3c7
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Wed Aug 12 19:09:14 2020 -0700

    Facebook completed

commit 282d6cb011
Author: LocalizationBuildProcess <v-bruhal@microsoft.com>
Date:   Wed Aug 12 13:16:42 2020 -0700

    Fix dependsOn in new-rg templates

* Clean out the irrelevant fixes

* Revert parts of webex-test

* Fix deploy

* Fix environment vars for test

* Just make the build work

* Drop quotes for BOT_ENDPOINT value
2020-09-08 18:21:56 -07:00
BruceHaley 2bef3d44d6
Fix ARM template template-with-new-rg.json for the other DotNet func test builds (#4450)
* Fix dependsOn in new-rg templates

* Facebook completed

* Webex test .yml partly done.

* Webex done.

* Done with tests windows

* Fix webex typo

* Remove var ReleasePackageVersion from builds

* Change Assert.Inconclusive to Assert.Fail in WebexClientTest.cs

* Add WebexTestBotWebexRoomId and others to dotnet test env vars

* Revert WebexClientTest.cs

* Remove env var WebexTestBotWebexRoomId
2020-08-19 09:06:04 -07:00
Josh 357f4a29f1
Fixing and suppressing build warnings (#4406)
* suppressing warnings

* reverting async

* Revert "reverting async"

This reverts commit 7675775d69.

* suppressing await warning

* Removed explicit ref to json 10.x from AppInsightsWebApi to avoid version warnings.
Updated Twilio.TestBot to target only netcoreapp3.1, removed reference to Microsoft.AspNetCore.App and avoided warning
Removed unused variable from OAuthPromptTests.cs
Updated NamedPipesTest to capture the task returned by ConnectAsync.
Removed Razore references from TestProtocol to avoid warning.
Added TreatWarningsAsErrors to the Directory.Build.props for tests so we keep things clean going forward

* Consolidated some nuget packages to see if that addresses some msbuild warnings.

* Added explicit ref to Config on test project to see if that fixes warning

* Added explicit packages to see if we can avoid warnings

* Added explicit reference to solve build warnings.
Consolidated assembly versions

* Added explicit assembly reference to solve build warning

* Updated httpheaders version in streaming and removed explicit refs from other projects.

* Changed headers to 2.1.14

* Added explicit ref for headers to Adaptive.Profiling

* Added explicit ref

* More explicit refs for Http.Headers

* One more explicit ref to http headers

* Added explicit version for Http.Headers to all web projects

* Removed all explicit references to http.headers

* Removed Http.Headers from functional tests

* Set the build log to detailed to see if I can narrow down the issue.

* Trying lout explicit ref for Microsoft.Net.Http.Headers in ApsNet.Core

* Cleanup: Removed detailed parameter from yaml
Cleamup: reverted steam to use the lowest version of httpheaders and also lowered the version in Integration.AspNet.Core
Added explicit versions for Microsoft.Net.Http.Headers to FunctionalTests

* Lowered headers version to match streaming

* Added 3.1 targets for Slack and Webex adapters.
Added explicit Microsoft.AspNetCore.App to Functional tests

* Cleanup: reverted some changes that don't seem to be needed

* Changed TestFrameworks to TestFramework for the project that only target one framework.

Co-authored-by: Gabo Gilabert <ggilaber@microsoft.com>
2020-08-11 09:36:14 -07:00
Denise Scollo 9a4ed7594b
Lower time needed to complete running tests (#4306)
* update build yaml

- remove unnecessary install of net core specifics
- add maximunCpuCount: true variable to build resources in parallel

* update yaml to split tests for netcore 21 and 31

* update ci test steps to target netcore 21 or 31

* change artifact name to use

* update target framework to be set with variable for tests

* fix properties indentation

* fix indentation properties for schema csproj

* add missing space in comment

Co-authored-by: Santiago Grangetto <santiagograngetto@gmail.com>
2020-07-24 09:50:32 -07:00
Gabo Gilabert 22f10761e1
Updated FN Test projects to match samples (#4236)
* Fixes issue with InvokeResponse<T> hidding the underlying value for Body.
Makes methods ins SkillHttpClient virtual so they can be mocked in tests.
Updated BotFrameworkClient to use a deepclone of the activity rather than try/catch/finally to simply code and make sure we don't risk altering the original activity while the async request is being executed.
Improved test coverage for BotFrameworkClient and SkillHttpClient.

* Updated Skill test projects to match samples.

* Deleted composer testing project
2020-07-07 13:53:30 -07:00
Gabo Gilabert 6720f2cec6
Added FxCop to Microsoft.BotBuilder and addressed errors. (#4141)
* Added FxCop to Microsoft.BotBuilder and addressed errors.
Enabled the SX1309 (FieldNamesShouldBeginWithUnderscores) stylecop rule and addressed the violations on BotBuilder but excluded it from the other projects for now to avoid collisions.
Enabled CA1309 (Use ordinal StringComparison) to the main ruleset and addressed violations.
Added ($NoWarn) to root dir props to make sure tests take this value.

* Enabled AsyncUsage analyzer and fixed violations wherever ir was possible.

* Refactore Task.Run usages to await/async equivalents.

* Updated Adapters folder to use FxCop 3.0

* Refactored ShowTypingMiddleware to avoid using Task.Run so we don't create unnecessary threads.

* Updated constructor to use _httpClient field instead of the expression.
2020-06-24 20:02:33 -07:00
BruceHaley c869f80d50
Change endpoint to mybot from messages (#4167) 2020-06-24 09:49:38 -07:00
BruceHaley bb52f9f885
Fix 3 functional test builds (#4163)
* add az group create

* Switch to template-with-preexisting-rg.json

* Fix template args for az deployment sub create

* Fix arg appServicePlanLocation

* Try "call az deployment group create"

* Fix call az deployment group create #4

* Fix facebook pipeline

* Fix facebook call az deployment group create

* Fix template reference

* Fix webex pipeline

* Drop --location "westus"

* Fix windows func test build

* Fix botgroup

* Remove slack refs from windows template

* Add message to "Set up directline keys"
2020-06-23 15:55:38 -07:00
Gary Pretty fb0b5ec22a
Refactor of Slack adapter to address dependency on 3rd party library (#4046)
* Further WIP

* - Removed unused files
- Updated tests
- Removed remaining dependencies on client model classes

* Remove redundant error supression

* Added missing classes as per PR #3760

* Fix up namespaces for model classes

* Fix up tests

* Fixed warnings on build

* Removed redundant XML comment
2020-06-16 08:38:57 -07:00
Gabo Gilabert 2963d0da22
Sets warnings as errors and adds FxCop analyzer to Schema project. (#4061)
* Configured TreatWarningsAsErrors on all projects in the libraries folder except for Microsoft.Bot.Builder.Dialogs.Adaptive.Testing (that needs to be addressed separatelly).
Created Directory.Build.props for FunctionalTests and Tests to manage excludes for the projects in those folders.
Added NoWarn properties for documentation on each project (these will be addressed by another issue).
Fixed long hanging fruit warnings.
Added Roslyn FxCop analyzer to Microsoft.Bot.Schema and fixed violation or excluded them using #pragma.

* Fixed binary compat issues

* Fixed more binary compat issues
2020-06-12 13:42:12 -07:00
Phil Haack 42bb359cf7
Slack sets timestamp as unix time in seconds
If the server validates that the timestamp is recent to prevent replay attacks, then this would fail.
2020-05-16 15:51:06 -07:00
Steven Gum 0908005f49
Merge 4.9 into master (#3890)
* [Expression] Add formatNumber, formatEpoch and  formatTicks as prebuilt functions (#3876) (#3883)

* add formatNumber prebuilt function

* change to string output to keep tailing zeors

* Add formatEpoch and formatTicks.
Removed ticks from formatDate and fixed some bugs.
Fixed a bug in JSON conversion where 64 bit/double values were getting truncated.

* Add tests that were dropped.

* Add locale to formatNumber.

* Add 1000's seperators.

* fix a test case

* change a test case

Co-authored-by: Chris McConnell <chrimc@microsoft.com>

Co-authored-by: Chris McConnell <chrimc@microsoft.com>

* override OnComputeId in AdaptiveSkillDialog (#3882)

* override OnComputeId in AdaptiveSkillDialog

* refactor AdaptiveSkillDialog.OnComputeId()

* remove superfluous parenthesis around activity

* apply @stevenic's PR feedback

* Rename $kind Microsoft.SkillDialog => Microsoft.BeginSkillDialog
Rename class AdaptiveSkillDialog => BeginSkillDialog
Move files into actions folders
replace all $kind => new $kind

* Style: Async method nomenclature, missing ConfigureAwait and CancellationTokens

* Rename $kind Microsoft.BeginSkillDialog => Microsoft.BeginSkill
Rename class BeginSkillDialog to BeginSkill

* update title for begin skill

* Cancellation, nomenclature and style improvements

* Cancellation tokens and propagation

* merge CheckForVersionChangeAsync()

* Missing cancellation tokens

Co-authored-by: Shuai Wang <shuwan@microsoft.com>
Co-authored-by: Chris McConnell <chrimc@microsoft.com>
Co-authored-by: Tom Laird-McConnell <tomlm@microsoft.com>
Co-authored-by: Carlos Castro <ccastro@microsoft.com>
Co-authored-by: Carlos Castro <carlosscastro@users.noreply.github.com>
2020-05-12 14:56:58 -07:00
Tom Laird-McConnell e4001f79ac
Replace UseState() with UseBotState() (#3862)
* Replace UseState with UseBotState() which is simpler in implementation and usage pattern.
Fix all unit tests that were using it.

* switch to params signature

* update

* Updated adatpive skills test project to use the new UseBotState method and remvoed dependency on UserState from the test projects

* changed method signatures to be backward compatible.
Added obselete to UseState() helper.

* Removed explicit ref to TimexExpression

Co-authored-by: Gabo Gilabert <ggilaber@microsoft.com>
2020-05-04 14:00:56 -07:00
Tom Laird-McConnell d17a8d492f fix up namespaces and references
consolidate mock package versions
2020-04-29 07:47:26 -07:00
Gabo Gilabert a7e5015c80
Updated RunAsync to avoid sending EoC from the RootBot to the channel (#3735)
BF code updates
* Refactored DialogExtensions and created tests for it
* Updated SkillHandler to store SkillConversationReference in state.
* Refactored and cleaned up unit tests.
* Fixed class comments.
Test code updates:
* Updated DialogToDialog to align with samples and fixed issue in DialogSkillBot calling EchoSkill
* Updated DialogSkillBot to be a skill consumer and consume DialogEchoSkillBot and test Parent -> Skill 1 -> Skill 2.
2020-04-15 12:24:36 -04:00
Gabo Gilabert f94377b545
Updates DialogManager to work with skills (#3709)
* Updated DialogManager to handle skill requests (in adition to parent bot requests).
Added unit tests.
Added end to end Parent->Skill sample with DialogManager for testing.
* Fixed typos, unused namespaces and removed redundant default.
* Added check for active dialog in reprompt and unit test for it.
2020-04-13 16:21:11 -04:00
Eric Dahlvang 457016f48e fix dialog root bot's DeliveryMode 2020-03-06 20:15:14 -08:00
Gabo Gilabert 705f7fbb9d
Added interruptions support to SkillDialog (#3507)
* Added RepromptDialogAsync and ResumeDialogAsync to SkillDialog.
Moved skill request handling logic into Dialog.RunAsync
Updated sample DialogToDialog sample to handle interruptions
2020-03-05 18:50:05 -05:00
Eric Dahlvang 0833051494
Set up Facebook functional test key vault variables (#3505)
* Set up key vault variables

* Normalize vars

* Add delete resource conditional var

* Fix BotName var
2020-03-05 15:44:30 -08:00
BruceHaley b3cf355537
Functional test Linux fixes (#3494)
* Debug: show bot keys

* Fix ReadBotMessagesAsync()

* Update publish arguments with fix from PR #3457.

* Fix publish args in functional setup steps
2020-03-05 11:33:09 -08:00
Gabo Gilabert 9960e6802e
Adds support for buffered replies to skill dialog (#3496)
* Renamed SkillDialogArgs to BeginSkillDialogOptions for parity.
Updated SkillConversationIdFactory in DialogRootBot to use the new methods.
Updated BotFrameworkHttpClient to restore RelatesTo after is done with it.
Namepsaced OAuthScopeKey key in BotAdapter to avoid collisions.
Updated SkillDialog to use new methods from ConversationIdFactory.

* Added support for using DeliveryMode in SkillDialog.
Updated MainDialog to set the property if present.

* Fixed broken tests
2020-03-04 22:22:14 -08:00
BruceHaley 7306159b62
Set up Webex functional tests to use key vault secrets (#3484)
* Rename variables to match names in the key vault

* Rename 2 more vars
2020-03-03 15:35:43 -08:00
Eric Dahlvang c42dcde28b
Add originatingAudience to SkillHttpClient.PostActivityAsync (#3477)
* Add originatingAudience to SkillHttpClient.PostActivityAsync

* Deprecated old methods in SkillCOnversationIdFactoryBase and added new ones.
Updated related classes to use the new methods.

* clone ConversationReference for FunctionalTest's SkillConversationIdFactory

* change skill conversation.id in SimpleRootBot example

* Skill Unit test updates

Co-authored-by: Gabo Gilabert <gabog@users.noreply.github.com>
2020-03-03 15:16:10 -08:00
BruceHaley b14269bf81
Set up slack key vault linkage (#3478) 2020-03-02 17:11:19 -08:00
Gabo Gilabert 9f7c650964 Moved SkillDIalog into the the Microsoft.Bot.Builder.Dialogs project and added unit tests for it.
Moved ConversationState from SkillDialog constructor to SkillDialogOptions.

Updated DialogTestClient to expose DialogContext so we can test dialog cancellation and added tests for it.

Ipdate DialogRootBot sample to use new options.
2020-03-02 12:14:46 -08:00
Gabo Gilabert 1481157a7c
Updates to SkillDialog based on VA feedback. (#3458)
* Updates to SkillDialog based on VA feedback.
* Updated samples to work with new changes, cleaned up namespace and added Error Handling code based on skill samples.
* Updated MainDialog to show a remote skill cancelation from the a parent.
* Remove FnTest project from the Skills solution that references Adapter projects that are not in scope
2020-02-27 14:54:09 -05:00
bothosting.runtime@bf.ai 096e10c24f Merge branch 'master' into jeffders/OAuthCardSSOMaster 2020-02-24 13:04:50 -08:00
Gary Pretty 89e5ada6a8
Update functional tests project to add target framework 3.1 (#3355)
* Update functional tests project to add target framework 3.1

* Nudge build

* Attempting fix for NuGet restore error.

* Re-added platform condition to see if tests pass

* Moved trace constant into main property group in project file

* RE-moving the Trace constant to a conditional property group. Previous error is occuring on other branches.
2020-02-11 21:35:10 -08:00
Gabo Gilabert 69112a39fa
SkillDialog (#3346)
* First pass at SkillDialog
Created preview Skills project and placeholder for unit test.
Added DialotToDialog and SimpleSkillBot for local testing.
Added abstract BotFrameworkClient base class to decouple http dependency.
Added Skills Solution.

* Refactored DialogToDialog to use EchoSkillBot and DialogSkillBot.
Deleted simplebot to bot for now.
Updated code to make it work.

* Forced adding launchSettings.json to code to make it easier to configure locally during dev.

* Added support for InvokeActivities in SkillDialog.
Updated welcome card.

* Added guard in SkillDialog to only process Message and event activities.
Removed invoke handling funcitonality from SkillDialog and sample call.

* Removed Invoke Code from skilldialog
Added new projects to the Mcirosoft.Bot.Builder.sln file

* Revreated Skill.sln after merge and remove 31 suffix from DialogSkill Test projects.

* Removed icon.png ref from csproj file

* Readded projects lost after merge
Removed Expressions.Properties from skills solution.

* Touched to force another build

* Updated SkillDialog to take activities instead of creating them and updated MainDialog to create the activities.
Updated SkillDialogArgs to take the skill and the activity to forward.
Addressed other comments from PR
2020-02-11 23:26:50 -05:00