Skip to content

[Beta] Merge [Main] and remove unnecessary overrides#2699

Merged
MSNev merged 8 commits intomicrosoft:betafrom
MSNev:MSNev/MergeMainToBeta
Feb 10, 2026
Merged

[Beta] Merge [Main] and remove unnecessary overrides#2699
MSNev merged 8 commits intomicrosoft:betafrom
MSNev:MSNev/MergeMainToBeta

Conversation

@MSNev
Copy link
Collaborator

@MSNev MSNev commented Feb 9, 2026

No description provided.

rggammon and others added 7 commits December 3, 2025 16:25
…ed (microsoft#2642)

* Separate BeaconSendFailure and BeaconSendFailure from SizeLimitExceeded to make it easier to troubleshoot SizeLimitExceeded errors

* PR feedback
* Add redact URL configuration in readme

* Update README.md

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update vulnerable dependencies

* Update

* Simplify overrides
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR appears to merge mainline dependency state into the beta branch and adjust repo-level dependency version enforcement, including adding a forced form-data version and refreshing parts of the Rush shrinkwrap. It also includes a small cleanup in an E2E test error-handling path.

Changes:

  • Add an npm overrides entry in the root package.json to force form-data.
  • Pin form-data via Rush preferredVersions and introduce it into npm-shrinkwrap.json, alongside various shrinkwrap dependency/version updates.
  • Remove one assignment to this._ctx.err in an E2E test catch block.

Reviewed changes

Copilot reviewed 3 out of 4 changed files in this pull request and generated 4 comments.

File Description
package.json Adds npm overrides to force form-data version.
common/config/rush/npm-shrinkwrap.json Pins/adds form-data and updates multiple locked toolchain deps (e.g., api-extractor / typescript-eslint).
common/config/rush/common-versions.json Adds Rush preferredVersions pin for form-data.
AISKU/Tests/Unit/src/applicationinsights.e2e.tests.ts Removes a single this._ctx.err assignment in a fetch failure path.
Files not reviewed (1)
  • common/config/rush/npm-shrinkwrap.json: Language not supported

@MSNev MSNev enabled auto-merge (rebase) February 9, 2026 23:31
auto-merge was automatically disabled February 9, 2026 23:51

Rebase failed

@MSNev MSNev merged commit 229e921 into microsoft:beta Feb 10, 2026
9 of 11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants