So what are my options? My new MacBook OSX 10.10 and my MacPro is OSX 10.7.5 -- it runs on my MacPro now. Is there a simple solution to upgrade both?
Simplest is to move to Creative Cloud. You could buy CS6 but there is no upgrade path. You’ll have to pay full price and you’ll already be two full versions out of date.