Added .editorConfig and changed iteration node creation (#510)

* Added "paused" message when in debug

* SetIterationDates called at all times, not at creation.

* Tab vs space.  Added .editorconfig and fixed my tabs

Co-authored-by: Calvé, Patrice <[email protected]>
Co-authored-by: Martin Hinshelwood nkdAgility.com <[email protected]>

Author: 3 people

.editorconfig

@@ -0,0 +1,8 @@
+[*]
+end_of_line = crlf
+
+[*.xml]
+indent_style = space
+
+[*.cs]
+indent_style = space

VstsSyncMigrator.sln

@@ -44,6 +44,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Console", "Console", "{FA57
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A05A7847-4C75-4E92-B156-F529483688CC}"
 	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
 		GitVersion.yml = GitVersion.yml

src/VstsSyncMigrator.Console/Program.cs

@@ -1,32 +1,19 @@
-using CommandLine.Text;
-using CommandLine;
-using Microsoft.ApplicationInsights;
-using Microsoft.ApplicationInsights.Channel;
-using Microsoft.ApplicationInsights.Extensibility;
-using Microsoft.TeamFoundation.Client;
-using Microsoft.TeamFoundation.WorkItemTracking.Client;
+using CommandLine;
+using Microsoft.ApplicationInsights.DataContracts;
+using Microsoft.VisualStudio.Services.Common;
 using Newtonsoft.Json;
+using NuGet;
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Globalization;
+using System.IO;
 using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
+using System.Net;
+using System.Net.NetworkInformation;
+using VstsSyncMigrator.Commands;
 using VstsSyncMigrator.Engine;
-using VstsSyncMigrator.Engine.ComponentContext;
-using System.IO;
 using VstsSyncMigrator.Engine.Configuration;
 using VstsSyncMigrator.Engine.Configuration.FieldMap;
-using VstsSyncMigrator.Engine.Configuration.Processing;
-using Microsoft.ApplicationInsights.DataContracts;
-using NuGet;
-using System.Net.NetworkInformation;
-using VstsSyncMigrator.Commands;
-using Microsoft.VisualStudio.Services.Common;
-using System.Net;
 
 namespace VstsSyncMigrator.ConsoleApp
 {
@@ -94,7 +81,7 @@ public static int Main(string[] args)
             Console.WriteLine("Writing log to " + logPath);
             //////////////////////////////////////////////////
             Version thisVersion = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
-           
+
             Trace.WriteLine(string.Format("Running version detected as {0}", thisVersion), "[Info]");
             if (IsOnline())
             {
@@ -118,7 +105,7 @@ public static int Main(string[] args)
 #endif
                 }
             }
-            
+
             Trace.WriteLine(string.Format("Telemetry Enabled: {0}", Telemetry.Current.IsEnabled().ToString()), "[Info]");
             Trace.WriteLine("Telemetry Note: We use Application Insights to collect telemetry on performance & feature usage for the tools to help our developers target features. This data is tied to a session ID that is generated and shown in the logs. This can help with debugging.");
             Trace.WriteLine(string.Format("SessionID: {0}", Telemetry.Current.Context.Session.Id), "[Info]");
@@ -147,6 +134,7 @@ public static int Main(string[] args)
             Trace.WriteLine(string.Format("Duration: {0}", mainTimer.Elapsed.ToString("c")), "[Info]");
             Trace.WriteLine(string.Format("End Time: {0}", DateTime.Now.ToUniversalTime().ToLocalTime()), "[Info]");
 #if DEBUG
+            Trace.WriteLine("App paused so you can check the output.  Press a key to close.");
             Console.ReadKey();
 #endif
             return result;
@@ -233,7 +221,7 @@ private static object RunExecuteAndReturnExitCode(RunOptions opts)
                         }
 
                         me.ChangeSetMapping.Add(changesetId, split[1]);
-                    }                    
+                    }
                 }
             }
 

src/VstsSyncMigrator.Core/Execution/MigrationContext/NodeStructuresMigrationContext.cs

@@ -1,6 +1,5 @@
 using Microsoft.TeamFoundation.Server;
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Xml;
@@ -80,7 +79,7 @@ private void CreateNodes(XmlNodeList nodeList, ICommonStructureService css, Node
                     {
                         finishDate = DateTime.Parse(item.Attributes["FinishDate"].Value);
                     }
-                    
+
                     targetNode = CreateNode(css, newNodeName, parentPath, startDate, finishDate);
                 }
                 else
@@ -109,7 +108,7 @@ private bool ShouldCreateNode(NodeInfo parentPath, string newNodeName)
                 var split = nodePath.Split('\\');
                 var removeProjectAndType = split.Skip(3);
                 var path = string.Join(@"\", removeProjectAndType);
-                
+
                 // We need to check if the path is a parent path of one of the base paths, as we need those
                 foreach (var basePath in config.BasePaths)
                 {
@@ -138,7 +137,7 @@ private NodeInfo CreateNode(ICommonStructureService css, string name, NodeInfo p
         {
             string nodePath = string.Format(@"{0}\{1}", parent.Path, name);
             NodeInfo node = null;
-            
+
             Trace.Write(string.Format("--CreateNode: {0}", nodePath));
             try
             {
@@ -175,9 +174,18 @@ private NodeInfo CreateNode(ICommonStructureService css, string name, NodeInfo p
                 string newPathUri = css.CreateNode(name, parent.Uri);
                 Trace.Write("...created");
                 node = css.GetNode(newPathUri);
+            }
+
+            try
+            {
                 ((ICommonStructureService4)css).SetIterationDates(node.Uri, startDate, finishDate);
                 Trace.Write("...dates assigned");
             }
+            catch (CommonStructureSubsystemException ex)
+            {
+                Telemetry.Current.TrackException(ex);
+                Trace.Write("...dates not set");
+            }
 
             Trace.WriteLine(String.Empty);
             return node;