Merge pull request #31 from weshaggard/ConsistentBuild

Make the build tools repo build consistently.
Merge branch 'master' into NugetResolve