PR 52: Added Area Path switch and fixed bug #4905 +semver:major

 - Added ability to use the area path prefix (Much easier than regex) and fixed

Related work items: #4905, #4893

Author: MrHinsh

TfsWitMigrator.Core/Configuration/EngineConfiguration.cs

@@ -88,7 +88,7 @@ public static EngineConfiguration GetDefault()
                     { "Product Backlog Item", "Product Backlog Item" }
             };
             ec.Processors = new List<ITfsProcessingConfig>();
-            ec.Processors.Add(new WorkItemMigrationConfig() { Enabled = false, UpdateCreatedBy=true, UpdateCreatedDate=true, UpdateSoureReflectedId=true, QueryBit = @"AND [TfsMigrationTool.ReflectedWorkItemId] = '' AND  [Microsoft.VSTS.Common.ClosedDate] = '' AND [System.WorkItemType] IN ('Shared Steps', 'Shared Parameter', 'Test Case', 'Requirement', 'Task', 'User Story', 'Bug')" });
+            ec.Processors.Add(new WorkItemMigrationConfig() { Enabled = false, UpdateCreatedBy=true, PrefixProjectToNodes = true, UpdateCreatedDate=true, UpdateSoureReflectedId=true, QueryBit = @"AND [TfsMigrationTool.ReflectedWorkItemId] = '' AND  [Microsoft.VSTS.Common.ClosedDate] = '' AND [System.WorkItemType] IN ('Shared Steps', 'Shared Parameter', 'Test Case', 'Requirement', 'Task', 'User Story', 'Bug')" });
             ec.Processors.Add(new WorkItemUpdateConfig() { Enabled = false, QueryBit = @"AND [TfsMigrationTool.ReflectedWorkItemId] = '' AND  [Microsoft.VSTS.Common.ClosedDate] = '' AND [System.WorkItemType] IN ('Shared Steps', 'Shared Parameter', 'Test Case', 'Requirement', 'Task', 'User Story', 'Bug')" });
             ec.Processors.Add(new NodeStructuresMigrationConfig() { Enabled = false });
             ec.Processors.Add(new LinkMigrationConfig() { Enabled = false, QueryBit= @"AND [System.ExternalLinkCount] > 0 AND [System.RelatedLinkCount] > 0" });

TfsWitMigrator.Core/Configuration/Processing/WorkItemMigrationConfig.cs

@@ -9,6 +9,7 @@ namespace VSTS.DataBulkEditor.Engine.Configuration.Processing
     public class WorkItemMigrationConfig : ITfsProcessingConfig
     {
         public bool Enabled { get; set; }
+        public bool PrefixProjectToNodes { get; set; }
         public bool UpdateCreatedDate { get; set; }
         public bool UpdateCreatedBy { get; set; }
 public bool UpdateSoureReflectedId { get; set; }

TfsWitMigrator.Core/Execution/MigrationContext/LinkMigrationContext.cs

@@ -215,7 +215,9 @@ where l is RelatedLink
         private WorkItem GetRightHandSideTargitWi(WorkItem wiSourceL, WorkItem wiSourceR, WorkItem wiTargetL, WorkItemStoreContext targetStore)
         {
             WorkItem wiTargetR;
-            if (!(wiTargetL == null) && wiSourceR.Project.Name == wiTargetL.Project.Name)
+            if (!(wiTargetL == null) 
+                && wiSourceR.Project.Name == wiTargetL.Project.Name 
+                && wiSourceR.Project.Store.TeamProjectCollection.Uri.ToString() == wiTargetL.Project.Store.TeamProjectCollection.Uri.ToString())
             {
                 // Moving to same team project as SourceR
                 wiTargetR = wiSourceR;

TfsWitMigrator.Core/Execution/MigrationContext/WorkItemMigrationContext.cs

@@ -63,7 +63,7 @@ internal override void InternalExecute()
                     // Deside on WIT
                     if (me.WorkItemTypeDefinitions.ContainsKey(sourceWI.Type.Name))
                     {
-                        newwit = CreateAndPopulateWorkItem(sourceWI, destProject, me.WorkItemTypeDefinitions[sourceWI.Type.Name].Map(sourceWI));
+                        newwit = CreateAndPopulateWorkItem(_config,sourceWI, destProject, me.WorkItemTypeDefinitions[sourceWI.Type.Name].Map(sourceWI));
                         if (newwit.Fields.Contains(me.ReflectedWorkItemIdFieldName))
                         {
                             newwit.Fields[me.ReflectedWorkItemIdFieldName].Value = sourceStore.CreateReflectedWorkItemId(sourceWI);
@@ -135,7 +135,7 @@ private static bool HasChildPBI(WorkItem sourceWI)
             return sourceWI.Title.ToLower().StartsWith("epic") || sourceWI.Title.ToLower().StartsWith("theme");
         }
 
-        private static WorkItem CreateAndPopulateWorkItem(WorkItem oldWi, Project destProject, String destType)
+        private static WorkItem CreateAndPopulateWorkItem(WorkItemMigrationConfig config , WorkItem oldWi, Project destProject, String destType)
         {
             var fieldMappingStartTime = DateTime.UtcNow;
             Stopwatch fieldMappingTimer = new Stopwatch();
@@ -198,8 +198,17 @@ private static WorkItem CreateAndPopulateWorkItem(WorkItem oldWi, Project destPr
                     newwit.Fields[f.ReferenceName].Value = oldWi.Fields[f.ReferenceName].Value;
                 }
             }
-            newwit.AreaPath = string.Format(@"{0}\{1}", newwit.Project.Name, oldWi.AreaPath);
-            newwit.IterationPath = string.Format(@"{0}\{1}", newwit.Project.Name, oldWi.IterationPath);
+            if (config.PrefixProjectToNodes)
+            {
+                newwit.AreaPath = string.Format(@"{0}\{1}", newwit.Project.Name, oldWi.AreaPath);
+                newwit.IterationPath = string.Format(@"{0}\{1}", newwit.Project.Name, oldWi.IterationPath);
+            } else
+            {
+                var regex = new Regex(Regex.Escape(oldWi.Project.Name));
+                newwit.AreaPath = regex.Replace(oldWi.AreaPath, "newwit.Project.Name", 1);
+                newwit.IterationPath = regex.Replace(oldWi.IterationPath, "newwit.Project.Name", 1);
+            }
+            
             newwit.Fields["System.ChangedDate"].Value = oldWi.Fields["System.ChangedDate"].Value;
 
             switch (destType)