merge master into 4.future #1850
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…soft/botbuilder-js into ccastro/streaming-refactor
…soft/botbuilder-js into ccastro/streaming-refactor
…nto daveta-integrationBot
Streaming: refactor streaming into adapter. General improvements and quality.
Fix for badly formatted user agent JSON response to Streaming requests.
…botbuilder-js into daveta-integrationBot
…otbuilder-js into tiens-integrationBot
…otbuilder-js into tiens-integrationBot
Co-authored-by: Steven Ickman <stevenic@microsoft.com>
Co-authored-by: Tom Laird-McConnell <tomlm@microsoft.com>
…xplicit on what is a valid number range (#1822)
* migrate .net change in for adding oauth app credentials as a parameter * rename variable * change turn state key name * fix use ternary operator * use CredentialTokenProvider interface that extends UserTokenProvider interface * remove unused comments * correct the credentialTokenProvider interface path * fix import * fix the dependency chain * fix parameter name * fix comments * fix tests * fix token resolve test * fix test * added getSignInLink overload * - Merge branch 'master' into oauthOverloads - dropped unnecessary overloads - added param docstrings * remove accidental merge file Co-authored-by: Ted <tedlee@microsoft.com>
* Added buffered delivery mode support. * Renamed buffered to bufferedReplies * Fixed some test issues * Disabled date tests that don't work in the Pacific Time Zone * tested end to end plus some fixes Co-authored-by: johnataylor <johtaylo@microsoft.com>
* fix test error * replace flat function * fix typo
a community adapters is in use. Co-authored-by: ckkMicrosoft <30480427+ckkMicrosoft@users.noreply.github.com> Co-authored-by: Steven Ickman <stevenic@microsoft.com>
* Move BotIdentityKey to BotAdapter from BotFrameworkAdapter, makign it available to derived adapters This is part of skills support Related to #1523 * Add overload on ContinueConversation to support skills * allow 3 or more params to continueconversation * manually revert continueConversation changes Co-authored-by: johnataylor <johtaylo@microsoft.com> Co-authored-by: Steven Ickman <stevenic@microsoft.com> Co-authored-by: Steven Gum <14935595+stevengum@users.noreply.github.com>
Co-authored-by: Eric Dahlvang <v-eridah@microsoft.com>
* fix import in testbot * fix lint errors * * refactor AppCredentials * fix more lint errors * remove ".default" for dotnet parity * fix gov auth, update govConstants * refactor to enable gov skills
Co-authored-by: Eric Dahlvang <v-eridah@microsoft.com>
* add getMember and getPagedMember to teamsInfo * abstract options object * examples * fix test * add missing awaits Co-authored-by: Steven Ickman <stevenic@microsoft.com>
Co-authored-by: Steven Ickman <stevenic@microsoft.com>
* init * port some changes in LG and Expression * change filePath to lowercase * revert substring change * fix * fix extra tabs * retrigger * retrigger Co-authored-by: Steven Ickman <stevenic@microsoft.com>
* replaced new Server with createNodeServer(); created test INodeSocket2 for type hint * removed new Func unit test * consolidated server-creation into 1 utils module; added unit tests * removed await from Promise.all, as it was originally * Update libraries/botframework-streaming/tests/NamedPipe.test.js Co-Authored-By: Christopher Anderson <chrande@microsoft.com> * replaced references to @types/node classes with bf-streaming interfaces, minus for the static methods on Buffer and nodeWebSocket.create() * added more signatures to INodeSocket to remove Socket type dependency from WebSocketTransport * cleaned up comment * changed INodeSocket.connect() to return any, as the nested types on signature made it unsuitable to be a Socket (we are not creating interfaces for the multiple layers of node types * changed Buffer to INodeBuffer type hint * added type guards to ensure we're getting an INodeServer back from createNodeServer * added unit test * added duck typing checks for server methods * Added methods to INodeSocket to remove dependency on node stream.Duplex type * put server-creation in trycatch block, as we don't know if node 'net' module might change their Server ctor overloads * removed space from top of imports in tests * added false path to checks (whoops, forgot them) * moved imort below comment Co-authored-by: Christopher Anderson <chrande@microsoft.com> Co-authored-by: Steven Ickman <stevenic@microsoft.com>
* add skillDialog and associated classes * move non-impl Skill code to core for use in dialogs * scaffold dialogRootBot and dialogSkillBot * apply SkillDialog updates from microsoft/botbuilder-dotnet#3474 * rename SkillDialogArgs to BeginSkillDialogOptions Co-authored-by: Steven Ickman <stevenic@microsoft.com>
…nto zim/merge-master-into-4.future
Co-authored-by: johnataylor <johtaylo@microsoft.com>
included .lg files.
* adjust template range * update
…merge-master-into-4.future
stevengum
approved these changes
Mar 5, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
To unblock some work on 4.future, I have to merge master into 4.future to introduce the latest code changes on master.
Specific Changes
Testing