Tested and working good @dellis1972 , will need migration docs updating to remove the <Target Name="RestoreDotnetTools" section from existing projects and the templates updating.
But it's good, even in an upgrade scenario, it will update the tools to match the nuget dependency

@SimonDarksideJ where are we with testing on this ? I can't remember?

The last change broke some things I found, it made it harder to both upgrade and use.

1. Create a project with the 3.8.4 templates
2. Build and then clean to ensure everything works
3. Manually edit the dotnet tools and csproj to use new local configured nugets
4. Edit csproj to remove restore action
5. Use VS or DotNet restore to update packages
6. Try and build
7. See restore / tools issues, also Android refuses to build content in a combined build using startkit template. (even though running command manually or using mgcb works)

I got numerous issues getting projects to build or even upgrade with the latest builds. The previous build seemed to work better.

7. See restore / tools issues, also Android refuses to build content in a combined build using startkit template. (even though running command manually or using mgcb works)

I got numerous issues getting projects to build or even upgrade with the latest builds. The previous build seemed to work better.

Do you have the actual error messages you get?