Merge pull request #2093 from NuGet/danliu/testfix

Fix nuget.functional.test.sln so that it can restore packages and build ...