Merge what bits we can merge between questor.csproj and questormanager.csproj, this should alleviate some .net SDK dependencies