The Bioshock Collection (containing ground-up remasters of the original Bioshock & Bioshock 2 alongside a port of the PC release of Infinite) is out now and contains all DLC content form prior versions.