Update

src/MigrationTools.Clients.TfsObjectModel/Processors/TfsWorkItemMigrationProcessor.cs

@@ -37,6 +37,7 @@
 using Serilog.Context;
 using Serilog.Events;
 using ILogger = Serilog.ILogger;
+using MigrationTools.Tools.Interfaces;
 
 namespace MigrationTools.Processors
 {
@@ -60,12 +61,12 @@ public class TfsWorkItemMigrationProcessor : TfsProcessor
  private ILogger workItemLog;
  private List<string> _itemsInError;
 
- public TfsWorkItemMigrationProcessor(IOptions<TfsWorkItemOverwriteProcessorOptions> options, TfsCommonTools tfsCommonTools, ProcessorEnricherContainer processorEnrichers, IServiceProvider services, ITelemetryLogger telemetry, ILogger<TfsWorkItemMigrationProcessor> logger) : base(options, tfsCommonTools, processorEnrichers, services, telemetry, logger)
+ public TfsWorkItemMigrationProcessor(IOptions<TfsWorkItemMigrationProcessorOptions> options, TfsCommonTools tfsCommonTools, ProcessorEnricherContainer processorEnrichers, IServiceProvider services, ITelemetryLogger telemetry, ILogger<TfsWorkItemMigrationProcessor> logger) : base(options, tfsCommonTools, processorEnrichers, services, telemetry, logger)
  {
  contextLog = Serilog.Log.ForContext<TfsWorkItemMigrationProcessor>();
  }
 
- new TfsWorkItemOverwriteProcessorOptions Options => (TfsWorkItemOverwriteProcessorOptions)base.Options;
+ new TfsWorkItemMigrationProcessorOptions Options => (TfsWorkItemMigrationProcessorOptions)base.Options;
 
  new TfsTeamProjectEndpoint Source => (TfsTeamProjectEndpoint)base.Source;
 
@@ -277,8 +278,7 @@ private void ValidateAllWorkItemTypesHaveReflectedWorkItemIdField(List<WorkItemD
  private void ValiddateWorkItemTypesExistInTarget(List<WorkItemData> sourceWorkItems)
  {
  contextLog.Information("Validating::Check that all work item types needed in the Target exist or are mapped");
- var workItemTypeMappingTool = Services.GetRequiredService<WorkItemTypeMappingTool>();
- // get list of all work item types
+ // get list of all work item types
  List<String> sourceWorkItemTypes = sourceWorkItems.SelectMany(x => x.Revisions.Values)
  //.Where(x => x.Fields[fieldName].Value.ToString().Contains("\\"))
  .Select(x => x.Type)
@@ -299,7 +299,7 @@ private void ValiddateWorkItemTypesExistInTarget(List<WorkItemData> sourceWorkIt
  foreach (var missingWorkItemType in missingWorkItemTypes)
  {
  bool thisTypeMapped = true;
- if (!workItemTypeMappingTool.Mappings.ContainsKey(missingWorkItemType))
+ if (!CommonTools.WorkItemTypeMapping.Mappings.ContainsKey(missingWorkItemType))
  {
  thisTypeMapped = false;
  }
@@ -664,7 +664,6 @@ private void ProcessWorkItemLinks(IWorkItemMigrationClient sourceStore, IWorkIte
 
  private WorkItemData ReplayRevisions(List<RevisionItem> revisionsToMigrate, WorkItemData sourceWorkItem, WorkItemData targetWorkItem)
  {
- var workItemTypeMappingTool = Services.GetRequiredService<WorkItemTypeMappingTool>();
  try
  {
  //If work item hasn't been created yet, create a shell
@@ -678,9 +677,9 @@ private WorkItemData ReplayRevisions(List<RevisionItem> revisionsToMigrate, Work
  TraceWriteLine(LogEventLevel.Information, $"WorkItem has changed type at one of the revisions, from {targetType} to {finalDestType}");
  }
 
- if (workItemTypeMappingTool.Mappings.ContainsKey(targetType))
+ if (CommonTools.WorkItemTypeMapping.Mappings.ContainsKey(targetType))
  {
- targetType = workItemTypeMappingTool.Mappings[targetType];
+ targetType = CommonTools.WorkItemTypeMapping.Mappings[targetType];
  }
  targetWorkItem = CreateWorkItem_Shell(Target.WorkItems.Project, sourceWorkItem, targetType);
  }
@@ -701,9 +700,9 @@ private WorkItemData ReplayRevisions(List<RevisionItem> revisionsToMigrate, Work
 
  // Decide on WIT
  var destType = currentRevisionWorkItem.Type;
- if (workItemTypeMappingTool.Mappings.ContainsKey(destType))
+ if (CommonTools.WorkItemTypeMapping.Mappings.ContainsKey(destType))
  {
- destType = workItemTypeMappingTool.Mappings[destType];
+ destType = CommonTools.WorkItemTypeMapping.Mappings[destType];
  }
  bool typeChange = (destType != targetWorkItem.Type);
 

src/MigrationTools.Clients.TfsObjectModel/Processors/TfsWorkItemMigrationProcessorOptions.cs

@@ -8,7 +8,7 @@
 namespace MigrationTools.Processors
 {
 
- public class TfsWorkItemOverwriteProcessorOptions : ProcessorOptions, IWorkItemProcessorConfig
+ public class TfsWorkItemMigrationProcessorOptions : ProcessorOptions, IWorkItemProcessorConfig
  {
 
 

src/MigrationTools.Clients.TfsObjectModel/TfsExtensions.cs

@@ -37,6 +37,7 @@ public static WorkItemData GetRevision(this WorkItemData context, int rev)
  {
  // internalObject = context.internalObject
  // TODO: Had to revert to calling revision load again untill WorkItemMigrationContext.PopulateWorkItem can be updated to pull from WorkItemData
+
  internalObject = originalWi.Store.GetWorkItem(originalWi.Id, rev)
  };
 

src/MigrationTools.Clients.TfsObjectModel/Tools/TfsValidateRequiredFieldTool.cs

@@ -11,6 +11,7 @@
 using MigrationTools.Processors;
 using MigrationTools.Processors.Infrastructure;
 using MigrationTools.Tools.Infrastructure;
+using MigrationTools.Tools.Interfaces;
 
 namespace MigrationTools.Tools
 {
@@ -27,7 +28,7 @@ public TfsValidateRequiredFieldTool(IOptions<TfsValidateRequiredFieldToolOptions
 
  public bool ValidatingRequiredField(TfsProcessor processor, string fieldToFind, List<WorkItemData> sourceWorkItems)
  {
- var workItemTypeMappingTool = Services.GetRequiredService<WorkItemTypeMappingTool>();
+ var workItemTypeMappingTool = Services.GetRequiredService<IWorkItemTypeMappingTool>();
  var sourceWorkItemTypes = sourceWorkItems.Select(wid => wid.ToWorkItem().Type).Distinct();
  var targetTypes = processor.Target.WorkItems.Project.ToProject().WorkItemTypes;
  var result = true;

src/MigrationTools/Services/TelemetryClientAdapter.cs

@@ -17,7 +17,7 @@ public class TelemetryClientAdapter : ITelemetryLogger
 
  public TelemetryClientAdapter(IMigrationToolVersion migrationToolVersion)
  {
-
+ _MigrationToolVersion = migrationToolVersion;
  elmahIoClient = ElmahioAPI.Create("7589821e832a4ae1a1170f8201def634", new ElmahIoOptions
  {
  Timeout = TimeSpan.FromSeconds(30),
@@ -68,6 +68,11 @@ public void TrackException(Exception ex, IDictionary<string, string> properties)
 
  public void TrackException(Exception ex, IEnumerable<KeyValuePair<string, string>> properties = null)
  {
+ if (properties == null)
+ {
+ TrackException(ex, null);
+ return;
+ }
  TrackException(ex, properties.ToDictionary(k => k.Key, v => v.Value));
  }