Update ValueTuple and SqlClient to latest#4671
Conversation
|
@copilot can you please remove all the changes to nuget.config? |
|
@copilot - can you please try again. It should be this exact set of changes - you can squash all commits, but omit all the Nuget.config changes. The result should make no changes to NuGet.config - only the props files. |
ericstj
changed the title
There was a problem hiding this comment.
Pull request overview
Updates shared dependency version pins across multiple sub-repos to align on newer System.ValueTuple and System.Data.SqlClient versions for builds.
Changes:
- Bump
System.Data.SqlClientto 4.9.1 (winforms, runtime, roslyn source-only). - Bump
System.ValueTupleto 4.6.2 (runtime, roslyn source-only, aspnetcore, F# SDK implicit reference).
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| src/winforms/Directory.Packages.props | Updates centrally-managed System.Data.SqlClient package version to 4.9.1. |
| src/runtime/eng/Versions.props | Updates runtime “maintenance packages” pins for System.Data.SqlClient and System.ValueTuple. |
| src/roslyn/eng/Versions.props | Updates source-only maintenance-package pins for System.Data.SqlClient and System.ValueTuple. |
| src/fsharp/src/FSharp.Build/Microsoft.FSharp.NetSdk.props | Updates the implicit System.ValueTuple package version used by the F# SDK props. |
| src/aspnetcore/eng/Versions.props | Updates aspnetcore maintenance-package pin for System.ValueTuple. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
Can I please get a review on this? Would like to get this, backflowing, then backport to 10.0 |
|
/backport to release/10.0.1xx |
|
Started backporting to |
|
@ericstj backporting to git am output$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Update ValueTuple and SqlClient to latest
Using index info to reconstruct a base tree...
M src/aspnetcore/NuGet.config
M src/aspnetcore/eng/Versions.props
M src/fsharp/src/FSharp.Build/Microsoft.FSharp.NetSdk.props
M src/roslyn/NuGet.config
M src/roslyn/eng/Versions.props
M src/runtime/NuGet.config
M src/runtime/eng/Versions.props
M src/source-build-reference-packages/NuGet.config
M src/winforms/NuGet.config
Falling back to patching base and 3-way merge...
Auto-merging src/aspnetcore/NuGet.config
Auto-merging src/aspnetcore/eng/Versions.props
Auto-merging src/fsharp/src/FSharp.Build/Microsoft.FSharp.NetSdk.props
Auto-merging src/roslyn/NuGet.config
Auto-merging src/roslyn/eng/Versions.props
Auto-merging src/runtime/NuGet.config
CONFLICT (content): Merge conflict in src/runtime/NuGet.config
Auto-merging src/runtime/eng/Versions.props
Auto-merging src/source-build-reference-packages/NuGet.config
Auto-merging src/winforms/NuGet.config
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 Update ValueTuple and SqlClient to latest
Error: The process '/usr/bin/git' failed with exit code 128 |
|
Interesting -- the backport bot failed because it tried to replay all commits rather than just the squashed commit. |
|
@ericstj yes that's expected, the backport bot gets the .patch from the PR which will have individual changes (because it should work for in-progress PRs and also because it allows git am 3way merge) |
Update ValueTuple and SqlClient to recently shipped versions.