Merge pull request #3826 from monojenkins/update-csprojs