Build using projects rather than solutions and add samples back to main solution.