|
5 | 5 | using System.Text.RegularExpressions; |
6 | 6 | using System.Threading; |
7 | 7 | using System.Threading.Tasks; |
| 8 | + |
8 | 9 | using Microsoft.TeamFoundation.Client; |
9 | 10 | using Microsoft.TeamFoundation.Core.WebApi; |
10 | 11 | using Microsoft.TeamFoundation.WorkItemTracking.Client; |
11 | 12 | using Microsoft.VisualStudio.Services.Common; |
12 | 13 | using Microsoft.VisualStudio.Services.Operations; |
| 14 | + |
13 | 15 | using Migration.Common; |
14 | 16 | using Migration.Common.Log; |
15 | 17 | using Migration.WIContract; |
| 18 | + |
16 | 19 | using VsWebApi = Microsoft.VisualStudio.Services.WebApi; |
17 | 20 | using WebApi = Microsoft.TeamFoundation.WorkItemTracking.WebApi; |
18 | 21 | using WebModel = Microsoft.TeamFoundation.WorkItemTracking.WebApi.Models; |
@@ -740,15 +743,20 @@ private void EnsureAssigneeField(WiRevision rev, WorkItem wi) |
740 | 743 | rev.Fields.Add(new WiField() { ReferenceName = WiFieldReference.AssignedTo, Value = assignedTo }); |
741 | 744 | } |
742 | 745 |
|
743 | | - private void EnsureDateFields(WiRevision rev) |
| 746 | + private void EnsureDateFields(WiRevision rev, WorkItem wi) |
744 | 747 | { |
745 | 748 | if (rev.Index == 0 && !rev.Fields.HasAnyByRefName(WiFieldReference.CreatedDate)) |
746 | 749 | { |
747 | 750 | rev.Fields.Add(new WiField() { ReferenceName = WiFieldReference.CreatedDate, Value = rev.Time.ToString("o") }); |
748 | 751 | } |
749 | 752 | if (!rev.Fields.HasAnyByRefName(WiFieldReference.ChangedDate)) |
750 | 753 | { |
751 | | - rev.Fields.Add(new WiField() { ReferenceName = WiFieldReference.ChangedDate, Value = rev.Time.ToString("o") }); |
| 754 | + if (wi.ChangedDate == rev.Time) |
| 755 | + { |
| 756 | + rev.Fields.Add(new WiField() { ReferenceName = WiFieldReference.ChangedDate, Value = rev.Time.AddMilliseconds(1).ToString("o") }); |
| 757 | + } |
| 758 | + else |
| 759 | + rev.Fields.Add(new WiField() { ReferenceName = WiFieldReference.ChangedDate, Value = rev.Time.ToString("o") }); |
752 | 760 | } |
753 | 761 |
|
754 | 762 | } |
@@ -853,7 +861,7 @@ public bool ImportRevision(WiRevision rev, WorkItem wi) |
853 | 861 | if (rev.Index == 0) |
854 | 862 | EnsureClasificationFields(rev); |
855 | 863 |
|
856 | | - EnsureDateFields(rev); |
| 864 | + EnsureDateFields(rev, wi); |
857 | 865 | EnsureAuthorFields(rev); |
858 | 866 | EnsureAssigneeField(rev, wi); |
859 | 867 | EnsureFieldsOnStateChange(rev, wi); |
|
0 commit comments