PR 62: Merge pbi/4893-supportStructureMigrator to master +semver:minor

 - Updated NodeStructuresMigration.cs to support choosing the scructure
 - Added support for Stuctures with #4893
 - Merge branch 'master'

Related work items: #4893

Author: MrHinsh

TfsWitMigrator.Core/Configuration/Processing/NodeStructuresMigrationConfig.cs

@@ -9,6 +9,7 @@ namespace VSTS.DataBulkEditor.Engine.Configuration.Processing
     public class NodeStructuresMigrationConfig : ITfsProcessingConfig
     {
         public bool Enabled { get; set; }
+        public bool PrefixProjectToNodes { get; set; }
 
         public Type Processor
         {

TfsWitMigrator.Core/Execution/MigrationContext/NodeStructuresMigrationContext.cs

@@ -10,6 +10,7 @@ namespace VSTS.DataBulkEditor.Engine
 {
     public class NodeStructuresMigrationContext : MigrationContextBase
     {
+        NodeStructuresMigrationConfig config;
 
         public override string Name
         {
@@ -21,6 +22,7 @@ public override string Name
 
         public NodeStructuresMigrationContext(MigrationEngine me, NodeStructuresMigrationConfig config) : base(me, config)
         {
+            this.config = config;
         }
 
         internal override void InternalExecute()
@@ -29,28 +31,28 @@ internal override void InternalExecute()
             ICommonStructureService sourceCss = (ICommonStructureService)me.Source.Collection.GetService(typeof(ICommonStructureService));
             ProjectInfo sourceProjectInfo = sourceCss.GetProjectFromName(me.Source.Name);
             NodeInfo[] sourceNodes = sourceCss.ListStructures(sourceProjectInfo.Uri);
-
-            NodeInfo sourceAreaNode = (from n in sourceNodes where n.Path.Contains("Area") select n).Single();
-
-            XmlElement sourceAreaTree = sourceCss.GetNodesXml(new string[] { sourceAreaNode.Uri }, true);
-
-            NodeInfo sourceIterationNode = (from n in sourceNodes where n.Path.Contains("Iteration") select n).Single();
-            XmlElement sourceIterationsTree = sourceCss.GetNodesXml(new string[] { sourceIterationNode.Uri }, true);
             //////////////////////////////////////////////////
             ICommonStructureService targetCss = (ICommonStructureService)me.Target.Collection.GetService(typeof(ICommonStructureService));
             //////////////////////////////////////////////////
+            ProcessCommonStructure("Area", sourceNodes, targetCss, sourceCss);
+            //////////////////////////////////////////////////
+            ProcessCommonStructure("Iteration", sourceNodes, targetCss, sourceCss);
+            //////////////////////////////////////////////////
+        }
 
-            NodeInfo areaParent = CreateNode(targetCss, me.Source.Name, targetCss.GetNodeFromPath(string.Format("\\{0}\\Area", me.Target.Name)));
-            if (sourceAreaTree.ChildNodes[0].HasChildNodes)
-            { 
-            CreateNodes(sourceAreaTree.ChildNodes[0].ChildNodes[0].ChildNodes, targetCss, areaParent);
+        private void ProcessCommonStructure(string treeType, NodeInfo[] sourceNodes, ICommonStructureService targetCss, ICommonStructureService sourceCss)
+        {
+            NodeInfo sourceNode = (from n in sourceNodes where n.Path.Contains(treeType) select n).Single();
+            XmlElement sourceTree = sourceCss.GetNodesXml(new string[] { sourceNode.Uri }, true);
+            NodeInfo structureParent = targetCss.GetNodeFromPath(string.Format("\\{0}\\{1}", me.Target.Name, treeType));
+            if (config.PrefixProjectToNodes)
+            {
+                structureParent = CreateNode(targetCss, me.Source.Name, structureParent);
             }
-            NodeInfo iterationParent = CreateNode(targetCss, me.Source.Name, targetCss.GetNodeFromPath(string.Format("\\{0}\\Iteration", me.Target.Name)));
-            if (sourceIterationsTree.ChildNodes[0].HasChildNodes)
+            if (sourceTree.ChildNodes[0].HasChildNodes)
             {
-                CreateNodes(sourceIterationsTree.ChildNodes[0].ChildNodes[0].ChildNodes, targetCss, iterationParent);
+                CreateNodes(sourceTree.ChildNodes[0].ChildNodes[0].ChildNodes, targetCss, structureParent);
             }
-            //////////////////////////////////////////////////
         }
 
         private void CreateNodes(XmlNodeList nodeList, ICommonStructureService css, NodeInfo parentPath)

TfsWitMigrator.Core/_VSTS.DataBulkEditor.Engine.nuspec

@@ -6,12 +6,12 @@
     <title>$title$</title>
     <authors>nkdAgility, MrHinsh</authors>
     <owners>nkdAgility, MrHinsh</owners>
-    <licenseUrl>https://github.com/nkdAgility/vsts-data-bulk-editor</licenseUrl>
-    <projectUrl>https://github.com/nkdAgility/vsts-data-bulk-editor</projectUrl>
+    <licenseUrl>https://github.com/nkdAgility/vsts-sync-migration</licenseUrl>
+    <projectUrl>https://github.com/nkdAgility/vsts-sync-migration</projectUrl>
     <iconUrl>http://nkdagility.com/wp-content/uploads/2014/03/cropped-nakedalm-logo-260.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>naked Agility Visual Studio Team Services Bulk Data Editor Engine allows you to bulk edit data in Microsoft Team Foundation Server (TFS) and Visual Studio Team Services (VSTS). You can migrate work items, area &amp; iterations, &amp; test data from one Team Project to another. You can builk update work items and apply processing rules against your server or account. While the code is managed on Visual Studio Team Services all commits and releases are synched to https://github.com/nkdAgility/vsts-data-bulk-editor/ </description>
-    <releaseNotes>Summary of changes made in this release of the package.</releaseNotes>
+    <description>naked Agility Visual Studio Team Services Sync &amp; Migration Engine allows you to bulk edit data in Microsoft Team Foundation Server (TFS) and Visual Studio Team Services (VSTS). You can migrate work items, area &amp; iterations, &amp; test data from one Team Project to another. You can builk update work items and apply processing rules against your server or account. While the code is managed on Visual Studio Team Services all commits and releases are synched to https://github.com/nkdAgility/vsts-data-bulk-editor/ </description>
+    <releaseNotes>If you are looking for the migration tool, not just the API then use https://github.com/nkdAgility/vsts-sync-migration/releases. </releaseNotes>
     <copyright>Copyright © naked Agility Limited 2016</copyright>
     <tags>VS-TeamServices, VSTS, Visual Studio, TFS, Team Foundation Server</tags>
   </metadata>