Skip to content

Commit 0144585

Browse files
committed
Merge branch '6.0.0-rc1' of github.com:typinghard/azure-devops-state-tracker into 6.0.0
2 parents 1ff1102 + a82aee0 commit 0144585

File tree

5 files changed

+7
-12
lines changed

5 files changed

+7
-12
lines changed

azure_pull_request.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
pool:
2+
vmImage: ubuntu-latest
23
name: Azure Pipelines
34
demands: java
45

@@ -21,15 +22,8 @@ steps:
2122
2223
- task: CmdLine@2
2324
inputs:
24-
script: dotnet build --no-incremental
25-
displayName: 'Run dotnet build'
26-
27-
- task: DotNetCoreCLI@2
28-
displayName: 'Run dotnet test'
29-
inputs:
30-
command: test
31-
projects: '**/*[Tt]ests/*.csproj'
32-
arguments: '--configuration $(BuildConfiguration) /p:CollectCoverage=true /p:CoverletOutputFormat=opencover --collect "Code Coverage" /p:Exclude=[xunit.*]*'
25+
script: dotnet test --configuration $(BuildConfiguration) /p:CollectCoverage=true /p:CoverletOutputFormat=opencover --collect "Code Coverage" /p:Exclude=[xunit.*]*
26+
displayName: 'Run Tests'
3327

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

src/AzureDevopsTracker.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<FileVersion>6.0.0</FileVersion>
2222
<Version>6.0.0</Version>
2323
<PackageReleaseNotes>Add ChangeLog Feature</PackageReleaseNotes>
24+
<Title>Azure DevOps Tracker</Title>
2425
</PropertyGroup>
2526

2627
<ItemGroup>

src/Entities/WorkItem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public void AddTimeByState(TimeByState timeByState)
9595

9696
public void AddTimesByState(IEnumerable<TimeByState> timesByState)
9797
{
98-
if (timesByState is not null && !timesByState.Any())
98+
if (timesByState is null || timesByState?.Any() == false)
9999
return;
100100

101101
foreach (var timeByState in timesByState)

src/Extensions/HelperExtenions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public static string ExtractEmail(this string user)
2525
if (!user.Contains(" <") && !user.TrimEnd().Contains(">"))
2626
return user;
2727

28-
return user.Split("<").LastOrDefault().Split(">").FirstOrDefault();
28+
return user.Split("<").LastOrDefault()?.Split(">")?.FirstOrDefault();
2929
}
3030

3131
public static string ToTextTime(this TimeSpan timeSpan)

tests/AzureDevopsTracker.Tests/AzureDevopsTracker.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="coverlet.msbuild" Version="3.1.1">
12+
<PackageReference Include="coverlet.msbuild" Version="3.1.2">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>

0 commit comments

Comments
 (0)