Correctly Implementing NuGet Restore
Fixing Crash related to AVD detection

Fixes #644