work in progress
Updates to support latest msbuild scripting