Compatibility updates for new versions of .net
Remove deprecated SetValidator method
Revert project file changes for now.