Skip to content

Commit 70e0132

Browse files
Merge branch 'master' into dependabot/nuget/src/WorkItemMigrator/JiraExport/Newtonsoft.Json-13.0.2
2 parents f91f3da + 3361bb8 commit 70e0132

File tree

111 files changed

+5979
-1373
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+5979
-1373
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,22 @@ labels: ''
66
assignees: ''
77
---
88

9+
# Read this before submitting your support ticket/bug report
10+
11+
- [ ] Make sure that you have searched for your problem in the **FAQ**: <https://github.com/solidify/jira-azuredevops-migrator/blob/master/docs/faq.md>
12+
- [ ] Make sure that you have searched for your problem in the **issue board** (you can search for keywords in the **filters** search bar): <https://github.com/solidify/jira-azuredevops-migrator/issues?q=is%3Aissue+>
13+
- [ ] Fill in the issue template below (starting with **Describe the problem**)
14+
- [ ] Delete this section but keep the issue template
15+
---
16+
917
**Describe the problem**
18+
1019
A clear and concise description of what the problem/bug is.
1120

1221
**To Reproduce**
22+
1323
Steps to reproduce the behavior:
24+
1425
1. Go to '...'
1526
2. Click on '....'
1627
3. Scroll down to '....'

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,3 +335,6 @@ About
335335

336336
# Visual Code
337337
**/.ionide
338+
339+
# Testing scripts
340+
*.ps1

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1818
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
21+
SOFTWARE.

azure-pipelines.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ variables:
99
BuildConfiguration: 'release'
1010
major: 3
1111
minor: 0
12+
dotNetVersion: '3.1.x'
1213

1314
name: $(major).$(minor)$(rev:.r)
1415

@@ -26,6 +27,11 @@ steps:
2627
inputs:
2728
VersionRegex: '\d+\.\d+\.\d+'
2829

30+
- task: UseDotNet@2
31+
inputs:
32+
packageType: 'sdk'
33+
version: '$(dotNetVersion)'
34+
2935
- task: NuGetCommand@2
3036
displayName: 'NuGet restore'
3137
inputs:
@@ -83,7 +89,7 @@ steps:
8389
inputs:
8490
SourceFolder: '$(system.defaultworkingdirectory)\src\WorkItemMigrator\JiraExport\bin\$(BuildConfiguration)'
8591
Contents: |
86-
ApplicationInsights.config
92+
ApplicationInsights.config
8793
Atlassian.Jira.dll
8894
jira-export.exe
8995
jira-export.exe.config
@@ -110,6 +116,7 @@ steps:
110116
Microsoft.TeamFoundation.Client.dll
111117
Microsoft.TeamFoundation.Common.dll
112118
Microsoft.TeamFoundation.Core.WebApi.dll
119+
Microsoft.TeamFoundation.SourceControl.WebApi.dll
113120
Microsoft.TeamFoundation.WorkItemTracking.Client.DataStoreLoader.dll
114121
Microsoft.TeamFoundation.WorkItemTracking.Client.dll
115122
Microsoft.TeamFoundation.WorkItemTracking.Common.dll

docs/CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
3434

3535
## Enforcement
3636

37-
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at opensource@solidify.se. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
37+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at <mailto:opensource@solidify.se>. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
3838

3939
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
4040

docs/Samples/config-agile.json

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414
"base-area-path": "Migrated",
1515
"base-iteration-path": "Migrated",
1616
"ignore-failed-links": true,
17+
"include-link-comments": false,
18+
"include-jira-css-styles": false,
19+
"ignore-empty-revisions": false,
20+
"suppress-notifications": false,
21+
"sleep-time-between-revision-import-milliseconds": 0,
1722
"process-template": "Agile",
1823
"link-map": {
1924
"link": [
@@ -25,6 +30,10 @@
2530
"source": "Parent",
2631
"target": "System.LinkTypes.Hierarchy-Reverse"
2732
},
33+
{
34+
"source": "Child",
35+
"target": "System.LinkTypes.Hierarchy-Forward"
36+
},
2837
{
2938
"source": "Relates",
3039
"target": "System.LinkTypes.Related"
@@ -71,9 +80,16 @@
7180
"target": "System.AssignedTo",
7281
"mapper": "MapUser"
7382
},
83+
{
84+
"source": "Sprint",
85+
"source-type": "name",
86+
"target": "System.IterationPath",
87+
"mapper": "MapSprint"
88+
},
7489
{
7590
"source": "description",
7691
"target": "System.Description",
92+
"not-for": "Bug",
7793
"mapper": "MapRendered"
7894
},
7995
{
@@ -128,10 +144,6 @@
128144
"source": "In Progress",
129145
"target": "Active"
130146
},
131-
{
132-
"source": "Done",
133-
"target": "Resolved"
134-
},
135147
{
136148
"source": "Done",
137149
"target": "Closed"
@@ -183,7 +195,8 @@
183195
{
184196
"source": "description",
185197
"target": "Microsoft.VSTS.TCM.ReproSteps",
186-
"for": "Bug"
198+
"for": "Bug",
199+
"mapper": "MapRendered"
187200
},
188201
{
189202
"source": "environment",
@@ -193,4 +206,4 @@
193206
}
194207
]
195208
}
196-
}
209+
}

docs/Samples/config-basic.json

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414
"base-area-path": "Migrated",
1515
"base-iteration-path": "Migrated",
1616
"ignore-failed-links": true,
17+
"include-link-comments": false,
18+
"include-jira-css-styles": false,
19+
"ignore-empty-revisions": false,
20+
"suppress-notifications": false,
21+
"sleep-time-between-revision-import-milliseconds": 0,
1722
"process-template": "Basic",
1823
"link-map": {
1924
"link": [
@@ -25,6 +30,10 @@
2530
"source": "Parent",
2631
"target": "System.LinkTypes.Hierarchy-Reverse"
2732
},
33+
{
34+
"source": "Child",
35+
"target": "System.LinkTypes.Hierarchy-Forward"
36+
},
2837
{
2938
"source": "Relates",
3039
"target": "System.LinkTypes.Related"
@@ -45,10 +54,6 @@
4554
"source": "New Feature",
4655
"target": "Issue"
4756
},
48-
{
49-
"source": "Bug",
50-
"target": "Bug"
51-
},
5257
{
5358
"source": "Task",
5459
"target": "Task"
@@ -67,9 +72,16 @@
6772
"target": "System.AssignedTo",
6873
"mapper": "MapUser"
6974
},
75+
{
76+
"source": "Sprint",
77+
"source-type": "name",
78+
"target": "System.IterationPath",
79+
"mapper": "MapSprint"
80+
},
7081
{
7182
"source": "description",
7283
"target": "System.Description",
84+
"not-for": "Bug",
7385
"mapper": "MapRendered"
7486
},
7587
{
@@ -133,8 +145,9 @@
133145
{
134146
"source": "description",
135147
"target": "Microsoft.VSTS.TCM.ReproSteps",
136-
"for": "Bug"
148+
"for": "Bug",
149+
"mapper": "MapRendered"
137150
}
138151
]
139152
}
140-
}
153+
}

docs/Samples/config-cmmi.json

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414
"base-area-path": "SourceProject_Migrated",
1515
"base-iteration-path": "SourceProject_Migrated",
1616
"ignore-failed-links": true,
17+
"include-link-comments": false,
18+
"include-jira-css-styles": false,
19+
"ignore-empty-revisions": false,
20+
"suppress-notifications": false,
21+
"sleep-time-between-revision-import-milliseconds": 0,
1722
"process-template": "CMMI",
1823
"link-map": {
1924
"link": [
@@ -99,11 +104,18 @@
99104
"target": "System.AssignedTo",
100105
"mapper": "MapUser"
101106
},
107+
{
108+
"source": "Sprint",
109+
"source-type": "name",
110+
"target": "System.IterationPath",
111+
"mapper": "MapSprint"
112+
},
102113
{
103114
"source": "description",
104115
"target": "System.Description",
116+
"not-for": "Bug",
105117
"mapper": "MapRendered"
106-
},
118+
},
107119
{
108120
"source": "priority",
109121
"target": "Microsoft.VSTS.Common.Priority",
@@ -184,10 +196,6 @@
184196
"source": "Review",
185197
"target": "Resolved"
186198
},
187-
{
188-
"source": "Done",
189-
"target": "Resolved"
190-
},
191199
{
192200
"source": "Confirm",
193201
"target": "Resolved"
@@ -279,7 +287,8 @@
279287
{
280288
"source": "description",
281289
"target": "Microsoft.VSTS.TCM.ReproSteps",
282-
"for": "Bug"
290+
"for": "Bug",
291+
"mapper": "MapRendered"
283292
},
284293
{
285294
"source": "environment",
@@ -289,4 +298,4 @@
289298
}
290299
]
291300
}
292-
}
301+
}

docs/Samples/config-scrum.json

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414
"base-area-path": "Migrated",
1515
"base-iteration-path": "Migrated",
1616
"ignore-failed-links": true,
17+
"include-link-comments": false,
18+
"include-jira-css-styles": false,
19+
"ignore-empty-revisions": false,
20+
"suppress-notifications": false,
21+
"sleep-time-between-revision-import-milliseconds": 0,
1722
"process-template": "Scrum",
1823
"link-map": {
1924
"link": [
@@ -25,6 +30,10 @@
2530
"source": "Parent",
2631
"target": "System.LinkTypes.Hierarchy-Reverse"
2732
},
33+
{
34+
"source": "Child",
35+
"target": "System.LinkTypes.Hierarchy-Forward"
36+
},
2837
{
2938
"source": "Relates",
3039
"target": "System.LinkTypes.Related"
@@ -78,6 +87,7 @@
7887
{
7988
"source": "description",
8089
"target": "System.Description",
90+
"not-for": "Bug",
8191
"mapper": "MapRendered"
8292
},
8393
{
@@ -222,8 +232,9 @@
222232
{
223233
"source": "description",
224234
"target": "Microsoft.VSTS.TCM.ReproSteps",
225-
"for": "Bug"
235+
"for": "Bug",
236+
"mapper": "MapRendered"
226237
}
227238
]
228239
}
229-
}
240+
}

docs/attachmentsjournalfile.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@
44

55
The attachments journal file contains data on the following format:
66

7-
attachment;id
7+
```txt
8+
attachment;id
9+
```
810

911
## Example file
1012

11-
```
12-
10015;2231232
13-
10015-thumb;2231233
14-
```
13+
```txt
14+
10015;2231232
15+
10015-thumb;2231233
16+
```

0 commit comments

Comments
 (0)