Updated solution files to match upstream.