Updated to use new Infrastructure code
Updated nuspec dependencies