Skip to content
This repository has been archived by the owner on Jun 30, 2022. It is now read-only.

Conversation

Batta32
Copy link
Collaborator

@Batta32 Batta32 commented Jun 4, 2021

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

  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the appropriate tests
  • I have updated related documentation

sidmore and others added 30 commits March 26, 2020 12:05
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 bots

Co-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
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

[PORT microsoft#3152][Botskills] Get the LU filename using basename
…a_update

Update skill template manifest to latest SDK versions
lauren-mills and others added 17 commits June 2, 2021 15:05
…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-next

Merge master into next branch
@lauren-mills lauren-mills merged commit 6084613 into microsoft:master Jun 4, 2021
@Batta32 Batta32 deleted the feature/southworks/deprecation-plan/merge-next-into-master branch June 8, 2021 13:02
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.