Rework for built-in NuGet restore