Calculations of the accretion and evolution of giant planets: The effects of solid cores