Compatibility updates for new versions of .net
Remove deprecated SetValidator method
Revert project file changes for now.
Remove broken reference
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Remove broken reference
  Revert project file changes for now.
  Compatibility updates for new versions of .net Remove deprecated SetValidator method