Update to common project system
Correctly check the disposing argument to Dispose