Which are correct:
1-What did I do that you got angry?
2-What did I do so that you got angry?
3-What did I do so you got angry?
4-What did I do for you to get angry?
5-What did I do that made you angry?
5. What did I do that made you angry?
Also: What did I do that got/made you so angry?
I'm not a teacher, but I write for a living. Please don't ask me about 2nd conditionals, but I'm a safe bet for what reads well in (American) English.