Include json version file updates in hasUpdates

[adamzip]

#5406

Changes:

• MergeJsonsAsync returns true only if any changes were made
• Extract the update of global.json and dotnet-tools.json to a different method and return true if changes were made
• Change top-level "hadUpdates" calculation to take into account global.json and dotnet-tools.json

[Copilot]

Pull Request Overview

This PR fixes a bug where JSON version file updates (global.json and dotnet-tools.json) were not being properly tracked in the hasUpdates flag during backflow operations. The changes ensure that toolset updates are correctly reported as changes.

Key changes:

• Modified MergeJsonsAsync to return a boolean indicating whether changes were made
• Extracted toolset update logic into a separate BackflowToolsets method that tracks changes
• Updated VersionFileUpdateResult to include a HasToolsetUpdates field
• Fixed a documentation comment that incorrectly described conflict resolution behavior

Reviewed Changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
VmrVersionFileMerger.cs	Removed unused parameter and simplified deletion logic; corrected conflict resolution comment
VmrBackflower.cs	Added HasToolsetUpdates to the hasChanges calculation
VersionFileUpdateResult.cs	Added HasToolsetUpdates field to track toolset changes
JsonFileMerger.cs	Changed return type to bool and added logic to detect and return whether changes were made
BackflowConflictResolver.cs	Split toolset and dependency updates into separate methods to track toolset changes independently

[premun]

LGTM

Can we add a test? There probably already are tests for this class so maybe AI can cook up one really fast?

[premun]

I like this much better

[premun]

A leftover?

[premun]

Here it also says source repo