Made changes to build the correct nuget packages

#1907