Thank you Matthew,
Since we are getting the error, I suppose we should ask for a manually modified solution for our specific environment.
I'll get in touch with Support.
Still, it would be good if you could follow this up with Microsoft and your dev team to see if a solution is possible. Otherwise we'll have to ask Support for solution files every time there is a new release.
Best
Joris