Merge TFS packaging & building