Every new screen adds another repository method with its own copy of the same Where, Include and OrderBy. The Specification pattern gets the interface down to two methods that never change again - with exactly the same SQL.
Bumping the TargetFramework tag is the easy 10% of a .NET upgrade. NuGet package compatibility, breaking-change review, and the .NET Upgrade Assistant that automates most of the mechanical work.