Skip to content
This repository was archived by the owner on Jan 5, 2026. It is now read-only.

Merge main into 4.14#1978

Closed
axelsrz wants to merge 38 commits into
releases/4.14from
main
Closed

Merge main into 4.14#1978
axelsrz wants to merge 38 commits into
releases/4.14from
main

Conversation

@axelsrz
Copy link
Copy Markdown
Member

@axelsrz axelsrz commented Oct 28, 2022

#minor

axelsrz and others added 30 commits June 30, 2021 14:55
* Version to 4.15.0

* Updated version in README
Co-authored-by: Santiago Grangetto <38112957+santgr11@users.noreply.github.com>
* Delete app ids, pws.

* Comment out broken tests.

* Comment out the final failing test.

* Formatted for Black compliance

* lint fixes

* Another black-compliance fix.
* Fix django vulnerability

* Update babel to 2.9.1

* Update outdated agent spec in pipeline
#1798)

Co-authored-by: Axel Suárez <axsuarez@microsoft.com>
Co-authored-by: Monica Rivera <44449640+mrivera-ms@users.noreply.github.com>
Co-authored-by: Monica Rivera <44449640+mrivera-ms@users.noreply.github.com>
* Fix Telemetry Logger attachments

* ran black & pylint

* fix build errors

* fix black formatting build error

* fix pylint import order

Co-authored-by: Axel Suárez <axsuarez@microsoft.com>
Co-authored-by: tracyboehrer <tracyboehrer@users.noreply.github.com>
* Patch update on msrest dependency

* Patch update on msrest dependency (0.6.19)
* Fix django vulnerability

* vulnerability fix: "django==2.2.28"

* Update botbuilder requirements to 4.14.2

* Fix black import error

* reformat libraries with latest black

* Add component detection

* Update urllib3 root dependencies

* Revert azure-cognitiveservices-language-luis to 0.2.0 from 0.7.0

* Roll back all urllib3 root dependencies

* Revert the last two

* git reset to 'Add component detection' commit

* git reset to 'Update urllib3 root dependencies' commit

* Revert azure-cognitiveservices-language-luis to 0.2.0
…re (#1957)

* Corrected TeamsChannelData deserialization in TelemetryLoggerMiddleware

* Pinned emoji package for proper recognizers-text operation

* Corrected TelemetryLoggerMiddleware test for Teams

* Formatted TelemetryLoggerMiddleware

Co-authored-by: Tracy Boehrer <trboehre@microsoft.com>
Co-authored-by: Tracy Boehrer <trboehre@microsoft.com>
* Bump MSAL to 1.17.0

* Bump botframework-connector version

* Revert "Bump botframework-connector version"

This reverts commit f4f2d52.

Co-authored-by: tracyboehrer <tracyboehrer@users.noreply.github.com>
Co-authored-by: Tracy Boehrer <trboehre@microsoft.com>
Co-authored-by: microsoft-github-policy-service[bot] <77245923+microsoft-github-policy-service[bot]@users.noreply.github.com>
* update deployment template:
Split the deployment of appservcice and azurebot
Add AzureBotRegion

* fix python template

Co-authored-by: fangyangci <fangyangci@microsoft.com>
Co-authored-by: tracyboehrer <tracyboehrer@users.noreply.github.com>
Co-authored-by: Tracy Boehrer <trboehre@microsoft.com>
Co-authored-by: Tracy Boehrer <trboehre@microsoft.com>
Co-authored-by: Tracy Boehrer <trboehre@microsoft.com>
ram-xv and others added 8 commits October 27, 2022 12:58
Co-authored-by: tracyboehrer <tracyboehrer@users.noreply.github.com>
* PyJWT udpated by sdawodu

* 'black' formatting

Co-authored-by: Tracy Boehrer <trboehre@microsoft.com>
Co-authored-by: tracyboehrer <tracyboehrer@users.noreply.github.com>
Co-authored-by: Tracy Boehrer <trboehre@microsoft.com>
Bumps [yargs-parser](https://github.com/yargs/yargs-parser) to 18.1.3 and updates ancestor dependency [replace](https://github.com/ALMaclaine/replace). These dependencies need to be updated together.


Updates `yargs-parser` from 11.1.1 to 18.1.3
- [Release notes](https://github.com/yargs/yargs-parser/releases)
- [Changelog](https://github.com/yargs/yargs-parser/blob/main/CHANGELOG.md)
- [Commits](yargs/yargs-parser@v11.1.1...v18.1.3)

Updates `replace` from 1.1.0 to 1.2.2
- [Release notes](https://github.com/ALMaclaine/replace/releases)
- [Commits](https://github.com/ALMaclaine/replace/commits)

---
updated-dependencies:
- dependency-name: yargs-parser
  dependency-type: indirect
- dependency-name: replace
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tracy Boehrer <trboehre@microsoft.com>
Co-authored-by: Tracy Boehrer <trboehre@microsoft.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants