Code changes for Solution file changes