Index: Core/Common/src/Core.Common.Controls.TreeView/Core.Common.Controls.TreeView.csproj
===================================================================
diff -u -r1d7918edb37f7516b423a4f71fc1feca429d4e20 -re2e9b8f56864fad784b080c62dfb0145e0c0d4b3
--- Core/Common/src/Core.Common.Controls.TreeView/Core.Common.Controls.TreeView.csproj	(.../Core.Common.Controls.TreeView.csproj)	(revision 1d7918edb37f7516b423a4f71fc1feca429d4e20)
+++ Core/Common/src/Core.Common.Controls.TreeView/Core.Common.Controls.TreeView.csproj	(.../Core.Common.Controls.TreeView.csproj)	(revision e2e9b8f56864fad784b080c62dfb0145e0c0d4b3)
@@ -31,10 +31,6 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=1.2.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\log4net.2.0.4\lib\net40-full\log4net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
@@ -94,7 +90,6 @@
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
Index: Core/Common/src/Core.Common.Controls.TreeView/DragDropHandler.cs
===================================================================
diff -u -r1d7918edb37f7516b423a4f71fc1feca429d4e20 -re2e9b8f56864fad784b080c62dfb0145e0c0d4b3
--- Core/Common/src/Core.Common.Controls.TreeView/DragDropHandler.cs	(.../DragDropHandler.cs)	(revision 1d7918edb37f7516b423a4f71fc1feca429d4e20)
+++ Core/Common/src/Core.Common.Controls.TreeView/DragDropHandler.cs	(.../DragDropHandler.cs)	(revision e2e9b8f56864fad784b080c62dfb0145e0c0d4b3)
@@ -22,7 +22,7 @@
 using System;
 using System.Drawing;
 using System.Windows.Forms;
-using Core.Common.Controls.Forms;
+using FormsTreeView = System.Windows.Forms.TreeView;
 
 namespace Core.Common.Controls.TreeView
 {
@@ -35,7 +35,7 @@
         private TreeNode lastPlaceholderNode;
         private Graphics placeHolderGraphics;
 
-        public void HandleDragDrop(TreeViewControl treeViewControl, DoubleBufferedTreeView treeView, DragEventArgs e, Func<object, TreeNodeInfo> getTreeNodeInfoForData)
+        public void HandleDragDrop(TreeViewControl treeViewControl, FormsTreeView treeView, DragEventArgs e, Func<object, TreeNodeInfo> getTreeNodeInfoForData)
         {
             ClearPlaceHolders(treeView);
 
@@ -84,7 +84,7 @@
             }
         }
 
-        public void HandleDragOver(DoubleBufferedTreeView treeView, object sender, DragEventArgs e, Func<object, TreeNodeInfo> getTreeNodeInfoForData)
+        public void HandleDragOver(FormsTreeView treeView, object sender, DragEventArgs e, Func<object, TreeNodeInfo> getTreeNodeInfoForData)
         {
             if (lastDragOverPoint.X == e.X && lastDragOverPoint.Y == e.Y)
             {
@@ -144,7 +144,7 @@
             }
         }
 
-        public void HandleItemDrag(DoubleBufferedTreeView treeView, ItemDragEventArgs e, Func<object, TreeNodeInfo> getTreeNodeInfoForData)
+        public void HandleItemDrag(FormsTreeView treeView, ItemDragEventArgs e, Func<object, TreeNodeInfo> getTreeNodeInfoForData)
         {
             // gather allowed effects for the current item.
             var sourceNode = (TreeNode) e.Item;
@@ -175,12 +175,12 @@
             treeView.DoDragDrop(dataObject, effects);
         }
 
-        public void HandleDragLeave(DoubleBufferedTreeView treeView)
+        public void HandleDragLeave(FormsTreeView treeView)
         {
             ClearPlaceHolders(treeView);
         }
 
-        private void DrawPlaceholder(DoubleBufferedTreeView treeView, TreeNode node, PlaceholderLocation location)
+        private void DrawPlaceholder(FormsTreeView treeView, TreeNode node, PlaceholderLocation location)
         {
             if (lastPlaceholderNode == node && lastPlaceholderLocation == location)
             {
@@ -196,7 +196,7 @@
             node.DrawPlaceHolder(location, treeView.CreateGraphics());
         }
 
-        private void ClearPlaceHolders(DoubleBufferedTreeView treeView)
+        private void ClearPlaceHolders(FormsTreeView treeView)
         {
             if (placeHolderGraphics != null)
             {
@@ -231,7 +231,7 @@
 
         private static void ScrollIntoView(Point point, TreeNode nodeOver, object sender)
         {
-            var treeView = sender as DoubleBufferedTreeView;
+            var treeView = sender as FormsTreeView;
             if (treeView == null)
             {
                 return;
@@ -255,7 +255,7 @@
             }
         }
 
-        private PlaceholderLocation GetPlaceHoldersLocation(DoubleBufferedTreeView treeView, TreeNode nodeDragging, TreeNode nodeOver, DragEventArgs e, Func<object, TreeNodeInfo> getTreeNodeInfoForData)
+        private PlaceholderLocation GetPlaceHoldersLocation(FormsTreeView treeView, TreeNode nodeDragging, TreeNode nodeOver, DragEventArgs e, Func<object, TreeNodeInfo> getTreeNodeInfoForData)
         {
             var loc = PlaceholderLocation.None;
             int offsetY = treeView.PointToClient(Cursor.Position).Y - nodeOver.Bounds.Top;
Index: Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.cs
===================================================================
diff -u -r1d7918edb37f7516b423a4f71fc1feca429d4e20 -re2e9b8f56864fad784b080c62dfb0145e0c0d4b3
--- Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.cs	(.../TreeViewControl.cs)	(revision 1d7918edb37f7516b423a4f71fc1feca429d4e20)
+++ Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.cs	(.../TreeViewControl.cs)	(revision e2e9b8f56864fad784b080c62dfb0145e0c0d4b3)
@@ -41,15 +41,17 @@
         public event EventHandler NodeUpdated; // TODO; Way to explicit!
         public event EventHandler<TreeNodeDataDeletedEventArgs> DataDeleted; // TODO; Way to explicit!
 
-        private readonly Dictionary<Type, TreeNodeInfo> tagTypeTreeNodeInfoLookup = new Dictionary<Type, TreeNodeInfo>();
         private const int maximumTextLength = 259;
-        private readonly Dictionary<TreeNode, TreeNodeObserver> treeNodeObserverLookup = new Dictionary<TreeNode, TreeNodeObserver>();
-        private object data;
         private const string stateImageLocationString = "StateImage";
         private const int uncheckedCheckBoxStateImageIndex = 0;
         private const int checkedCheckBoxStateImageIndex = 1;
+
         private readonly DragDropHandler dragDropHandler = new DragDropHandler();
+        private readonly Dictionary<Type, TreeNodeInfo> tagTypeTreeNodeInfoLookup = new Dictionary<Type, TreeNodeInfo>();
+        private readonly Dictionary<TreeNode, TreeNodeObserver> treeNodeObserverLookup = new Dictionary<TreeNode, TreeNodeObserver>();
 
+        private object data;
+
         public TreeViewControl()
         {
             InitializeComponent();
@@ -270,20 +272,6 @@
             }
         }
 
-        private Image CreateCheckBoxGlyph(CheckBoxState state)
-        {
-            var result = new Bitmap(16, 16);
-
-            using (var g = Graphics.FromImage(result))
-            {
-                Size glyphSize = CheckBoxRenderer.GetGlyphSize(g, state);
-
-                CheckBoxRenderer.DrawCheckBox(g, new Point((result.Width - glyphSize.Width)/2, (result.Height - glyphSize.Height)/2), state);
-            }
-
-            return result;
-        }
-
         /// <summary>
         /// This method searches all nodes in the tree view for a node with a matching tag.
         /// </summary>
@@ -307,6 +295,44 @@
                            .FirstOrDefault(node => node != null);
         }
 
+        private void AddRootNode()
+        {
+            var rootNode = new TreeNode
+            {
+                Tag = data
+            };
+
+            UpdateNode(rootNode);
+
+            if (rootNode.Nodes.Count > 0)
+            {
+                rootNode.Expand();
+            }
+
+            treeView.Nodes.Add(rootNode);
+
+            treeNodeObserverLookup.Add(rootNode, new TreeNodeObserver(rootNode, this));
+        }
+
+        private TreeNode CreateTreeNode(TreeNode parentNode, object nodeData)
+        {
+            var newNode = new TreeNode
+            {
+                Tag = nodeData
+            };
+
+            if (treeView.CheckBoxes)
+            {
+                newNode.Checked = parentNode.Checked;
+            }
+
+            UpdateNode(newNode);
+
+            treeNodeObserverLookup.Add(newNode, new TreeNodeObserver(newNode, this));
+
+            return newNode;
+        }
+
         /// <summary>
         /// This method updates the provided <see cref="TreeNode"/>.
         /// </summary>
@@ -357,72 +383,58 @@
             OnNodeUpdated(treeNode);
         }
 
-        private void SetTreeNodeImageKey(TreeNode treeNode, TreeNodeInfo treeNodeInfo)
+        private void RefreshChildNodes(TreeNode treeNode, TreeNodeInfo treeNodeInfo)
         {
-            if (treeNodeInfo.Image != null)
+            var newTreeNodes = new Dictionary<int, TreeNode>();
+            var outdatedTreeNodes = treeNode.Nodes.Cast<TreeNode>().ToList();
+            var currentTreeNodesPerTag = treeNode.Nodes.Cast<TreeNode>().ToList().ToDictionary(ctn => ctn.Tag, ctn => ctn);
+            var newChildNodeObjects = treeNodeInfo.ChildNodeObjects != null
+                                          ? treeNodeInfo.ChildNodeObjects(treeNode.Tag)
+                                          : new object[0];
+
+            // Create a list of outdated tree nodes and new tree nodes
+            for (var i = 0; i < newChildNodeObjects.Length; i++)
             {
-                var image = treeNodeInfo.Image(treeNode.Tag);
-                var imageCollection = treeView.ImageList.Images;
-                var imageKey = GetImageHash(image);
-                if (imageCollection.ContainsKey(imageKey))
+                if (currentTreeNodesPerTag.ContainsKey(newChildNodeObjects[i]))
                 {
-                    treeNode.ImageKey = imageKey;
-                    treeNode.SelectedImageKey = imageKey;
+                    // Remove any node from the list of outdated nodes that should remain part of the node collection
+                    outdatedTreeNodes.Remove(currentTreeNodesPerTag[newChildNodeObjects[i]]);
                 }
                 else
                 {
-                    treeNode.ImageKey = imageKey;
-                    treeNode.SelectedImageKey = imageKey;
-                    imageCollection.Add(imageKey, image);
+                    // If there's no existing node yet, create a new one and add it to the list of new nodes
+                    newTreeNodes.Add(i, CreateTreeNode(treeNode, newChildNodeObjects[i]));
                 }
             }
-        }
 
-        private string GetImageHash(Image image)
-        {
-            var stream = new MemoryStream();
-            image.Save(stream, image.RawFormat);
-            MD5CryptoServiceProvider md5 = new MD5CryptoServiceProvider();
-            byte[] hash = md5.ComputeHash(stream.ToArray());
-            return Encoding.UTF8.GetString(hash);
-        }
-
-        private void AddRootNode()
-        {
-            var rootNode = new TreeNode
+            // Remove any outdated nodes
+            foreach (var removedNode in outdatedTreeNodes)
             {
-                Tag = data
-            };
+                treeNode.Nodes.Remove(removedNode);
 
-            UpdateNode(rootNode);
+                RemoveTreeNodeFromLookupRecursively(removedNode);
+            }
 
-            if (rootNode.Nodes.Count > 0)
+            // Insert any new nodes
+            foreach (var node in newTreeNodes)
             {
-                rootNode.Expand();
+                treeNode.Nodes.Insert(node.Key, node.Value);
             }
 
-            treeView.Nodes.Add(rootNode);
+            // If relevant, set selection to the last of the added nodes
+            var lastAddedNodeToSetSelectionTo = newTreeNodes.Values.LastOrDefault(node =>
+            {
+                var dataObject = node.Tag;
+                var info = GetTreeNodeInfoForData(dataObject);
 
-            treeNodeObserverLookup.Add(rootNode, new TreeNodeObserver(rootNode, this));
-        }
+                return info.EnsureVisibleOnCreate != null && info.EnsureVisibleOnCreate(dataObject);
+            });
 
-        private TreeNode CreateTreeNode(TreeNode parentNode, object nodeData)
-        {
-            var newNode = new TreeNode
+            if (lastAddedNodeToSetSelectionTo != null)
             {
-                Tag = nodeData
-            };
-
-            if (treeView.CheckBoxes)
-            {
-                newNode.Checked = parentNode.Checked;
+                lastAddedNodeToSetSelectionTo.EnsureVisible();
+                treeView.SelectedNode = lastAddedNodeToSetSelectionTo;
             }
-
-            UpdateNode(newNode);
-
-            treeNodeObserverLookup.Add(newNode, new TreeNodeObserver(newNode, this));
-
-            return newNode;
         }
 
         private void RemoveAllNodes()
@@ -468,63 +480,53 @@
             return treeNodeInfo ?? tagTypeTreeNodeInfoLookup.FirstOrDefault(kvp => kvp.Key.IsInstanceOfType(item)).Value;
         }
 
-        private void RefreshChildNodes(TreeNode treeNode, TreeNodeInfo treeNodeInfo)
+        private static object GetParentTag(TreeNode treeNode)
         {
-            var newTreeNodes = new Dictionary<int, TreeNode>();
-            var outdatedTreeNodes = treeNode.Nodes.Cast<TreeNode>().ToList();
-            var currentTreeNodesPerTag = treeNode.Nodes.Cast<TreeNode>().ToList().ToDictionary(ctn => ctn.Tag, ctn => ctn);
-            var newChildNodeObjects = treeNodeInfo.ChildNodeObjects != null
-                                          ? treeNodeInfo.ChildNodeObjects(treeNode.Tag)
-                                          : new object[0];
+            return treeNode.Parent != null ? treeNode.Parent.Tag : null;
+        }
 
-            // Create a list of outdated tree nodes and new tree nodes
-            for (var i = 0; i < newChildNodeObjects.Length; i++)
-            {
-                if (currentTreeNodesPerTag.ContainsKey(newChildNodeObjects[i]))
-                {
-                    // Remove any node from the list of outdated nodes that should remain part of the node collection
-                    outdatedTreeNodes.Remove(currentTreeNodesPerTag[newChildNodeObjects[i]]);
-                }
-                else
-                {
-                    // If there's no existing node yet, create a new one and add it to the list of new nodes
-                    newTreeNodes.Add(i, CreateTreeNode(treeNode, newChildNodeObjects[i]));
-                }
-            }
+        private Image CreateCheckBoxGlyph(CheckBoxState state)
+        {
+            var result = new Bitmap(16, 16);
 
-            // Remove any outdated nodes
-            foreach (var removedNode in outdatedTreeNodes)
+            using (var g = Graphics.FromImage(result))
             {
-                treeNode.Nodes.Remove(removedNode);
+                Size glyphSize = CheckBoxRenderer.GetGlyphSize(g, state);
 
-                RemoveTreeNodeFromLookupRecursively(removedNode);
+                CheckBoxRenderer.DrawCheckBox(g, new Point((result.Width - glyphSize.Width)/2, (result.Height - glyphSize.Height)/2), state);
             }
 
-            // Insert any new nodes
-            foreach (var node in newTreeNodes)
-            {
-                treeNode.Nodes.Insert(node.Key, node.Value);
-            }
+            return result;
+        }
 
-            // If relevant, set selection to the last of the added nodes
-            var lastAddedNodeToSetSelectionTo = newTreeNodes.Values.LastOrDefault(node =>
+        private void SetTreeNodeImageKey(TreeNode treeNode, TreeNodeInfo treeNodeInfo)
+        {
+            if (treeNodeInfo.Image != null)
             {
-                var dataObject = node.Tag;
-                var info = GetTreeNodeInfoForData(dataObject);
-
-                return info.EnsureVisibleOnCreate != null && info.EnsureVisibleOnCreate(dataObject);
-            });
-
-            if (lastAddedNodeToSetSelectionTo != null)
-            {
-                lastAddedNodeToSetSelectionTo.EnsureVisible();
-                treeView.SelectedNode = lastAddedNodeToSetSelectionTo;
+                var image = treeNodeInfo.Image(treeNode.Tag);
+                var imageCollection = treeView.ImageList.Images;
+                var imageKey = GetImageHash(image);
+                if (imageCollection.ContainsKey(imageKey))
+                {
+                    treeNode.ImageKey = imageKey;
+                    treeNode.SelectedImageKey = imageKey;
+                }
+                else
+                {
+                    treeNode.ImageKey = imageKey;
+                    treeNode.SelectedImageKey = imageKey;
+                    imageCollection.Add(imageKey, image);
+                }
             }
         }
 
-        private static object GetParentTag(TreeNode treeNode)
+        private string GetImageHash(Image image)
         {
-            return treeNode.Parent != null ? treeNode.Parent.Tag : null;
+            var stream = new MemoryStream();
+            image.Save(stream, image.RawFormat);
+            MD5CryptoServiceProvider md5 = new MD5CryptoServiceProvider();
+            byte[] hash = md5.ComputeHash(stream.ToArray());
+            return Encoding.UTF8.GetString(hash);
         }
 
         private void OnNodeUpdated(TreeNode treeNode)
Fisheye: Tag e2e9b8f56864fad784b080c62dfb0145e0c0d4b3 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Controls.TreeView/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?