Merge pull request #4005 from monojenkins/update-csprojs