So far, I do not see a clean way to work around this issue in MSBuild. Given how complex (and fragile) the NuGet packaging has been, I sincerely hesitate to add more complexity here, as it would risk breaking (correct) versions of MSBuild and/or Visual Studio.