[main] Bump Polyfill from 7.9.1 to 7.14.0 #4793
Merged
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
Bumps [Polyfill](https://github.com/SimonCropp/Polyfill) from 7.9.1 to 7.14.0. - [Commits](SimonCropp/Polyfill@7.9.1...7.14.0) --- updated-dependencies: - dependency-name: Polyfill dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Evangelink
approved these changes
Jan 27, 2025
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #4793 +/- ##
==========================================
- Coverage 65.61% 64.15% -1.46%
==========================================
Files 595 595
Lines 35746 35746
==========================================
- Hits 23454 22933 -521
- Misses 12292 12813 +521
Flags with carried forward coverage won't be shown. Click here to find out more. |
This was referenced Jan 27, 2025
|
/backport to rel/3.7 |
|
Started backporting to rel/3.7: https://github.com/microsoft/testfx/actions/runs/12984381078 |
|
@Youssef1313 backporting to rel/3.7 failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: [main] Bump Polyfill from 7.9.1 to 7.14.0
Using index info to reconstruct a base tree...
M Directory.Packages.props
Falling back to patching base and 3-way merge...
Auto-merging Directory.Packages.props
CONFLICT (content): Merge conflict in Directory.Packages.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 [main] Bump Polyfill from 7.9.1 to 7.14.0
Error: The process '/usr/bin/git' failed with exit code 128NOTE: A PR will be created, but needs to be revised manually!** |
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.
Bumps Polyfill from 7.9.1 to 7.14.0.
Commits
feb7a43Update Directory.Build.props749591fMerge branch 'main' of https://github.com/SimonCropp/Polyfillccc376ecleanup7221dd2Add TypeForwardedTo pointing to BCL (#292)2ffa228Add TypeForwardedTo pointing to BCL (#291)3972819Update api_list.include.md33a8730simplify lockfa4c6a1remove ConsumeCs12.csprojd410de1fix lock11a5ce4RandomPolyfill with staticSharedproperty (#288)Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebasewill rebase this PR@dependabot recreatewill recreate this PR, overwriting any edits that have been made to it@dependabot mergewill merge this PR after your CI passes on it@dependabot squash and mergewill squash and merge this PR after your CI passes on it@dependabot cancel mergewill cancel a previously requested merge and block automerging@dependabot reopenwill reopen this PR if it is closed@dependabot closewill close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot show <dependency name> ignore conditionswill show all of the ignore conditions of the specified dependency@dependabot ignore this major versionwill close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor versionwill close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependencywill close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)