Implementing remainder of NuGet AutoResotre fix