Merge pull request #3942 from monojenkins/update-csprojs