Some minor fixes to make the build work more universally

Primarily: Updated to Azure SDK 2.2. I'll need to update the build agents when this is merged in, so expect some build failures around then :).