Skip to content

Commit 2b2d4fc

Browse files
danielpalmedanielpalme
committed
Merge branch 'main' into net9
2 parents 127855e + 20438c8 commit 2b2d4fc

File tree

6 files changed

+17
-192
lines changed

6 files changed

+17
-192
lines changed

‎src/Deployment/nuget/ReportGenerator.Core.nuspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ https://github.com/danielpalme/ReportGenerator/wiki/Custom-history-storage</desc
3131
<dependency id="Microsoft.Extensions.Configuration.Json" version="8.0.1" />
3232
<dependency id="Microsoft.Extensions.ObjectPool" version="8.0.10" />
3333
<dependency id="System.Text.Json" version="8.0.5" />
34-
<dependency id="DotNetConfig" version="1.0.6" />
34+
<dependency id="DotNetConfig" version="1.2.0" />
3535
</group>
3636

3737
<group targetFramework="netcoreapp">
@@ -41,7 +41,7 @@ https://github.com/danielpalme/ReportGenerator/wiki/Custom-history-storage</desc
4141
<dependency id="Microsoft.Extensions.Configuration.Json" version="8.0.1" />
4242
<dependency id="Microsoft.Extensions.ObjectPool" version="8.0.10" />
4343
<dependency id="System.Text.Json" version="8.0.5" />
44-
<dependency id="DotNetConfig" version="1.0.6" />
44+
<dependency id="DotNetConfig" version="1.2.0" />
4545
<dependency id="McMaster.NETCore.Plugins" version="1.4.0" />
4646
</group>
4747
</dependencies>

‎src/ReportGenerator.Core.Test/Common/JsonSerializerTest.cs

-49
This file was deleted.

‎src/ReportGenerator.Core/Common/JsonSerializer.cs

-128
This file was deleted.

‎src/ReportGenerator.Core/Generator.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,9 @@ public bool GenerateReport(
152152
}
153153

154154
Logger.Debug(Resources.Settings);
155-
Logger.Debug(" " + JsonSerializer.ToJsonString(settings));
156-
Logger.Debug(" " + JsonSerializer.ToJsonString(minimumCoverageThresholds));
157-
Logger.Debug(" " + JsonSerializer.ToJsonString(riskHotspotsAnalysisThresholds));
155+
Logger.Debug(" " + System.Text.Json.JsonSerializer.Serialize(settings));
156+
Logger.Debug(" " + System.Text.Json.JsonSerializer.Serialize(minimumCoverageThresholds));
157+
Logger.Debug(" " + System.Text.Json.JsonSerializer.Serialize(riskHotspotsAnalysisThresholds));
158158

159159
var stopWatch = Stopwatch.StartNew();
160160

‎src/ReportGenerator.Core/Reporting/Builders/CodeClimateReportBuilder.cs

+7-6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System.Globalization;
44
using System.IO;
55
using System.Text;
6+
using System.Text.Json;
67
using Palmmedia.ReportGenerator.Core.Common;
78
using Palmmedia.ReportGenerator.Core.Logging;
89
using Palmmedia.ReportGenerator.Core.Parser.Analysis;
@@ -84,7 +85,7 @@ public void CreateSummaryReport(SummaryResult summaryResult)
8485
reportTextWriter.WriteLine("{");
8586

8687
reportTextWriter.WriteLine(" \"ci_service\": {");
87-
reportTextWriter.WriteLine($" \"branch\": \"{JsonSerializer.EscapeString(gitInformation.Branch)}\",");
88+
reportTextWriter.WriteLine($" \"branch\": {JsonSerializer.Serialize(gitInformation.Branch)},");
8889
reportTextWriter.WriteLine(" \"build_identifier\": \"\",");
8990
reportTextWriter.WriteLine(" \"build_url\": \"\",");
9091
reportTextWriter.WriteLine($" \"commit_sha\": \"{gitInformation.Sha}\",");
@@ -95,15 +96,15 @@ public void CreateSummaryReport(SummaryResult summaryResult)
9596
reportTextWriter.WriteLine(" \"environment\": {");
9697
reportTextWriter.WriteLine(" \"gem_version\": \"\",");
9798
reportTextWriter.WriteLine(" \"package_version\": \"\",");
98-
reportTextWriter.WriteLine($" \"pwd\": \"{JsonSerializer.EscapeString(Directory.GetCurrentDirectory())}\",");
99-
reportTextWriter.WriteLine($" \"prefix\": \"{JsonSerializer.EscapeString(Directory.GetCurrentDirectory())}\",");
99+
reportTextWriter.WriteLine($" \"pwd\": {JsonSerializer.Serialize(Directory.GetCurrentDirectory())},");
100+
reportTextWriter.WriteLine($" \"prefix\": {JsonSerializer.Serialize(Directory.GetCurrentDirectory())},");
100101
reportTextWriter.WriteLine(" \"rails_root\": \"\",");
101102
reportTextWriter.WriteLine(" \"reporter_version\": \"0.11.1\",");
102103
reportTextWriter.WriteLine(" \"simplecov_root\": \"\"");
103104
reportTextWriter.WriteLine(" },");
104105

105106
reportTextWriter.WriteLine(" \"git\": {");
106-
reportTextWriter.WriteLine($" \"branch\": \"{JsonSerializer.EscapeString(gitInformation.Branch)}\",");
107+
reportTextWriter.WriteLine($" \"branch\": {JsonSerializer.Serialize(gitInformation.Branch)},");
107108
reportTextWriter.WriteLine($" \"head\": \"{gitInformation.Sha}\",");
108109
reportTextWriter.WriteLine($" \"committed_at\": {(string.IsNullOrWhiteSpace(gitInformation.TimeStamp) ? "null" : gitInformation.TimeStamp)}");
109110
reportTextWriter.WriteLine(" },");
@@ -140,7 +141,7 @@ public void CreateSummaryReport(SummaryResult summaryResult)
140141
}
141142

142143
reportTextWriter.WriteLine(" {");
143-
reportTextWriter.WriteLine($" \"blob_id\": \"{JsonSerializer.EscapeString(GitHelper.GetFileHash(file.Path))}\",");
144+
reportTextWriter.WriteLine($" \"blob_id\": {JsonSerializer.Serialize(GitHelper.GetFileHash(file.Path))},");
144145
reportTextWriter.Write($" \"coverage\": [");
145146

146147
var lineCoverage = file.LineCoverage;
@@ -170,7 +171,7 @@ public void CreateSummaryReport(SummaryResult summaryResult)
170171
reportTextWriter.WriteLine($" \"covered\": {file.CoverableLines.ToString(CultureInfo.InvariantCulture)},");
171172
reportTextWriter.WriteLine($" \"total\": {file.TotalLines.GetValueOrDefault().ToString(CultureInfo.InvariantCulture)}");
172173
reportTextWriter.WriteLine(" },");
173-
reportTextWriter.WriteLine($" \"name\": \"{JsonSerializer.EscapeString(file.Path)}\"");
174+
reportTextWriter.WriteLine($" \"name\": {JsonSerializer.Serialize(file.Path)}");
174175
reportTextWriter.Write(" }");
175176
}
176177
}

‎src/ReportGenerator.Core/Reporting/Builders/JsonSummaryReportBuilder.cs

+5-4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System.IO;
55
using System.Linq;
66
using System.Text;
7+
using System.Text.Json;
78
using Palmmedia.ReportGenerator.Core.Common;
89
using Palmmedia.ReportGenerator.Core.Logging;
910
using Palmmedia.ReportGenerator.Core.Parser.Analysis;
@@ -141,11 +142,11 @@ public void CreateSummaryReport(SummaryResult summaryResult)
141142

142143
if (metric.Value.HasValue)
143144
{
144-
reportTextWriter.Write($" {{ \"name\": \"{JsonSerializer.EscapeString(metric.Name)}\", \"value\": {metric.Value.Value.ToString(CultureInfo.InvariantCulture)} }}");
145+
reportTextWriter.Write($" {{ \"name\": {JsonSerializer.Serialize(metric.Name)}, \"value\": {metric.Value.Value.ToString(CultureInfo.InvariantCulture)} }}");
145146
}
146147
else
147148
{
148-
reportTextWriter.Write($" {{ \"name\": \"{JsonSerializer.EscapeString(metric.Name)}\", \"value\": null }}");
149+
reportTextWriter.Write($" {{ \"name\": {JsonSerializer.Serialize(metric.Name)}, \"value\": null }}");
149150
}
150151

151152
metricCounter++;
@@ -167,7 +168,7 @@ public void CreateSummaryReport(SummaryResult summaryResult)
167168
reportTextWriter.WriteLine(",");
168169
}
169170

170-
reportTextWriter.WriteLine($" {{ \"name\": \"{JsonSerializer.EscapeString(assembly.Name)}\", \"classes\": {assembly.Classes.Count().ToString(CultureInfo.InvariantCulture)}, \"coverage\": {(assembly.CoverageQuota.HasValue ? assembly.CoverageQuota.Value.ToString(CultureInfo.InvariantCulture) : "null")}, \"coveredlines\": {assembly.CoveredLines.ToString(CultureInfo.InvariantCulture)}, \"coverablelines\": {assembly.CoverableLines.ToString(CultureInfo.InvariantCulture)}, \"totallines\": {(assembly.TotalLines.HasValue ? assembly.TotalLines.Value.ToString(CultureInfo.InvariantCulture) : "null")}, \"branchcoverage\": {(assembly.BranchCoverageQuota.HasValue ? assembly.BranchCoverageQuota.Value.ToString(CultureInfo.InvariantCulture) : "null")}, \"coveredbranches\": {(assembly.CoveredBranches.HasValue ? assembly.CoveredBranches.Value.ToString(CultureInfo.InvariantCulture) : "null")}, \"totalbranches\": {(assembly.TotalBranches.HasValue ? assembly.TotalBranches.Value.ToString(CultureInfo.InvariantCulture) : null)}, \"methodcoverage\": {(assembly.CodeElementCoverageQuota.HasValue ? assembly.CodeElementCoverageQuota.Value.ToString(CultureInfo.InvariantCulture) : "null")}, \"coveredmethods\": {assembly.CoveredCodeElements.ToString(CultureInfo.InvariantCulture)}, \"totalmethods\": {assembly.TotalCodeElements.ToString(CultureInfo.InvariantCulture)}, \"classesinassembly\": [");
171+
reportTextWriter.WriteLine($" {{ \"name\": {JsonSerializer.Serialize(assembly.Name)}, \"classes\": {assembly.Classes.Count().ToString(CultureInfo.InvariantCulture)}, \"coverage\": {(assembly.CoverageQuota.HasValue ? assembly.CoverageQuota.Value.ToString(CultureInfo.InvariantCulture) : "null")}, \"coveredlines\": {assembly.CoveredLines.ToString(CultureInfo.InvariantCulture)}, \"coverablelines\": {assembly.CoverableLines.ToString(CultureInfo.InvariantCulture)}, \"totallines\": {(assembly.TotalLines.HasValue ? assembly.TotalLines.Value.ToString(CultureInfo.InvariantCulture) : "null")}, \"branchcoverage\": {(assembly.BranchCoverageQuota.HasValue ? assembly.BranchCoverageQuota.Value.ToString(CultureInfo.InvariantCulture) : "null")}, \"coveredbranches\": {(assembly.CoveredBranches.HasValue ? assembly.CoveredBranches.Value.ToString(CultureInfo.InvariantCulture) : "null")}, \"totalbranches\": {(assembly.TotalBranches.HasValue ? assembly.TotalBranches.Value.ToString(CultureInfo.InvariantCulture) : null)}, \"methodcoverage\": {(assembly.CodeElementCoverageQuota.HasValue ? assembly.CodeElementCoverageQuota.Value.ToString(CultureInfo.InvariantCulture) : "null")}, \"coveredmethods\": {assembly.CoveredCodeElements.ToString(CultureInfo.InvariantCulture)}, \"totalmethods\": {assembly.TotalCodeElements.ToString(CultureInfo.InvariantCulture)}, \"classesinassembly\": [");
171172

172173
int classCounter = 0;
173174

@@ -178,7 +179,7 @@ public void CreateSummaryReport(SummaryResult summaryResult)
178179
reportTextWriter.WriteLine(",");
179180
}
180181

181-
reportTextWriter.Write($" {{ \"name\": \"{JsonSerializer.EscapeString(@class.Name)}\", \"coverage\": {(@class.CoverageQuota.HasValue ? @class.CoverageQuota.Value.ToString(CultureInfo.InvariantCulture) : "null")}, \"coveredlines\": {@class.CoveredLines.ToString(CultureInfo.InvariantCulture)}, \"coverablelines\": {@class.CoverableLines.ToString(CultureInfo.InvariantCulture)}, \"totallines\": {(@class.TotalLines.HasValue ? @class.TotalLines.Value.ToString(CultureInfo.InvariantCulture) : "null")}, \"branchcoverage\": {(@class.BranchCoverageQuota.HasValue ? @class.BranchCoverageQuota.Value.ToString(CultureInfo.InvariantCulture) : "null")}, \"coveredbranches\": {(@class.CoveredBranches.HasValue ? @class.CoveredBranches.Value.ToString(CultureInfo.InvariantCulture) : "null")}, \"totalbranches\": {(@class.TotalBranches.HasValue ? @class.TotalBranches.Value.ToString(CultureInfo.InvariantCulture) : null)}, \"methodcoverage\": {(@class.CodeElementCoverageQuota.HasValue ? @class.CodeElementCoverageQuota.Value.ToString(CultureInfo.InvariantCulture) : "null")}, \"coveredmethods\": {@class.CoveredCodeElements.ToString(CultureInfo.InvariantCulture)}, \"totalmethods\": {@class.TotalCodeElements.ToString(CultureInfo.InvariantCulture)} }}");
182+
reportTextWriter.Write($" {{ \"name\": {JsonSerializer.Serialize(@class.Name)}, \"coverage\": {(@class.CoverageQuota.HasValue ? @class.CoverageQuota.Value.ToString(CultureInfo.InvariantCulture) : "null")}, \"coveredlines\": {@class.CoveredLines.ToString(CultureInfo.InvariantCulture)}, \"coverablelines\": {@class.CoverableLines.ToString(CultureInfo.InvariantCulture)}, \"totallines\": {(@class.TotalLines.HasValue ? @class.TotalLines.Value.ToString(CultureInfo.InvariantCulture) : "null")}, \"branchcoverage\": {(@class.BranchCoverageQuota.HasValue ? @class.BranchCoverageQuota.Value.ToString(CultureInfo.InvariantCulture) : "null")}, \"coveredbranches\": {(@class.CoveredBranches.HasValue ? @class.CoveredBranches.Value.ToString(CultureInfo.InvariantCulture) : "null")}, \"totalbranches\": {(@class.TotalBranches.HasValue ? @class.TotalBranches.Value.ToString(CultureInfo.InvariantCulture) : null)}, \"methodcoverage\": {(@class.CodeElementCoverageQuota.HasValue ? @class.CodeElementCoverageQuota.Value.ToString(CultureInfo.InvariantCulture) : "null")}, \"coveredmethods\": {@class.CoveredCodeElements.ToString(CultureInfo.InvariantCulture)}, \"totalmethods\": {@class.TotalCodeElements.ToString(CultureInfo.InvariantCulture)} }}");
182183

183184
classCounter++;
184185
}

0 commit comments

Comments
 (0)