This repository was archived by the owner on Jun 30, 2022. It is now read-only.
- Notifications
You must be signed in to change notification settings - Fork526
Merge next into master#3823
Merged
lauren-mills merged 168 commits intomicrosoft:masterfromsouthworks:feature/southworks/deprecation-plan/merge-next-into-masterJun 4, 2021
Merged
Merge next into master#3823
lauren-mills merged 168 commits intomicrosoft:masterfromsouthworks:feature/southworks/deprecation-plan/merge-next-into-masterJun 4, 2021
Uh oh!
There was an error while loading.Please reload this page.
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
Co-authored-by: Luis Sergio <37625424+LCarbonellRod@users.noreply.github.com>
* Add Test for Proactive and feedback util* Fix Name of Feedback Test* Fix comments from Patrick
* Skill Invoke Handler Forwarding and Process Invoke Response
* Update Bot-Solutions* Update Virtual Assistant* Update Skill* Merge with next* Apply feedback* Rollback initialization of LocaleTemplateManager in the botsCo-authored-by: Victor <victor@grycuk.net>Co-authored-by: Luis Sergio <37625424+LCarbonellRod@users.noreply.github.com>
…#3474)* Concat texts for multiturn responses in Interactions table* Update to next template and push again
* Add BotIdentity to TurnState
Minor doc fixes pointed out by our community
* Fix Nuget build error* Fix Test build error (microsoft#3500)* Fix comment from Tai
* Add UT for ActivityEx, DialogContextEx, EventDebuggerMiddleware, SetLocaleMiddleware, QueueHostedService* Add UT for BackgrounWorker & Utils* Add MultiAuthDialog and EventPrompt Functional Test* SkillConversationIdFactory and OauthExtension Tests* Add CodeCoverage exclusion attribute to UT's* More Response Generation Test
…otskills/re-introduce-basename[PORTmicrosoft#3152][Botskills] Get the LU filename using basename
Fix for encoding issue in update script
…a_updateUpdate skill template manifest to latest SDK versions
…add-manifest-endpoint-typescript[TypeScript][Skill] Add manifest endpoint
…fix-botskills-linux-tests[Botskills] Add compability for Linux
* Fix botskills unit tests after merge* Fix TypeScript generator vulnerabilities and deprecated unit test after merge* Fix TypeScript VA Template disparities against sample after merge* Fix TypeScript Bot-Soltuions package-lock after merge* Fix authentication feature
* Update dependencies version* Update dependencies version* Update test* Update imports
Moved back to AzureBlobTranscriptStore until sdk update to 4.13
…deprecation-plan/merge-master-into-nextMerge master into next branch
lauren-mills approved these changesJun 4, 2021
Sign up for freeto subscribe to this conversation on GitHub. Already have an account?Sign in.
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.
Purpose
What is the context of this pull request? Why is it being done?
In order to apply the changes of next branch to master branch, the merge of both branches is necessary.
Changes
Are there any changes that need to be called out as significant or particularly difficult to grasp? (Include illustrative screenshots for context if applicable.)
Merge next into master.
Tests
Is this covered by existing tests or new ones? If no, why not?
-
Feature Plan
Are there any remaining steps or dependencies before this issue can be fully resolved? If so, describe and link to any relevant pull requests or issues.
-
Checklist
General