Updated to multi-project build