TFS 2010 Branch Across Team Projects – Best Practices

by

I’ll throw an option in to the ring, it may or may not not be useful to you. If it’s any consolation I’ve been pondering over this one for a while now and haven’t been able to come up with a completely satisfactory solution. It’s a really good question and I’d be very interested in seeing how others have solved this problem.

I know it’s considered a good idea to build from source wherever possible but I’m not a fan of branching between Team Projects. If you have a some common code and it needs to be branched between 2 or 3 other Team Projects then the branching is manageable but if you have 20 or 30 (or 100) Team Projects then managing the merges becomes a headache. There can be other issues if the developers working in the consuming Team Projects don’t have the same permissions in the “master” such as not being able to see history etc. Of course if you have code that needs to be shared between Team Projects in different Project Collections then you can’t branch anyway.

So with that in mind I would suggest that you treat the common code in the same way you might treat a 3rd party library and use binary references. Once you get in to that mindset a number of options are available to you. (here are a few but there are probably more)

  1. You could have the build for your common code copy the binaries to a drop location, alongside a merge module for packaging (if you use MSI). You then create a binary reference to the drop location and get whatever you use for packaging to import the merge module. In this scenario you need to make sure that the drop location is stable (and preferably read only to most of the devs to prevent tampering)
  2. Similar to option 1 but use a tool like NuGet to manage your references, this will automate the process of referencing new versions of the binaries.
  3. You could just check in the binaries to $/Product1/branch/lib/common folder in your branch and reference them using a relative path

As I said, I’m very interested in hearing how other SOers have solved the shared code problem using TFS.

EDIT: After 8 years of thinking about this, Nuget packages are the way forward here. I’ve left the rest of the answer in place as it still gets views and up-votes. Building dependencies in to packages and storing them in a binary repository (nuget / Nexus / Artifactory / Azure Artifacts etc.) is pretty much the standard way of solving this problem

More Related Contents:

  1. How can I completely remove TFS Bindings
  2. How to ignore files/directories in TFS for avoiding them to go to central source repository?
  3. Clear stored TFS credentials in Visual Studio 2017
  4. BuildActivity ignores ToolsVersion
  5. Team Build Error: The Path … is already mapped to workspace
  6. Is it able to ignore/disable the first step Get source in vNext Build?
  7. Visual Studio 2015 TFS .tfignore file
  8. Team Build: Publish locally using MSDeploy
  9. Files listed as pending changes when doing merges that didn’t change?
  10. Get TFS to ignore my packages folder
  11. How can I always block checkin of a specific file in TFS
  12. How to get tf.exe (TFS command line client)?
  13. How to connect TFS in Visual Studio code
  14. TFS Get Specific Version into separate folder
  15. Why doesn’t TFS get latest get the latest?
  16. How to get TFS2015 Build (Build.vnext) and NuGet package restore to use custom package sources
  17. Choice for build tool: MSBuild, NANT or something else?
  18. Valid Parameters for MSDeploy via MSBuild
  19. How can I exclude a specific file from TFS source control
  20. VS2012 return to a normal TFS checkin window?
  21. How to unlock a file from someone else in Team Foundation Server
  22. What’s the best way to get TFS to output each project to its own directory?
  23. C# 6.0 TFS Builds
  24. How to get the variable value in TFS/AzureDevOps from Build to Release Pipeline?
  25. How to chain builds in TFS 2015?
  26. What is Shelving in TFS?
  27. Delete Local Folder in TFS
  28. How to undo another user’s checkout in TFS via the GUI?
  29. TFS 2012 Build “Access to Path Denied”
  30. TFS 2012 Disable Multiple Check-out not working [closed]

Leave a Comment