Merge pull request #10894 from dotnet/Add_Build_Type