What I'm thinking of is a license almost identical to the MIT and/or Apache 2.0 license, but with a clause that prohibits mega-corps from wholesale rebranding and using your code.
I have a few OSS projects myself, and help maintain a larger one, and I love the spirit of OSS, so I'm a little split on this one. But I don't really think Microsoft's actions here are truely in the spirit of OSS. Yes, the license allows it, but is it aligned with the OSS ethos? Is it "right"?
But the viral nature of GPL and the notion of "derived works" may be of some use here.