August 25, 2015 | Posted in Visual Studio 2013
On the whole merging changesets between code steams goes without any hitches. On occasion you’ll find issues merging, I find in particular designer files, because they are auto generated in the IDE. If you are finding it difficult to merge and you face the same problem, you can merge the changeset across, take the target version (the key bit here) and then manually implement the changes again in the target branch.
It’s by no means ideal, and if you have found a better way of doing this, please share!
For more information on coding merging see https://msdn.microsoft.com/en-us/library/ms181428%28v=vs.120%29.aspx
August 5, 2015 | Posted in .Net
We have a .Net Windows Forms application that uses RoboHelp to serve up help files. However, since moving our Team Foundation Server to TFS 2013 on Windows Server 2012 R2 compilation issues arose with errors suggesting that XMLHTTP30Class couldn’t be found in the MSXML2 namespace. The same story was true for DOMDocument30Class.
To resolve this simply use XMLHTTP60Class and DOMDocument60Class instead, in RoboHelp_CSH.cs which is supplied by Adobe for .Net incorporation.
I could find no documentation on this either on MSDN or on the Adobe website so hopefully this will help someone else in the same situation.
It’s important to point out that we had the latest version of MSXML Core Service on the server and infact on my machine (the error wasn’t present on my Windows 7 x64 machine however it was present on the new Windows Server 2012 R2 / TFS 2013 machine). The version used was MSXML 6 SP3.