Skip to content

Commit c13c4d0

Browse files
authored
Merge pull request #11 from typinghard/sonarcloud_initial
Initial changes to run sonarqube on sonarcloud
2 parents cca8559 + 56d328b commit c13c4d0

File tree

15 files changed

+93
-121
lines changed

15 files changed

+93
-121
lines changed

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,3 +348,9 @@ MigrationBackup/
348348

349349
# Ionide (cross platform F# VS Code tools) working folder
350350
.ionide/
351+
352+
.sonarqube
353+
354+
*.bat
355+
356+
*.xml

adt_pull_request.yml

Lines changed: 10 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -10,67 +10,29 @@ steps:
1010
organization: typinghard
1111
projectKey: 'typinghard_azure-devops-tracker'
1212
extraProperties: |
13-
# Additional properties that will be passed to the scanner,
14-
# Put one key=value per line, example:
15-
# sonar.exclusions=**/*.bin
16-
#sonar.coverageReportPaths=$(Agent.TempDirectory)/**/*.trx
17-
#sonar.cs.opencover.reportsPaths=$(Agent.TempDirectory)/**/*.trx
18-
#sonar.coverageReportPaths=$(Agent.TempDirectory)/reports/SonarQube.xml
19-
#sonar.cs.dotcover.reportsPaths=$(Agent.TempDirectory)/reports/DetailedXML.xml
20-
sonar.cs.opencover.reportsPaths=$(Build.SourcesDirectory)/**/coverage.opencover.xml
21-
sonar.cs.vstest.reportsPaths=$(Agent.TempDirectory)/**/*.trx
22-
sonar.cs.opencover.reportsPaths=$(Agent.TempDirectory)\**\*.trx
23-
sonar.cs.vstest.reportsPaths=$(Agent.TempDirectory)\**\*.trx
24-
sonar.cs.vscoveragexml.reportsPaths=$(Agent.TempDirectory)\**\*.coveragexml
25-
sonar.cs.vscoveragexml.reportsPaths=coverage.xml
26-
sonar.cs.opencover.reportsPaths=coverage.xml
27-
sonar.verbose=true
28-
13+
sonar.exclusions=**/obj/**,**/*.dll
14+
sonar.cs.opencover.reportsPaths=$(Agent.TempDirectory)/**/coverage.opencover.xml
15+
sonar.cs.vstest.reportsPaths=$(Agent.TempDirectory)/*.trx
2916
3017
- task: CmdLine@2
3118
inputs:
3219
script: dotnet restore
33-
displayName: 'Rodando dotnet restore'
20+
displayName: 'Run dotnet restore'
3421

3522
- task: CmdLine@2
3623
inputs:
3724
script: dotnet build --no-incremental
38-
displayName: 'Rodando dotnet build'
39-
40-
- task: DotNetCoreCLI@2
41-
displayName: 'Rodando dotnet test'
42-
inputs:
43-
command: test
44-
projects: '**/*[Tt]ests/*.csproj'
45-
arguments: '--configuration $(BuildConfiguration) /p:CollectCoverage=true /p:CoverletOutputFormat=opencover --collect "Code Coverage"'
25+
displayName: 'Run dotnet build'
4626

4727
- script: 'dotnet tool install --global coverlet.console'
4828
displayName: 'Install coverlet global tool'
4929

50-
#- script: 'reportgenerator -reports:$(Agent.TempDirectory)/**/coverage.cobertura.xml -targetdir:$(Build.SourcesDirectory)/coverlet/reports -reporttypes:"Cobertura"'
51-
# displayName: 'Create reports'
52-
53-
- script: coverlet *.Tests.dll --target "dotnet" --targetargs "test --no-build" -f=opencover -o="coverage.xml"
54-
displayName: 'Run coverlet'
55-
56-
- task: PublishTestResults@2
57-
inputs:
58-
testResultsFormat: 'VSTest'
59-
testResultsFiles: '$(Agent.TempDirectory)/**.*trx'
60-
61-
#- task: Palmmedia.reportgenerator.reportgenerator-build-release-task.reportgenerator@5
62-
# displayName: ReportGenerator
63-
# inputs:
64-
# reports: '$(Agent.TempDirectory)/coverage.cobertura.xml'
65-
# targetdir: '$(Build.SourcesDirectory)/reports'
66-
# reporttypes: 'SonarQube'
67-
# assemblyfilters: '-xunit\*'
68-
69-
- task: PublishCodeCoverageResults@1
70-
displayName: 'Publish code coverage from $(Build.SourcesDirectory)/coverage.xml'
30+
- task: DotNetCoreCLI@2
31+
displayName: 'Run dotnet test'
7132
inputs:
72-
codeCoverageTool: Cobertura
73-
summaryFileLocation: '$(Build.SourcesDirectory)/coverage.xml'
33+
command: test
34+
projects: '**/*[Tt]ests/*.csproj'
35+
arguments: '--configuration $(BuildConfiguration) /p:CollectCoverage=true /p:CoverletOutputFormat=opencover --collect "Code Coverage" /p:Exclude=[xunit.*]*'
7436

7537
- task: SonarSource.sonarcloud.ce096e50-6155-4de8-8800-4221aaeed4a1.SonarCloudAnalyze@1
7638
displayName: 'Run Code Analysis'

src/Adapters/WorkItemAdapter.cs

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using AzureDevopsTracker.DTOs;
1+
using AzureDevopsTracker.Dtos;
22
using AzureDevopsTracker.Entities;
33
using AzureDevopsTracker.Extensions;
44
using AzureDevopsTracker.Interfaces;
@@ -10,11 +10,11 @@ namespace AzureDevopsTracker.Adapters
1010
{
1111
internal class WorkItemAdapter : IWorkItemAdapter
1212
{
13-
public WorkItemDTO ToWorkItemDTO(WorkItem workItem)
13+
public WorkItemDto ToWorkItemDto(WorkItem workItem)
1414
{
1515
if (workItem is null) return null;
1616

17-
return new WorkItemDTO()
17+
return new WorkItemDto()
1818
{
1919
Id = workItem.Id,
2020
CreatedAt = workItem.CreatedAt,
@@ -32,30 +32,30 @@ public WorkItemDTO ToWorkItemDTO(WorkItem workItem)
3232
WorkItemParentId = workItem.WorkItemParentId,
3333
Activity = workItem.Activity,
3434
Tags = workItem.Tags is null ? new List<string>() : workItem.Tags.Split(';').ToList(),
35-
WorkItemsChangesDTO = ToWorkItemsChangeDTO(workItem.WorkItemsChanges.OrderBy(x => x.CreatedAt).ToList()),
36-
TimesByStateDTO = ToTimeByStatesDTO(workItem.CalculateTotalTimeByState().ToList()),
35+
WorkItemsChangesDto = ToWorkItemsChangeDto(workItem.WorkItemsChanges.OrderBy(x => x.CreatedAt).ToList()),
36+
TimesByStateDto = ToTimeByStatesDto(workItem.CalculateTotalTimeByState().ToList()),
3737
};
3838
}
3939

40-
public List<WorkItemDTO> ToWorkItemsDTO(List<WorkItem> workItems)
40+
public List<WorkItemDto> ToWorkItemsDto(List<WorkItem> workItems)
4141
{
42-
var workItemsDTO = new List<WorkItemDTO>();
42+
var workItemsDto = new List<WorkItemDto>();
4343

44-
if (workItems is null) return workItemsDTO;
44+
if (workItems is null) return workItemsDto;
4545

4646
workItems.ForEach(
4747
workItem =>
48-
workItemsDTO.Add(ToWorkItemDTO(workItem)));
48+
workItemsDto.Add(ToWorkItemDto(workItem)));
4949

50-
return workItemsDTO
50+
return workItemsDto
5151
.ToList();
5252
}
5353

54-
public WorkItemChangeDTO ToWorkItemChangeDTO(WorkItemChange workIteChange)
54+
public WorkItemChangeDto ToWorkItemChangeDto(WorkItemChange workIteChange)
5555
{
5656
if (workIteChange is null) return null;
5757

58-
return new WorkItemChangeDTO()
58+
return new WorkItemChangeDto()
5959
{
6060
NewDate = workIteChange.NewDate,
6161
NewState = workIteChange.NewState,
@@ -65,26 +65,26 @@ public WorkItemChangeDTO ToWorkItemChangeDTO(WorkItemChange workIteChange)
6565
};
6666
}
6767

68-
public List<WorkItemChangeDTO> ToWorkItemsChangeDTO(List<WorkItemChange> workItemsChanges)
68+
public List<WorkItemChangeDto> ToWorkItemsChangeDto(List<WorkItemChange> workItemsChanges)
6969
{
70-
var workItemsChangeDTO = new List<WorkItemChangeDTO>();
70+
var workItemsChangeDto = new List<WorkItemChangeDto>();
7171

72-
if (workItemsChanges is null) return workItemsChangeDTO;
72+
if (workItemsChanges is null) return workItemsChangeDto;
7373

7474
workItemsChanges.ForEach(
7575
workItemsChange =>
76-
workItemsChangeDTO.Add(ToWorkItemChangeDTO(workItemsChange)));
76+
workItemsChangeDto.Add(ToWorkItemChangeDto(workItemsChange)));
7777

78-
return workItemsChangeDTO
78+
return workItemsChangeDto
7979
.Where(w => w is not null)
8080
.ToList();
8181
}
8282

83-
public TimeByStateDTO ToTimeByStateDTO(TimeByState workItemStatusTime)
83+
public TimeByStateDto ToTimeByStateDto(TimeByState workItemStatusTime)
8484
{
8585
if (workItemStatusTime is null) return null;
8686

87-
return new TimeByStateDTO()
87+
return new TimeByStateDto()
8888
{
8989
CreatedAt = workItemStatusTime.CreatedAt,
9090
State = workItemStatusTime.State,
@@ -93,17 +93,17 @@ public TimeByStateDTO ToTimeByStateDTO(TimeByState workItemStatusTime)
9393
};
9494
}
9595

96-
public List<TimeByStateDTO> ToTimeByStatesDTO(List<TimeByState> workItemStatusTimes)
96+
public List<TimeByStateDto> ToTimeByStatesDto(List<TimeByState> workItemStatusTimes)
9797
{
98-
var workItemStatusTimeDTO = new List<TimeByStateDTO>();
98+
var workItemStatusTimeDto = new List<TimeByStateDto>();
9999

100-
if (workItemStatusTimes is null) return workItemStatusTimeDTO;
100+
if (workItemStatusTimes is null) return workItemStatusTimeDto;
101101

102102
workItemStatusTimes.ForEach(
103103
workItemStatusTime =>
104-
workItemStatusTimeDTO.Add(ToTimeByStateDTO(workItemStatusTime)));
104+
workItemStatusTimeDto.Add(ToTimeByStateDto(workItemStatusTime)));
105105

106-
return workItemStatusTimeDTO
106+
return workItemStatusTimeDto
107107
.Where(w => w is not null)
108108
.ToList();
109109
}

src/DTOs/Create/CreateWorkItemDTO.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using Newtonsoft.Json;
22
using System.Text.Json.Serialization;
33

4-
namespace AzureDevopsTracker.DTOs.Create
4+
namespace AzureDevopsTracker.Dtos.Create
55
{
6-
public record CreateWorkItemDTO
6+
public record CreateWorkItemDto
77
{
88
[JsonPropertyName("resource")]
99
[JsonProperty("resource")]

src/DTOs/Delete/DeleteWorkItemDTO.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using Newtonsoft.Json;
22
using System.Text.Json.Serialization;
33

4-
namespace AzureDevopsTracker.DTOs.Delete
4+
namespace AzureDevopsTracker.Dtos.Delete
55
{
6-
public record DeleteWorkItemDTO
6+
public record DeleteWorkItemDto
77
{
88
[JsonPropertyName("resource")]
99
[JsonProperty("resource")]

src/DTOs/Fields.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System;
33
using System.Text.Json.Serialization;
44

5-
namespace AzureDevopsTracker.DTOs
5+
namespace AzureDevopsTracker.Dtos
66
{
77
public record Fields
88
{

src/DTOs/Resource.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using Newtonsoft.Json;
22
using System.Text.Json.Serialization;
33

4-
namespace AzureDevopsTracker.DTOs
4+
namespace AzureDevopsTracker.Dtos
55
{
66
public record Resource
77
{

src/DTOs/Restore/RestoreWorkItemDTO.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using Newtonsoft.Json;
22
using System.Text.Json.Serialization;
33

4-
namespace AzureDevopsTracker.DTOs.Restore
4+
namespace AzureDevopsTracker.Dtos.Restore
55
{
6-
public record RestoreWorkItemDTO
6+
public record RestoreWorkItemDto
77
{
88
[JsonPropertyName("resource")]
99
[JsonProperty("resource")]

src/DTOs/Update/UpdateWorkItemDTO.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
using System;
33
using System.Text.Json.Serialization;
44

5-
namespace AzureDevopsTracker.DTOs.Update
5+
namespace AzureDevopsTracker.Dtos.Update
66
{
7-
public record UpdatedWorkItemDTO
7+
public record UpdatedWorkItemDto
88
{
99
[JsonPropertyName("resource")]
1010
[JsonProperty("resource")]

src/DTOs/WorkItemDTO.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
using System;
33
using System.Collections.Generic;
44

5-
namespace AzureDevopsTracker.DTOs
5+
namespace AzureDevopsTracker.Dtos
66
{
7-
public record WorkItemDTO
7+
public record WorkItemDto
88
{
99
[JsonProperty("id")]
1010
public string Id { get; init; }
@@ -55,13 +55,13 @@ public record WorkItemDTO
5555
public IEnumerable<string> Tags { get; init; }
5656

5757
[JsonProperty("workItems_changes")]
58-
public List<WorkItemChangeDTO> WorkItemsChangesDTO { get; init; }
58+
public List<WorkItemChangeDto> WorkItemsChangesDto { get; init; }
5959

6060
[JsonProperty("times_by_state")]
61-
public List<TimeByStateDTO> TimesByStateDTO { get; init; }
61+
public List<TimeByStateDto> TimesByStateDto { get; init; }
6262
}
6363

64-
public record WorkItemChangeDTO
64+
public record WorkItemChangeDto
6565
{
6666
[JsonProperty("new_date")]
6767
public DateTime NewDate { get; init; }
@@ -80,7 +80,7 @@ public record WorkItemChangeDTO
8080
}
8181

8282

83-
public record TimeByStateDTO
83+
public record TimeByStateDto
8484
{
8585
[JsonProperty("created_at")]
8686
public DateTime CreatedAt { get; init; }

0 commit comments

Comments
 (0)