Scotland sets out £24bn infrastructure plan