Merge branch 'main' into feature/configuration-builder

nkdAgility · Aug 4, 2024 · 22f7d92 · 22f7d92
2 parents 8845081 + 272c96d
commit 22f7d92
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/MigrationTools.Clients.AzureDevops.ObjectModel/Endpoints/TfsWorkItemConvertor.cs b/src/MigrationTools.Clients.AzureDevops.ObjectModel/Endpoints/TfsWorkItemConvertor.cs
@@ -60,7 +60,7 @@ private SortedDictionary<int, RevisionItem> GetRevisionItems(RevisionCollection
             }
             catch (ArgumentException e)
             {
-                Log.Warning(e, "For some Reason there are multiple Revisions on {WorkItemId} with the same System.Rev. We will create a renumbered list...", items[0].WorkItemId);
+                Log.Warning("For some Reason there are multiple Revisions on {WorkItemId} with the same System.Rev. We will create a renumbered list...", items[0].WorkItemId);
                 var currentNumber = -1;
                 foreach (var item in items)
                 {

diff --git a/src/VstsSyncMigrator.Core/Execution/MigrationContext/WorkItemMigrationContext.cs b/src/VstsSyncMigrator.Core/Execution/MigrationContext/WorkItemMigrationContext.cs
@@ -213,7 +213,7 @@ protected override void InternalExecute()
                         Engine.Source.WorkItems.Project.Name, Engine.Target.WorkItems.Project.Name, contextLog);
 
                     sourceWorkItems = ((TfsWorkItemMigrationClient)Engine.Target.WorkItems).FilterExistingWorkItems(
-                        sourceWorkItems, _config.WIQLQuery,
+                        sourceWorkItems, targetWIQLQuery,
                         (TfsWorkItemMigrationClient)Engine.Source.WorkItems);
                     contextLog.Information(
                         "!! After removing all found work items there are {SourceWorkItemCount} remaining to be migrated.",
@@ -911,7 +911,7 @@ private WorkItemData ReplayRevisions(List<RevisionItem> revisionsToMigrate, Work
                 if (targetWorkItem != null)
                 {
                     foreach (Field f in targetWorkItem.ToWorkItem().Fields)
-                        parameters.Add($"{f.ReferenceName} ({f.Name})", f.Value.ToString());
+                        parameters.Add($"{f.ReferenceName} ({f.Name})", f.Value?.ToString());
                 }
                 _telemetry.TrackException(ex, parameters);
                 TraceWriteLine(LogEventLevel.Information, "...FAILED to Save");