Split the msbuild task into two parts