[trunk] Fixing VSSolutionBuilder single Moc generation