修复C#中的编译错误
Merge commit 'aed2ccf616833244045f196a1df44d3f9d03b010'