Skip to content

Commit d466f39

Browse files
Merge pull request #9 from davidmehren/net9-support
Support for .NET 9
2 parents 63ec7e8 + 2f4a37c commit d466f39

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

CodeQualityToGitlab/CodeQualityToGitlab.csproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
5+
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<PackAsTool>true</PackAsTool>
@@ -25,13 +25,14 @@
2525

2626
<ItemGroup>
2727
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0" />
28+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2829
<PackageReference Include="PolySharp" Version="1.14.1">
2930
<PrivateAssets>all</PrivateAssets>
3031
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3132
</PackageReference>
32-
<PackageReference Include="Sarif.Sdk" Version="4.4.0" />
33-
<PackageReference Include="Serilog" Version="3.1.1" />
34-
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
33+
<PackageReference Include="Sarif.Sdk" Version="4.5.4" />
34+
<PackageReference Include="Serilog" Version="4.1.0" />
35+
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
3536
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
3637
</ItemGroup>
3738

CodeQualityToGitlab/SarifConverters/Converter1.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ public List<CodeQuality> Convert()
2020

2121
var log = JsonConvert.DeserializeObject<SarifLogVersionOne>(logContents, settings);
2222

23-
var results = log.Runs
23+
var results = log?.Runs
2424
.SelectMany(x => x.Results)
25-
.Where(r => r.SuppressionStates == SuppressionStatesVersionOne.None);
25+
.Where(r => r.SuppressionStates == SuppressionStatesVersionOne.None) ?? [];
2626

2727
var cqrs = new List<CodeQuality>();
2828
foreach (var result in results)

Test/Test.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

88
<IsPackable>false</IsPackable>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="FluentAssertions" Version="6.12.0" />
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
14-
<PackageReference Include="xunit" Version="2.6.1" />
15-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
12+
<PackageReference Include="FluentAssertions" Version="6.12.2" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
14+
<PackageReference Include="xunit" Version="2.9.2" />
15+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
<PrivateAssets>all</PrivateAssets>
1818
</PackageReference>
19-
<PackageReference Include="coverlet.collector" Version="6.0.0">
19+
<PackageReference Include="coverlet.collector" Version="6.0.2">
2020
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2121
<PrivateAssets>all</PrivateAssets>
2222
</PackageReference>

0 commit comments

Comments
 (0)