- minor msbuild refactoring