Since making his debut in the Black and Red in December 2006, the 26-year-old prop has become an important member of the front row and was awarded with his first Test cap for Scotland in February.
The former Galashiels Academy student, who is a qualified doctor, praised the team environment that has aided his development and believes he can continue to progress in the capital.
Cross said: "I'm pleased to have extended my contract with Edinburgh and I intend to continue to grow as a player in an excellent environment.
"We've got some great facilities at the club and the team is making exciting progress.
"I believe it is the ideal environment for me to pursue my dream to represent my country again in the future and achieving my goals as a player."
Head coach Andy Robinson welcomed the news and believes Cross' willingness to learn and application levels will enable him to fulfill his potential with Edinburgh.
Robinson said: "I think Geoff has developed all year and there is still room for him to keep improving. If he does that then I'd like to think he will get more international experience.
"He showed in his performance against Connacht last week that he really wants to play for this club."
On the player recruitment front, young scrum half Ross Samson will join Edinburgh next season from Newcastle Falcons Academy.
The former Scotland under-20 internationalist, 21, was born in Edinburgh and attended Stewart's Melville College before heading south to Tyneside.
Robinson believes Samson will prove to be an astute addition to the squad.
He added: "Ross has played for the Scotland under-20 team and he is a scrum half with real potential."
Moving up to fourth place in the Magners League standings after a bonus point victory over Connacht, Robinson has chosen to name an unchanged squad for the visit of EDF Energy Cup Finalists Cardiff.
On the injury front, Hugo Southwell (head knock) is still unavailable while Ryan Grant (eye), Roland Reid (knee) and Marc Teague (shoulder) are joined in the treatment room by long term casualties Matt Dey (shoulder), Ross Rennie (knee), David Callam (hip), and Steven Turnbull (ankle).
Meanwhile Calum MacRae, Andrew Easson and Jim Thompson are still away on duty with Scotland 7s.
Edinburgh Rugby Club squad to play Cardiff Blues in the Magners League at Murrayfield (Friday 3 April, kick off 7.30pm)
15 Chris Paterson
14 Andrew Turnbull
13 Ben Cairns
12 Nick De Luca
11 Simon Webster
10 Phil Godman
9 Mike Blair (captain)
1 Kyle Traynor
2 Ross Ford
3 Geoff Cross
4 Craig Hamilton
5 Jim Hamilton
6 Scott Newlands
7 Alan MacDonald
8 Allister Hogg
Substitutes: Andrew Kelly, Gavin Kerr, Scott MacLeod, Matt Mustchin, Greig Laidlaw, David Blair, John Houston.
Guinness PRO12
Suite 208, Alexandra House,
The Sweepstakes
Ballsbridge, Dublin 4, Ireland