[Beta] Merge [Main] and remove unnecessary overrides#2699
Merged
MSNev merged 8 commits intomicrosoft:betafrom Feb 10, 2026
Merged
[Beta] Merge [Main] and remove unnecessary overrides#2699MSNev merged 8 commits intomicrosoft:betafrom
MSNev merged 8 commits intomicrosoft:betafrom
Conversation
…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
Contributor
There was a problem hiding this comment.
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
overridesentry in the rootpackage.jsonto forceform-data. - Pin
form-datavia RushpreferredVersionsand introduce it intonpm-shrinkwrap.json, alongside various shrinkwrap dependency/version updates. - Remove one assignment to
this._ctx.errin 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
hectorhdzg
approved these changes
Feb 9, 2026
JacksonWeber
approved these changes
Feb 9, 2026
auto-merge was automatically disabled
February 9, 2026 23:51
Rebase failed
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.