reverting .nuspec change, updating vcxproj to use $guid1 macro